From dd0af4a5532c251fd655024ba475f72eaf9c93a0 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 18 八月 2025 16:20:10 +0800
Subject: [PATCH] 汇总

---
 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs |  624 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 338 insertions(+), 286 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
index ec49e6b..8a46553 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -29,28 +29,28 @@
         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.ColumnDefinition columnDefinition33 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition34 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition35 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition36 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition49 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition50 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition51 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition52 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition53 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition54 = new DevExpress.XtraLayout.RowDefinition();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.lbCollectGuid = new DevExpress.XtraEditors.LabelControl();
             this.txt_gdbh = new DevExpress.XtraEditors.TextEdit();
             this.txt_gx = new DevExpress.XtraEditors.TextEdit();
             this.txt_collectBy = new DevExpress.XtraEditors.TextEdit();
             this.txt_barCode = new DevExpress.XtraEditors.TextEdit();
             this.txt_currentBarCode = new DevExpress.XtraEditors.TextEdit();
-            this.txt_gwm = new DevExpress.XtraEditors.TextEdit();
+            this.txt_gongWei = new DevExpress.XtraEditors.TextEdit();
             this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_bc = new DevExpress.XtraEditors.TextEdit();
-            this.txt_gw = new DevExpress.XtraEditors.TextEdit();
             this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
             this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
             this.txt_sbNo = new DevExpress.XtraEditors.TextEdit();
@@ -60,6 +60,7 @@
             this.btnGood = new DevExpress.XtraEditors.SimpleButton();
             this.btnBad = new DevExpress.XtraEditors.SimpleButton();
             this.txt_dianJianPath = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -67,18 +68,17 @@
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layShuiJian = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layDianJian = new DevExpress.XtraLayout.LayoutControlItem();
             this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton();
             this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton();
             this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton();
@@ -114,6 +114,7 @@
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx2 = new DevExpress.XtraGrid.GridControl();
             this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -131,6 +132,7 @@
             this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
@@ -151,10 +153,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_collectBy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_currentBarCode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_gwm.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gongWei.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_bc.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_gw.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_sbNo.Properties)).BeginInit();
@@ -162,6 +163,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_yjDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_sjDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_dianJianPath.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -169,18 +171,17 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layShuiJian)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit();
             this.panel3.SuspendLayout();
             this.panel2.SuspendLayout();
@@ -214,7 +215,7 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1367, 619);
-            this.splitMx1.SplitterPosition = 191;
+            this.splitMx1.SplitterPosition = 229;
             this.splitMx1.TabIndex = 0;
             // 
             // splitTop1
@@ -243,21 +244,21 @@
             this.splitTop1.Panel2.Controls.Add(this.panel1);
             this.splitTop1.Panel2.Text = "Panel2";
             this.splitTop1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitTop1.Size = new System.Drawing.Size(1367, 191);
+            this.splitTop1.Size = new System.Drawing.Size(1367, 229);
             this.splitTop1.SplitterPosition = 527;
             this.splitTop1.TabIndex = 0;
             // 
             // layoutMx1
             // 
+            this.layoutMx1.Controls.Add(this.lbCollectGuid);
             this.layoutMx1.Controls.Add(this.txt_gdbh);
             this.layoutMx1.Controls.Add(this.txt_gx);
             this.layoutMx1.Controls.Add(this.txt_collectBy);
             this.layoutMx1.Controls.Add(this.txt_barCode);
             this.layoutMx1.Controls.Add(this.txt_currentBarCode);
-            this.layoutMx1.Controls.Add(this.txt_gwm);
+            this.layoutMx1.Controls.Add(this.txt_gongWei);
             this.layoutMx1.Controls.Add(this.txt_itemNo);
             this.layoutMx1.Controls.Add(this.txt_bc);
-            this.layoutMx1.Controls.Add(this.txt_gw);
             this.layoutMx1.Controls.Add(this.txt_itemName);
             this.layoutMx1.Controls.Add(this.txt_itemModel);
             this.layoutMx1.Controls.Add(this.txt_sbNo);
@@ -268,144 +269,154 @@
             this.layoutMx1.Controls.Add(this.btnBad);
             this.layoutMx1.Controls.Add(this.txt_dianJianPath);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem6});
             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.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(828, 191);
+            this.layoutMx1.Size = new System.Drawing.Size(828, 229);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
+            // lbCollectGuid
+            // 
+            this.lbCollectGuid.Location = new System.Drawing.Point(214, 177);
+            this.lbCollectGuid.Name = "lbCollectGuid";
+            this.lbCollectGuid.Size = new System.Drawing.Size(79, 18);
+            this.lbCollectGuid.StyleController = this.layoutMx1;
+            this.lbCollectGuid.TabIndex = 22;
+            this.lbCollectGuid.Text = "lbCollectGuid";
+            // 
             // txt_gdbh
             // 
-            this.txt_gdbh.Location = new System.Drawing.Point(84, 12);
+            this.txt_gdbh.Location = new System.Drawing.Point(111, 12);
             this.txt_gdbh.Name = "txt_gdbh";
             this.txt_gdbh.Properties.ReadOnly = true;
-            this.txt_gdbh.Size = new System.Drawing.Size(126, 24);
+            this.txt_gdbh.Size = new System.Drawing.Size(99, 24);
             this.txt_gdbh.StyleController = this.layoutMx1;
             this.txt_gdbh.TabIndex = 4;
             // 
             // txt_gx
             // 
-            this.txt_gx.Location = new System.Drawing.Point(84, 40);
+            this.txt_gx.Location = new System.Drawing.Point(111, 46);
             this.txt_gx.Name = "txt_gx";
             this.txt_gx.Properties.ReadOnly = true;
-            this.txt_gx.Size = new System.Drawing.Size(126, 24);
+            this.txt_gx.Size = new System.Drawing.Size(99, 24);
             this.txt_gx.StyleController = this.layoutMx1;
             this.txt_gx.TabIndex = 5;
             // 
             // txt_collectBy
             // 
-            this.txt_collectBy.Location = new System.Drawing.Point(84, 68);
+            this.txt_collectBy.Location = new System.Drawing.Point(111, 81);
             this.txt_collectBy.Name = "txt_collectBy";
             this.txt_collectBy.Properties.ReadOnly = true;
-            this.txt_collectBy.Size = new System.Drawing.Size(126, 24);
+            this.txt_collectBy.Size = new System.Drawing.Size(99, 24);
             this.txt_collectBy.StyleController = this.layoutMx1;
             this.txt_collectBy.TabIndex = 6;
             // 
             // txt_barCode
             // 
-            this.txt_barCode.Location = new System.Drawing.Point(84, 96);
+            this.txt_barCode.Location = new System.Drawing.Point(111, 116);
             this.txt_barCode.Name = "txt_barCode";
-            this.txt_barCode.Size = new System.Drawing.Size(328, 24);
+            this.txt_barCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
+            this.txt_barCode.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(78)))), ((int)(((byte)(138)))), ((int)(((byte)(200)))));
+            this.txt_barCode.Properties.Appearance.Options.UseFont = true;
+            this.txt_barCode.Properties.Appearance.Options.UseForeColor = true;
+            this.txt_barCode.Size = new System.Drawing.Size(301, 24);
             this.txt_barCode.StyleController = this.layoutMx1;
             this.txt_barCode.TabIndex = 1;
             // 
             // txt_currentBarCode
             // 
-            this.txt_currentBarCode.Location = new System.Drawing.Point(84, 124);
+            this.txt_currentBarCode.Location = new System.Drawing.Point(111, 151);
             this.txt_currentBarCode.Name = "txt_currentBarCode";
             this.txt_currentBarCode.Properties.ReadOnly = true;
-            this.txt_currentBarCode.Size = new System.Drawing.Size(328, 24);
+            this.txt_currentBarCode.Size = new System.Drawing.Size(301, 24);
             this.txt_currentBarCode.StyleController = this.layoutMx1;
             this.txt_currentBarCode.TabIndex = 8;
             // 
-            // txt_gwm
+            // txt_gongWei
             // 
-            this.txt_gwm.Location = new System.Drawing.Point(84, 152);
-            this.txt_gwm.Name = "txt_gwm";
-            this.txt_gwm.Size = new System.Drawing.Size(126, 24);
-            this.txt_gwm.StyleController = this.layoutMx1;
-            this.txt_gwm.TabIndex = 9;
+            this.txt_gongWei.Location = new System.Drawing.Point(111, 186);
+            this.txt_gongWei.Name = "txt_gongWei";
+            this.txt_gongWei.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
+            this.txt_gongWei.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(78)))), ((int)(((byte)(138)))), ((int)(((byte)(200)))));
+            this.txt_gongWei.Properties.Appearance.Options.UseFont = true;
+            this.txt_gongWei.Properties.Appearance.Options.UseForeColor = true;
+            this.txt_gongWei.Size = new System.Drawing.Size(99, 24);
+            this.txt_gongWei.StyleController = this.layoutMx1;
+            this.txt_gongWei.TabIndex = 9;
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(286, 12);
+            this.txt_itemNo.Location = new System.Drawing.Point(313, 12);
             this.txt_itemNo.Name = "txt_itemNo";
             this.txt_itemNo.Properties.ReadOnly = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(126, 24);
+            this.txt_itemNo.Size = new System.Drawing.Size(99, 24);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 10;
             // 
             // txt_bc
             // 
-            this.txt_bc.Location = new System.Drawing.Point(286, 40);
+            this.txt_bc.Location = new System.Drawing.Point(313, 46);
             this.txt_bc.Name = "txt_bc";
             this.txt_bc.Properties.ReadOnly = true;
-            this.txt_bc.Size = new System.Drawing.Size(126, 24);
+            this.txt_bc.Size = new System.Drawing.Size(99, 24);
             this.txt_bc.StyleController = this.layoutMx1;
             this.txt_bc.TabIndex = 11;
             // 
-            // txt_gw
-            // 
-            this.txt_gw.Location = new System.Drawing.Point(286, 68);
-            this.txt_gw.Name = "txt_gw";
-            this.txt_gw.Properties.ReadOnly = true;
-            this.txt_gw.Size = new System.Drawing.Size(126, 24);
-            this.txt_gw.StyleController = this.layoutMx1;
-            this.txt_gw.TabIndex = 12;
-            // 
             // txt_itemName
             // 
-            this.txt_itemName.Location = new System.Drawing.Point(488, 12);
+            this.txt_itemName.Location = new System.Drawing.Point(515, 46);
             this.txt_itemName.Name = "txt_itemName";
             this.txt_itemName.Properties.ReadOnly = true;
-            this.txt_itemName.Size = new System.Drawing.Size(126, 24);
+            this.txt_itemName.Size = new System.Drawing.Size(99, 24);
             this.txt_itemName.StyleController = this.layoutMx1;
             this.txt_itemName.TabIndex = 13;
             // 
             // txt_itemModel
             // 
-            this.txt_itemModel.Location = new System.Drawing.Point(690, 12);
+            this.txt_itemModel.Location = new System.Drawing.Point(515, 12);
             this.txt_itemModel.Name = "txt_itemModel";
             this.txt_itemModel.Properties.ReadOnly = true;
-            this.txt_itemModel.Size = new System.Drawing.Size(126, 24);
+            this.txt_itemModel.Size = new System.Drawing.Size(301, 24);
             this.txt_itemModel.StyleController = this.layoutMx1;
             this.txt_itemModel.TabIndex = 14;
             // 
             // txt_sbNo
             // 
-            this.txt_sbNo.Location = new System.Drawing.Point(488, 68);
+            this.txt_sbNo.Location = new System.Drawing.Point(313, 81);
             this.txt_sbNo.Name = "txt_sbNo";
             this.txt_sbNo.Properties.ReadOnly = true;
-            this.txt_sbNo.Size = new System.Drawing.Size(126, 24);
+            this.txt_sbNo.Size = new System.Drawing.Size(99, 24);
             this.txt_sbNo.StyleController = this.layoutMx1;
             this.txt_sbNo.TabIndex = 15;
             // 
             // txt_sjXt
             // 
-            this.txt_sjXt.Location = new System.Drawing.Point(488, 40);
+            this.txt_sjXt.Location = new System.Drawing.Point(515, 81);
             this.txt_sjXt.Name = "txt_sjXt";
             this.txt_sjXt.Properties.ReadOnly = true;
-            this.txt_sjXt.Size = new System.Drawing.Size(126, 24);
+            this.txt_sjXt.Size = new System.Drawing.Size(99, 24);
             this.txt_sjXt.StyleController = this.layoutMx1;
             this.txt_sjXt.TabIndex = 16;
             // 
             // txt_yjDate
             // 
-            this.txt_yjDate.Location = new System.Drawing.Point(690, 40);
+            this.txt_yjDate.Location = new System.Drawing.Point(717, 46);
             this.txt_yjDate.Name = "txt_yjDate";
             this.txt_yjDate.Properties.ReadOnly = true;
-            this.txt_yjDate.Size = new System.Drawing.Size(126, 24);
+            this.txt_yjDate.Size = new System.Drawing.Size(99, 24);
             this.txt_yjDate.StyleController = this.layoutMx1;
             this.txt_yjDate.TabIndex = 17;
             // 
             // txt_sjDate
             // 
-            this.txt_sjDate.Location = new System.Drawing.Point(690, 68);
+            this.txt_sjDate.Location = new System.Drawing.Point(717, 81);
             this.txt_sjDate.Name = "txt_sjDate";
             this.txt_sjDate.Properties.ReadOnly = true;
-            this.txt_sjDate.Size = new System.Drawing.Size(126, 24);
+            this.txt_sjDate.Size = new System.Drawing.Size(99, 24);
             this.txt_sjDate.StyleController = this.layoutMx1;
             this.txt_sjDate.TabIndex = 18;
             // 
@@ -413,9 +424,9 @@
             // 
             this.btnGood.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
             this.btnGood.Appearance.Options.UseBackColor = true;
-            this.btnGood.Location = new System.Drawing.Point(416, 96);
+            this.btnGood.Location = new System.Drawing.Point(416, 116);
             this.btnGood.Name = "btnGood";
-            this.btnGood.Size = new System.Drawing.Size(198, 83);
+            this.btnGood.Size = new System.Drawing.Size(198, 96);
             this.btnGood.StyleController = this.layoutMx1;
             this.btnGood.TabIndex = 19;
             this.btnGood.Text = "鑹搧";
@@ -424,21 +435,33 @@
             // 
             this.btnBad.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
             this.btnBad.Appearance.Options.UseBackColor = true;
-            this.btnBad.Location = new System.Drawing.Point(618, 96);
+            this.btnBad.Location = new System.Drawing.Point(618, 116);
             this.btnBad.Name = "btnBad";
-            this.btnBad.Size = new System.Drawing.Size(198, 83);
+            this.btnBad.Size = new System.Drawing.Size(198, 96);
             this.btnBad.StyleController = this.layoutMx1;
             this.btnBad.TabIndex = 20;
             this.btnBad.Text = "涓嶈壇鍝�";
             // 
             // txt_dianJianPath
             // 
-            this.txt_dianJianPath.Location = new System.Drawing.Point(286, 152);
+            this.txt_dianJianPath.Location = new System.Drawing.Point(313, 186);
             this.txt_dianJianPath.Name = "txt_dianJianPath";
             this.txt_dianJianPath.Properties.ReadOnly = true;
-            this.txt_dianJianPath.Size = new System.Drawing.Size(126, 24);
+            this.txt_dianJianPath.Size = new System.Drawing.Size(99, 24);
             this.txt_dianJianPath.StyleController = this.layoutMx1;
             this.txt_dianJianPath.TabIndex = 21;
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.lbCollectGuid;
+            this.layoutControlItem6.Location = new System.Drawing.Point(202, 165);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem6.Size = new System.Drawing.Size(202, 36);
+            this.layoutControlItem6.Text = "閲囬泦琛実uid";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem6.TextVisible = false;
             // 
             // Root
             // 
@@ -451,53 +474,52 @@
             this.layoutControlItem4,
             this.layoutControlItem7,
             this.layoutControlItem8,
-            this.layoutControlItem9,
-            this.layoutControlItem10,
-            this.layoutControlItem12,
-            this.layoutControlItem14,
-            this.layoutControlItem15,
             this.layoutControlItem5,
-            this.layoutControlItem6,
+            this.layShuiJian,
             this.layoutControlItem16,
             this.layoutControlItem17,
+            this.layoutControlItem12,
+            this.layoutControlItem15,
+            this.layoutControlItem14,
             this.layoutControlItem13,
+            this.layoutControlItem10,
             this.layoutControlItem11,
-            this.layoutControlItem18});
+            this.layDianJian});
             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;
+            columnDefinition33.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition33.Width = 100D;
+            columnDefinition34.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition34.Width = 100D;
+            columnDefinition35.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition35.Width = 100D;
+            columnDefinition36.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition36.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;
+            columnDefinition33,
+            columnDefinition34,
+            columnDefinition35,
+            columnDefinition36});
+            rowDefinition49.Height = 100D;
+            rowDefinition49.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition50.Height = 100D;
+            rowDefinition50.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition51.Height = 100D;
+            rowDefinition51.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition52.Height = 100D;
+            rowDefinition52.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition53.Height = 100D;
+            rowDefinition53.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition54.Height = 100D;
+            rowDefinition54.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3,
-            rowDefinition4,
-            rowDefinition5,
-            rowDefinition6});
-            this.Root.Size = new System.Drawing.Size(828, 191);
+            rowDefinition49,
+            rowDefinition50,
+            rowDefinition51,
+            rowDefinition52,
+            rowDefinition53,
+            rowDefinition54});
+            this.Root.Size = new System.Drawing.Size(828, 229);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -505,41 +527,41 @@
             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(202, 28);
+            this.layoutControlItem1.Size = new System.Drawing.Size(202, 34);
             this.layoutControlItem1.Text = "宸ュ崟缂栧彿";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_gx;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 28);
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 34);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(202, 28);
+            this.layoutControlItem2.Size = new System.Drawing.Size(202, 35);
             this.layoutControlItem2.Text = "褰撳墠宸ュ簭";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_collectBy;
             this.layoutControlItem3.CustomizationFormText = "鎿嶄綔鍛樺伐";
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 56);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 69);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(202, 28);
+            this.layoutControlItem3.Size = new System.Drawing.Size(202, 35);
             this.layoutControlItem3.Text = "鎿嶄綔鍛樺伐";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(87, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_barCode;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 84);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 104);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem4.Size = new System.Drawing.Size(404, 28);
+            this.layoutControlItem4.Size = new System.Drawing.Size(404, 35);
             this.layoutControlItem4.Text = "鎵拷婧爜";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 18);
             // 
             // layoutControlItem7
             // 
@@ -547,107 +569,53 @@
             this.layoutControlItem7.Location = new System.Drawing.Point(202, 0);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(202, 28);
+            this.layoutControlItem7.Size = new System.Drawing.Size(202, 34);
             this.layoutControlItem7.Text = "浜у搧缂栫爜";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(87, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_bc;
-            this.layoutControlItem8.Location = new System.Drawing.Point(202, 28);
+            this.layoutControlItem8.Location = new System.Drawing.Point(202, 34);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(202, 28);
+            this.layoutControlItem8.Size = new System.Drawing.Size(202, 35);
             this.layoutControlItem8.Text = "鐝";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.txt_gw;
-            this.layoutControlItem9.Location = new System.Drawing.Point(202, 56);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem9.Size = new System.Drawing.Size(202, 28);
-            this.layoutControlItem9.Text = "宸ヤ綅";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txt_itemName;
-            this.layoutControlItem10.Location = new System.Drawing.Point(404, 0);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem10.Size = new System.Drawing.Size(202, 28);
-            this.layoutControlItem10.Text = "浜у搧鍚嶇О";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.txt_sbNo;
-            this.layoutControlItem12.Location = new System.Drawing.Point(404, 56);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(202, 28);
-            this.layoutControlItem12.Text = "璁惧缂栫爜";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_yjDate;
-            this.layoutControlItem14.Location = new System.Drawing.Point(606, 28);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem14.Size = new System.Drawing.Size(202, 28);
-            this.layoutControlItem14.Text = "璁″垝鏃堕棿";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.txt_sjDate;
-            this.layoutControlItem15.Location = new System.Drawing.Point(606, 56);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem15.Size = new System.Drawing.Size(202, 28);
-            this.layoutControlItem15.Text = "瀹為檯鏃堕棿";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(87, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_currentBarCode;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 112);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 139);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem5.Size = new System.Drawing.Size(404, 28);
+            this.layoutControlItem5.Size = new System.Drawing.Size(404, 35);
             this.layoutControlItem5.Text = "褰撳墠鏉$爜";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18);
             // 
-            // layoutControlItem6
+            // layShuiJian
             // 
-            this.layoutControlItem6.Control = this.txt_gwm;
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 140);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem6.Size = new System.Drawing.Size(202, 31);
-            this.layoutControlItem6.Text = "鎵伐浣嶇爜";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+            this.layShuiJian.Control = this.txt_gongWei;
+            this.layShuiJian.Location = new System.Drawing.Point(0, 174);
+            this.layShuiJian.Name = "layShuiJian";
+            this.layShuiJian.OptionsTableLayoutItem.RowIndex = 5;
+            this.layShuiJian.Size = new System.Drawing.Size(202, 35);
+            this.layShuiJian.Text = "鎵伐浣嶇爜";
+            this.layShuiJian.TextSize = new System.Drawing.Size(87, 18);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.btnGood;
-            this.layoutControlItem16.Location = new System.Drawing.Point(404, 84);
+            this.layoutControlItem16.Location = new System.Drawing.Point(404, 104);
             this.layoutControlItem16.MaxSize = new System.Drawing.Size(0, 100);
             this.layoutControlItem16.MinSize = new System.Drawing.Size(41, 100);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem16.OptionsTableLayoutItem.RowSpan = 3;
-            this.layoutControlItem16.Size = new System.Drawing.Size(202, 87);
+            this.layoutControlItem16.Size = new System.Drawing.Size(202, 105);
             this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem16.Text = "鑹搧鎸夐挳";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -656,58 +624,104 @@
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.btnBad;
-            this.layoutControlItem17.Location = new System.Drawing.Point(606, 84);
+            this.layoutControlItem17.Location = new System.Drawing.Point(606, 104);
             this.layoutControlItem17.MaxSize = new System.Drawing.Size(0, 100);
             this.layoutControlItem17.MinSize = new System.Drawing.Size(56, 100);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem17.OptionsTableLayoutItem.RowSpan = 3;
-            this.layoutControlItem17.Size = new System.Drawing.Size(202, 87);
+            this.layoutControlItem17.Size = new System.Drawing.Size(202, 105);
             this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem17.Text = "涓嶈壇鍝佹寜閽�";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem17.TextVisible = false;
             // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_sbNo;
+            this.layoutControlItem12.Location = new System.Drawing.Point(202, 69);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem12.Size = new System.Drawing.Size(202, 35);
+            this.layoutControlItem12.Text = "璁惧缂栫爜";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(87, 18);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_sjDate;
+            this.layoutControlItem15.Location = new System.Drawing.Point(606, 69);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem15.Size = new System.Drawing.Size(202, 35);
+            this.layoutControlItem15.Text = "Mes瀹為檯寮�宸�";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(87, 18);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_yjDate;
+            this.layoutControlItem14.Location = new System.Drawing.Point(606, 34);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem14.Size = new System.Drawing.Size(202, 35);
+            this.layoutControlItem14.Text = "Mes璁″垝寮�宸�";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(87, 18);
+            // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_sjXt;
-            this.layoutControlItem13.Location = new System.Drawing.Point(404, 28);
+            this.layoutControlItem13.CustomizationFormText = "鐢熶骇绾垮埆";
+            this.layoutControlItem13.Location = new System.Drawing.Point(404, 69);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem13.Size = new System.Drawing.Size(202, 28);
-            this.layoutControlItem13.Text = "绾垮埆";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem13.Size = new System.Drawing.Size(202, 35);
+            this.layoutControlItem13.Text = "鐢熶骇绾垮埆";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(87, 18);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_itemName;
+            this.layoutControlItem10.Location = new System.Drawing.Point(404, 34);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem10.Size = new System.Drawing.Size(202, 35);
+            this.layoutControlItem10.Text = "浜у搧鍚嶇О";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_itemModel;
-            this.layoutControlItem11.Location = new System.Drawing.Point(606, 0);
+            this.layoutControlItem11.Location = new System.Drawing.Point(404, 0);
             this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem11.Size = new System.Drawing.Size(202, 28);
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem11.Size = new System.Drawing.Size(404, 34);
             this.layoutControlItem11.Text = "浜у搧瑙勬牸";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18);
             // 
-            // layoutControlItem18
+            // layDianJian
             // 
-            this.layoutControlItem18.Control = this.txt_dianJianPath;
-            this.layoutControlItem18.Location = new System.Drawing.Point(202, 140);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem18.Size = new System.Drawing.Size(202, 31);
-            this.layoutControlItem18.Text = "鐢垫璺緞";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
+            this.layDianJian.Control = this.txt_dianJianPath;
+            this.layDianJian.Location = new System.Drawing.Point(202, 174);
+            this.layDianJian.Name = "layDianJian";
+            this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layDianJian.OptionsTableLayoutItem.RowIndex = 5;
+            this.layDianJian.Size = new System.Drawing.Size(202, 35);
+            this.layDianJian.Text = "鐢垫璺緞";
+            this.layDianJian.TextSize = new System.Drawing.Size(87, 18);
             // 
             // simpleButton7
             // 
             this.simpleButton7.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
             this.simpleButton7.Appearance.Options.UseBackColor = true;
-            this.simpleButton7.Location = new System.Drawing.Point(122, 126);
+            this.simpleButton7.Location = new System.Drawing.Point(122, 154);
             this.simpleButton7.Name = "simpleButton7";
-            this.simpleButton7.Size = new System.Drawing.Size(86, 50);
+            this.simpleButton7.Size = new System.Drawing.Size(86, 56);
             this.simpleButton7.TabIndex = 10;
             this.simpleButton7.Text = "璁惧";
             // 
@@ -715,9 +729,9 @@
             // 
             this.simpleButton6.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
             this.simpleButton6.Appearance.Options.UseBackColor = true;
-            this.simpleButton6.Location = new System.Drawing.Point(425, 126);
+            this.simpleButton6.Location = new System.Drawing.Point(425, 154);
             this.simpleButton6.Name = "simpleButton6";
-            this.simpleButton6.Size = new System.Drawing.Size(86, 50);
+            this.simpleButton6.Size = new System.Drawing.Size(86, 56);
             this.simpleButton6.TabIndex = 9;
             this.simpleButton6.Text = "鍙栨秷";
             // 
@@ -725,9 +739,9 @@
             // 
             this.simpleButton5.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
             this.simpleButton5.Appearance.Options.UseBackColor = true;
-            this.simpleButton5.Location = new System.Drawing.Point(223, 126);
+            this.simpleButton5.Location = new System.Drawing.Point(223, 154);
             this.simpleButton5.Name = "simpleButton5";
-            this.simpleButton5.Size = new System.Drawing.Size(86, 50);
+            this.simpleButton5.Size = new System.Drawing.Size(86, 56);
             this.simpleButton5.TabIndex = 8;
             this.simpleButton5.Text = "鍝佽川";
             // 
@@ -735,9 +749,9 @@
             // 
             this.simpleButton4.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
             this.simpleButton4.Appearance.Options.UseBackColor = true;
-            this.simpleButton4.Location = new System.Drawing.Point(324, 126);
+            this.simpleButton4.Location = new System.Drawing.Point(324, 154);
             this.simpleButton4.Name = "simpleButton4";
-            this.simpleButton4.Size = new System.Drawing.Size(86, 50);
+            this.simpleButton4.Size = new System.Drawing.Size(86, 56);
             this.simpleButton4.TabIndex = 7;
             this.simpleButton4.Text = "鍏跺畠";
             // 
@@ -745,34 +759,35 @@
             // 
             this.simpleButton3.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
             this.simpleButton3.Appearance.Options.UseBackColor = true;
-            this.simpleButton3.Location = new System.Drawing.Point(21, 126);
+            this.simpleButton3.Location = new System.Drawing.Point(21, 154);
             this.simpleButton3.Name = "simpleButton3";
-            this.simpleButton3.Size = new System.Drawing.Size(86, 50);
+            this.simpleButton3.Size = new System.Drawing.Size(86, 56);
             this.simpleButton3.TabIndex = 6;
             this.simpleButton3.Text = "鐗╂枡";
             // 
             // prog1
             // 
-            this.prog1.Location = new System.Drawing.Point(21, 88);
+            this.prog1.Location = new System.Drawing.Point(22, 110);
             this.prog1.Name = "prog1";
             this.prog1.Properties.ShowTitle = true;
-            this.prog1.Size = new System.Drawing.Size(489, 22);
+            this.prog1.Size = new System.Drawing.Size(489, 26);
             this.prog1.TabIndex = 5;
             // 
             // panel3
             // 
-            this.panel3.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            this.panel3.BackColor = System.Drawing.SystemColors.Highlight;
             this.panel3.Controls.Add(this.lbSum4);
             this.panel3.Controls.Add(this.label6);
+            this.panel3.ForeColor = System.Drawing.Color.White;
             this.panel3.Location = new System.Drawing.Point(411, 7);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(99, 71);
+            this.panel3.Size = new System.Drawing.Size(99, 89);
             this.panel3.TabIndex = 4;
             // 
             // lbSum4
             // 
             this.lbSum4.AutoSize = true;
-            this.lbSum4.Location = new System.Drawing.Point(45, 46);
+            this.lbSum4.Location = new System.Drawing.Point(45, 54);
             this.lbSum4.Name = "lbSum4";
             this.lbSum4.Size = new System.Drawing.Size(16, 18);
             this.lbSum4.TabIndex = 1;
@@ -789,18 +804,19 @@
             // 
             // panel2
             // 
-            this.panel2.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            this.panel2.BackColor = System.Drawing.SystemColors.Highlight;
             this.panel2.Controls.Add(this.lbSum3);
             this.panel2.Controls.Add(this.label4);
+            this.panel2.ForeColor = System.Drawing.Color.White;
             this.panel2.Location = new System.Drawing.Point(281, 7);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(99, 71);
+            this.panel2.Size = new System.Drawing.Size(99, 89);
             this.panel2.TabIndex = 3;
             // 
             // lbSum3
             // 
             this.lbSum3.AutoSize = true;
-            this.lbSum3.Location = new System.Drawing.Point(45, 46);
+            this.lbSum3.Location = new System.Drawing.Point(45, 54);
             this.lbSum3.Name = "lbSum3";
             this.lbSum3.Size = new System.Drawing.Size(16, 18);
             this.lbSum3.TabIndex = 1;
@@ -817,18 +833,19 @@
             // 
             // panel4
             // 
-            this.panel4.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            this.panel4.BackColor = System.Drawing.SystemColors.Highlight;
             this.panel4.Controls.Add(this.lbSum2);
             this.panel4.Controls.Add(this.label8);
-            this.panel4.Location = new System.Drawing.Point(151, 7);
+            this.panel4.ForeColor = System.Drawing.Color.White;
+            this.panel4.Location = new System.Drawing.Point(143, 7);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(99, 71);
+            this.panel4.Size = new System.Drawing.Size(110, 89);
             this.panel4.TabIndex = 2;
             // 
             // lbSum2
             // 
             this.lbSum2.AutoSize = true;
-            this.lbSum2.Location = new System.Drawing.Point(45, 46);
+            this.lbSum2.Location = new System.Drawing.Point(45, 54);
             this.lbSum2.Name = "lbSum2";
             this.lbSum2.Size = new System.Drawing.Size(16, 18);
             this.lbSum2.TabIndex = 1;
@@ -837,26 +854,27 @@
             // label8
             // 
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(18, 10);
+            this.label8.Location = new System.Drawing.Point(1, 10);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(68, 18);
+            this.label8.Size = new System.Drawing.Size(107, 18);
             this.label8.TabIndex = 0;
-            this.label8.Text = "鎶曞叆鏁伴噺";
+            this.label8.Text = "G001:鎶曞叆鏁伴噺";
             // 
             // panel1
             // 
-            this.panel1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            this.panel1.BackColor = System.Drawing.SystemColors.Highlight;
             this.panel1.Controls.Add(this.lbSum1);
             this.panel1.Controls.Add(this.label1);
+            this.panel1.ForeColor = System.Drawing.Color.White;
             this.panel1.Location = new System.Drawing.Point(21, 7);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(99, 71);
+            this.panel1.Size = new System.Drawing.Size(99, 89);
             this.panel1.TabIndex = 0;
             // 
             // lbSum1
             // 
             this.lbSum1.AutoSize = true;
-            this.lbSum1.Location = new System.Drawing.Point(45, 46);
+            this.lbSum1.Location = new System.Drawing.Point(45, 54);
             this.lbSum1.Name = "lbSum1";
             this.lbSum1.Size = new System.Drawing.Size(16, 18);
             this.lbSum1.TabIndex = 1;
@@ -877,7 +895,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1367, 416);
+            this.tabMx.Size = new System.Drawing.Size(1367, 378);
             this.tabMx.TabIndex = 4;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -887,7 +905,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1365, 384);
+            this.tabMxPage1.Size = new System.Drawing.Size(1365, 346);
             this.tabMxPage1.Text = "鑹搧鍚嶇О";
             // 
             // gcMx1
@@ -896,7 +914,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(1365, 384);
+            this.gcMx1.Size = new System.Drawing.Size(1365, 346);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -917,7 +935,8 @@
             this.gridColumn1,
             this.gridColumn4,
             this.gridColumn14,
-            this.gridColumn15});
+            this.gridColumn15,
+            this.gridColumn24});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -996,6 +1015,7 @@
             this.gridColumn3.FieldName = "quantity";
             this.gridColumn3.MinWidth = 25;
             this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.OptionsColumn.ReadOnly = true;
             this.gridColumn3.Visible = true;
             this.gridColumn3.VisibleIndex = 6;
             this.gridColumn3.Width = 94;
@@ -1018,6 +1038,7 @@
             this.gridColumn2.FieldName = "processNo";
             this.gridColumn2.MinWidth = 25;
             this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.OptionsColumn.ReadOnly = true;
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 7;
             this.gridColumn2.Width = 94;
@@ -1028,8 +1049,7 @@
             this.gridColumn1.FieldName = "badDescription";
             this.gridColumn1.MinWidth = 25;
             this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 8;
+            this.gridColumn1.OptionsColumn.ReadOnly = true;
             this.gridColumn1.Width = 94;
             // 
             // gridColumn4
@@ -1038,35 +1058,49 @@
             this.gridColumn4.FieldName = "checkResult";
             this.gridColumn4.MinWidth = 25;
             this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.OptionsColumn.ReadOnly = true;
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 9;
+            this.gridColumn4.VisibleIndex = 8;
             this.gridColumn4.Width = 94;
             // 
             // gridColumn14
             // 
             this.gridColumn14.Caption = "涓婃姤浜�";
-            this.gridColumn14.FieldName = "collectByName";
+            this.gridColumn14.FieldName = "createBy";
             this.gridColumn14.MinWidth = 25;
             this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.OptionsColumn.ReadOnly = true;
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 10;
+            this.gridColumn14.VisibleIndex = 9;
             this.gridColumn14.Width = 94;
             // 
             // gridColumn15
             // 
-            this.gridColumn15.Caption = "涓婃姤鏃堕棿";
+            this.gridColumn15.Caption = "鏈�鍚庝笂鎶ユ椂闂�";
             this.gridColumn15.FieldName = "createDate";
             this.gridColumn15.MinWidth = 25;
             this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.OptionsColumn.ReadOnly = true;
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 11;
+            this.gridColumn15.VisibleIndex = 10;
             this.gridColumn15.Width = 94;
+            // 
+            // gridColumn24
+            // 
+            this.gridColumn24.Caption = "鏁版嵁鐘舵��";
+            this.gridColumn24.FieldName = "barCodeStatusTxt";
+            this.gridColumn24.MinWidth = 25;
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.OptionsColumn.ReadOnly = true;
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 11;
+            this.gridColumn24.Width = 94;
             // 
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1365, 384);
+            this.tabMxPage2.Size = new System.Drawing.Size(1365, 354);
             this.tabMxPage2.Text = "涓嶈壇鍝佹槑缁�";
             // 
             // gcMx2
@@ -1075,7 +1109,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(1365, 384);
+            this.gcMx2.Size = new System.Drawing.Size(1365, 354);
             this.gcMx2.TabIndex = 1;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -1097,7 +1131,8 @@
             this.gridColumn20,
             this.gridColumn21,
             this.gridColumn22,
-            this.gridColumn23});
+            this.gridColumn23,
+            this.gridColumn25});
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1176,6 +1211,7 @@
             this.gridColumn16.FieldName = "quantity";
             this.gridColumn16.MinWidth = 25;
             this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.OptionsColumn.ReadOnly = true;
             this.gridColumn16.Visible = true;
             this.gridColumn16.VisibleIndex = 6;
             this.gridColumn16.Width = 94;
@@ -1198,6 +1234,7 @@
             this.gridColumn18.FieldName = "processNo";
             this.gridColumn18.MinWidth = 25;
             this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.OptionsColumn.ReadOnly = true;
             this.gridColumn18.Visible = true;
             this.gridColumn18.VisibleIndex = 7;
             this.gridColumn18.Width = 94;
@@ -1208,6 +1245,7 @@
             this.gridColumn19.FieldName = "badDescription";
             this.gridColumn19.MinWidth = 25;
             this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.OptionsColumn.ReadOnly = true;
             this.gridColumn19.Visible = true;
             this.gridColumn19.VisibleIndex = 8;
             this.gridColumn19.Width = 94;
@@ -1218,6 +1256,7 @@
             this.gridColumn20.FieldName = "checkResult";
             this.gridColumn20.MinWidth = 25;
             this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.OptionsColumn.ReadOnly = true;
             this.gridColumn20.Visible = true;
             this.gridColumn20.VisibleIndex = 9;
             this.gridColumn20.Width = 94;
@@ -1225,9 +1264,10 @@
             // gridColumn21
             // 
             this.gridColumn21.Caption = "涓婃姤浜�";
-            this.gridColumn21.FieldName = "collectByName";
+            this.gridColumn21.FieldName = "createBy";
             this.gridColumn21.MinWidth = 25;
             this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.OptionsColumn.ReadOnly = true;
             this.gridColumn21.Visible = true;
             this.gridColumn21.VisibleIndex = 10;
             this.gridColumn21.Width = 94;
@@ -1238,6 +1278,7 @@
             this.gridColumn22.FieldName = "createDate";
             this.gridColumn22.MinWidth = 25;
             this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.OptionsColumn.ReadOnly = true;
             this.gridColumn22.Visible = true;
             this.gridColumn22.VisibleIndex = 11;
             this.gridColumn22.Width = 94;
@@ -1248,9 +1289,19 @@
             this.gridColumn23.FieldName = "badReson";
             this.gridColumn23.MinWidth = 25;
             this.gridColumn23.Name = "gridColumn23";
-            this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 12;
+            this.gridColumn23.OptionsColumn.ReadOnly = true;
             this.gridColumn23.Width = 94;
+            // 
+            // gridColumn25
+            // 
+            this.gridColumn25.Caption = "鏁版嵁鐘舵��";
+            this.gridColumn25.FieldName = "barCodeStatus";
+            this.gridColumn25.MinWidth = 25;
+            this.gridColumn25.Name = "gridColumn25";
+            this.gridColumn25.OptionsColumn.ReadOnly = true;
+            this.gridColumn25.Visible = true;
+            this.gridColumn25.VisibleIndex = 12;
+            this.gridColumn25.Width = 94;
             // 
             // Frm_Work01
             // 
@@ -1283,10 +1334,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_collectBy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_currentBarCode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_gwm.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gongWei.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_bc.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_gw.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_sbNo.Properties)).EndInit();
@@ -1294,6 +1344,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_yjDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_sjDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_dianJianPath.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1301,18 +1352,17 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layShuiJian)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit();
             this.panel3.ResumeLayout(false);
             this.panel3.PerformLayout();
@@ -1359,14 +1409,13 @@
         private DevExpress.XtraEditors.TextEdit txt_collectBy;
         private DevExpress.XtraEditors.TextEdit txt_barCode;
         private DevExpress.XtraEditors.TextEdit txt_currentBarCode;
-        private DevExpress.XtraEditors.TextEdit txt_gwm;
+        private DevExpress.XtraEditors.TextEdit txt_gongWei;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraEditors.TextEdit txt_itemNo;
         private DevExpress.XtraEditors.TextEdit txt_bc;
-        private DevExpress.XtraEditors.TextEdit txt_gw;
         private DevExpress.XtraEditors.TextEdit txt_itemName;
         private DevExpress.XtraEditors.TextEdit txt_itemModel;
         private DevExpress.XtraEditors.TextEdit txt_sbNo;
@@ -1375,11 +1424,6 @@
         private DevExpress.XtraEditors.TextEdit txt_sjDate;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
         private DevExpress.XtraEditors.SimpleButton btnGood;
         private DevExpress.XtraEditors.SimpleButton btnBad;
         private System.Windows.Forms.Panel panel3;
@@ -1401,11 +1445,9 @@
         private DevExpress.XtraEditors.SimpleButton simpleButton3;
         private DevExpress.XtraEditors.ProgressBarControl prog1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layShuiJian;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
@@ -1428,6 +1470,16 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
         private DevExpress.XtraEditors.TextEdit txt_dianJianPath;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraEditors.LabelControl lbCollectGuid;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layDianJian;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3