From b70819eee3a21dfb202f99eb0663891cabd9b76d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 14 六月 2025 14:37:22 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 2
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs | 31 +
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs | 895 ++++++++++++++++++++++++++++++-------------------------
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 14
5 files changed, 515 insertions(+), 436 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index f6bebc1..02cdb69 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -51,7 +51,6 @@
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_fApproverStaus = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fBillTypeID = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fSaleOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -294,7 +293,6 @@
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_fApproverStaus,
this.gridColumn2,
- this.gv_id,
this.gv_billNo,
this.gv_fBillTypeID,
this.gv_fSaleOrgId,
@@ -338,17 +336,6 @@
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
this.gridColumn2.Width = 94;
- //
- // gv_id
- //
- this.gv_id.AppearanceCell.Options.UseFont = true;
- this.gv_id.Caption = "涓婚敭GUID";
- this.gv_id.FieldName = "id";
- this.gv_id.MinWidth = 50;
- this.gv_id.Name = "gv_id";
- this.gv_id.OptionsColumn.AllowEdit = false;
- this.gv_id.Tag = "query_a.id";
- this.gv_id.Width = 94;
//
// gv_billNo
//
@@ -1640,7 +1627,6 @@
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_id;
private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_fBillTypeID;
private DevExpress.XtraGrid.Columns.GridColumn gv_fSaleOrgId;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index 8d6cd74..b7858e0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -14,7 +14,7 @@
{
public partial class Frm_SalesDeliver : DevExpress.XtraEditors.XtraForm
{
- string _webServiceName = "SalesDeliverManager/";
+ string _webServiceName = "SalesDeliverManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
public Frm_SalesDeliver()
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
index 8e36e8a..66db1f7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
@@ -31,17 +31,17 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition21 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -76,7 +76,7 @@
this.txt_gdbh = new DevExpress.XtraEditors.TextEdit();
this.txt_processNo = new DevExpress.XtraEditors.TextEdit();
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
- this.txt_barCode = new DevExpress.XtraEditors.TextEdit();
+ this.txt_barCode111 = new DevExpress.XtraEditors.TextEdit();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
@@ -85,36 +85,29 @@
this.txt_sjDate = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton();
- this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton();
- this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton();
- this.simpleButton4 = new DevExpress.XtraEditors.SimpleButton();
- this.simpleButton3 = new DevExpress.XtraEditors.SimpleButton();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.panel5 = new System.Windows.Forms.Panel();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.lbSum1 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.panel4 = new System.Windows.Forms.Panel();
+ this.lbSum2 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
this.prog1 = new DevExpress.XtraEditors.ProgressBarControl();
this.panel2 = new System.Windows.Forms.Panel();
this.lbSum3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
- this.panel4 = new System.Windows.Forms.Panel();
- this.lbSum2 = new System.Windows.Forms.Label();
- this.label8 = new System.Windows.Forms.Label();
- this.panel1 = new System.Windows.Forms.Panel();
- this.lbSum1 = new System.Windows.Forms.Label();
- this.label1 = new System.Windows.Forms.Label();
- this.btnGood = new DevExpress.XtraEditors.SimpleButton();
+ this.panel3 = new System.Windows.Forms.Panel();
+ this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton();
this.btnBad = new DevExpress.XtraEditors.SimpleButton();
+ this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton();
+ this.btnGood = new DevExpress.XtraEditors.SimpleButton();
+ this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton();
+ this.simpleButton3 = new DevExpress.XtraEditors.SimpleButton();
+ this.simpleButton4 = new DevExpress.XtraEditors.SimpleButton();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
@@ -151,6 +144,18 @@
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_barCode = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -181,7 +186,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_gdbh.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_processNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_barCode111.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
@@ -190,23 +195,16 @@
((System.ComponentModel.ISupportInitialize)(this.txt_sjDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ this.panel5.SuspendLayout();
+ this.panel1.SuspendLayout();
+ this.panel4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit();
this.panel2.SuspendLayout();
- this.panel4.SuspendLayout();
- this.panel1.SuspendLayout();
+ this.panel3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage2.SuspendLayout();
@@ -215,6 +213,17 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -305,7 +314,8 @@
this.gridColumn21,
this.gridColumn23,
this.gridColumn37,
- this.gridColumn38});
+ this.gridColumn38,
+ this.gridColumn3});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -495,7 +505,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1251, 570);
- this.splitMx1.SplitterPosition = 226;
+ this.splitMx1.SplitterPosition = 260;
this.splitMx1.TabIndex = 1;
//
// splitTop1
@@ -512,20 +522,11 @@
//
// splitTop1.Panel2
//
- this.splitTop1.Panel2.Controls.Add(this.simpleButton7);
- this.splitTop1.Panel2.Controls.Add(this.simpleButton6);
- this.splitTop1.Panel2.Controls.Add(this.simpleButton5);
- this.splitTop1.Panel2.Controls.Add(this.simpleButton4);
- this.splitTop1.Panel2.Controls.Add(this.simpleButton3);
- this.splitTop1.Panel2.Controls.Add(this.prog1);
- this.splitTop1.Panel2.Controls.Add(this.panel2);
- this.splitTop1.Panel2.Controls.Add(this.panel4);
- this.splitTop1.Panel2.Controls.Add(this.panel1);
- this.splitTop1.Panel2.Controls.Add(this.btnGood);
- this.splitTop1.Panel2.Controls.Add(this.btnBad);
+ this.splitTop1.Panel2.Controls.Add(this.panel5);
+ this.splitTop1.Panel2.Controls.Add(this.panel3);
this.splitTop1.Panel2.Text = "Panel2";
this.splitTop1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitTop1.Size = new System.Drawing.Size(1251, 226);
+ this.splitTop1.Size = new System.Drawing.Size(1251, 260);
this.splitTop1.SplitterPosition = 390;
this.splitTop1.TabIndex = 0;
//
@@ -538,30 +539,31 @@
this.layoutMx1.Controls.Add(this.txt_gdbh);
this.layoutMx1.Controls.Add(this.txt_processNo);
this.layoutMx1.Controls.Add(this.txt_createBy);
- this.layoutMx1.Controls.Add(this.txt_barCode);
+ this.layoutMx1.Controls.Add(this.txt_barCode111);
this.layoutMx1.Controls.Add(this.txt_itemNo);
this.layoutMx1.Controls.Add(this.txt_itemName);
this.layoutMx1.Controls.Add(this.txt_itemModel);
this.layoutMx1.Controls.Add(this.txt_sjXt);
this.layoutMx1.Controls.Add(this.txt_yjDate);
this.layoutMx1.Controls.Add(this.txt_sjDate);
+ this.layoutMx1.Controls.Add(this.txt_barCode);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem5});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(981, 0, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(699, 264, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(849, 226);
+ this.layoutMx1.Size = new System.Drawing.Size(849, 260);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// txt_repairReson
//
this.txt_repairReson.BtnTxt = "涓嶈壇鍘熷洜";
- this.txt_repairReson.Location = new System.Drawing.Point(12, 157);
+ this.txt_repairReson.Location = new System.Drawing.Point(12, 182);
this.txt_repairReson.Name = "txt_repairReson";
- this.txt_repairReson.Size = new System.Drawing.Size(410, 57);
+ this.txt_repairReson.Size = new System.Drawing.Size(410, 66);
this.txt_repairReson.TabIndex = 26;
this.txt_repairReson.TextTxt = "";
this.txt_repairReson.WhereTxt = " a.s_type=\'宸ュ簭涓嶈壇鍘熷洜\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
@@ -569,9 +571,9 @@
// txt_badDescription
//
this.txt_badDescription.BtnTxt = "涓嶈壇鎻忚堪";
- this.txt_badDescription.Location = new System.Drawing.Point(12, 99);
+ this.txt_badDescription.Location = new System.Drawing.Point(12, 114);
this.txt_badDescription.Name = "txt_badDescription";
- this.txt_badDescription.Size = new System.Drawing.Size(410, 54);
+ this.txt_badDescription.Size = new System.Drawing.Size(410, 64);
this.txt_badDescription.TabIndex = 25;
this.txt_badDescription.TextTxt = "";
this.txt_badDescription.WhereTxt = "s_type=\'鐜板満缁翠慨涓嶈壇鐜拌薄\'";
@@ -579,9 +581,9 @@
// txt_repairMethd
//
this.txt_repairMethd.BtnTxt = "涓嶈壇瀵圭瓥";
- this.txt_repairMethd.Location = new System.Drawing.Point(426, 99);
+ this.txt_repairMethd.Location = new System.Drawing.Point(426, 148);
this.txt_repairMethd.Name = "txt_repairMethd";
- this.txt_repairMethd.Size = new System.Drawing.Size(411, 115);
+ this.txt_repairMethd.Size = new System.Drawing.Size(411, 100);
this.txt_repairMethd.TabIndex = 24;
this.txt_repairMethd.TextTxt = "";
this.txt_repairMethd.WhereTxt = " a.s_type=\'宸ュ簭涓嶈壇瀵圭瓥\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
@@ -596,90 +598,94 @@
//
// txt_gdbh
//
- this.txt_gdbh.Location = new System.Drawing.Point(84, 12);
+ this.txt_gdbh.Location = new System.Drawing.Point(99, 80);
this.txt_gdbh.Name = "txt_gdbh";
this.txt_gdbh.Properties.ReadOnly = true;
- this.txt_gdbh.Size = new System.Drawing.Size(131, 24);
+ this.txt_gdbh.Size = new System.Drawing.Size(116, 24);
this.txt_gdbh.StyleController = this.layoutMx1;
this.txt_gdbh.TabIndex = 4;
//
// txt_processNo
//
- this.txt_processNo.Location = new System.Drawing.Point(498, 70);
+ this.txt_processNo.Location = new System.Drawing.Point(513, 114);
this.txt_processNo.Name = "txt_processNo";
this.txt_processNo.Properties.ReadOnly = true;
- this.txt_processNo.Size = new System.Drawing.Size(131, 24);
+ this.txt_processNo.Size = new System.Drawing.Size(116, 24);
this.txt_processNo.StyleController = this.layoutMx1;
this.txt_processNo.TabIndex = 5;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(705, 70);
+ this.txt_createBy.Location = new System.Drawing.Point(720, 114);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.ReadOnly = true;
- this.txt_createBy.Size = new System.Drawing.Size(132, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(117, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 6;
//
- // txt_barCode
+ // txt_barCode111
//
- this.txt_barCode.Location = new System.Drawing.Point(84, 70);
- this.txt_barCode.Name = "txt_barCode";
- this.txt_barCode.Size = new System.Drawing.Size(338, 24);
- this.txt_barCode.StyleController = this.layoutMx1;
- this.txt_barCode.TabIndex = 7;
+ this.txt_barCode111.Location = new System.Drawing.Point(99, 12);
+ this.txt_barCode111.Name = "txt_barCode111";
+ this.txt_barCode111.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold);
+ this.txt_barCode111.Properties.Appearance.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Hyperlink;
+ this.txt_barCode111.Properties.Appearance.Options.UseFont = true;
+ this.txt_barCode111.Properties.Appearance.Options.UseForeColor = true;
+ this.txt_barCode111.Size = new System.Drawing.Size(323, 30);
+ this.txt_barCode111.StyleController = this.layoutMx1;
+ this.txt_barCode111.TabIndex = 7;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(84, 41);
+ this.txt_itemNo.Location = new System.Drawing.Point(513, 46);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.ReadOnly = true;
- this.txt_itemNo.Size = new System.Drawing.Size(131, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(116, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 10;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(291, 41);
+ this.txt_itemName.Location = new System.Drawing.Point(720, 46);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.ReadOnly = true;
- this.txt_itemName.Size = new System.Drawing.Size(131, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(117, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 13;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(498, 41);
+ this.txt_itemModel.Location = new System.Drawing.Point(513, 80);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.ReadOnly = true;
- this.txt_itemModel.Size = new System.Drawing.Size(339, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(324, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 14;
//
// txt_sjXt
//
- this.txt_sjXt.Location = new System.Drawing.Point(291, 12);
+ this.txt_sjXt.Location = new System.Drawing.Point(306, 80);
this.txt_sjXt.Name = "txt_sjXt";
this.txt_sjXt.Properties.ReadOnly = true;
- this.txt_sjXt.Size = new System.Drawing.Size(131, 24);
+ this.txt_sjXt.Size = new System.Drawing.Size(116, 24);
this.txt_sjXt.StyleController = this.layoutMx1;
this.txt_sjXt.TabIndex = 16;
//
// txt_yjDate
//
- this.txt_yjDate.Location = new System.Drawing.Point(498, 12);
+ this.txt_yjDate.Location = new System.Drawing.Point(513, 12);
this.txt_yjDate.Name = "txt_yjDate";
this.txt_yjDate.Properties.ReadOnly = true;
- this.txt_yjDate.Size = new System.Drawing.Size(131, 24);
+ this.txt_yjDate.Size = new System.Drawing.Size(116, 24);
this.txt_yjDate.StyleController = this.layoutMx1;
this.txt_yjDate.TabIndex = 17;
//
// txt_sjDate
//
- this.txt_sjDate.Location = new System.Drawing.Point(705, 12);
+ this.txt_sjDate.Location = new System.Drawing.Point(720, 12);
this.txt_sjDate.Name = "txt_sjDate";
this.txt_sjDate.Properties.ReadOnly = true;
- this.txt_sjDate.Size = new System.Drawing.Size(132, 24);
+ this.txt_sjDate.Size = new System.Drawing.Size(117, 24);
this.txt_sjDate.StyleController = this.layoutMx1;
this.txt_sjDate.TabIndex = 18;
//
@@ -699,172 +705,59 @@
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem1,
- this.layoutControlItem4,
- this.layoutControlItem18,
- this.layoutControlItem16,
- this.layoutControlItem7,
- this.layoutControlItem10,
- this.layoutControlItem11,
- this.layoutControlItem9,
- this.layoutControlItem2,
- this.layoutControlItem13,
this.layoutControlItem14,
this.layoutControlItem15,
- this.layoutControlItem3});
+ this.layoutControlItem4,
+ this.layoutControlItem9,
+ this.layoutControlItem1,
+ this.layoutControlItem13,
+ this.layoutControlItem2,
+ this.layoutControlItem3,
+ this.layoutControlItem6,
+ this.layoutControlItem16,
+ this.layoutControlItem18,
+ this.layoutControlItem11,
+ this.layoutControlItem7,
+ this.layoutControlItem10});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9,
+ columnDefinition10,
+ columnDefinition11,
+ columnDefinition12});
+ rowDefinition15.Height = 100D;
+ rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition16.Height = 100D;
+ rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition17.Height = 100D;
+ rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition18.Height = 100D;
+ rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition19.Height = 100D;
+ rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition20.Height = 100D;
+ rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition21.Height = 100D;
+ rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6,
- rowDefinition7});
- this.Root.Size = new System.Drawing.Size(849, 226);
+ rowDefinition15,
+ rowDefinition16,
+ rowDefinition17,
+ rowDefinition18,
+ rowDefinition19,
+ rowDefinition20,
+ rowDefinition21});
+ this.Root.Size = new System.Drawing.Size(849, 260);
this.Root.TextVisible = false;
- //
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.txt_gdbh;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(207, 29);
- this.layoutControlItem1.Text = "宸ュ崟缂栧彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_barCode;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 58);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(414, 29);
- this.layoutControlItem4.Text = "鎵拷婧爜";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem18
- //
- this.layoutControlItem18.Control = this.txt_repairMethd;
- this.layoutControlItem18.Location = new System.Drawing.Point(414, 87);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem18.OptionsTableLayoutItem.RowSpan = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(415, 119);
- this.layoutControlItem18.Text = "涓嶈壇瀵圭瓥";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem18.TextVisible = false;
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_badDescription;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 87);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(414, 58);
- this.layoutControlItem16.Text = "涓嶈壇鐜板儚";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem16.TextVisible = false;
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_itemNo;
- this.layoutControlItem7.Location = new System.Drawing.Point(0, 29);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(207, 29);
- this.layoutControlItem7.Text = "浜у搧缂栫爜";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_itemName;
- this.layoutControlItem10.Location = new System.Drawing.Point(207, 29);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(207, 29);
- this.layoutControlItem10.Text = "浜у搧鍚嶇О";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_itemModel;
- this.layoutControlItem11.Location = new System.Drawing.Point(414, 29);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(415, 29);
- this.layoutControlItem11.Text = "浜у搧瑙勬牸";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_repairReson;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 145);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem9.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(414, 61);
- this.layoutControlItem9.Text = "涓嶈壇鍘熷洜";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem9.TextVisible = false;
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_processNo;
- this.layoutControlItem2.Location = new System.Drawing.Point(414, 58);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(207, 29);
- this.layoutControlItem2.Text = "涓婃姤宸ュ簭";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_sjXt;
- this.layoutControlItem13.Location = new System.Drawing.Point(207, 0);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(207, 29);
- this.layoutControlItem13.Text = "鐢熶骇绾垮埆";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
@@ -872,9 +765,9 @@
this.layoutControlItem14.Location = new System.Drawing.Point(414, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(207, 29);
+ this.layoutControlItem14.Size = new System.Drawing.Size(207, 34);
this.layoutControlItem14.Text = "璁″垝鏃堕棿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem15
//
@@ -882,74 +775,104 @@
this.layoutControlItem15.Location = new System.Drawing.Point(621, 0);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(208, 29);
+ this.layoutControlItem15.Size = new System.Drawing.Size(208, 34);
this.layoutControlItem15.Text = "瀹為檯鏃堕棿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
//
- // layoutControlItem3
+ // layoutControlItem4
//
- this.layoutControlItem3.Control = this.txt_createBy;
- this.layoutControlItem3.Location = new System.Drawing.Point(621, 58);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(208, 29);
- this.layoutControlItem3.Text = "涓婃姤鍛樺伐";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.Control = this.txt_barCode111;
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem4.Size = new System.Drawing.Size(414, 34);
+ this.layoutControlItem4.Text = "鎵拷婧爜";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
- // simpleButton7
+ // layoutControlItem9
//
- this.simpleButton7.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
- this.simpleButton7.Appearance.Options.UseBackColor = true;
- this.simpleButton7.Location = new System.Drawing.Point(95, 109);
- this.simpleButton7.Name = "simpleButton7";
- this.simpleButton7.Size = new System.Drawing.Size(61, 43);
- this.simpleButton7.TabIndex = 10;
- this.simpleButton7.Text = "璁惧";
+ this.layoutControlItem9.Control = this.txt_repairReson;
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 170);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowSpan = 2;
+ this.layoutControlItem9.Size = new System.Drawing.Size(414, 70);
+ this.layoutControlItem9.Text = "涓嶈壇鍘熷洜";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem9.TextVisible = false;
//
- // simpleButton6
+ // panel5
//
- this.simpleButton6.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
- this.simpleButton6.Appearance.Options.UseBackColor = true;
- this.simpleButton6.Location = new System.Drawing.Point(317, 110);
- this.simpleButton6.Name = "simpleButton6";
- this.simpleButton6.Size = new System.Drawing.Size(61, 43);
- this.simpleButton6.TabIndex = 9;
- this.simpleButton6.Text = "鍙栨秷";
+ this.panel5.Controls.Add(this.panel1);
+ this.panel5.Controls.Add(this.panel4);
+ this.panel5.Controls.Add(this.prog1);
+ this.panel5.Controls.Add(this.panel2);
+ this.panel5.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel5.Location = new System.Drawing.Point(0, 0);
+ this.panel5.Name = "panel5";
+ this.panel5.Size = new System.Drawing.Size(390, 117);
+ this.panel5.TabIndex = 22;
//
- // simpleButton5
+ // panel1
//
- this.simpleButton5.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
- this.simpleButton5.Appearance.Options.UseBackColor = true;
- this.simpleButton5.Location = new System.Drawing.Point(169, 109);
- this.simpleButton5.Name = "simpleButton5";
- this.simpleButton5.Size = new System.Drawing.Size(61, 43);
- this.simpleButton5.TabIndex = 8;
- this.simpleButton5.Text = "鍝佽川";
+ this.panel1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+ this.panel1.Controls.Add(this.lbSum1);
+ this.panel1.Controls.Add(this.label1);
+ this.panel1.Location = new System.Drawing.Point(3, 3);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(99, 78);
+ this.panel1.TabIndex = 0;
//
- // simpleButton4
+ // lbSum1
//
- this.simpleButton4.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
- this.simpleButton4.Appearance.Options.UseBackColor = true;
- this.simpleButton4.Location = new System.Drawing.Point(243, 109);
- this.simpleButton4.Name = "simpleButton4";
- this.simpleButton4.Size = new System.Drawing.Size(61, 43);
- this.simpleButton4.TabIndex = 7;
- this.simpleButton4.Text = "鍏跺畠";
+ this.lbSum1.AutoSize = true;
+ this.lbSum1.Location = new System.Drawing.Point(45, 44);
+ this.lbSum1.Name = "lbSum1";
+ this.lbSum1.Size = new System.Drawing.Size(16, 18);
+ this.lbSum1.TabIndex = 1;
+ this.lbSum1.Text = "0";
//
- // simpleButton3
+ // label1
//
- this.simpleButton3.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
- this.simpleButton3.Appearance.Options.UseBackColor = true;
- this.simpleButton3.Location = new System.Drawing.Point(21, 109);
- this.simpleButton3.Name = "simpleButton3";
- this.simpleButton3.Size = new System.Drawing.Size(61, 43);
- this.simpleButton3.TabIndex = 6;
- this.simpleButton3.Text = "鐗╂枡";
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(18, 15);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(68, 18);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "宸ュ崟鏁伴噺";
+ //
+ // panel4
+ //
+ this.panel4.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+ this.panel4.Controls.Add(this.lbSum2);
+ this.panel4.Controls.Add(this.label8);
+ this.panel4.Location = new System.Drawing.Point(133, 3);
+ this.panel4.Name = "panel4";
+ this.panel4.Size = new System.Drawing.Size(99, 78);
+ this.panel4.TabIndex = 2;
+ //
+ // lbSum2
+ //
+ this.lbSum2.AutoSize = true;
+ this.lbSum2.Location = new System.Drawing.Point(45, 44);
+ this.lbSum2.Name = "lbSum2";
+ this.lbSum2.Size = new System.Drawing.Size(16, 18);
+ this.lbSum2.TabIndex = 1;
+ this.lbSum2.Text = "0";
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.Location = new System.Drawing.Point(18, 15);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(53, 18);
+ this.label8.TabIndex = 0;
+ this.label8.Text = "寰呬慨鐞�";
//
// prog1
//
- this.prog1.Location = new System.Drawing.Point(21, 79);
+ this.prog1.Location = new System.Drawing.Point(3, 87);
this.prog1.Name = "prog1";
this.prog1.Properties.ShowTitle = true;
this.prog1.Size = new System.Drawing.Size(359, 22);
@@ -960,15 +883,15 @@
this.panel2.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
this.panel2.Controls.Add(this.lbSum3);
this.panel2.Controls.Add(this.label4);
- this.panel2.Location = new System.Drawing.Point(281, 7);
+ this.panel2.Location = new System.Drawing.Point(263, 3);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(99, 64);
+ this.panel2.Size = new System.Drawing.Size(99, 78);
this.panel2.TabIndex = 3;
//
// lbSum3
//
this.lbSum3.AutoSize = true;
- this.lbSum3.Location = new System.Drawing.Point(45, 37);
+ this.lbSum3.Location = new System.Drawing.Point(45, 44);
this.lbSum3.Name = "lbSum3";
this.lbSum3.Size = new System.Drawing.Size(16, 18);
this.lbSum3.TabIndex = 1;
@@ -977,87 +900,96 @@
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(18, 10);
+ this.label4.Location = new System.Drawing.Point(18, 15);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(53, 18);
this.label4.TabIndex = 0;
this.label4.Text = "宸蹭慨鐞�";
//
- // panel4
+ // panel3
//
- this.panel4.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
- this.panel4.Controls.Add(this.lbSum2);
- this.panel4.Controls.Add(this.label8);
- this.panel4.Location = new System.Drawing.Point(151, 7);
- this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(99, 64);
- this.panel4.TabIndex = 2;
+ this.panel3.Controls.Add(this.simpleButton7);
+ this.panel3.Controls.Add(this.btnBad);
+ this.panel3.Controls.Add(this.simpleButton6);
+ this.panel3.Controls.Add(this.btnGood);
+ this.panel3.Controls.Add(this.simpleButton5);
+ this.panel3.Controls.Add(this.simpleButton3);
+ this.panel3.Controls.Add(this.simpleButton4);
+ this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panel3.Location = new System.Drawing.Point(0, 123);
+ this.panel3.Name = "panel3";
+ this.panel3.Size = new System.Drawing.Size(390, 137);
+ this.panel3.TabIndex = 21;
//
- // lbSum2
+ // simpleButton7
//
- this.lbSum2.AutoSize = true;
- this.lbSum2.Location = new System.Drawing.Point(45, 37);
- this.lbSum2.Name = "lbSum2";
- this.lbSum2.Size = new System.Drawing.Size(16, 18);
- this.lbSum2.TabIndex = 1;
- this.lbSum2.Text = "0";
- //
- // label8
- //
- this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(18, 10);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(53, 18);
- this.label8.TabIndex = 0;
- this.label8.Text = "寰呬慨鐞�";
- //
- // panel1
- //
- this.panel1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
- this.panel1.Controls.Add(this.lbSum1);
- this.panel1.Controls.Add(this.label1);
- this.panel1.Location = new System.Drawing.Point(21, 7);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(99, 64);
- this.panel1.TabIndex = 0;
- //
- // lbSum1
- //
- this.lbSum1.AutoSize = true;
- this.lbSum1.Location = new System.Drawing.Point(45, 37);
- this.lbSum1.Name = "lbSum1";
- this.lbSum1.Size = new System.Drawing.Size(16, 18);
- this.lbSum1.TabIndex = 1;
- this.lbSum1.Text = "0";
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(18, 10);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(68, 18);
- this.label1.TabIndex = 0;
- this.label1.Text = "宸ュ崟鏁伴噺";
- //
- // btnGood
- //
- this.btnGood.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
- this.btnGood.Appearance.Options.UseBackColor = true;
- this.btnGood.Location = new System.Drawing.Point(21, 159);
- this.btnGood.Name = "btnGood";
- this.btnGood.Size = new System.Drawing.Size(166, 58);
- this.btnGood.TabIndex = 19;
- this.btnGood.Text = "OK";
+ this.simpleButton7.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
+ this.simpleButton7.Appearance.Options.UseBackColor = true;
+ this.simpleButton7.Location = new System.Drawing.Point(81, 4);
+ this.simpleButton7.Name = "simpleButton7";
+ this.simpleButton7.Size = new System.Drawing.Size(61, 43);
+ this.simpleButton7.TabIndex = 10;
+ this.simpleButton7.Text = "璁惧";
//
// btnBad
//
this.btnBad.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
this.btnBad.Appearance.Options.UseBackColor = true;
- this.btnBad.Location = new System.Drawing.Point(212, 159);
+ this.btnBad.Location = new System.Drawing.Point(198, 59);
this.btnBad.Name = "btnBad";
- this.btnBad.Size = new System.Drawing.Size(166, 58);
+ this.btnBad.Size = new System.Drawing.Size(166, 70);
this.btnBad.TabIndex = 20;
this.btnBad.Text = "NG";
+ //
+ // simpleButton6
+ //
+ this.simpleButton6.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
+ this.simpleButton6.Appearance.Options.UseBackColor = true;
+ this.simpleButton6.Location = new System.Drawing.Point(303, 5);
+ this.simpleButton6.Name = "simpleButton6";
+ this.simpleButton6.Size = new System.Drawing.Size(61, 43);
+ this.simpleButton6.TabIndex = 9;
+ this.simpleButton6.Text = "鍙栨秷";
+ //
+ // btnGood
+ //
+ this.btnGood.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
+ this.btnGood.Appearance.Options.UseBackColor = true;
+ this.btnGood.Location = new System.Drawing.Point(7, 59);
+ this.btnGood.Name = "btnGood";
+ this.btnGood.Size = new System.Drawing.Size(166, 70);
+ this.btnGood.TabIndex = 19;
+ this.btnGood.Text = "OK";
+ //
+ // simpleButton5
+ //
+ this.simpleButton5.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
+ this.simpleButton5.Appearance.Options.UseBackColor = true;
+ this.simpleButton5.Location = new System.Drawing.Point(155, 4);
+ this.simpleButton5.Name = "simpleButton5";
+ this.simpleButton5.Size = new System.Drawing.Size(61, 43);
+ this.simpleButton5.TabIndex = 8;
+ this.simpleButton5.Text = "鍝佽川";
+ //
+ // simpleButton3
+ //
+ this.simpleButton3.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
+ this.simpleButton3.Appearance.Options.UseBackColor = true;
+ this.simpleButton3.Location = new System.Drawing.Point(7, 4);
+ this.simpleButton3.Name = "simpleButton3";
+ this.simpleButton3.Size = new System.Drawing.Size(61, 43);
+ this.simpleButton3.TabIndex = 6;
+ this.simpleButton3.Text = "鐗╂枡";
+ //
+ // simpleButton4
+ //
+ this.simpleButton4.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
+ this.simpleButton4.Appearance.Options.UseBackColor = true;
+ this.simpleButton4.Location = new System.Drawing.Point(229, 4);
+ this.simpleButton4.Name = "simpleButton4";
+ this.simpleButton4.Size = new System.Drawing.Size(61, 43);
+ this.simpleButton4.TabIndex = 7;
+ this.simpleButton4.Text = "鍏跺畠";
//
// tabMx
//
@@ -1065,7 +997,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage2;
- this.tabMx.Size = new System.Drawing.Size(1251, 332);
+ this.tabMx.Size = new System.Drawing.Size(1251, 298);
this.tabMx.TabIndex = 4;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1075,7 +1007,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1249, 300);
+ this.tabMxPage2.Size = new System.Drawing.Size(1249, 266);
this.tabMxPage2.Text = "寰呬慨鐞嗘槑缁�";
//
// gcMx2
@@ -1084,7 +1016,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1249, 300);
+ this.gcMx2.Size = new System.Drawing.Size(1249, 266);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1267,7 +1199,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1249, 300);
+ this.tabMxPage1.Size = new System.Drawing.Size(1249, 266);
this.tabMxPage1.Text = "宸蹭慨鐞嗘槑缁�";
//
// gcMx1
@@ -1276,7 +1208,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1249, 300);
+ this.gcMx1.Size = new System.Drawing.Size(1249, 266);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1455,6 +1387,140 @@
this.gridColumn25.VisibleIndex = 12;
this.gridColumn25.Width = 94;
//
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_gdbh;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 68);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem1.Size = new System.Drawing.Size(207, 34);
+ this.layoutControlItem1.Text = "宸ュ崟缂栧彿";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_sjXt;
+ this.layoutControlItem13.Location = new System.Drawing.Point(207, 68);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem13.Size = new System.Drawing.Size(207, 34);
+ this.layoutControlItem13.Text = "鐢熶骇绾垮埆";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_processNo;
+ this.layoutControlItem2.Location = new System.Drawing.Point(414, 102);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem2.Size = new System.Drawing.Size(207, 34);
+ this.layoutControlItem2.Text = "涓婃姤宸ュ簭";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_createBy;
+ this.layoutControlItem3.Location = new System.Drawing.Point(621, 102);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem3.Size = new System.Drawing.Size(208, 34);
+ this.layoutControlItem3.Text = "涓婃姤鍛樺伐";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // txt_barCode
+ //
+ this.txt_barCode.Location = new System.Drawing.Point(99, 46);
+ this.txt_barCode.Name = "txt_barCode";
+ this.txt_barCode.Properties.ReadOnly = true;
+ this.txt_barCode.Size = new System.Drawing.Size(323, 24);
+ this.txt_barCode.StyleController = this.layoutMx1;
+ this.txt_barCode.TabIndex = 27;
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_barCode;
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 34);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem6.Size = new System.Drawing.Size(414, 34);
+ this.layoutControlItem6.Text = "褰撳墠杩芥函鐮�";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_badDescription;
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 102);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowSpan = 2;
+ this.layoutControlItem16.Size = new System.Drawing.Size(414, 68);
+ this.layoutControlItem16.Text = "涓嶈壇鎻忚堪";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem16.TextVisible = false;
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txt_repairMethd;
+ this.layoutControlItem18.Location = new System.Drawing.Point(414, 136);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowSpan = 3;
+ this.layoutControlItem18.Size = new System.Drawing.Size(415, 104);
+ this.layoutControlItem18.Text = "涓嶈壇瀵圭瓥";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem18.TextVisible = false;
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_itemModel;
+ this.layoutControlItem11.Location = new System.Drawing.Point(414, 68);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(415, 34);
+ this.layoutControlItem11.Text = "浜у搧瑙勬牸";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_itemNo;
+ this.layoutControlItem7.Location = new System.Drawing.Point(414, 34);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem7.Size = new System.Drawing.Size(207, 34);
+ this.layoutControlItem7.Text = "浜у搧缂栫爜";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_itemName;
+ this.layoutControlItem10.Location = new System.Drawing.Point(621, 34);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem10.Size = new System.Drawing.Size(208, 34);
+ this.layoutControlItem10.Text = "浜у搧鍚嶇О";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "淇悊鐘舵��";
+ this.gridColumn3.FieldName = "repairResult";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 10;
+ this.gridColumn3.Width = 94;
+ //
// Frm_Repair
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1494,7 +1560,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_gdbh.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_processNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_barCode111.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
@@ -1503,26 +1569,19 @@
((System.ComponentModel.ISupportInitialize)(this.txt_sjDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ this.panel5.ResumeLayout(false);
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
+ this.panel4.ResumeLayout(false);
+ this.panel4.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
- this.panel4.ResumeLayout(false);
- this.panel4.PerformLayout();
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
+ this.panel3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage2.ResumeLayout(false);
@@ -1531,6 +1590,17 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
this.ResumeLayout(false);
}
@@ -1555,7 +1625,7 @@
private DevExpress.XtraEditors.TextEdit txt_gdbh;
private DevExpress.XtraEditors.TextEdit txt_processNo;
private DevExpress.XtraEditors.TextEdit txt_createBy;
- private DevExpress.XtraEditors.TextEdit txt_barCode;
+ private DevExpress.XtraEditors.TextEdit txt_barCode111;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
private DevExpress.XtraEditors.TextEdit txt_itemName;
private DevExpress.XtraEditors.TextEdit txt_itemModel;
@@ -1565,8 +1635,6 @@
private DevExpress.XtraEditors.SimpleButton btnGood;
private DevExpress.XtraEditors.SimpleButton btnBad;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraEditors.SimpleButton simpleButton7;
private DevExpress.XtraEditors.SimpleButton simpleButton6;
private DevExpress.XtraEditors.SimpleButton simpleButton5;
@@ -1600,14 +1668,8 @@
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private UcDictionary txt_repairMethd;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private UcDictionary txt_repairReson;
private UcDictionary txt_badDescription;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
@@ -1616,11 +1678,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
@@ -1644,5 +1703,21 @@
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private System.Windows.Forms.Panel panel3;
+ private System.Windows.Forms.Panel panel5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraEditors.TextEdit txt_barCode;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
index 7a24cfb..7bcd22d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
@@ -31,7 +31,7 @@
}, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
- txt_barCode.Text = "";
+ txt_barCode111.Text = "";
getModel(value, "", "", "", "");
}, (value) =>
{
@@ -39,7 +39,7 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- txt_barCode.KeyDown += (s, e) =>
+ txt_barCode111.KeyDown += (s, e) =>
{
if (e.KeyCode == Keys.Enter) { getModel(lbGuid.Text.Trim(), "", "", "", ""); };
};
@@ -49,7 +49,7 @@
};
btnBad.Click += (s, e) =>
{
-
+
getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_repairReson.TextTxt.Trim(), txt_repairMethd.TextTxt.Trim(), badTag);
};
}
@@ -129,8 +129,8 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- txt_barCode.Text = "";
- gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ txt_barCode111.Text = "";
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.createDate", "desc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -175,7 +175,8 @@
/// <param name="_checkResult"></param>
private void getModel(string strGuid, string _badXx, string _badYy, string _badDc, string _checkResult)
{
- if (!string.IsNullOrEmpty(_checkResult)) {
+ if (!string.IsNullOrEmpty(_checkResult))
+ {
string _reason = txt_repairReson.TextTxt.Trim();
if (string.IsNullOrEmpty(_reason))
{
@@ -191,8 +192,8 @@
return;
};
}
-
- string _barCode = txt_barCode.Text.Trim();
+
+ string _barCode = txt_barCode111.Text.Trim();
var _obj = new
{
guid = strGuid,//涓诲缓
@@ -215,9 +216,17 @@
lbSum2.Text = dy.lbSum2;
lbSum3.Text = dy.lbSum3;
prog1.Position = dy.jd;
- txt_barCode.ReadOnly = false;
- txt_repairReson.IsReadly = false;
- txt_repairMethd.IsReadly = false;
+ txt_barCode111.ReadOnly = false;
+ string _repairResult = dy.repairResult;
+ if (!string.IsNullOrEmpty(_repairResult))
+ {
+ txt_repairReson.IsReadly = true;
+ txt_repairMethd.IsReadly = true;
+ }
+ else {
+ txt_repairReson.IsReadly = false;
+ txt_repairMethd.IsReadly = false;
+ }
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 431e6c8..e67f34f 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -908,6 +908,12 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
+ <Compile Include="test\XtraForm2.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="test\XtraForm2.Designer.cs">
+ <DependentUpon>XtraForm2.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\SelectCk.cs">
<SubType>Form</SubType>
</Compile>
@@ -1622,6 +1628,9 @@
<EmbeddedResource Include="DevFrm\WW\showWwZhongTai.resx">
<DependentUpon>showWwZhongTai.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="test\XtraForm2.resx">
+ <DependentUpon>XtraForm2.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectCk.resx">
<DependentUpon>SelectCk.cs</DependentUpon>
</EmbeddedResource>
--
Gitblit v1.9.3