From 2e44301eda2efb4b61e6dc53d4fff668229f7321 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 17 九月 2025 22:05:27 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs |  362 ++++++++++++++++++++++++++-------------------------
 1 files changed, 184 insertions(+), 178 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 56d4c84..83ed8ca 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -92,7 +92,6 @@
             this.gv_daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_daa011 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_daa005 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -100,8 +99,6 @@
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_daa015 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_daa009 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_prepareTime = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_daa028 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_daa016 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_daa017 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_mesStartProd = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -142,6 +139,7 @@
             this.txt_isQiTao = new DevExpress.XtraEditors.CheckEdit();
             this.txt_daa018 = new DevExpress.XtraEditors.TextEdit();
             this.txt_daa025 = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.txt_daa021 = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -159,16 +157,17 @@
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
             this.txt_daa015label = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem46 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem48 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem49 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -201,6 +200,7 @@
             this.gvMx1dab020 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1dab022 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1dab023 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn58 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabPage6 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx6 = new DevExpress.XtraGrid.GridControl();
             this.gvMx6 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -304,6 +304,7 @@
             this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx100 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layMx100 = new DevExpress.XtraDataLayout.DataLayoutControl();
@@ -378,6 +379,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa025.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa021.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
@@ -395,16 +397,17 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa015label)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem48)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem49)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -591,7 +594,6 @@
             this.gv_daa003,
             this.gv_daa004,
             this.gv_daa008,
-            this.gv_daa011,
             this.gridColumn4,
             this.gv_daa010,
             this.gv_daa005,
@@ -599,8 +601,6 @@
             this.gridColumn1,
             this.gv_daa015,
             this.gv_daa009,
-            this.gv_prepareTime,
-            this.gv_daa028,
             this.gv_daa016,
             this.gv_daa017,
             this.gv_mesStartProd,
@@ -626,8 +626,6 @@
             this.gridColumn5.MinWidth = 50;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Tag = "query_a.jabs";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 0;
             this.gridColumn5.Width = 50;
             // 
             // gridColumn7
@@ -639,7 +637,7 @@
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Tag = "query_a.jabs";
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 1;
+            this.gridColumn7.VisibleIndex = 0;
             this.gridColumn7.Width = 50;
             // 
             // gridColumn10
@@ -651,7 +649,7 @@
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Tag = "query_a.jabs";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 2;
+            this.gridColumn10.VisibleIndex = 1;
             this.gridColumn10.Width = 50;
             // 
             // gridColumn12
@@ -662,8 +660,6 @@
             this.gridColumn12.MinWidth = 50;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Tag = "query_a.jabs";
-            this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 3;
             this.gridColumn12.Width = 50;
             // 
             // gridColumn6
@@ -675,7 +671,7 @@
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Tag = "query_a.jabs";
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 4;
+            this.gridColumn6.VisibleIndex = 2;
             this.gridColumn6.Width = 50;
             // 
             // gridColumn27
@@ -685,20 +681,20 @@
             this.gridColumn27.MinWidth = 25;
             this.gridColumn27.Name = "gridColumn27";
             this.gridColumn27.Visible = true;
-            this.gridColumn27.VisibleIndex = 19;
+            this.gridColumn27.VisibleIndex = 15;
             this.gridColumn27.Width = 94;
             // 
             // gv_daa018
             // 
             this.gv_daa018.AppearanceCell.Options.UseFont = true;
             this.gv_daa018.Caption = "宸ュ崟鐘舵��";
-            this.gv_daa018.FieldName = "daa018Txt";
+            this.gv_daa018.FieldName = "daa018TxtColor";
             this.gv_daa018.MinWidth = 90;
             this.gv_daa018.Name = "gv_daa018";
             this.gv_daa018.OptionsColumn.AllowEdit = false;
             this.gv_daa018.Tag = "query_a.daa018";
             this.gv_daa018.Visible = true;
-            this.gv_daa018.VisibleIndex = 5;
+            this.gv_daa018.VisibleIndex = 3;
             this.gv_daa018.Width = 90;
             // 
             // gridColoun100
@@ -709,7 +705,7 @@
             this.gridColoun100.Name = "gridColoun100";
             this.gridColoun100.Tag = "org.fnamber";
             this.gridColoun100.Visible = true;
-            this.gridColoun100.VisibleIndex = 29;
+            this.gridColoun100.VisibleIndex = 26;
             this.gridColoun100.Width = 250;
             // 
             // gv_daa001
@@ -722,7 +718,7 @@
             this.gv_daa001.OptionsColumn.AllowEdit = false;
             this.gv_daa001.Tag = "query_a.daa001";
             this.gv_daa001.Visible = true;
-            this.gv_daa001.VisibleIndex = 6;
+            this.gv_daa001.VisibleIndex = 7;
             this.gv_daa001.Width = 120;
             // 
             // gv_daa021
@@ -735,7 +731,7 @@
             this.gv_daa021.OptionsColumn.AllowEdit = false;
             this.gv_daa021.Tag = "query_a.daa021";
             this.gv_daa021.Visible = true;
-            this.gv_daa021.VisibleIndex = 7;
+            this.gv_daa021.VisibleIndex = 17;
             this.gv_daa021.Width = 100;
             // 
             // gridColumn3
@@ -785,22 +781,8 @@
             this.gv_daa008.OptionsColumn.AllowEdit = false;
             this.gv_daa008.Tag = "query_a.daa008";
             this.gv_daa008.Visible = true;
-            this.gv_daa008.VisibleIndex = 13;
+            this.gv_daa008.VisibleIndex = 4;
             this.gv_daa008.Width = 50;
-            // 
-            // gv_daa011
-            // 
-            this.gv_daa011.AppearanceCell.Options.UseFont = true;
-            this.gv_daa011.Caption = "宸茬敓浜ч噺";
-            this.gv_daa011.FieldName = "daa011";
-            this.gv_daa011.MaxWidth = 50;
-            this.gv_daa011.MinWidth = 50;
-            this.gv_daa011.Name = "gv_daa011";
-            this.gv_daa011.OptionsColumn.AllowEdit = false;
-            this.gv_daa011.Tag = "query_a.daa011";
-            this.gv_daa011.Visible = true;
-            this.gv_daa011.VisibleIndex = 14;
-            this.gv_daa011.Width = 50;
             // 
             // gridColumn4
             // 
@@ -808,19 +790,19 @@
             this.gridColumn4.AppearanceCell.Options.UseForeColor = true;
             this.gridColumn4.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
             this.gridColumn4.AppearanceHeader.Options.UseForeColor = true;
-            this.gridColumn4.Caption = "寰呯敓浜ч噺";
+            this.gridColumn4.Caption = "寰呭叆搴撻噺";
             this.gridColumn4.FieldName = "dscl";
             this.gridColumn4.MaxWidth = 50;
             this.gridColumn4.MinWidth = 50;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 15;
+            this.gridColumn4.VisibleIndex = 6;
             this.gridColumn4.Width = 50;
             // 
             // gv_daa010
             // 
             this.gv_daa010.AppearanceCell.Options.UseFont = true;
-            this.gv_daa010.Caption = "鍏ュ簱鏁伴噺";
+            this.gv_daa010.Caption = "宸插叆搴撻噺";
             this.gv_daa010.FieldName = "daa010";
             this.gv_daa010.MaxWidth = 50;
             this.gv_daa010.MinWidth = 50;
@@ -828,7 +810,7 @@
             this.gv_daa010.OptionsColumn.AllowEdit = false;
             this.gv_daa010.Tag = "query_a.daa010";
             this.gv_daa010.Visible = true;
-            this.gv_daa010.VisibleIndex = 17;
+            this.gv_daa010.VisibleIndex = 5;
             this.gv_daa010.Width = 50;
             // 
             // gv_daa005
@@ -842,7 +824,7 @@
             this.gv_daa005.OptionsColumn.AllowEdit = false;
             this.gv_daa005.Tag = "query_a.daa005";
             this.gv_daa005.Visible = true;
-            this.gv_daa005.VisibleIndex = 18;
+            this.gv_daa005.VisibleIndex = 14;
             this.gv_daa005.Width = 50;
             // 
             // gv_cust
@@ -863,7 +845,7 @@
             this.gridColumn1.MinWidth = 50;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 20;
+            this.gridColumn1.VisibleIndex = 16;
             this.gridColumn1.Width = 94;
             // 
             // gv_daa015
@@ -889,30 +871,8 @@
             this.gv_daa009.OptionsColumn.AllowEdit = false;
             this.gv_daa009.Tag = "query_a.daa009";
             this.gv_daa009.Visible = true;
-            this.gv_daa009.VisibleIndex = 16;
+            this.gv_daa009.VisibleIndex = 13;
             this.gv_daa009.Width = 94;
-            // 
-            // gv_prepareTime
-            // 
-            this.gv_prepareTime.AppearanceCell.Options.UseFont = true;
-            this.gv_prepareTime.Caption = "棰勮澶囨枡鏃堕棿";
-            this.gv_prepareTime.FieldName = "prepareTime";
-            this.gv_prepareTime.MinWidth = 50;
-            this.gv_prepareTime.Name = "gv_prepareTime";
-            this.gv_prepareTime.OptionsColumn.AllowEdit = false;
-            this.gv_prepareTime.Tag = "query_a.prepare_time";
-            this.gv_prepareTime.Width = 180;
-            // 
-            // gv_daa028
-            // 
-            this.gv_daa028.AppearanceCell.Options.UseFont = true;
-            this.gv_daa028.Caption = "澶囨枡瀹屾垚鏃堕棿";
-            this.gv_daa028.FieldName = "daa028";
-            this.gv_daa028.MinWidth = 50;
-            this.gv_daa028.Name = "gv_daa028";
-            this.gv_daa028.OptionsColumn.AllowEdit = false;
-            this.gv_daa028.Tag = "query_a.daa028";
-            this.gv_daa028.Width = 180;
             // 
             // gv_daa016
             // 
@@ -924,7 +884,7 @@
             this.gv_daa016.OptionsColumn.AllowEdit = false;
             this.gv_daa016.Tag = "query_a.daa016";
             this.gv_daa016.Visible = true;
-            this.gv_daa016.VisibleIndex = 21;
+            this.gv_daa016.VisibleIndex = 19;
             this.gv_daa016.Width = 180;
             // 
             // gv_daa017
@@ -937,7 +897,7 @@
             this.gv_daa017.OptionsColumn.AllowEdit = false;
             this.gv_daa017.Tag = "query_a.daa017";
             this.gv_daa017.Visible = true;
-            this.gv_daa017.VisibleIndex = 22;
+            this.gv_daa017.VisibleIndex = 20;
             this.gv_daa017.Width = 180;
             // 
             // gv_mesStartProd
@@ -950,7 +910,7 @@
             this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
             this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
             this.gv_mesStartProd.Visible = true;
-            this.gv_mesStartProd.VisibleIndex = 23;
+            this.gv_mesStartProd.VisibleIndex = 21;
             this.gv_mesStartProd.Width = 180;
             // 
             // gv_mesEndProd
@@ -963,7 +923,7 @@
             this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
             this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
             this.gv_mesEndProd.Visible = true;
-            this.gv_mesEndProd.VisibleIndex = 24;
+            this.gv_mesEndProd.VisibleIndex = 22;
             this.gv_mesEndProd.Width = 180;
             // 
             // gridColumn21
@@ -973,7 +933,7 @@
             this.gridColumn21.MinWidth = 25;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 25;
+            this.gridColumn21.VisibleIndex = 23;
             this.gridColumn21.Width = 94;
             // 
             // gridColumn22
@@ -983,7 +943,7 @@
             this.gridColumn22.MinWidth = 25;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 26;
+            this.gridColumn22.VisibleIndex = 24;
             this.gridColumn22.Width = 94;
             // 
             // gridColumn23
@@ -1001,7 +961,7 @@
             this.gridColumn24.MinWidth = 25;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
-            this.gridColumn24.VisibleIndex = 27;
+            this.gridColumn24.VisibleIndex = 25;
             this.gridColumn24.Width = 94;
             // 
             // gridColumn25
@@ -1011,7 +971,7 @@
             this.gridColumn25.MinWidth = 25;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
-            this.gridColumn25.VisibleIndex = 28;
+            this.gridColumn25.VisibleIndex = 18;
             this.gridColumn25.Width = 94;
             // 
             // gridColumn52
@@ -1092,6 +1052,7 @@
             this.layoutMx1.Controls.Add(this.txt_isQiTao);
             this.layoutMx1.Controls.Add(this.txt_daa018);
             this.layoutMx1.Controls.Add(this.txt_daa025);
+            this.layoutMx1.Controls.Add(this.txt_daa021);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem29,
@@ -1099,7 +1060,7 @@
             this.layoutControlItem41});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1059, 277, 812, 500);
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(797, 526, 812, 500);
             this.layoutMx1.Root = this.Root;
             this.layoutMx1.Size = new System.Drawing.Size(1650, 192);
             this.layoutMx1.TabIndex = 0;
@@ -1124,10 +1085,10 @@
             // 
             // txt_daa009
             // 
-            this.txt_daa009.Location = new System.Drawing.Point(114, 155);
+            this.txt_daa009.Location = new System.Drawing.Point(521, 155);
             this.txt_daa009.Name = "txt_daa009";
             this.txt_daa009.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa009.Size = new System.Drawing.Size(708, 24);
+            this.txt_daa009.Size = new System.Drawing.Size(301, 24);
             this.txt_daa009.StyleController = this.layoutMx1;
             this.txt_daa009.TabIndex = 240;
             this.txt_daa009.Tag = "";
@@ -1254,7 +1215,7 @@
             // 
             // txt_daa029
             // 
-            this.txt_daa029.Location = new System.Drawing.Point(114, 68);
+            this.txt_daa029.Location = new System.Drawing.Point(114, 97);
             this.txt_daa029.Name = "txt_daa029";
             this.txt_daa029.Properties.Appearance.Options.UseFont = true;
             this.txt_daa029.Size = new System.Drawing.Size(301, 24);
@@ -1284,7 +1245,7 @@
             // 
             // txt_daa003
             // 
-            this.txt_daa003.Location = new System.Drawing.Point(114, 97);
+            this.txt_daa003.Location = new System.Drawing.Point(114, 126);
             this.txt_daa003.Name = "txt_daa003";
             this.txt_daa003.Properties.Appearance.Options.UseFont = true;
             this.txt_daa003.Size = new System.Drawing.Size(301, 24);
@@ -1304,7 +1265,7 @@
             // 
             // txt_daa004
             // 
-            this.txt_daa004.Location = new System.Drawing.Point(114, 126);
+            this.txt_daa004.Location = new System.Drawing.Point(114, 155);
             this.txt_daa004.Name = "txt_daa004";
             this.txt_daa004.Properties.Appearance.Options.UseFont = true;
             this.txt_daa004.Size = new System.Drawing.Size(301, 24);
@@ -1367,6 +1328,15 @@
             this.txt_daa025.StyleController = this.layoutMx1;
             this.txt_daa025.TabIndex = 479;
             // 
+            // txt_daa021
+            // 
+            this.txt_daa021.Location = new System.Drawing.Point(114, 68);
+            this.txt_daa021.Name = "txt_daa021";
+            this.txt_daa021.Size = new System.Drawing.Size(301, 24);
+            this.txt_daa021.StyleController = this.layoutMx1;
+            this.txt_daa021.TabIndex = 480;
+            this.txt_daa021.Tag = "readonly";
+            // 
             // layoutControlItem29
             // 
             this.layoutControlItem29.Control = this.lbGuid;
@@ -1420,16 +1390,17 @@
             this.layoutControlItem12,
             this.layoutControlItem16,
             this.layoutControlItem9,
-            this.layoutControlItem13,
-            this.layoutControlItem19,
-            this.layoutControlItem17,
-            this.layoutControlItem28,
             this.txt_daa015label,
             this.layoutControlItem14,
             this.layoutControlItem46,
             this.layoutControlItem48,
             this.layoutControlItem40,
-            this.layoutControlItem27});
+            this.layoutControlItem27,
+            this.layoutControlItem28,
+            this.layoutControlItem17,
+            this.layoutControlItem19,
+            this.layoutControlItem13,
+            this.layoutControlItem49});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1605,47 +1576,6 @@
             this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
             // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.txt_daa029;
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 56);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem13.Size = new System.Drawing.Size(407, 29);
-            this.layoutControlItem13.Text = "浜у搧缂栫爜";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem19
-            // 
-            this.layoutControlItem19.Control = this.txt_daa003;
-            this.layoutControlItem19.Location = new System.Drawing.Point(0, 85);
-            this.layoutControlItem19.Name = "layoutControlItem19";
-            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem19.Size = new System.Drawing.Size(407, 29);
-            this.layoutControlItem19.Text = "浜у搧鍚嶇О";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem17
-            // 
-            this.layoutControlItem17.Control = this.txt_daa004;
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 114);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem17.Size = new System.Drawing.Size(407, 29);
-            this.layoutControlItem17.Text = "浜у搧瑙勬牸";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem28
-            // 
-            this.layoutControlItem28.Control = this.txt_daa009;
-            this.layoutControlItem28.Location = new System.Drawing.Point(0, 143);
-            this.layoutControlItem28.Name = "layoutControlItem28";
-            this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem28.Size = new System.Drawing.Size(814, 29);
-            this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
-            this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
-            // 
             // txt_daa015label
             // 
             this.txt_daa015label.Control = this.txt_daa015;
@@ -1712,6 +1642,57 @@
             this.layoutControlItem27.Size = new System.Drawing.Size(409, 29);
             this.layoutControlItem27.Text = "鐢熶骇绫诲瀷";
             this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem28
+            // 
+            this.layoutControlItem28.Control = this.txt_daa009;
+            this.layoutControlItem28.Location = new System.Drawing.Point(407, 143);
+            this.layoutControlItem28.Name = "layoutControlItem28";
+            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem28.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
+            this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem17
+            // 
+            this.layoutControlItem17.Control = this.txt_daa004;
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 143);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem17.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem17.Text = "浜у搧瑙勬牸";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem19
+            // 
+            this.layoutControlItem19.Control = this.txt_daa003;
+            this.layoutControlItem19.Location = new System.Drawing.Point(0, 114);
+            this.layoutControlItem19.Name = "layoutControlItem19";
+            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem19.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem19.Text = "浜у搧鍚嶇О";
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_daa029;
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 85);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem13.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem13.Text = "浜у搧缂栫爜";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem49
+            // 
+            this.layoutControlItem49.Control = this.txt_daa021;
+            this.layoutControlItem49.Location = new System.Drawing.Point(0, 56);
+            this.layoutControlItem49.Name = "layoutControlItem49";
+            this.layoutControlItem49.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem49.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem49.Text = "浠诲姟鍗曞彿";
+            this.layoutControlItem49.TextSize = new System.Drawing.Size(90, 18);
             // 
             // tabMx
             // 
@@ -1784,7 +1765,8 @@
             this.gvMx1dab019,
             this.gvMx1dab020,
             this.gvMx1dab022,
-            this.gvMx1dab023});
+            this.gvMx1dab023,
+            this.gridColumn58});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1807,7 +1789,7 @@
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Visible = true;
             this.gridColumn13.VisibleIndex = 0;
-            this.gridColumn13.Width = 94;
+            this.gridColumn13.Width = 89;
             // 
             // gvMx1dab001
             // 
@@ -1819,7 +1801,7 @@
             this.gvMx1dab001.Tag = "query_a.dab001";
             this.gvMx1dab001.Visible = true;
             this.gvMx1dab001.VisibleIndex = 1;
-            this.gvMx1dab001.Width = 94;
+            this.gvMx1dab001.Width = 89;
             // 
             // gvMx1dab003
             // 
@@ -1831,7 +1813,7 @@
             this.gvMx1dab003.Tag = "query_a.dab003";
             this.gvMx1dab003.Visible = true;
             this.gvMx1dab003.VisibleIndex = 2;
-            this.gvMx1dab003.Width = 94;
+            this.gvMx1dab003.Width = 89;
             // 
             // gvMx1dab004
             // 
@@ -1842,8 +1824,8 @@
             this.gvMx1dab004.Name = "gvMx1dab004";
             this.gvMx1dab004.Tag = "query_a.dab004";
             this.gvMx1dab004.Visible = true;
-            this.gvMx1dab004.VisibleIndex = 3;
-            this.gvMx1dab004.Width = 94;
+            this.gvMx1dab004.VisibleIndex = 4;
+            this.gvMx1dab004.Width = 89;
             // 
             // gvMx1dab005
             // 
@@ -1854,8 +1836,8 @@
             this.gvMx1dab005.Name = "gvMx1dab005";
             this.gvMx1dab005.Tag = "query_a.dab005";
             this.gvMx1dab005.Visible = true;
-            this.gvMx1dab005.VisibleIndex = 4;
-            this.gvMx1dab005.Width = 94;
+            this.gvMx1dab005.VisibleIndex = 5;
+            this.gvMx1dab005.Width = 89;
             // 
             // gvMx1dab006
             // 
@@ -1866,8 +1848,8 @@
             this.gvMx1dab006.Name = "gvMx1dab006";
             this.gvMx1dab006.Tag = "query_a.dab006";
             this.gvMx1dab006.Visible = true;
-            this.gvMx1dab006.VisibleIndex = 5;
-            this.gvMx1dab006.Width = 94;
+            this.gvMx1dab006.VisibleIndex = 6;
+            this.gvMx1dab006.Width = 89;
             // 
             // gvMx1dab007
             // 
@@ -1878,8 +1860,8 @@
             this.gvMx1dab007.Name = "gvMx1dab007";
             this.gvMx1dab007.Tag = "query_a.dab007";
             this.gvMx1dab007.Visible = true;
-            this.gvMx1dab007.VisibleIndex = 6;
-            this.gvMx1dab007.Width = 94;
+            this.gvMx1dab007.VisibleIndex = 7;
+            this.gvMx1dab007.Width = 89;
             // 
             // gridColumn14
             // 
@@ -1888,8 +1870,8 @@
             this.gridColumn14.MinWidth = 25;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 7;
-            this.gridColumn14.Width = 94;
+            this.gridColumn14.VisibleIndex = 8;
+            this.gridColumn14.Width = 89;
             // 
             // gvMx1dab014
             // 
@@ -1900,8 +1882,8 @@
             this.gvMx1dab014.Name = "gvMx1dab014";
             this.gvMx1dab014.Tag = "query_a.dab014";
             this.gvMx1dab014.Visible = true;
-            this.gvMx1dab014.VisibleIndex = 8;
-            this.gvMx1dab014.Width = 94;
+            this.gvMx1dab014.VisibleIndex = 9;
+            this.gvMx1dab014.Width = 89;
             // 
             // gridColumn15
             // 
@@ -1910,8 +1892,8 @@
             this.gridColumn15.MinWidth = 25;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 9;
-            this.gridColumn15.Width = 94;
+            this.gridColumn15.VisibleIndex = 10;
+            this.gridColumn15.Width = 89;
             // 
             // gridColumn16
             // 
@@ -1920,8 +1902,8 @@
             this.gridColumn16.MinWidth = 25;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 10;
-            this.gridColumn16.Width = 94;
+            this.gridColumn16.VisibleIndex = 11;
+            this.gridColumn16.Width = 89;
             // 
             // gvMx1dab012
             // 
@@ -1932,8 +1914,8 @@
             this.gvMx1dab012.Name = "gvMx1dab012";
             this.gvMx1dab012.Tag = "query_a.dab012";
             this.gvMx1dab012.Visible = true;
-            this.gvMx1dab012.VisibleIndex = 11;
-            this.gvMx1dab012.Width = 94;
+            this.gvMx1dab012.VisibleIndex = 12;
+            this.gvMx1dab012.Width = 89;
             // 
             // gvMx1dab009
             // 
@@ -1944,8 +1926,8 @@
             this.gvMx1dab009.Name = "gvMx1dab009";
             this.gvMx1dab009.Tag = "query_a.dab009";
             this.gvMx1dab009.Visible = true;
-            this.gvMx1dab009.VisibleIndex = 12;
-            this.gvMx1dab009.Width = 94;
+            this.gvMx1dab009.VisibleIndex = 13;
+            this.gvMx1dab009.Width = 246;
             // 
             // gvMx1scrapqty
             // 
@@ -1976,8 +1958,8 @@
             this.gvMx1zyBl.Name = "gvMx1zyBl";
             this.gvMx1zyBl.Tag = "query_a.zy_bl";
             this.gvMx1zyBl.Visible = true;
-            this.gvMx1zyBl.VisibleIndex = 17;
-            this.gvMx1zyBl.Width = 94;
+            this.gvMx1zyBl.VisibleIndex = 18;
+            this.gvMx1zyBl.Width = 72;
             // 
             // gvMx1llBl
             // 
@@ -1988,8 +1970,8 @@
             this.gvMx1llBl.Name = "gvMx1llBl";
             this.gvMx1llBl.Tag = "query_a.ll_bl";
             this.gvMx1llBl.Visible = true;
-            this.gvMx1llBl.VisibleIndex = 15;
-            this.gvMx1llBl.Width = 94;
+            this.gvMx1llBl.VisibleIndex = 16;
+            this.gvMx1llBl.Width = 58;
             // 
             // gvMx1lpTl
             // 
@@ -2000,8 +1982,8 @@
             this.gvMx1lpTl.Name = "gvMx1lpTl";
             this.gvMx1lpTl.Tag = "query_a.lp_tl";
             this.gvMx1lpTl.Visible = true;
-            this.gvMx1lpTl.VisibleIndex = 16;
-            this.gvMx1lpTl.Width = 94;
+            this.gvMx1lpTl.VisibleIndex = 17;
+            this.gvMx1lpTl.Width = 58;
             // 
             // gvMx1dab021
             // 
@@ -2012,8 +1994,8 @@
             this.gvMx1dab021.Name = "gvMx1dab021";
             this.gvMx1dab021.Tag = "query_a.dab021";
             this.gvMx1dab021.Visible = true;
-            this.gvMx1dab021.VisibleIndex = 13;
-            this.gvMx1dab021.Width = 94;
+            this.gvMx1dab021.VisibleIndex = 14;
+            this.gvMx1dab021.Width = 58;
             // 
             // gvMx1dab010
             // 
@@ -2094,8 +2076,18 @@
             this.gvMx1dab023.Name = "gvMx1dab023";
             this.gvMx1dab023.Tag = "query_a.dab023";
             this.gvMx1dab023.Visible = true;
-            this.gvMx1dab023.VisibleIndex = 14;
-            this.gvMx1dab023.Width = 94;
+            this.gvMx1dab023.VisibleIndex = 15;
+            this.gvMx1dab023.Width = 58;
+            // 
+            // gridColumn58
+            // 
+            this.gridColumn58.Caption = "棰嗘枡杩涘害";
+            this.gridColumn58.FieldName = "barbl";
+            this.gridColumn58.MinWidth = 25;
+            this.gridColumn58.Name = "gridColumn58";
+            this.gridColumn58.Visible = true;
+            this.gridColumn58.VisibleIndex = 3;
+            this.gridColumn58.Width = 94;
             // 
             // xtraTabPage6
             // 
@@ -2503,7 +2495,7 @@
             // gridColumn62
             // 
             this.gridColumn62.Caption = "鏁版嵁鐘舵��";
-            this.gridColumn62.FieldName = "barCodeRemark";
+            this.gridColumn62.FieldName = "bRemark";
             this.gridColumn62.MinWidth = 25;
             this.gridColumn62.Name = "gridColumn62";
             this.gridColumn62.OptionsColumn.ReadOnly = true;
@@ -3278,7 +3270,8 @@
             this.gridColumn42,
             this.gridColumn43,
             this.gridColumn34,
-            this.gridColumn35});
+            this.gridColumn35,
+            this.gridColumn55});
             this.gvMx3.GridControl = this.gcMx3;
             this.gvMx3.Name = "gvMx3";
             this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -3383,6 +3376,16 @@
             this.gridColumn35.Visible = true;
             this.gridColumn35.VisibleIndex = 5;
             this.gridColumn35.Width = 94;
+            // 
+            // gridColumn55
+            // 
+            this.gridColumn55.Caption = "鏁版嵁鐘舵��";
+            this.gridColumn55.FieldName = "bRemark";
+            this.gridColumn55.MinWidth = 25;
+            this.gridColumn55.Name = "gridColumn55";
+            this.gridColumn55.Visible = true;
+            this.gridColumn55.VisibleIndex = 6;
+            this.gridColumn55.Width = 94;
             // 
             // xtraTabPage4
             // 
@@ -3816,6 +3819,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa025.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa021.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
@@ -3833,16 +3837,17 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa015label)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem48)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem49)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -3961,7 +3966,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa003;
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa004;
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa008;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_daa011;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa010;
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa005;
@@ -3969,8 +3973,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa015;
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa009;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_prepareTime;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_daa028;
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa016;
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa017;
         private DevExpress.XtraGrid.Columns.GridColumn gv_mesStartProd;
@@ -4134,10 +4136,6 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
         private DevExpress.XtraDataLayout.DataLayoutControl layMx100;
         private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup4;
         private DevExpress.XtraEditors.SimpleButton btnIn;
@@ -4205,5 +4203,13 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn65;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptTuoBanNbz;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
+        private DevExpress.XtraEditors.TextEdit txt_daa021;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem49;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn58;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3