From ad76617fb57542f92350f84a33b0c2cf63f69383 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 11 四月 2025 15:14:24 +0800
Subject: [PATCH] fqc

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs |  520 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 263 insertions(+), 257 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 99722b4..81d11b6 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -29,34 +29,35 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+            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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -107,7 +108,6 @@
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
             this.lbGuid = new System.Windows.Forms.Label();
-            this.txt_sjXt = new Gs.DevApp.UserControl.UcLookWorkline();
             this.txt_daa009 = new DevExpress.XtraEditors.TextEdit();
             this.txt_daa013 = new DevExpress.XtraEditors.TextEdit();
             this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
@@ -117,7 +117,7 @@
             this.txt_daa028 = new DevExpress.XtraEditors.TextEdit();
             this.txt_mesStartProd = new DevExpress.XtraEditors.TextEdit();
             this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_daa022Txt = new DevExpress.XtraEditors.TextEdit();
+            this.txt_daa022Remark = new DevExpress.XtraEditors.TextEdit();
             this.txt_daa010 = new DevExpress.XtraEditors.TextEdit();
             this.txt_mesEndProd = new DevExpress.XtraEditors.TextEdit();
             this.txt_daa011 = new DevExpress.XtraEditors.TextEdit();
@@ -149,10 +149,7 @@
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -245,6 +242,11 @@
             this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.txt_daa015 = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -273,7 +275,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa028.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa022Txt.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa022Remark.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa010.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).BeginInit();
@@ -305,10 +307,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -349,6 +348,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -518,8 +521,6 @@
             this.gridColumn8.MinWidth = 50;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Tag = "query_a.jabs";
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 3;
             this.gridColumn8.Width = 50;
             // 
             // gridColumn9
@@ -531,7 +532,7 @@
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Tag = "query_a.jabs";
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 4;
+            this.gridColumn9.VisibleIndex = 3;
             this.gridColumn9.Width = 50;
             // 
             // gridColumn10
@@ -543,7 +544,7 @@
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Tag = "query_a.jabs";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 5;
+            this.gridColumn10.VisibleIndex = 4;
             this.gridColumn10.Width = 50;
             // 
             // gridColumn11
@@ -555,7 +556,7 @@
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Tag = "query_a.jabs";
             this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 6;
+            this.gridColumn11.VisibleIndex = 5;
             this.gridColumn11.Width = 50;
             // 
             // gridColumn12
@@ -567,7 +568,7 @@
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Tag = "query_a.jabs";
             this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 7;
+            this.gridColumn12.VisibleIndex = 6;
             this.gridColumn12.Width = 50;
             // 
             // gridColumn6
@@ -579,17 +580,17 @@
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Tag = "query_a.jabs";
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 8;
+            this.gridColumn6.VisibleIndex = 7;
             this.gridColumn6.Width = 50;
             // 
             // gridColumn27
             // 
             this.gridColumn27.Caption = "澶囨枡绾у埆";
-            this.gridColumn27.FieldName = "daa022Txt";
+            this.gridColumn27.FieldName = "daa022Remark";
             this.gridColumn27.MinWidth = 25;
             this.gridColumn27.Name = "gridColumn27";
             this.gridColumn27.Visible = true;
-            this.gridColumn27.VisibleIndex = 9;
+            this.gridColumn27.VisibleIndex = 8;
             this.gridColumn27.Width = 94;
             // 
             // gv_daa018
@@ -602,7 +603,7 @@
             this.gv_daa018.OptionsColumn.AllowEdit = false;
             this.gv_daa018.Tag = "query_a.daa018";
             this.gv_daa018.Visible = true;
-            this.gv_daa018.VisibleIndex = 10;
+            this.gv_daa018.VisibleIndex = 9;
             this.gv_daa018.Width = 90;
             // 
             // gridColoun100
@@ -613,7 +614,7 @@
             this.gridColoun100.Name = "gridColoun100";
             this.gridColoun100.Tag = "org.fnamber";
             this.gridColoun100.Visible = true;
-            this.gridColoun100.VisibleIndex = 11;
+            this.gridColoun100.VisibleIndex = 10;
             this.gridColoun100.Width = 250;
             // 
             // gv_daa001
@@ -626,7 +627,7 @@
             this.gv_daa001.OptionsColumn.AllowEdit = false;
             this.gv_daa001.Tag = "query_a.daa001";
             this.gv_daa001.Visible = true;
-            this.gv_daa001.VisibleIndex = 12;
+            this.gv_daa001.VisibleIndex = 11;
             this.gv_daa001.Width = 120;
             // 
             // gv_daa021
@@ -639,7 +640,7 @@
             this.gv_daa021.OptionsColumn.AllowEdit = false;
             this.gv_daa021.Tag = "query_a.daa021";
             this.gv_daa021.Visible = true;
-            this.gv_daa021.VisibleIndex = 13;
+            this.gv_daa021.VisibleIndex = 12;
             this.gv_daa021.Width = 100;
             // 
             // gridColumn3
@@ -649,7 +650,7 @@
             this.gridColumn3.MinWidth = 50;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 14;
+            this.gridColumn3.VisibleIndex = 13;
             this.gridColumn3.Width = 94;
             // 
             // gv_daa003
@@ -662,7 +663,7 @@
             this.gv_daa003.OptionsColumn.AllowEdit = false;
             this.gv_daa003.Tag = "query_a.daa003";
             this.gv_daa003.Visible = true;
-            this.gv_daa003.VisibleIndex = 15;
+            this.gv_daa003.VisibleIndex = 14;
             this.gv_daa003.Width = 150;
             // 
             // gv_daa004
@@ -675,7 +676,7 @@
             this.gv_daa004.OptionsColumn.AllowEdit = false;
             this.gv_daa004.Tag = "query_a.daa004";
             this.gv_daa004.Visible = true;
-            this.gv_daa004.VisibleIndex = 16;
+            this.gv_daa004.VisibleIndex = 15;
             this.gv_daa004.Width = 150;
             // 
             // gv_daa008
@@ -689,7 +690,7 @@
             this.gv_daa008.OptionsColumn.AllowEdit = false;
             this.gv_daa008.Tag = "query_a.daa008";
             this.gv_daa008.Visible = true;
-            this.gv_daa008.VisibleIndex = 17;
+            this.gv_daa008.VisibleIndex = 16;
             this.gv_daa008.Width = 50;
             // 
             // gv_daa011
@@ -703,7 +704,7 @@
             this.gv_daa011.OptionsColumn.AllowEdit = false;
             this.gv_daa011.Tag = "query_a.daa011";
             this.gv_daa011.Visible = true;
-            this.gv_daa011.VisibleIndex = 18;
+            this.gv_daa011.VisibleIndex = 17;
             this.gv_daa011.Width = 50;
             // 
             // gridColumn4
@@ -714,7 +715,7 @@
             this.gridColumn4.MinWidth = 50;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 19;
+            this.gridColumn4.VisibleIndex = 18;
             this.gridColumn4.Width = 50;
             // 
             // gv_daa010
@@ -728,7 +729,7 @@
             this.gv_daa010.OptionsColumn.AllowEdit = false;
             this.gv_daa010.Tag = "query_a.daa010";
             this.gv_daa010.Visible = true;
-            this.gv_daa010.VisibleIndex = 21;
+            this.gv_daa010.VisibleIndex = 20;
             this.gv_daa010.Width = 50;
             // 
             // gv_daa005
@@ -742,7 +743,7 @@
             this.gv_daa005.OptionsColumn.AllowEdit = false;
             this.gv_daa005.Tag = "query_a.daa005";
             this.gv_daa005.Visible = true;
-            this.gv_daa005.VisibleIndex = 22;
+            this.gv_daa005.VisibleIndex = 21;
             this.gv_daa005.Width = 50;
             // 
             // gv_cust
@@ -755,7 +756,7 @@
             this.gv_cust.OptionsColumn.AllowEdit = false;
             this.gv_cust.Tag = "query_a.cust";
             this.gv_cust.Visible = true;
-            this.gv_cust.VisibleIndex = 23;
+            this.gv_cust.VisibleIndex = 22;
             this.gv_cust.Width = 100;
             // 
             // gridColumn1
@@ -765,7 +766,7 @@
             this.gridColumn1.MinWidth = 50;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 24;
+            this.gridColumn1.VisibleIndex = 23;
             this.gridColumn1.Width = 94;
             // 
             // gv_daa015
@@ -778,7 +779,7 @@
             this.gv_daa015.OptionsColumn.AllowEdit = false;
             this.gv_daa015.Tag = "query_a.daa015";
             this.gv_daa015.Visible = true;
-            this.gv_daa015.VisibleIndex = 25;
+            this.gv_daa015.VisibleIndex = 24;
             this.gv_daa015.Width = 94;
             // 
             // gridColumn2
@@ -788,7 +789,7 @@
             this.gridColumn2.MinWidth = 50;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 26;
+            this.gridColumn2.VisibleIndex = 25;
             this.gridColumn2.Width = 94;
             // 
             // gv_daa009
@@ -801,7 +802,7 @@
             this.gv_daa009.OptionsColumn.AllowEdit = false;
             this.gv_daa009.Tag = "query_a.daa009";
             this.gv_daa009.Visible = true;
-            this.gv_daa009.VisibleIndex = 20;
+            this.gv_daa009.VisibleIndex = 19;
             this.gv_daa009.Width = 94;
             // 
             // gv_prepareTime
@@ -814,7 +815,7 @@
             this.gv_prepareTime.OptionsColumn.AllowEdit = false;
             this.gv_prepareTime.Tag = "query_a.prepare_time";
             this.gv_prepareTime.Visible = true;
-            this.gv_prepareTime.VisibleIndex = 27;
+            this.gv_prepareTime.VisibleIndex = 26;
             this.gv_prepareTime.Width = 180;
             // 
             // gv_daa028
@@ -827,7 +828,7 @@
             this.gv_daa028.OptionsColumn.AllowEdit = false;
             this.gv_daa028.Tag = "query_a.daa028";
             this.gv_daa028.Visible = true;
-            this.gv_daa028.VisibleIndex = 28;
+            this.gv_daa028.VisibleIndex = 27;
             this.gv_daa028.Width = 180;
             // 
             // gv_daa016
@@ -840,7 +841,7 @@
             this.gv_daa016.OptionsColumn.AllowEdit = false;
             this.gv_daa016.Tag = "query_a.daa016";
             this.gv_daa016.Visible = true;
-            this.gv_daa016.VisibleIndex = 29;
+            this.gv_daa016.VisibleIndex = 28;
             this.gv_daa016.Width = 180;
             // 
             // gv_daa017
@@ -853,7 +854,7 @@
             this.gv_daa017.OptionsColumn.AllowEdit = false;
             this.gv_daa017.Tag = "query_a.daa017";
             this.gv_daa017.Visible = true;
-            this.gv_daa017.VisibleIndex = 30;
+            this.gv_daa017.VisibleIndex = 29;
             this.gv_daa017.Width = 180;
             // 
             // gv_mesStartProd
@@ -866,7 +867,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 = 31;
+            this.gv_mesStartProd.VisibleIndex = 30;
             this.gv_mesStartProd.Width = 180;
             // 
             // gv_mesEndProd
@@ -879,7 +880,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 = 32;
+            this.gv_mesEndProd.VisibleIndex = 31;
             this.gv_mesEndProd.Width = 180;
             // 
             // gridColumn21
@@ -889,7 +890,7 @@
             this.gridColumn21.MinWidth = 25;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 33;
+            this.gridColumn21.VisibleIndex = 32;
             this.gridColumn21.Width = 94;
             // 
             // gridColumn22
@@ -899,7 +900,7 @@
             this.gridColumn22.MinWidth = 25;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 34;
+            this.gridColumn22.VisibleIndex = 33;
             this.gridColumn22.Width = 94;
             // 
             // gridColumn23
@@ -917,7 +918,7 @@
             this.gridColumn24.MinWidth = 25;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
-            this.gridColumn24.VisibleIndex = 35;
+            this.gridColumn24.VisibleIndex = 34;
             this.gridColumn24.Width = 94;
             // 
             // gridColumn25
@@ -927,7 +928,7 @@
             this.gridColumn25.MinWidth = 25;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
-            this.gridColumn25.VisibleIndex = 36;
+            this.gridColumn25.VisibleIndex = 35;
             this.gridColumn25.Width = 94;
             // 
             // gridColumn26
@@ -937,7 +938,7 @@
             this.gridColumn26.MinWidth = 25;
             this.gridColumn26.Name = "gridColumn26";
             this.gridColumn26.Visible = true;
-            this.gridColumn26.VisibleIndex = 37;
+            this.gridColumn26.VisibleIndex = 36;
             this.gridColumn26.Width = 94;
             // 
             // pageBar1
@@ -982,7 +983,6 @@
             // layoutMx1
             // 
             this.layoutMx1.Controls.Add(this.lbGuid);
-            this.layoutMx1.Controls.Add(this.txt_sjXt);
             this.layoutMx1.Controls.Add(this.txt_daa009);
             this.layoutMx1.Controls.Add(this.txt_daa013);
             this.layoutMx1.Controls.Add(this.txt_daa001);
@@ -992,7 +992,7 @@
             this.layoutMx1.Controls.Add(this.txt_daa028);
             this.layoutMx1.Controls.Add(this.txt_mesStartProd);
             this.layoutMx1.Controls.Add(this.txt_daa014);
-            this.layoutMx1.Controls.Add(this.txt_daa022Txt);
+            this.layoutMx1.Controls.Add(this.txt_daa022Remark);
             this.layoutMx1.Controls.Add(this.txt_daa010);
             this.layoutMx1.Controls.Add(this.txt_mesEndProd);
             this.layoutMx1.Controls.Add(this.txt_daa011);
@@ -1004,6 +1004,7 @@
             this.layoutMx1.Controls.Add(this.txt_daa003);
             this.layoutMx1.Controls.Add(this.txt_dwName);
             this.layoutMx1.Controls.Add(this.txt_daa004);
+            this.layoutMx1.Controls.Add(this.txt_daa015);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem29});
@@ -1024,27 +1025,19 @@
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
             // 
-            // txt_sjXt
-            // 
-            this.txt_sjXt.IsReadly = false;
-            this.txt_sjXt.Location = new System.Drawing.Point(385, 152);
-            this.txt_sjXt.Name = "txt_sjXt";
-            this.txt_sjXt.Size = new System.Drawing.Size(165, 24);
-            this.txt_sjXt.TabIndex = 334;
-            // 
             // txt_daa009
             // 
-            this.txt_daa009.Location = new System.Drawing.Point(656, 124);
+            this.txt_daa009.Location = new System.Drawing.Point(385, 147);
             this.txt_daa009.Name = "txt_daa009";
             this.txt_daa009.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa009.Size = new System.Drawing.Size(165, 24);
+            this.txt_daa009.Size = new System.Drawing.Size(436, 24);
             this.txt_daa009.StyleController = this.layoutMx1;
             this.txt_daa009.TabIndex = 240;
             this.txt_daa009.Tag = "";
             // 
             // txt_daa013
             // 
-            this.txt_daa013.Location = new System.Drawing.Point(656, 96);
+            this.txt_daa013.Location = new System.Drawing.Point(656, 119);
             this.txt_daa013.Name = "txt_daa013";
             this.txt_daa013.Properties.Appearance.Options.UseFont = true;
             this.txt_daa013.Size = new System.Drawing.Size(165, 24);
@@ -1054,7 +1047,7 @@
             // 
             // txt_daa001
             // 
-            this.txt_daa001.Location = new System.Drawing.Point(114, 12);
+            this.txt_daa001.Location = new System.Drawing.Point(114, 7);
             this.txt_daa001.Name = "txt_daa001";
             this.txt_daa001.Properties.Appearance.Options.UseFont = true;
             this.txt_daa001.Size = new System.Drawing.Size(165, 24);
@@ -1064,7 +1057,7 @@
             // 
             // textEdit1
             // 
-            this.textEdit1.Location = new System.Drawing.Point(385, 40);
+            this.textEdit1.Location = new System.Drawing.Point(385, 35);
             this.textEdit1.Name = "textEdit1";
             this.textEdit1.Properties.Appearance.Options.UseFont = true;
             this.textEdit1.Size = new System.Drawing.Size(165, 24);
@@ -1074,7 +1067,7 @@
             // 
             // txt_daa008
             // 
-            this.txt_daa008.Location = new System.Drawing.Point(656, 12);
+            this.txt_daa008.Location = new System.Drawing.Point(656, 7);
             this.txt_daa008.Name = "txt_daa008";
             this.txt_daa008.Properties.Appearance.Options.UseFont = true;
             this.txt_daa008.Size = new System.Drawing.Size(165, 24);
@@ -1084,7 +1077,7 @@
             // 
             // txt_saleOrderNo
             // 
-            this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 68);
+            this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 63);
             this.txt_saleOrderNo.Name = "txt_saleOrderNo";
             this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
             this.txt_saleOrderNo.Size = new System.Drawing.Size(165, 24);
@@ -1094,7 +1087,7 @@
             // 
             // txt_daa028
             // 
-            this.txt_daa028.Location = new System.Drawing.Point(385, 68);
+            this.txt_daa028.Location = new System.Drawing.Point(385, 63);
             this.txt_daa028.Name = "txt_daa028";
             this.txt_daa028.Properties.Appearance.Options.UseFont = true;
             this.txt_daa028.Size = new System.Drawing.Size(165, 24);
@@ -1104,7 +1097,7 @@
             // 
             // txt_mesStartProd
             // 
-            this.txt_mesStartProd.Location = new System.Drawing.Point(927, 40);
+            this.txt_mesStartProd.Location = new System.Drawing.Point(927, 35);
             this.txt_mesStartProd.Name = "txt_mesStartProd";
             this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
             this.txt_mesStartProd.Size = new System.Drawing.Size(166, 24);
@@ -1114,7 +1107,7 @@
             // 
             // txt_daa014
             // 
-            this.txt_daa014.Location = new System.Drawing.Point(114, 40);
+            this.txt_daa014.Location = new System.Drawing.Point(114, 35);
             this.txt_daa014.Name = "txt_daa014";
             this.txt_daa014.Properties.Appearance.Options.UseFont = true;
             this.txt_daa014.Size = new System.Drawing.Size(165, 24);
@@ -1122,19 +1115,19 @@
             this.txt_daa014.TabIndex = 327;
             this.txt_daa014.Tag = "readonly";
             // 
-            // txt_daa022Txt
+            // txt_daa022Remark
             // 
-            this.txt_daa022Txt.Location = new System.Drawing.Point(385, 12);
-            this.txt_daa022Txt.Name = "txt_daa022Txt";
-            this.txt_daa022Txt.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa022Txt.Size = new System.Drawing.Size(165, 24);
-            this.txt_daa022Txt.StyleController = this.layoutMx1;
-            this.txt_daa022Txt.TabIndex = 462;
-            this.txt_daa022Txt.Tag = "readonly";
+            this.txt_daa022Remark.Location = new System.Drawing.Point(385, 7);
+            this.txt_daa022Remark.Name = "txt_daa022Remark";
+            this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true;
+            this.txt_daa022Remark.Size = new System.Drawing.Size(165, 24);
+            this.txt_daa022Remark.StyleController = this.layoutMx1;
+            this.txt_daa022Remark.TabIndex = 462;
+            this.txt_daa022Remark.Tag = "readonly";
             // 
             // txt_daa010
             // 
-            this.txt_daa010.Location = new System.Drawing.Point(656, 40);
+            this.txt_daa010.Location = new System.Drawing.Point(656, 35);
             this.txt_daa010.Name = "txt_daa010";
             this.txt_daa010.Properties.Appearance.Options.UseFont = true;
             this.txt_daa010.Size = new System.Drawing.Size(165, 24);
@@ -1144,7 +1137,7 @@
             // 
             // txt_mesEndProd
             // 
-            this.txt_mesEndProd.Location = new System.Drawing.Point(927, 68);
+            this.txt_mesEndProd.Location = new System.Drawing.Point(927, 63);
             this.txt_mesEndProd.Name = "txt_mesEndProd";
             this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
             this.txt_mesEndProd.Size = new System.Drawing.Size(166, 24);
@@ -1154,7 +1147,7 @@
             // 
             // txt_daa011
             // 
-            this.txt_daa011.Location = new System.Drawing.Point(656, 68);
+            this.txt_daa011.Location = new System.Drawing.Point(656, 63);
             this.txt_daa011.Name = "txt_daa011";
             this.txt_daa011.Properties.Appearance.Options.UseFont = true;
             this.txt_daa011.Size = new System.Drawing.Size(165, 24);
@@ -1164,7 +1157,7 @@
             // 
             // txt_dptName
             // 
-            this.txt_dptName.Location = new System.Drawing.Point(385, 124);
+            this.txt_dptName.Location = new System.Drawing.Point(656, 91);
             this.txt_dptName.Name = "txt_dptName";
             this.txt_dptName.Properties.Appearance.Options.UseFont = true;
             this.txt_dptName.Size = new System.Drawing.Size(165, 24);
@@ -1174,7 +1167,7 @@
             // 
             // txt_daa016
             // 
-            this.txt_daa016.Location = new System.Drawing.Point(927, 96);
+            this.txt_daa016.Location = new System.Drawing.Point(927, 91);
             this.txt_daa016.Name = "txt_daa016";
             this.txt_daa016.Properties.Appearance.Options.UseFont = true;
             this.txt_daa016.Size = new System.Drawing.Size(166, 24);
@@ -1184,7 +1177,7 @@
             // 
             // txt_daa029
             // 
-            this.txt_daa029.Location = new System.Drawing.Point(114, 96);
+            this.txt_daa029.Location = new System.Drawing.Point(114, 91);
             this.txt_daa029.Name = "txt_daa029";
             this.txt_daa029.Properties.Appearance.Options.UseFont = true;
             this.txt_daa029.Size = new System.Drawing.Size(165, 24);
@@ -1194,7 +1187,7 @@
             // 
             // txt_lineName
             // 
-            this.txt_lineName.Location = new System.Drawing.Point(385, 96);
+            this.txt_lineName.Location = new System.Drawing.Point(385, 91);
             this.txt_lineName.Name = "txt_lineName";
             this.txt_lineName.Properties.Appearance.Options.UseFont = true;
             this.txt_lineName.Size = new System.Drawing.Size(165, 24);
@@ -1204,7 +1197,7 @@
             // 
             // txt_daa017
             // 
-            this.txt_daa017.Location = new System.Drawing.Point(927, 124);
+            this.txt_daa017.Location = new System.Drawing.Point(927, 119);
             this.txt_daa017.Name = "txt_daa017";
             this.txt_daa017.Properties.Appearance.Options.UseFont = true;
             this.txt_daa017.Size = new System.Drawing.Size(166, 24);
@@ -1214,7 +1207,7 @@
             // 
             // txt_daa003
             // 
-            this.txt_daa003.Location = new System.Drawing.Point(114, 152);
+            this.txt_daa003.Location = new System.Drawing.Point(114, 147);
             this.txt_daa003.Name = "txt_daa003";
             this.txt_daa003.Properties.Appearance.Options.UseFont = true;
             this.txt_daa003.Size = new System.Drawing.Size(165, 24);
@@ -1224,7 +1217,7 @@
             // 
             // txt_dwName
             // 
-            this.txt_dwName.Location = new System.Drawing.Point(927, 12);
+            this.txt_dwName.Location = new System.Drawing.Point(927, 7);
             this.txt_dwName.Name = "txt_dwName";
             this.txt_dwName.Properties.Appearance.Options.UseFont = true;
             this.txt_dwName.Size = new System.Drawing.Size(166, 24);
@@ -1234,7 +1227,7 @@
             // 
             // txt_daa004
             // 
-            this.txt_daa004.Location = new System.Drawing.Point(114, 124);
+            this.txt_daa004.Location = new System.Drawing.Point(114, 119);
             this.txt_daa004.Name = "txt_daa004";
             this.txt_daa004.Properties.Appearance.Options.UseFont = true;
             this.txt_daa004.Size = new System.Drawing.Size(165, 24);
@@ -1277,44 +1270,44 @@
             this.layoutControlItem8,
             this.layoutControlItem12,
             this.layoutControlItem16,
-            this.layoutControlItem18,
-            this.layoutControlItem20,
             this.layoutControlItem28,
-            this.layoutControlItem27});
+            this.layoutControlItem27,
+            this.layoutControlItem20,
+            this.layoutControlItem18});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition16.Width = 100D;
-            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition17.Width = 100D;
-            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition18.Width = 100D;
-            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition19.Width = 100D;
+            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;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition16,
-            columnDefinition17,
-            columnDefinition18,
-            columnDefinition19});
-            rowDefinition9.Height = 100D;
-            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition10.Height = 100D;
-            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition11.Height = 100D;
-            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition12.Height = 100D;
-            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition13.Height = 100D;
-            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition14.Height = 100D;
-            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+            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;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition9,
-            rowDefinition10,
-            rowDefinition11,
-            rowDefinition12,
-            rowDefinition13,
-            rowDefinition14});
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4,
+            rowDefinition5,
+            rowDefinition6});
             this.Root.Size = new System.Drawing.Size(1105, 188);
             this.Root.TextVisible = false;
             // 
@@ -1433,7 +1426,7 @@
             // 
             // layoutControlItem6
             // 
-            this.layoutControlItem6.Control = this.txt_daa022Txt;
+            this.layoutControlItem6.Control = this.txt_daa022Remark;
             this.layoutControlItem6.Location = new System.Drawing.Point(271, 0);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -1506,49 +1499,17 @@
             this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
             // 
-            // layoutControlItem18
-            // 
-            this.layoutControlItem18.Control = this.txt_daa013;
-            this.layoutControlItem18.Location = new System.Drawing.Point(542, 84);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem18.Size = new System.Drawing.Size(271, 28);
-            this.layoutControlItem18.Text = "鐢熶骇杞﹂棿";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem20
-            // 
-            this.layoutControlItem20.Control = this.txt_dptName;
-            this.layoutControlItem20.Location = new System.Drawing.Point(271, 112);
-            this.layoutControlItem20.Name = "layoutControlItem20";
-            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem20.Size = new System.Drawing.Size(271, 28);
-            this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
-            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
-            // 
             // layoutControlItem28
             // 
             this.layoutControlItem28.Control = this.txt_daa009;
-            this.layoutControlItem28.Location = new System.Drawing.Point(542, 112);
+            this.layoutControlItem28.Location = new System.Drawing.Point(271, 140);
             this.layoutControlItem28.Name = "layoutControlItem28";
-            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem28.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem28.Size = new System.Drawing.Size(542, 28);
             this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
             this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem27
-            // 
-            this.layoutControlItem27.Control = this.txt_sjXt;
-            this.layoutControlItem27.Location = new System.Drawing.Point(271, 140);
-            this.layoutControlItem27.Name = "layoutControlItem27";
-            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem27.Size = new System.Drawing.Size(271, 28);
-            this.layoutControlItem27.Text = "瀹為檯绾夸綋";
-            this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
             // 
             // tabMx
             // 
@@ -1921,7 +1882,7 @@
             this.tabMxPage2.Controls.Add(this.panMx99);
             this.tabMxPage2.Name = "tabMxPage2";
             this.tabMxPage2.Size = new System.Drawing.Size(1124, 481);
-            this.tabMxPage2.Text = "鎶ュ伐鏉$爜鏄庣粏";
+            this.tabMxPage2.Text = "鎵樻澘鐮佹槑缁�";
             // 
             // gcMx2
             // 
@@ -2001,7 +1962,7 @@
             // gvMx2itemBarcode
             // 
             this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜 ";
+            this.gvMx2itemBarcode.Caption = "鎵樻澘鏉$爜";
             this.gvMx2itemBarcode.FieldName = "itemBarcode";
             this.gvMx2itemBarcode.MinWidth = 50;
             this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
@@ -2013,7 +1974,7 @@
             // gvMx2quantity
             // 
             this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
-            this.gvMx2quantity.Caption = "鏁伴噺 ";
+            this.gvMx2quantity.Caption = "鍐呭寘瑁呮暟閲� ";
             this.gvMx2quantity.FieldName = "quantity";
             this.gvMx2quantity.MinWidth = 50;
             this.gvMx2quantity.Name = "gvMx2quantity";
@@ -2153,10 +2114,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -2199,30 +2160,30 @@
             // 
             // txt_iCount_1
             // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(850, 12);
+            this.txt_iCount_1.Location = new System.Drawing.Point(835, 12);
             this.txt_iCount_1.Name = "txt_iCount_1";
             this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_iCount_1.Size = new System.Drawing.Size(78, 24);
+            this.txt_iCount_1.Size = new System.Drawing.Size(93, 24);
             this.txt_iCount_1.StyleController = this.layoutMx99;
             this.txt_iCount_1.TabIndex = 332;
             this.txt_iCount_1.Tag = "readOnly-1";
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(666, 12);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(651, 12);
             this.txt_psnQty_1.Name = "txt_psnQty_1";
             this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_psnQty_1.Size = new System.Drawing.Size(78, 24);
+            this.txt_psnQty_1.Size = new System.Drawing.Size(93, 24);
             this.txt_psnQty_1.StyleController = this.layoutMx99;
             this.txt_psnQty_1.TabIndex = 330;
             this.txt_psnQty_1.Tag = "readOnly-1";
             // 
             // txt_printRemark
             // 
-            this.txt_printRemark.Location = new System.Drawing.Point(482, 12);
+            this.txt_printRemark.Location = new System.Drawing.Point(467, 12);
             this.txt_printRemark.Name = "txt_printRemark";
             this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
-            this.txt_printRemark.Size = new System.Drawing.Size(78, 24);
+            this.txt_printRemark.Size = new System.Drawing.Size(93, 24);
             this.txt_printRemark.StyleController = this.layoutMx99;
             this.txt_printRemark.TabIndex = 334;
             this.txt_printRemark.Tag = "readOnly-1";
@@ -2230,22 +2191,22 @@
             // txt_kQty
             // 
             this.txt_kQty.EditValue = "";
-            this.txt_kQty.Location = new System.Drawing.Point(298, 12);
+            this.txt_kQty.Location = new System.Drawing.Point(283, 12);
             this.txt_kQty.Name = "txt_kQty";
             this.txt_kQty.Properties.Appearance.Options.UseFont = true;
             this.txt_kQty.Properties.ReadOnly = true;
-            this.txt_kQty.Size = new System.Drawing.Size(78, 24);
+            this.txt_kQty.Size = new System.Drawing.Size(93, 24);
             this.txt_kQty.StyleController = this.layoutMx99;
             this.txt_kQty.TabIndex = 472;
             this.txt_kQty.Tag = "readonly";
             // 
             // txt_yQty
             // 
-            this.txt_yQty.Location = new System.Drawing.Point(114, 12);
+            this.txt_yQty.Location = new System.Drawing.Point(99, 12);
             this.txt_yQty.Name = "txt_yQty";
             this.txt_yQty.Properties.Appearance.Options.UseFont = true;
             this.txt_yQty.Properties.ReadOnly = true;
-            this.txt_yQty.Size = new System.Drawing.Size(78, 24);
+            this.txt_yQty.Size = new System.Drawing.Size(93, 24);
             this.txt_yQty.StyleController = this.layoutMx99;
             this.txt_yQty.TabIndex = 470;
             this.txt_yQty.Tag = "readonly";
@@ -2263,29 +2224,29 @@
             this.layoutControlItem26});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.Name = "Root";
-            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition20.Width = 100D;
-            columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition21.Width = 100D;
-            columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition22.Width = 100D;
-            columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition23.Width = 100D;
-            columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition24.Width = 100D;
-            columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition25.Width = 100D;
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
+            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7.Width = 100D;
+            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition8.Width = 100D;
+            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition9.Width = 100D;
+            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition10.Width = 100D;
             this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition20,
-            columnDefinition21,
-            columnDefinition22,
-            columnDefinition23,
-            columnDefinition24,
-            columnDefinition25});
-            rowDefinition15.Height = 100D;
-            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5,
+            columnDefinition6,
+            columnDefinition7,
+            columnDefinition8,
+            columnDefinition9,
+            columnDefinition10});
+            rowDefinition7.Height = 100D;
+            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition15});
+            rowDefinition7});
             this.layoutControlGroup1.Size = new System.Drawing.Size(1124, 54);
             this.layoutControlGroup1.TextVisible = false;
             // 
@@ -2298,7 +2259,7 @@
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.Size = new System.Drawing.Size(184, 34);
             this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem23
             // 
@@ -2310,7 +2271,7 @@
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem23.Size = new System.Drawing.Size(184, 34);
             this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
-            this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem21
             // 
@@ -2322,19 +2283,20 @@
             this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem21.Size = new System.Drawing.Size(184, 34);
             this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem24
             // 
             this.layoutControlItem24.AppearanceItemCaption.Options.UseTextOptions = true;
             this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem24.Control = this.txt_psnQty_1;
+            this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�";
             this.layoutControlItem24.Location = new System.Drawing.Point(552, 0);
             this.layoutControlItem24.Name = "layoutControlItem24";
             this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem24.Size = new System.Drawing.Size(184, 34);
-            this.layoutControlItem24.Text = "姣忓紶鏉$爜鏁伴噺";
-            this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
+            this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem25
             // 
@@ -2345,8 +2307,8 @@
             this.layoutControlItem25.Name = "layoutControlItem25";
             this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 4;
             this.layoutControlItem25.Size = new System.Drawing.Size(184, 34);
-            this.layoutControlItem25.Text = "鎵撳嵃鏉$爜寮犳暟";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem25.Text = "鎵撳嵃寮犳暟";
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem26
             // 
@@ -2368,7 +2330,7 @@
             this.xtraTabPage3.Controls.Add(this.panMx98);
             this.xtraTabPage3.Name = "xtraTabPage3";
             this.xtraTabPage3.Size = new System.Drawing.Size(1124, 481);
-            this.xtraTabPage3.Text = "宸ュ崟杩芥函鐮�";
+            this.xtraTabPage3.Text = "杩芥函鐮佹槑缁�";
             // 
             // gcMx3
             // 
@@ -2573,26 +2535,26 @@
             this.layoutControlItem34});
             this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup2.Name = "Root";
-            columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition26.Width = 100D;
-            columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition27.Width = 100D;
-            columnDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition28.Width = 100D;
-            columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition29.Width = 100D;
-            columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition30.Width = 100D;
+            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition11.Width = 100D;
+            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition12.Width = 100D;
+            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition13.Width = 100D;
+            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition14.Width = 100D;
+            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition15.Width = 100D;
             this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition26,
-            columnDefinition27,
-            columnDefinition28,
-            columnDefinition29,
-            columnDefinition30});
-            rowDefinition16.Height = 100D;
-            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition11,
+            columnDefinition12,
+            columnDefinition13,
+            columnDefinition14,
+            columnDefinition15});
+            rowDefinition8.Height = 100D;
+            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition16});
+            rowDefinition8});
             this.layoutControlGroup2.Size = new System.Drawing.Size(1124, 54);
             this.layoutControlGroup2.TextVisible = false;
             // 
@@ -2647,6 +2609,48 @@
             this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem34.TextVisible = false;
             // 
+            // txt_daa015
+            // 
+            this.txt_daa015.Location = new System.Drawing.Point(385, 119);
+            this.txt_daa015.Name = "txt_daa015";
+            this.txt_daa015.Size = new System.Drawing.Size(165, 24);
+            this.txt_daa015.StyleController = this.layoutMx1;
+            this.txt_daa015.TabIndex = 473;
+            // 
+            // layoutControlItem27
+            // 
+            this.layoutControlItem27.Control = this.txt_daa015;
+            this.layoutControlItem27.Location = new System.Drawing.Point(271, 112);
+            this.layoutControlItem27.Name = "layoutControlItem27";
+            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem27.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem27.Text = "鐢熶骇绾垮埆ID";
+            this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem20
+            // 
+            this.layoutControlItem20.Control = this.txt_dptName;
+            this.layoutControlItem20.Location = new System.Drawing.Point(542, 84);
+            this.layoutControlItem20.Name = "layoutControlItem20";
+            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem20.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem18
+            // 
+            this.layoutControlItem18.Control = this.txt_daa013;
+            this.layoutControlItem18.CustomizationFormText = "鐢熶骇杞﹂棿ID";
+            this.layoutControlItem18.Location = new System.Drawing.Point(542, 112);
+            this.layoutControlItem18.Name = "layoutControlItem18";
+            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem18.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem18.Text = "杞﹂棿ID";
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+            // 
             // Frm_Womdaa
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2684,7 +2688,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa028.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa022Txt.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa022Remark.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa010.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).EndInit();
@@ -2716,10 +2720,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -2760,6 +2761,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2814,11 +2819,10 @@
         private DevExpress.XtraEditors.TextEdit txt_daa013;
         private DevExpress.XtraEditors.TextEdit textEdit1;
         private DevExpress.XtraEditors.TextEdit txt_saleOrderNo;
-        private DevExpress.XtraEditors.TextEdit txt_daa022Txt;
+        private DevExpress.XtraEditors.TextEdit txt_daa022Remark;
         private DevExpress.XtraEditors.TextEdit txt_daa028;
         private DevExpress.XtraEditors.TextEdit txt_mesEndProd;
         private DevExpress.XtraEditors.TextEdit txt_mesStartProd;
-        private UserControl.UcLookWorkline txt_sjXt;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraEditors.TextEdit txt_daa014;
         private DevExpress.XtraEditors.TextEdit txt_daa017;
@@ -2925,10 +2929,6 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
         private DevExpress.XtraGrid.GridControl gcMx3;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
@@ -2952,5 +2952,11 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+        private DevExpress.XtraEditors.TextEdit txt_daa015;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3