From f09ac29b50b114b56ad9c26435b482339cf79057 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 17 八月 2025 17:00:06 +0800
Subject: [PATCH] 过站

---
 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs |  312 ++++++++++++++++++++++++++++-----------------------
 1 files changed, 171 insertions(+), 141 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
index 76328e5..d959c87 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -42,6 +42,7 @@
             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();
@@ -70,7 +71,13 @@
             this.layShuiJian = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layDianJian = 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.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton();
             this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton();
             this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton();
@@ -126,12 +133,7 @@
             this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
-            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.layDianJian = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
             this.splitMx1.Panel1.SuspendLayout();
@@ -172,7 +174,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.layShuiJian)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).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.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit();
             this.panel3.SuspendLayout();
             this.panel2.SuspendLayout();
@@ -186,12 +194,7 @@
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).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.layDianJian)).BeginInit();
             this.SuspendLayout();
             // 
             // splitMx1
@@ -212,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 = 221;
             this.splitMx1.TabIndex = 0;
             // 
             // splitTop1
@@ -241,12 +244,13 @@
             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, 221);
             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);
@@ -265,13 +269,24 @@
             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, 221);
             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
             // 
@@ -284,7 +299,7 @@
             // 
             // txt_gx
             // 
-            this.txt_gx.Location = new System.Drawing.Point(111, 40);
+            this.txt_gx.Location = new System.Drawing.Point(111, 45);
             this.txt_gx.Name = "txt_gx";
             this.txt_gx.Properties.ReadOnly = true;
             this.txt_gx.Size = new System.Drawing.Size(99, 24);
@@ -293,7 +308,7 @@
             // 
             // txt_collectBy
             // 
-            this.txt_collectBy.Location = new System.Drawing.Point(111, 68);
+            this.txt_collectBy.Location = new System.Drawing.Point(111, 78);
             this.txt_collectBy.Name = "txt_collectBy";
             this.txt_collectBy.Properties.ReadOnly = true;
             this.txt_collectBy.Size = new System.Drawing.Size(99, 24);
@@ -302,7 +317,7 @@
             // 
             // txt_barCode
             // 
-            this.txt_barCode.Location = new System.Drawing.Point(111, 96);
+            this.txt_barCode.Location = new System.Drawing.Point(111, 111);
             this.txt_barCode.Name = "txt_barCode";
             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)))));
@@ -314,7 +329,7 @@
             // 
             // txt_currentBarCode
             // 
-            this.txt_currentBarCode.Location = new System.Drawing.Point(111, 124);
+            this.txt_currentBarCode.Location = new System.Drawing.Point(111, 144);
             this.txt_currentBarCode.Name = "txt_currentBarCode";
             this.txt_currentBarCode.Properties.ReadOnly = true;
             this.txt_currentBarCode.Size = new System.Drawing.Size(301, 24);
@@ -323,7 +338,7 @@
             // 
             // txt_gongWei
             // 
-            this.txt_gongWei.Location = new System.Drawing.Point(111, 152);
+            this.txt_gongWei.Location = new System.Drawing.Point(111, 177);
             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)))));
@@ -344,7 +359,7 @@
             // 
             // txt_bc
             // 
-            this.txt_bc.Location = new System.Drawing.Point(313, 40);
+            this.txt_bc.Location = new System.Drawing.Point(313, 45);
             this.txt_bc.Name = "txt_bc";
             this.txt_bc.Properties.ReadOnly = true;
             this.txt_bc.Size = new System.Drawing.Size(99, 24);
@@ -353,7 +368,7 @@
             // 
             // txt_itemName
             // 
-            this.txt_itemName.Location = new System.Drawing.Point(515, 40);
+            this.txt_itemName.Location = new System.Drawing.Point(515, 45);
             this.txt_itemName.Name = "txt_itemName";
             this.txt_itemName.Properties.ReadOnly = true;
             this.txt_itemName.Size = new System.Drawing.Size(99, 24);
@@ -371,7 +386,7 @@
             // 
             // txt_sbNo
             // 
-            this.txt_sbNo.Location = new System.Drawing.Point(313, 68);
+            this.txt_sbNo.Location = new System.Drawing.Point(313, 78);
             this.txt_sbNo.Name = "txt_sbNo";
             this.txt_sbNo.Properties.ReadOnly = true;
             this.txt_sbNo.Size = new System.Drawing.Size(99, 24);
@@ -380,7 +395,7 @@
             // 
             // txt_sjXt
             // 
-            this.txt_sjXt.Location = new System.Drawing.Point(515, 68);
+            this.txt_sjXt.Location = new System.Drawing.Point(515, 78);
             this.txt_sjXt.Name = "txt_sjXt";
             this.txt_sjXt.Properties.ReadOnly = true;
             this.txt_sjXt.Size = new System.Drawing.Size(99, 24);
@@ -389,7 +404,7 @@
             // 
             // txt_yjDate
             // 
-            this.txt_yjDate.Location = new System.Drawing.Point(717, 40);
+            this.txt_yjDate.Location = new System.Drawing.Point(717, 45);
             this.txt_yjDate.Name = "txt_yjDate";
             this.txt_yjDate.Properties.ReadOnly = true;
             this.txt_yjDate.Size = new System.Drawing.Size(99, 24);
@@ -398,7 +413,7 @@
             // 
             // txt_sjDate
             // 
-            this.txt_sjDate.Location = new System.Drawing.Point(717, 68);
+            this.txt_sjDate.Location = new System.Drawing.Point(717, 78);
             this.txt_sjDate.Name = "txt_sjDate";
             this.txt_sjDate.Properties.ReadOnly = true;
             this.txt_sjDate.Size = new System.Drawing.Size(99, 24);
@@ -409,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, 111);
             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 = "鑹搧";
@@ -420,16 +435,16 @@
             // 
             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, 111);
             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(313, 152);
+            this.txt_dianJianPath.Location = new System.Drawing.Point(313, 177);
             this.txt_dianJianPath.Name = "txt_dianJianPath";
             this.txt_dianJianPath.Properties.ReadOnly = true;
             this.txt_dianJianPath.Size = new System.Drawing.Size(99, 24);
@@ -451,13 +466,13 @@
             this.layShuiJian,
             this.layoutControlItem16,
             this.layoutControlItem17,
-            this.layDianJian,
             this.layoutControlItem12,
             this.layoutControlItem15,
             this.layoutControlItem14,
             this.layoutControlItem13,
             this.layoutControlItem10,
-            this.layoutControlItem11});
+            this.layoutControlItem11,
+            this.layDianJian});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -492,7 +507,7 @@
             rowDefinition4,
             rowDefinition5,
             rowDefinition6});
-            this.Root.Size = new System.Drawing.Size(828, 191);
+            this.Root.Size = new System.Drawing.Size(828, 221);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -500,17 +515,17 @@
             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, 33);
             this.layoutControlItem1.Text = "宸ュ崟缂栧彿";
             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, 33);
             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, 33);
             this.layoutControlItem2.Text = "褰撳墠宸ュ簭";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18);
             // 
@@ -518,21 +533,21 @@
             // 
             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, 66);
             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, 33);
             this.layoutControlItem3.Text = "鎿嶄綔鍛樺伐";
             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, 99);
             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, 33);
             this.layoutControlItem4.Text = "鎵拷婧爜";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 18);
             // 
@@ -542,53 +557,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, 33);
             this.layoutControlItem7.Text = "浜у搧缂栫爜";
             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, 33);
             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, 33);
             this.layoutControlItem8.Text = "鐝";
             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, 132);
             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, 33);
             this.layoutControlItem5.Text = "褰撳墠鏉$爜";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18);
             // 
             // layShuiJian
             // 
             this.layShuiJian.Control = this.txt_gongWei;
-            this.layShuiJian.Location = new System.Drawing.Point(0, 140);
+            this.layShuiJian.Location = new System.Drawing.Point(0, 165);
             this.layShuiJian.Name = "layShuiJian";
             this.layShuiJian.OptionsTableLayoutItem.RowIndex = 5;
-            this.layShuiJian.Size = new System.Drawing.Size(202, 31);
+            this.layShuiJian.Size = new System.Drawing.Size(202, 36);
             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, 99);
             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, 102);
             this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem16.Text = "鑹搧鎸夐挳";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -597,29 +612,97 @@
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.btnBad;
-            this.layoutControlItem17.Location = new System.Drawing.Point(606, 84);
+            this.layoutControlItem17.Location = new System.Drawing.Point(606, 99);
             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, 102);
             this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem17.Text = "涓嶈壇鍝佹寜閽�";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem17.TextVisible = false;
             // 
-            // layDianJian
+            // layoutControlItem12
             // 
-            this.layDianJian.Control = this.txt_dianJianPath;
-            this.layDianJian.Location = new System.Drawing.Point(202, 140);
-            this.layDianJian.Name = "layDianJian";
-            this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layDianJian.OptionsTableLayoutItem.RowIndex = 5;
-            this.layDianJian.Size = new System.Drawing.Size(202, 31);
-            this.layDianJian.Text = "鐢垫璺緞";
-            this.layDianJian.TextSize = new System.Drawing.Size(87, 18);
+            this.layoutControlItem12.Control = this.txt_sbNo;
+            this.layoutControlItem12.Location = new System.Drawing.Point(202, 66);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem12.Size = new System.Drawing.Size(202, 33);
+            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, 66);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem15.Size = new System.Drawing.Size(202, 33);
+            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, 33);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem14.Size = new System.Drawing.Size(202, 33);
+            this.layoutControlItem14.Text = "Mes璁″垝寮�宸�";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(87, 18);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_sjXt;
+            this.layoutControlItem13.CustomizationFormText = "鐢熶骇绾垮埆";
+            this.layoutControlItem13.Location = new System.Drawing.Point(404, 66);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem13.Size = new System.Drawing.Size(202, 33);
+            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, 33);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem10.Size = new System.Drawing.Size(202, 33);
+            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(404, 0);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem11.Size = new System.Drawing.Size(404, 33);
+            this.layoutControlItem11.Text = "浜у搧瑙勬牸";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18);
+            // 
+            // 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;
             // 
             // simpleButton7
             // 
@@ -797,7 +880,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, 386);
             this.tabMx.TabIndex = 4;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -807,7 +890,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, 354);
             this.tabMxPage1.Text = "鑹搧鍚嶇О";
             // 
             // gcMx1
@@ -816,7 +899,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, 354);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1002,7 +1085,7 @@
             // 
             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
@@ -1011,7 +1094,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});
@@ -1205,72 +1288,16 @@
             this.gridColumn25.VisibleIndex = 12;
             this.gridColumn25.Width = 94;
             // 
-            // layoutControlItem12
+            // layDianJian
             // 
-            this.layoutControlItem12.Control = this.txt_sbNo;
-            this.layoutControlItem12.Location = new System.Drawing.Point(202, 56);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(202, 28);
-            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, 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 = "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, 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 = "Mes璁″垝寮�宸�";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(87, 18);
-            // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.txt_sjXt;
-            this.layoutControlItem13.CustomizationFormText = "鐢熶骇绾垮埆";
-            this.layoutControlItem13.Location = new System.Drawing.Point(404, 56);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem13.Size = new System.Drawing.Size(202, 28);
-            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, 28);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem10.Size = new System.Drawing.Size(202, 28);
-            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(404, 0);
-            this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(404, 28);
-            this.layoutControlItem11.Text = "浜у搧瑙勬牸";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18);
+            this.layDianJian.Control = this.txt_dianJianPath;
+            this.layDianJian.Location = new System.Drawing.Point(202, 165);
+            this.layDianJian.Name = "layDianJian";
+            this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layDianJian.OptionsTableLayoutItem.RowIndex = 5;
+            this.layDianJian.Size = new System.Drawing.Size(202, 36);
+            this.layDianJian.Text = "鐢垫璺緞";
+            this.layDianJian.TextSize = new System.Drawing.Size(87, 18);
             // 
             // Frm_Work01
             // 
@@ -1324,7 +1351,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.layShuiJian)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).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.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit();
             this.panel3.ResumeLayout(false);
             this.panel3.PerformLayout();
@@ -1342,12 +1375,7 @@
             this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).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.layDianJian)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1438,7 +1466,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
         private DevExpress.XtraEditors.TextEdit txt_dianJianPath;
-        private DevExpress.XtraLayout.LayoutControlItem layDianJian;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
@@ -1447,5 +1474,8 @@
         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