From 437425784b7612e10d4a54bd64905c508347514d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 06 五月 2025 15:12:50 +0800
Subject: [PATCH] fqc

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 1905 +++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 1,258 insertions(+), 647 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index cdc375e..d64a341 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -29,23 +29,36 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition8 = 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();
+            this.components = new System.ComponentModel.Container();
+            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 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.XtraLayout.RowDefinition rowDefinition15 = 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.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
+            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 rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -55,10 +68,7 @@
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_daa027 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -77,7 +87,6 @@
             this.gv_cust = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_daa015 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = 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();
@@ -95,24 +104,17 @@
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
-            this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
             this.lbGuid = new System.Windows.Forms.Label();
-            this.txt_sjXt = new Gs.DevApp.UserControl.UcLookWorkline();
-            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
             this.txt_daa009 = new DevExpress.XtraEditors.TextEdit();
             this.txt_daa013 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
-            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
             this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
             this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
             this.txt_daa008 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_printRemark = new DevExpress.XtraEditors.TextEdit();
             this.txt_saleOrderNo = new DevExpress.XtraEditors.TextEdit();
             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();
@@ -124,6 +126,7 @@
             this.txt_daa003 = new DevExpress.XtraEditors.TextEdit();
             this.txt_dwName = new DevExpress.XtraEditors.TextEdit();
             this.txt_daa004 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_daa015 = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -136,16 +139,18 @@
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -199,14 +204,65 @@
             this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.panMx99 = new System.Windows.Forms.Panel();
+            this.layoutMx99 = new DevExpress.XtraLayout.LayoutControl();
+            this.radOut = new DevExpress.XtraEditors.RadioGroup();
+            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
+            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_printRemark = new DevExpress.XtraEditors.TextEdit();
+            this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
+            this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
+            this.txt_zQty = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx3 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.panMx98 = new System.Windows.Forms.Panel();
+            this.layoutMx98 = new DevExpress.XtraLayout.LayoutControl();
+            this.ucBtnPrint98 = new Gs.DevApp.UserControl.UcBtnPrint();
+            this.txt_yQty98 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_kQty98 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_printRemark98 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_iCount_98 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_zQty98 = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx4 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn41 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn44 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn45 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn46 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.panMx100 = new System.Windows.Forms.Panel();
+            this.ucBtnPrint100 = new Gs.DevApp.UserControl.UcBtnPrint();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -226,21 +282,16 @@
             this.splitMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa009.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa013.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).BeginInit();
             ((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();
@@ -252,6 +303,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa004.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -264,16 +316,18 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -283,14 +337,47 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            this.panMx99.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx99)).BeginInit();
+            this.layoutMx99.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
+            this.xtraTabPage3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
+            this.panMx98.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx98)).BeginInit();
+            this.layoutMx98.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark98.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty98.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
+            this.xtraTabPage4.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
+            this.panMx100.SuspendLayout();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -304,7 +391,7 @@
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1269, 80);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -315,7 +402,7 @@
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 740);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1269, 740);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -325,12 +412,13 @@
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 708);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1267, 708);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
             // 
             this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
             this.split1.Name = "split1";
@@ -344,18 +432,18 @@
             // split1.Panel2
             // 
             this.split1.Panel2.Text = "Panel2";
-            this.split1.Size = new System.Drawing.Size(1126, 708);
-            this.split1.SplitterPosition = 696;
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split1.Size = new System.Drawing.Size(1267, 708);
+            this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1126, 657);
+            this.gcMain1.Size = new System.Drawing.Size(1267, 657);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -364,17 +452,13 @@
             // 
             this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn5,
             this.gv_daa027,
             this.gridColumn7,
-            this.gridColumn8,
-            this.gridColumn9,
             this.gridColumn10,
-            this.gridColumn11,
             this.gridColumn12,
             this.gridColumn6,
             this.gridColumn27,
@@ -393,7 +477,6 @@
             this.gv_cust,
             this.gridColumn1,
             this.gv_daa015,
-            this.gridColumn2,
             this.gv_daa009,
             this.gv_prepareTime,
             this.gv_daa028,
@@ -428,7 +511,6 @@
             // 
             // gv_daa027
             // 
-            this.gv_daa027.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_daa027.AppearanceCell.Options.UseFont = true;
             this.gv_daa027.AppearanceHeader.Options.UseTextOptions = true;
             this.gv_daa027.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
@@ -455,30 +537,6 @@
             this.gridColumn7.VisibleIndex = 2;
             this.gridColumn7.Width = 50;
             // 
-            // gridColumn8
-            // 
-            this.gridColumn8.Caption = "鏄惁涓夊ぉ";
-            this.gridColumn8.FieldName = "isThree";
-            this.gridColumn8.MaxWidth = 50;
-            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
-            // 
-            this.gridColumn9.Caption = "鏄惁瓒呮椂";
-            this.gridColumn9.FieldName = "isCs";
-            this.gridColumn9.MaxWidth = 50;
-            this.gridColumn9.MinWidth = 50;
-            this.gridColumn9.Name = "gridColumn9";
-            this.gridColumn9.Tag = "query_a.jabs";
-            this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 4;
-            this.gridColumn9.Width = 50;
-            // 
             // gridColumn10
             // 
             this.gridColumn10.Caption = "鏄惁棣栨";
@@ -488,20 +546,8 @@
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Tag = "query_a.jabs";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 5;
+            this.gridColumn10.VisibleIndex = 3;
             this.gridColumn10.Width = 50;
-            // 
-            // gridColumn11
-            // 
-            this.gridColumn11.Caption = "鏄惁宸℃";
-            this.gridColumn11.FieldName = "isXj";
-            this.gridColumn11.MaxWidth = 50;
-            this.gridColumn11.MinWidth = 50;
-            this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.Tag = "query_a.jabs";
-            this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 6;
-            this.gridColumn11.Width = 50;
             // 
             // gridColumn12
             // 
@@ -512,7 +558,7 @@
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Tag = "query_a.jabs";
             this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 7;
+            this.gridColumn12.VisibleIndex = 5;
             this.gridColumn12.Width = 50;
             // 
             // gridColumn6
@@ -524,22 +570,21 @@
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Tag = "query_a.jabs";
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 8;
+            this.gridColumn6.VisibleIndex = 6;
             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 = 7;
             this.gridColumn27.Width = 94;
             // 
             // gv_daa018
             // 
-            this.gv_daa018.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_daa018.AppearanceCell.Options.UseFont = true;
             this.gv_daa018.Caption = "宸ュ崟鐘舵��";
             this.gv_daa018.FieldName = "daa018";
@@ -548,7 +593,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 = 8;
             this.gv_daa018.Width = 90;
             // 
             // gridColoun100
@@ -559,12 +604,11 @@
             this.gridColoun100.Name = "gridColoun100";
             this.gridColoun100.Tag = "org.fnamber";
             this.gridColoun100.Visible = true;
-            this.gridColoun100.VisibleIndex = 11;
+            this.gridColoun100.VisibleIndex = 9;
             this.gridColoun100.Width = 250;
             // 
             // gv_daa001
             // 
-            this.gv_daa001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_daa001.AppearanceCell.Options.UseFont = true;
             this.gv_daa001.Caption = "宸ュ崟鍗曞彿";
             this.gv_daa001.FieldName = "daa001";
@@ -573,12 +617,11 @@
             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 = 10;
             this.gv_daa001.Width = 120;
             // 
             // gv_daa021
             // 
-            this.gv_daa021.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_daa021.AppearanceCell.Options.UseFont = true;
             this.gv_daa021.Caption = "鎶曟枡鍗曞彿";
             this.gv_daa021.FieldName = "daa014";
@@ -587,7 +630,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 = 11;
             this.gv_daa021.Width = 100;
             // 
             // gridColumn3
@@ -597,12 +640,11 @@
             this.gridColumn3.MinWidth = 50;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 14;
+            this.gridColumn3.VisibleIndex = 12;
             this.gridColumn3.Width = 94;
             // 
             // gv_daa003
             // 
-            this.gv_daa003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_daa003.AppearanceCell.Options.UseFont = true;
             this.gv_daa003.Caption = "浜у搧鍚嶇О";
             this.gv_daa003.FieldName = "daa003";
@@ -611,12 +653,11 @@
             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 = 13;
             this.gv_daa003.Width = 150;
             // 
             // gv_daa004
             // 
-            this.gv_daa004.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_daa004.AppearanceCell.Options.UseFont = true;
             this.gv_daa004.Caption = "浜у搧瑙勬牸";
             this.gv_daa004.FieldName = "daa004";
@@ -625,12 +666,11 @@
             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 = 14;
             this.gv_daa004.Width = 150;
             // 
             // gv_daa008
             // 
-            this.gv_daa008.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_daa008.AppearanceCell.Options.UseFont = true;
             this.gv_daa008.Caption = "宸ュ崟鏁伴噺";
             this.gv_daa008.FieldName = "daa008";
@@ -640,12 +680,11 @@
             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 = 15;
             this.gv_daa008.Width = 50;
             // 
             // gv_daa011
             // 
-            this.gv_daa011.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_daa011.AppearanceCell.Options.UseFont = true;
             this.gv_daa011.Caption = "宸茬敓浜ч噺";
             this.gv_daa011.FieldName = "daa011";
@@ -655,22 +694,22 @@
             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 = 16;
             this.gv_daa011.Width = 50;
             // 
             // gridColumn4
             // 
             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 = 19;
+            this.gridColumn4.VisibleIndex = 17;
             this.gridColumn4.Width = 50;
             // 
             // gv_daa010
             // 
-            this.gv_daa010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_daa010.AppearanceCell.Options.UseFont = true;
             this.gv_daa010.Caption = "鍏ュ簱鏁伴噺";
             this.gv_daa010.FieldName = "daa010";
@@ -680,12 +719,11 @@
             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 = 19;
             this.gv_daa010.Width = 50;
             // 
             // gv_daa005
             // 
-            this.gv_daa005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_daa005.AppearanceCell.Options.UseFont = true;
             this.gv_daa005.Caption = "鍗曚綅";
             this.gv_daa005.FieldName = "fname";
@@ -695,12 +733,11 @@
             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 = 20;
             this.gv_daa005.Width = 50;
             // 
             // gv_cust
             // 
-            this.gv_cust.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_cust.AppearanceCell.Options.UseFont = true;
             this.gv_cust.Caption = "闇�姹傚崟鍙�";
             this.gv_cust.FieldName = "saleNo";
@@ -709,7 +746,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 = 21;
             this.gv_cust.Width = 100;
             // 
             // gridColumn1
@@ -719,12 +756,11 @@
             this.gridColumn1.MinWidth = 50;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 24;
+            this.gridColumn1.VisibleIndex = 22;
             this.gridColumn1.Width = 94;
             // 
             // gv_daa015
             // 
-            this.gv_daa015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_daa015.AppearanceCell.Options.UseFont = true;
             this.gv_daa015.Caption = "鐢熶骇绾垮埆";
             this.gv_daa015.FieldName = "lineName";
@@ -733,22 +769,11 @@
             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 = 23;
             this.gv_daa015.Width = 94;
-            // 
-            // gridColumn2
-            // 
-            this.gridColumn2.Caption = "瀹為檯绾垮埆";
-            this.gridColumn2.FieldName = "sjlineName";
-            this.gridColumn2.MinWidth = 50;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 26;
-            this.gridColumn2.Width = 94;
             // 
             // gv_daa009
             // 
-            this.gv_daa009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_daa009.AppearanceCell.Options.UseFont = true;
             this.gv_daa009.Caption = "澶囨敞";
             this.gv_daa009.FieldName = "daa009";
@@ -757,12 +782,11 @@
             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 = 18;
             this.gv_daa009.Width = 94;
             // 
             // gv_prepareTime
             // 
-            this.gv_prepareTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_prepareTime.AppearanceCell.Options.UseFont = true;
             this.gv_prepareTime.Caption = "棰勮澶囨枡鏃堕棿";
             this.gv_prepareTime.FieldName = "prepareTime";
@@ -771,12 +795,11 @@
             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 = 24;
             this.gv_prepareTime.Width = 180;
             // 
             // gv_daa028
             // 
-            this.gv_daa028.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_daa028.AppearanceCell.Options.UseFont = true;
             this.gv_daa028.Caption = "澶囨枡瀹屾垚鏃堕棿";
             this.gv_daa028.FieldName = "daa028";
@@ -785,12 +808,11 @@
             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 = 25;
             this.gv_daa028.Width = 180;
             // 
             // gv_daa016
             // 
-            this.gv_daa016.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_daa016.AppearanceCell.Options.UseFont = true;
             this.gv_daa016.Caption = "瀹為檯寮�宸ユ棩";
             this.gv_daa016.FieldName = "daa016";
@@ -799,12 +821,11 @@
             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 = 26;
             this.gv_daa016.Width = 180;
             // 
             // gv_daa017
             // 
-            this.gv_daa017.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_daa017.AppearanceCell.Options.UseFont = true;
             this.gv_daa017.Caption = "瀹為檯瀹屽伐鏃�";
             this.gv_daa017.FieldName = "daa017";
@@ -813,12 +834,11 @@
             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 = 27;
             this.gv_daa017.Width = 180;
             // 
             // gv_mesStartProd
             // 
-            this.gv_mesStartProd.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_mesStartProd.AppearanceCell.Options.UseFont = true;
             this.gv_mesStartProd.Caption = "MES棰勮寮�宸ユ椂闂�";
             this.gv_mesStartProd.FieldName = "mesStartProd";
@@ -827,12 +847,11 @@
             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 = 28;
             this.gv_mesStartProd.Width = 180;
             // 
             // gv_mesEndProd
             // 
-            this.gv_mesEndProd.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_mesEndProd.AppearanceCell.Options.UseFont = true;
             this.gv_mesEndProd.Caption = "MES棰勮瀹屽伐鏃堕棿";
             this.gv_mesEndProd.FieldName = "mesEndProd";
@@ -841,7 +860,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 = 29;
             this.gv_mesEndProd.Width = 180;
             // 
             // gridColumn21
@@ -851,7 +870,7 @@
             this.gridColumn21.MinWidth = 25;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 33;
+            this.gridColumn21.VisibleIndex = 30;
             this.gridColumn21.Width = 94;
             // 
             // gridColumn22
@@ -861,7 +880,7 @@
             this.gridColumn22.MinWidth = 25;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 34;
+            this.gridColumn22.VisibleIndex = 31;
             this.gridColumn22.Width = 94;
             // 
             // gridColumn23
@@ -879,7 +898,7 @@
             this.gridColumn24.MinWidth = 25;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
-            this.gridColumn24.VisibleIndex = 35;
+            this.gridColumn24.VisibleIndex = 32;
             this.gridColumn24.Width = 94;
             // 
             // gridColumn25
@@ -889,7 +908,7 @@
             this.gridColumn25.MinWidth = 25;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
-            this.gridColumn25.VisibleIndex = 36;
+            this.gridColumn25.VisibleIndex = 33;
             this.gridColumn25.Width = 94;
             // 
             // gridColumn26
@@ -899,7 +918,7 @@
             this.gridColumn26.MinWidth = 25;
             this.gridColumn26.Name = "gridColumn26";
             this.gridColumn26.Visible = true;
-            this.gridColumn26.VisibleIndex = 37;
+            this.gridColumn26.VisibleIndex = 34;
             this.gridColumn26.Width = 94;
             // 
             // pageBar1
@@ -910,7 +929,7 @@
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+            this.pageBar1.Size = new System.Drawing.Size(1267, 39);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
@@ -918,7 +937,7 @@
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 708);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1267, 708);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -937,30 +956,24 @@
             // 
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
-            this.splitMx1.Size = new System.Drawing.Size(1126, 708);
-            this.splitMx1.SplitterPosition = 237;
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx1.Size = new System.Drawing.Size(1267, 708);
+            this.splitMx1.SplitterPosition = 183;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
-            this.layoutMx1.Controls.Add(this.txt_kQty);
             this.layoutMx1.Controls.Add(this.lbGuid);
-            this.layoutMx1.Controls.Add(this.txt_sjXt);
-            this.layoutMx1.Controls.Add(this.ucBtnPrint1);
             this.layoutMx1.Controls.Add(this.txt_daa009);
             this.layoutMx1.Controls.Add(this.txt_daa013);
-            this.layoutMx1.Controls.Add(this.txt_yQty);
-            this.layoutMx1.Controls.Add(this.txt_iCount_1);
             this.layoutMx1.Controls.Add(this.txt_daa001);
-            this.layoutMx1.Controls.Add(this.txt_psnQty_1);
             this.layoutMx1.Controls.Add(this.textEdit1);
             this.layoutMx1.Controls.Add(this.txt_daa008);
-            this.layoutMx1.Controls.Add(this.txt_printRemark);
             this.layoutMx1.Controls.Add(this.txt_saleOrderNo);
             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);
@@ -972,28 +985,17 @@
             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});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(910, 587, 812, 500);
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(910, 530, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1126, 237);
+            this.layoutMx1.Size = new System.Drawing.Size(1267, 183);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
-            // 
-            // txt_kQty
-            // 
-            this.txt_kQty.Location = new System.Drawing.Point(932, 76);
-            this.txt_kQty.Name = "txt_kQty";
-            this.txt_kQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_kQty.Properties.Appearance.Options.UseFont = true;
-            this.txt_kQty.Properties.ReadOnly = true;
-            this.txt_kQty.Size = new System.Drawing.Size(161, 28);
-            this.txt_kQty.StyleController = this.layoutMx1;
-            this.txt_kQty.TabIndex = 471;
-            this.txt_kQty.Tag = "readonly";
             // 
             // lbGuid
             // 
@@ -1004,299 +1006,223 @@
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
             // 
-            // txt_sjXt
-            // 
-            this.txt_sjXt.IsReadly = false;
-            this.txt_sjXt.Location = new System.Drawing.Point(119, 204);
-            this.txt_sjXt.Name = "txt_sjXt";
-            this.txt_sjXt.Size = new System.Drawing.Size(160, 28);
-            this.txt_sjXt.TabIndex = 334;
-            // 
-            // ucBtnPrint1
-            // 
-            this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(825, 204);
-            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
-            this.ucBtnPrint1.Name = "ucBtnPrint1";
-            this.ucBtnPrint1.rptParameter = null;
-            this.ucBtnPrint1.Size = new System.Drawing.Size(206, 28);
-            this.ucBtnPrint1.TabIndex = 463;
-            // 
             // txt_daa009
             // 
-            this.txt_daa009.Location = new System.Drawing.Point(390, 204);
+            this.txt_daa009.Location = new System.Drawing.Point(420, 152);
             this.txt_daa009.Name = "txt_daa009";
-            this.txt_daa009.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa009.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa009.Size = new System.Drawing.Size(160, 28);
+            this.txt_daa009.Size = new System.Drawing.Size(506, 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(390, 140);
+            this.txt_daa013.Location = new System.Drawing.Point(726, 124);
             this.txt_daa013.Name = "txt_daa013";
-            this.txt_daa013.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa013.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa013.Size = new System.Drawing.Size(160, 28);
+            this.txt_daa013.Size = new System.Drawing.Size(200, 24);
             this.txt_daa013.StyleController = this.layoutMx1;
             this.txt_daa013.TabIndex = 472;
             this.txt_daa013.Tag = "readonly";
             // 
-            // txt_yQty
-            // 
-            this.txt_yQty.Location = new System.Drawing.Point(932, 44);
-            this.txt_yQty.Name = "txt_yQty";
-            this.txt_yQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_yQty.Properties.Appearance.Options.UseFont = true;
-            this.txt_yQty.Properties.ReadOnly = true;
-            this.txt_yQty.Size = new System.Drawing.Size(161, 28);
-            this.txt_yQty.StyleController = this.layoutMx1;
-            this.txt_yQty.TabIndex = 469;
-            this.txt_yQty.Tag = "readonly";
-            // 
-            // txt_iCount_1
-            // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(932, 172);
-            this.txt_iCount_1.Name = "txt_iCount_1";
-            this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_iCount_1.Size = new System.Drawing.Size(161, 28);
-            this.txt_iCount_1.StyleController = this.layoutMx1;
-            this.txt_iCount_1.TabIndex = 331;
-            this.txt_iCount_1.Tag = "readOnly-1";
-            // 
             // txt_daa001
             // 
-            this.txt_daa001.Location = new System.Drawing.Point(119, 12);
+            this.txt_daa001.Location = new System.Drawing.Point(114, 12);
             this.txt_daa001.Name = "txt_daa001";
-            this.txt_daa001.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa001.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa001.Size = new System.Drawing.Size(160, 28);
+            this.txt_daa001.Size = new System.Drawing.Size(200, 24);
             this.txt_daa001.StyleController = this.layoutMx1;
             this.txt_daa001.TabIndex = 216;
             this.txt_daa001.Tag = "readonly";
             // 
-            // txt_psnQty_1
-            // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(932, 140);
-            this.txt_psnQty_1.Name = "txt_psnQty_1";
-            this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_psnQty_1.Size = new System.Drawing.Size(161, 28);
-            this.txt_psnQty_1.StyleController = this.layoutMx1;
-            this.txt_psnQty_1.TabIndex = 329;
-            this.txt_psnQty_1.Tag = "readOnly-1";
-            // 
             // textEdit1
             // 
-            this.textEdit1.Location = new System.Drawing.Point(390, 44);
+            this.textEdit1.Location = new System.Drawing.Point(420, 40);
             this.textEdit1.Name = "textEdit1";
-            this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.textEdit1.Properties.Appearance.Options.UseFont = true;
-            this.textEdit1.Size = new System.Drawing.Size(160, 28);
+            this.textEdit1.Size = new System.Drawing.Size(200, 24);
             this.textEdit1.StyleController = this.layoutMx1;
             this.textEdit1.TabIndex = 467;
             this.textEdit1.Tag = "readonly";
             // 
             // txt_daa008
             // 
-            this.txt_daa008.Location = new System.Drawing.Point(661, 12);
+            this.txt_daa008.Location = new System.Drawing.Point(726, 12);
             this.txt_daa008.Name = "txt_daa008";
-            this.txt_daa008.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa008.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa008.Size = new System.Drawing.Size(160, 28);
+            this.txt_daa008.Size = new System.Drawing.Size(200, 24);
             this.txt_daa008.StyleController = this.layoutMx1;
             this.txt_daa008.TabIndex = 235;
             this.txt_daa008.Tag = "readonly";
             // 
-            // txt_printRemark
-            // 
-            this.txt_printRemark.Location = new System.Drawing.Point(932, 108);
-            this.txt_printRemark.Name = "txt_printRemark";
-            this.txt_printRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
-            this.txt_printRemark.Size = new System.Drawing.Size(161, 28);
-            this.txt_printRemark.StyleController = this.layoutMx1;
-            this.txt_printRemark.TabIndex = 333;
-            this.txt_printRemark.Tag = "readOnly-1";
-            // 
             // txt_saleOrderNo
             // 
-            this.txt_saleOrderNo.Location = new System.Drawing.Point(119, 76);
+            this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 68);
             this.txt_saleOrderNo.Name = "txt_saleOrderNo";
-            this.txt_saleOrderNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_saleOrderNo.Size = new System.Drawing.Size(160, 28);
+            this.txt_saleOrderNo.Size = new System.Drawing.Size(200, 24);
             this.txt_saleOrderNo.StyleController = this.layoutMx1;
             this.txt_saleOrderNo.TabIndex = 465;
             this.txt_saleOrderNo.Tag = "readonly";
             // 
             // txt_daa028
             // 
-            this.txt_daa028.Location = new System.Drawing.Point(390, 76);
+            this.txt_daa028.Location = new System.Drawing.Point(420, 68);
             this.txt_daa028.Name = "txt_daa028";
-            this.txt_daa028.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa028.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa028.Size = new System.Drawing.Size(160, 28);
+            this.txt_daa028.Size = new System.Drawing.Size(200, 24);
             this.txt_daa028.StyleController = this.layoutMx1;
             this.txt_daa028.TabIndex = 341;
             this.txt_daa028.Tag = "readonly";
             // 
             // txt_mesStartProd
             // 
-            this.txt_mesStartProd.Location = new System.Drawing.Point(661, 108);
+            this.txt_mesStartProd.Location = new System.Drawing.Point(1032, 40);
             this.txt_mesStartProd.Name = "txt_mesStartProd";
-            this.txt_mesStartProd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesStartProd.Size = new System.Drawing.Size(160, 28);
+            this.txt_mesStartProd.Size = new System.Drawing.Size(202, 24);
             this.txt_mesStartProd.StyleController = this.layoutMx1;
             this.txt_mesStartProd.TabIndex = 336;
             this.txt_mesStartProd.Tag = "readonly";
             // 
             // txt_daa014
             // 
-            this.txt_daa014.Location = new System.Drawing.Point(119, 44);
+            this.txt_daa014.Location = new System.Drawing.Point(114, 40);
             this.txt_daa014.Name = "txt_daa014";
-            this.txt_daa014.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa014.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa014.Size = new System.Drawing.Size(160, 28);
+            this.txt_daa014.Size = new System.Drawing.Size(200, 24);
             this.txt_daa014.StyleController = this.layoutMx1;
             this.txt_daa014.TabIndex = 327;
             this.txt_daa014.Tag = "readonly";
             // 
-            // txt_daa022Txt
+            // txt_daa022Remark
             // 
-            this.txt_daa022Txt.Location = new System.Drawing.Point(390, 12);
-            this.txt_daa022Txt.Name = "txt_daa022Txt";
-            this.txt_daa022Txt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_daa022Txt.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa022Txt.Size = new System.Drawing.Size(160, 28);
-            this.txt_daa022Txt.StyleController = this.layoutMx1;
-            this.txt_daa022Txt.TabIndex = 462;
-            this.txt_daa022Txt.Tag = "readonly";
+            this.txt_daa022Remark.Location = new System.Drawing.Point(420, 12);
+            this.txt_daa022Remark.Name = "txt_daa022Remark";
+            this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true;
+            this.txt_daa022Remark.Size = new System.Drawing.Size(200, 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(661, 44);
+            this.txt_daa010.Location = new System.Drawing.Point(726, 40);
             this.txt_daa010.Name = "txt_daa010";
-            this.txt_daa010.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa010.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa010.Size = new System.Drawing.Size(160, 28);
+            this.txt_daa010.Size = new System.Drawing.Size(200, 24);
             this.txt_daa010.StyleController = this.layoutMx1;
             this.txt_daa010.TabIndex = 243;
             this.txt_daa010.Tag = "readonly";
             // 
             // txt_mesEndProd
             // 
-            this.txt_mesEndProd.Location = new System.Drawing.Point(661, 140);
+            this.txt_mesEndProd.Location = new System.Drawing.Point(1032, 68);
             this.txt_mesEndProd.Name = "txt_mesEndProd";
-            this.txt_mesEndProd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesEndProd.Size = new System.Drawing.Size(160, 28);
+            this.txt_mesEndProd.Size = new System.Drawing.Size(202, 24);
             this.txt_mesEndProd.StyleController = this.layoutMx1;
             this.txt_mesEndProd.TabIndex = 338;
             this.txt_mesEndProd.Tag = "readonly";
             // 
             // txt_daa011
             // 
-            this.txt_daa011.Location = new System.Drawing.Point(661, 76);
+            this.txt_daa011.Location = new System.Drawing.Point(726, 68);
             this.txt_daa011.Name = "txt_daa011";
-            this.txt_daa011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa011.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa011.Size = new System.Drawing.Size(160, 28);
+            this.txt_daa011.Size = new System.Drawing.Size(200, 24);
             this.txt_daa011.StyleController = this.layoutMx1;
             this.txt_daa011.TabIndex = 247;
             this.txt_daa011.Tag = "readonly";
             // 
             // txt_dptName
             // 
-            this.txt_dptName.Location = new System.Drawing.Point(390, 172);
+            this.txt_dptName.Location = new System.Drawing.Point(726, 96);
             this.txt_dptName.Name = "txt_dptName";
-            this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_dptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dptName.Size = new System.Drawing.Size(160, 28);
+            this.txt_dptName.Size = new System.Drawing.Size(200, 24);
             this.txt_dptName.StyleController = this.layoutMx1;
             this.txt_dptName.TabIndex = 258;
             this.txt_dptName.Tag = "readonly";
             // 
             // txt_daa016
             // 
-            this.txt_daa016.Location = new System.Drawing.Point(661, 172);
+            this.txt_daa016.Location = new System.Drawing.Point(1032, 96);
             this.txt_daa016.Name = "txt_daa016";
-            this.txt_daa016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa016.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa016.Size = new System.Drawing.Size(160, 28);
+            this.txt_daa016.Size = new System.Drawing.Size(202, 24);
             this.txt_daa016.StyleController = this.layoutMx1;
             this.txt_daa016.TabIndex = 273;
             this.txt_daa016.Tag = "readonly";
             // 
             // txt_daa029
             // 
-            this.txt_daa029.Location = new System.Drawing.Point(119, 108);
+            this.txt_daa029.Location = new System.Drawing.Point(114, 96);
             this.txt_daa029.Name = "txt_daa029";
-            this.txt_daa029.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa029.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa029.Size = new System.Drawing.Size(160, 28);
+            this.txt_daa029.Size = new System.Drawing.Size(200, 24);
             this.txt_daa029.StyleController = this.layoutMx1;
             this.txt_daa029.TabIndex = 217;
             this.txt_daa029.Tag = "readonly";
             // 
             // txt_lineName
             // 
-            this.txt_lineName.Location = new System.Drawing.Point(390, 108);
+            this.txt_lineName.Location = new System.Drawing.Point(420, 96);
             this.txt_lineName.Name = "txt_lineName";
-            this.txt_lineName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_lineName.Properties.Appearance.Options.UseFont = true;
-            this.txt_lineName.Size = new System.Drawing.Size(160, 28);
+            this.txt_lineName.Size = new System.Drawing.Size(200, 24);
             this.txt_lineName.StyleController = this.layoutMx1;
             this.txt_lineName.TabIndex = 267;
             this.txt_lineName.Tag = "readonly";
             // 
             // txt_daa017
             // 
-            this.txt_daa017.Location = new System.Drawing.Point(661, 204);
+            this.txt_daa017.Location = new System.Drawing.Point(1032, 124);
             this.txt_daa017.Name = "txt_daa017";
-            this.txt_daa017.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa017.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa017.Size = new System.Drawing.Size(160, 28);
+            this.txt_daa017.Size = new System.Drawing.Size(202, 24);
             this.txt_daa017.StyleController = this.layoutMx1;
             this.txt_daa017.TabIndex = 280;
             this.txt_daa017.Tag = "readonly";
             // 
             // txt_daa003
             // 
-            this.txt_daa003.Location = new System.Drawing.Point(119, 172);
+            this.txt_daa003.Location = new System.Drawing.Point(114, 152);
             this.txt_daa003.Name = "txt_daa003";
-            this.txt_daa003.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa003.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa003.Size = new System.Drawing.Size(160, 28);
+            this.txt_daa003.Size = new System.Drawing.Size(200, 24);
             this.txt_daa003.StyleController = this.layoutMx1;
             this.txt_daa003.TabIndex = 219;
             this.txt_daa003.Tag = "readonly";
             // 
             // txt_dwName
             // 
-            this.txt_dwName.Location = new System.Drawing.Point(932, 12);
+            this.txt_dwName.Location = new System.Drawing.Point(1032, 12);
             this.txt_dwName.Name = "txt_dwName";
-            this.txt_dwName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_dwName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dwName.Size = new System.Drawing.Size(161, 28);
+            this.txt_dwName.Size = new System.Drawing.Size(202, 24);
             this.txt_dwName.StyleController = this.layoutMx1;
             this.txt_dwName.TabIndex = 226;
             this.txt_dwName.Tag = "readonly";
             // 
             // txt_daa004
             // 
-            this.txt_daa004.Location = new System.Drawing.Point(119, 140);
+            this.txt_daa004.Location = new System.Drawing.Point(114, 124);
             this.txt_daa004.Name = "txt_daa004";
-            this.txt_daa004.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa004.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa004.Size = new System.Drawing.Size(160, 28);
+            this.txt_daa004.Size = new System.Drawing.Size(200, 24);
             this.txt_daa004.StyleController = this.layoutMx1;
             this.txt_daa004.TabIndex = 222;
             this.txt_daa004.Tag = "readonly";
+            // 
+            // txt_daa015
+            // 
+            this.txt_daa015.Location = new System.Drawing.Point(420, 124);
+            this.txt_daa015.Name = "txt_daa015";
+            this.txt_daa015.Size = new System.Drawing.Size(200, 24);
+            this.txt_daa015.StyleController = this.layoutMx1;
+            this.txt_daa015.TabIndex = 473;
             // 
             // layoutControlItem29
             // 
@@ -1325,65 +1251,53 @@
             this.layoutControlItem13,
             this.layoutControlItem14,
             this.layoutControlItem17,
-            this.layoutControlItem18,
             this.layoutControlItem19,
-            this.layoutControlItem20,
-            this.layoutControlItem24,
-            this.layoutControlItem25,
-            this.layoutControlItem27,
-            this.layoutControlItem28,
             this.layoutControlItem6,
             this.layoutControlItem2,
-            this.layoutControlItem26,
             this.layoutControlItem15,
             this.layoutControlItem4,
-            this.layoutControlItem22,
+            this.layoutControlItem8,
             this.layoutControlItem12,
-            this.layoutControlItem23,
             this.layoutControlItem16,
-            this.layoutControlItem21,
-            this.layoutControlItem8});
+            this.layoutControlItem28,
+            this.layoutControlItem27,
+            this.layoutControlItem20,
+            this.layoutControlItem18});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition1.Width = 100D;
-            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition2.Width = 100D;
-            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition3.Width = 100D;
-            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition4.Width = 100D;
+            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;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition1,
-            columnDefinition2,
-            columnDefinition3,
-            columnDefinition4});
-            rowDefinition1.Height = 100D;
-            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition2.Height = 100D;
-            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition3.Height = 100D;
-            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition4.Height = 100D;
-            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition6.Height = 100D;
-            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition7.Height = 100D;
-            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition8.Height = 20D;
-            rowDefinition8.SizeType = System.Windows.Forms.SizeType.AutoSize;
+            columnDefinition16,
+            columnDefinition17,
+            columnDefinition18,
+            columnDefinition19});
+            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;
+            rowDefinition15.Height = 100D;
+            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3,
-            rowDefinition4,
-            rowDefinition5,
-            rowDefinition6,
-            rowDefinition7,
-            rowDefinition8});
-            this.Root.Size = new System.Drawing.Size(1105, 264);
+            rowDefinition10,
+            rowDefinition11,
+            rowDefinition12,
+            rowDefinition13,
+            rowDefinition14,
+            rowDefinition15});
+            this.Root.Size = new System.Drawing.Size(1246, 188);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -1391,214 +1305,234 @@
             this.layoutControlItem1.Control = this.txt_daa001;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem1.Size = new System.Drawing.Size(306, 28);
             this.layoutControlItem1.Text = "宸ュ崟鍗曞彿";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(95, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_daa008;
-            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(612, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem3.Size = new System.Drawing.Size(306, 28);
             this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(95, 18);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_daa014;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 32);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem5.Size = new System.Drawing.Size(306, 28);
             this.layoutControlItem5.Text = "鎶曟枡鍗曞彿";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(95, 18);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_daa010;
-            this.layoutControlItem7.Location = new System.Drawing.Point(542, 32);
+            this.layoutControlItem7.Location = new System.Drawing.Point(612, 28);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem7.Size = new System.Drawing.Size(306, 28);
             this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(95, 18);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_saleOrderNo;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 64);
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 56);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem9.Size = new System.Drawing.Size(306, 28);
             this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(95, 18);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_daa028;
-            this.layoutControlItem10.Location = new System.Drawing.Point(271, 64);
+            this.layoutControlItem10.Location = new System.Drawing.Point(306, 56);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem10.Size = new System.Drawing.Size(306, 28);
             this.layoutControlItem10.Text = "澶囨枡鏃堕棿";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(95, 18);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_daa011;
-            this.layoutControlItem11.Location = new System.Drawing.Point(542, 64);
+            this.layoutControlItem11.Location = new System.Drawing.Point(612, 56);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem11.Size = new System.Drawing.Size(306, 28);
             this.layoutControlItem11.Text = "宸茬敓浜ч噺";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(95, 18);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_daa029;
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 96);
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 84);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem13.Size = new System.Drawing.Size(306, 28);
             this.layoutControlItem13.Text = "浜у搧缂栫爜";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(95, 18);
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_lineName;
-            this.layoutControlItem14.Location = new System.Drawing.Point(271, 96);
+            this.layoutControlItem14.Location = new System.Drawing.Point(306, 84);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem14.Size = new System.Drawing.Size(306, 28);
             this.layoutControlItem14.Text = "鐢熶骇绾垮埆";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(95, 18);
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txt_daa004;
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 128);
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 112);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem17.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem17.Size = new System.Drawing.Size(306, 28);
             this.layoutControlItem17.Text = "浜у搧瑙勬牸";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(95, 18);
-            // 
-            // layoutControlItem18
-            // 
-            this.layoutControlItem18.Control = this.txt_daa013;
-            this.layoutControlItem18.Location = new System.Drawing.Point(271, 128);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem18.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem18.Text = "鐢熶骇杞﹂棿";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(95, 18);
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_daa003;
-            this.layoutControlItem19.Location = new System.Drawing.Point(0, 160);
+            this.layoutControlItem19.Location = new System.Drawing.Point(0, 140);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem19.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem19.Size = new System.Drawing.Size(306, 28);
             this.layoutControlItem19.Text = "浜у搧鍚嶇О";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(95, 18);
-            // 
-            // layoutControlItem20
-            // 
-            this.layoutControlItem20.Control = this.txt_dptName;
-            this.layoutControlItem20.Location = new System.Drawing.Point(271, 160);
-            this.layoutControlItem20.Name = "layoutControlItem20";
-            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem20.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
-            this.layoutControlItem20.TextSize = new System.Drawing.Size(95, 18);
-            // 
-            // layoutControlItem24
-            // 
-            this.layoutControlItem24.Control = this.txt_psnQty_1;
-            this.layoutControlItem24.Location = new System.Drawing.Point(813, 128);
-            this.layoutControlItem24.Name = "layoutControlItem24";
-            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem24.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem24.Text = "姣忓紶鏉$爜鏁伴噺:";
-            this.layoutControlItem24.TextSize = new System.Drawing.Size(95, 18);
-            // 
-            // layoutControlItem25
-            // 
-            this.layoutControlItem25.Control = this.txt_iCount_1;
-            this.layoutControlItem25.Location = new System.Drawing.Point(813, 160);
-            this.layoutControlItem25.Name = "layoutControlItem25";
-            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem25.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem25.Text = "鎵撳嵃鏉$爜寮犳暟:";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(95, 18);
-            // 
-            // layoutControlItem27
-            // 
-            this.layoutControlItem27.Control = this.txt_sjXt;
-            this.layoutControlItem27.Location = new System.Drawing.Point(0, 192);
-            this.layoutControlItem27.Name = "layoutControlItem27";
-            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem27.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem27.Text = "瀹為檯绾夸綋";
-            this.layoutControlItem27.TextSize = new System.Drawing.Size(95, 18);
-            // 
-            // layoutControlItem28
-            // 
-            this.layoutControlItem28.Control = this.txt_daa009;
-            this.layoutControlItem28.Location = new System.Drawing.Point(271, 192);
-            this.layoutControlItem28.Name = "layoutControlItem28";
-            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem28.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
-            this.layoutControlItem28.TextSize = new System.Drawing.Size(95, 18);
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem6
             // 
-            this.layoutControlItem6.Control = this.txt_daa022Txt;
-            this.layoutControlItem6.Location = new System.Drawing.Point(271, 0);
+            this.layoutControlItem6.Control = this.txt_daa022Remark;
+            this.layoutControlItem6.Location = new System.Drawing.Point(306, 0);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem6.Size = new System.Drawing.Size(306, 28);
             this.layoutControlItem6.Text = "閫氱煡澶囨枡";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(95, 18);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.textEdit1;
-            this.layoutControlItem2.Location = new System.Drawing.Point(271, 32);
+            this.layoutControlItem2.Location = new System.Drawing.Point(306, 28);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem2.Size = new System.Drawing.Size(306, 28);
             this.layoutControlItem2.Text = "澶囨枡鐘舵��";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(95, 18);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
             // 
-            // layoutControlItem26
+            // layoutControlItem15
             // 
-            this.layoutControlItem26.Control = this.ucBtnPrint1;
-            this.layoutControlItem26.Location = new System.Drawing.Point(813, 192);
-            this.layoutControlItem26.MaxSize = new System.Drawing.Size(210, 0);
-            this.layoutControlItem26.MinSize = new System.Drawing.Size(5, 5);
-            this.layoutControlItem26.Name = "layoutControlItem26";
-            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem26.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem26.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem26.Text = "鎵撳嵃鎸夐挳";
-            this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem26.TextVisible = false;
+            this.layoutControlItem15.Control = this.txt_dwName;
+            this.layoutControlItem15.Location = new System.Drawing.Point(918, 0);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem15.Size = new System.Drawing.Size(308, 28);
+            this.layoutControlItem15.Text = "鍗曚綅";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_mesStartProd;
+            this.layoutControlItem4.Location = new System.Drawing.Point(918, 28);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem4.Size = new System.Drawing.Size(308, 28);
+            this.layoutControlItem4.Text = "棰勮寮�宸ユ椂闂�";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_mesEndProd;
+            this.layoutControlItem8.Location = new System.Drawing.Point(918, 56);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem8.Size = new System.Drawing.Size(308, 28);
+            this.layoutControlItem8.Text = "棰勮瀹屽伐鏃堕棿";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_daa016;
+            this.layoutControlItem12.Location = new System.Drawing.Point(918, 84);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem12.Size = new System.Drawing.Size(308, 28);
+            this.layoutControlItem12.Text = "瀹為檯寮�宸ユ椂闂�";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.txt_daa017;
+            this.layoutControlItem16.Location = new System.Drawing.Point(918, 112);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem16.Size = new System.Drawing.Size(308, 28);
+            this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem28
+            // 
+            this.layoutControlItem28.Control = this.txt_daa009;
+            this.layoutControlItem28.Location = new System.Drawing.Point(306, 140);
+            this.layoutControlItem28.Name = "layoutControlItem28";
+            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem28.Size = new System.Drawing.Size(612, 28);
+            this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
+            this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem27
+            // 
+            this.layoutControlItem27.Control = this.txt_daa015;
+            this.layoutControlItem27.Location = new System.Drawing.Point(306, 112);
+            this.layoutControlItem27.Name = "layoutControlItem27";
+            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem27.Size = new System.Drawing.Size(306, 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(612, 84);
+            this.layoutControlItem20.Name = "layoutControlItem20";
+            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem20.Size = new System.Drawing.Size(306, 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(612, 112);
+            this.layoutControlItem18.Name = "layoutControlItem18";
+            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem18.Size = new System.Drawing.Size(306, 28);
+            this.layoutControlItem18.Text = "杞﹂棿ID";
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
             // 
             // tabMx
             // 
@@ -1606,17 +1540,19 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 459);
+            this.tabMx.Size = new System.Drawing.Size(1267, 513);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
-            this.tabMxPage2});
+            this.tabMxPage2,
+            this.xtraTabPage3,
+            this.xtraTabPage4});
             // 
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 427);
+            this.tabMxPage1.Size = new System.Drawing.Size(1265, 481);
             this.tabMxPage1.Text = "澶囨枡鍗曡韩";
             // 
             // gcMx1
@@ -1625,7 +1561,7 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1124, 427);
+            this.gcMx1.Size = new System.Drawing.Size(1265, 481);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1690,7 +1626,6 @@
             // 
             // gvMx1dab001
             // 
-            this.gvMx1dab001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab001.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab001.Caption = "宸ュ崟鍗曞彿";
             this.gvMx1dab001.FieldName = "dab001";
@@ -1703,7 +1638,6 @@
             // 
             // gvMx1dab003
             // 
-            this.gvMx1dab003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab003.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab003.Caption = "鏉愭枡缂栫爜";
             this.gvMx1dab003.FieldName = "itemNo";
@@ -1716,7 +1650,6 @@
             // 
             // gvMx1dab004
             // 
-            this.gvMx1dab004.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab004.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab004.Caption = "鏉愭枡鍚嶇О";
             this.gvMx1dab004.FieldName = "dab004";
@@ -1729,7 +1662,6 @@
             // 
             // gvMx1dab005
             // 
-            this.gvMx1dab005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab005.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab005.Caption = "鏉愭枡瑙勬牸";
             this.gvMx1dab005.FieldName = "dab005";
@@ -1742,7 +1674,6 @@
             // 
             // gvMx1dab006
             // 
-            this.gvMx1dab006.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab006.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab006.Caption = "闇�棰嗙敤閲�";
             this.gvMx1dab006.FieldName = "dab006";
@@ -1755,10 +1686,9 @@
             // 
             // gvMx1dab007
             // 
-            this.gvMx1dab007.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab007.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab007.Caption = "宸查鐢ㄩ噺";
-            this.gvMx1dab007.FieldName = "dab007";
+            this.gvMx1dab007.FieldName = "ylQty";
             this.gvMx1dab007.MinWidth = 50;
             this.gvMx1dab007.Name = "gvMx1dab007";
             this.gvMx1dab007.Tag = "query_a.dab007";
@@ -1769,6 +1699,7 @@
             // gridColumn14
             // 
             this.gridColumn14.Caption = "鍓╀綑鍙";
+            this.gridColumn14.FieldName = "klQty";
             this.gridColumn14.MinWidth = 25;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
@@ -1777,7 +1708,6 @@
             // 
             // gvMx1dab014
             // 
-            this.gvMx1dab014.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab014.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab014.Caption = "鏄惁鏇挎枡";
             this.gvMx1dab014.FieldName = "dab014Txt";
@@ -1809,7 +1739,6 @@
             // 
             // gvMx1dab012
             // 
-            this.gvMx1dab012.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab012.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab012.Caption = "缁勬垚鐢ㄩ噺";
             this.gvMx1dab012.FieldName = "dab012";
@@ -1822,7 +1751,6 @@
             // 
             // gvMx1dab009
             // 
-            this.gvMx1dab009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab009.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab009.Caption = "鍗曚綅";
             this.gvMx1dab009.FieldName = "dwName";
@@ -1835,7 +1763,6 @@
             // 
             // gvMx1scrapqty
             // 
-            this.gvMx1scrapqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1scrapqty.AppearanceCell.Options.UseFont = true;
             this.gvMx1scrapqty.Caption = "鍥哄畾鎹熻��";
             this.gvMx1scrapqty.FieldName = "scrapqty";
@@ -1846,7 +1773,6 @@
             // 
             // gvMx1scraprate
             // 
-            this.gvMx1scraprate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1scraprate.AppearanceCell.Options.UseFont = true;
             this.gvMx1scraprate.Caption = "鍙樺姩鎹熻�楃巼";
             this.gvMx1scraprate.FieldName = "scraprate";
@@ -1857,7 +1783,6 @@
             // 
             // gvMx1zyBl
             // 
-            this.gvMx1zyBl.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1zyBl.AppearanceCell.Options.UseFont = true;
             this.gvMx1zyBl.Caption = "浣滀笟涓嶈壇";
             this.gvMx1zyBl.FieldName = "zyBl";
@@ -1868,7 +1793,6 @@
             // 
             // gvMx1llBl
             // 
-            this.gvMx1llBl.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1llBl.AppearanceCell.Options.UseFont = true;
             this.gvMx1llBl.Caption = "鏉ユ枡涓嶈壇";
             this.gvMx1llBl.FieldName = "llBl";
@@ -1879,7 +1803,6 @@
             // 
             // gvMx1lpTl
             // 
-            this.gvMx1lpTl.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1lpTl.AppearanceCell.Options.UseFont = true;
             this.gvMx1lpTl.Caption = "鑹搧閫�鏂�";
             this.gvMx1lpTl.FieldName = "lpTl";
@@ -1890,7 +1813,6 @@
             // 
             // gvMx1dab021
             // 
-            this.gvMx1dab021.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab021.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab021.Caption = "琛ラ鏁伴噺";
             this.gvMx1dab021.FieldName = "dab021";
@@ -1901,7 +1823,6 @@
             // 
             // gvMx1dab010
             // 
-            this.gvMx1dab010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab010.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab010.Caption = "鏉愭枡绫诲瀷";
             this.gvMx1dab010.FieldName = "dab010";
@@ -1912,7 +1833,6 @@
             // 
             // gvMx1dab011
             // 
-            this.gvMx1dab011.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab011.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab011.Caption = "涓绘枡";
             this.gvMx1dab011.FieldName = "dab011";
@@ -1923,7 +1843,6 @@
             // 
             // gvMx1dab013
             // 
-            this.gvMx1dab013.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab013.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab013.Caption = "搴曟暟";
             this.gvMx1dab013.FieldName = "dab013";
@@ -1934,7 +1853,6 @@
             // 
             // gvMx1dab015
             // 
-            this.gvMx1dab015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab015.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab015.Caption = "鐐逛綅";
             this.gvMx1dab015.FieldName = "dab015";
@@ -1945,7 +1863,6 @@
             // 
             // gvMx1dab019
             // 
-            this.gvMx1dab019.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab019.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab019.Caption = "棰嗘枡鏂瑰紡";
             this.gvMx1dab019.FieldName = "dab019";
@@ -1956,7 +1873,6 @@
             // 
             // gvMx1dab020
             // 
-            this.gvMx1dab020.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab020.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab020.Caption = "瀹為鐢ㄩ噺";
             this.gvMx1dab020.FieldName = "dab020";
@@ -1967,7 +1883,6 @@
             // 
             // gvMx1dab022
             // 
-            this.gvMx1dab022.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab022.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab022.Caption = "閫�鏂欐暟閲�";
             this.gvMx1dab022.FieldName = "dab022";
@@ -1978,7 +1893,6 @@
             // 
             // gvMx1dab023
             // 
-            this.gvMx1dab023.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1dab023.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab023.Caption = "瓒呴鏁伴噺";
             this.gvMx1dab023.FieldName = "dab023";
@@ -1990,19 +1904,20 @@
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
+            this.tabMxPage2.Controls.Add(this.panMx99);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1124, 422);
-            this.tabMxPage2.Text = "鏉$爜鏄庣粏";
+            this.tabMxPage2.Size = new System.Drawing.Size(1265, 481);
+            this.tabMxPage2.Text = "鎵樻澘鐮佹槑缁�";
             // 
             // gcMx2
             // 
             this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx2.Location = new System.Drawing.Point(0, 0);
+            this.gcMx2.Location = new System.Drawing.Point(0, 82);
             this.gcMx2.MainView = this.gvMx2;
             this.gcMx2.Name = "gcMx2";
             this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit1});
-            this.gcMx2.Size = new System.Drawing.Size(1124, 422);
+            this.gcMx2.Size = new System.Drawing.Size(1265, 399);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -2011,7 +1926,6 @@
             // 
             this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gvMx2.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2.Appearance.Row.Options.UseFont = true;
             this.gvMx2.ColumnPanelRowHeight = 50;
             this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -2040,7 +1954,6 @@
             // 
             // gvMx2guid
             // 
-            this.gvMx2guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2guid.AppearanceCell.Options.UseFont = true;
             this.gvMx2guid.Caption = "guid ";
             this.gvMx2guid.FieldName = "guid";
@@ -2073,9 +1986,8 @@
             // 
             // gvMx2itemBarcode
             // 
-            this.gvMx2itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜 ";
+            this.gvMx2itemBarcode.Caption = "鎵樻澘鏉$爜";
             this.gvMx2itemBarcode.FieldName = "itemBarcode";
             this.gvMx2itemBarcode.MinWidth = 50;
             this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
@@ -2086,9 +1998,8 @@
             // 
             // gvMx2quantity
             // 
-            this.gvMx2quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
-            this.gvMx2quantity.Caption = "鏁伴噺 ";
+            this.gvMx2quantity.Caption = "鍐呭寘瑁呮暟閲� ";
             this.gvMx2quantity.FieldName = "quantity";
             this.gvMx2quantity.MinWidth = 50;
             this.gvMx2quantity.Name = "gvMx2quantity";
@@ -2099,7 +2010,6 @@
             // 
             // gvMx2unit
             // 
-            this.gvMx2unit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2unit.AppearanceCell.Options.UseFont = true;
             this.gvMx2unit.Caption = "鍗曚綅 ";
             this.gvMx2unit.FieldName = "dwName";
@@ -2122,7 +2032,6 @@
             // 
             // gvMx2itemSname
             // 
-            this.gvMx2itemSname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О ";
             this.gvMx2itemSname.FieldName = "itemName";
@@ -2145,7 +2054,6 @@
             // 
             // gvMx2createBy
             // 
-            this.gvMx2createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2createBy.AppearanceCell.Options.UseFont = true;
             this.gvMx2createBy.Caption = "鍒涘缓浜� ";
             this.gvMx2createBy.FieldName = "createBy";
@@ -2158,7 +2066,6 @@
             // 
             // gvMx2createDate
             // 
-            this.gvMx2createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2createDate.AppearanceCell.Options.UseFont = true;
             this.gvMx2createDate.Caption = "鍒涘缓鏃堕棿 ";
             this.gvMx2createDate.FieldName = "createDate";
@@ -2232,106 +2139,736 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions2.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
-            // layoutControlItem15
+            // panMx99
             // 
-            this.layoutControlItem15.Control = this.txt_dwName;
-            this.layoutControlItem15.Location = new System.Drawing.Point(813, 0);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem15.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem15.Text = "鍗曚綅";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(95, 18);
+            this.panMx99.Controls.Add(this.layoutMx99);
+            this.panMx99.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panMx99.Location = new System.Drawing.Point(0, 0);
+            this.panMx99.Name = "panMx99";
+            this.panMx99.Size = new System.Drawing.Size(1265, 82);
+            this.panMx99.TabIndex = 1;
             // 
-            // layoutControlItem4
+            // layoutMx99
             // 
-            this.layoutControlItem4.Control = this.txt_mesStartProd;
-            this.layoutControlItem4.Location = new System.Drawing.Point(542, 96);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem4.Text = "棰勮寮�宸ユ椂闂�";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(95, 18);
+            this.layoutMx99.Controls.Add(this.radOut);
+            this.layoutMx99.Controls.Add(this.ucBtnPrint1);
+            this.layoutMx99.Controls.Add(this.txt_iCount_1);
+            this.layoutMx99.Controls.Add(this.txt_psnQty_1);
+            this.layoutMx99.Controls.Add(this.txt_printRemark);
+            this.layoutMx99.Controls.Add(this.txt_kQty);
+            this.layoutMx99.Controls.Add(this.txt_yQty);
+            this.layoutMx99.Controls.Add(this.txt_zQty);
+            this.layoutMx99.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutMx99.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx99.Name = "layoutMx99";
+            this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(256, 530, 812, 500);
+            this.layoutMx99.Root = this.layoutControlGroup1;
+            this.layoutMx99.Size = new System.Drawing.Size(1265, 82);
+            this.layoutMx99.TabIndex = 0;
+            this.layoutMx99.Text = "layoutControl1";
             // 
-            // layoutControlItem22
+            // radOut
             // 
-            this.layoutControlItem22.Control = this.txt_yQty;
-            this.layoutControlItem22.Location = new System.Drawing.Point(813, 32);
-            this.layoutControlItem22.Name = "layoutControlItem22";
-            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem22.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem22.Text = "宸叉墦鍗版�婚噺:";
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(95, 18);
+            this.radOut.Location = new System.Drawing.Point(853, 10);
+            this.radOut.Margin = new System.Windows.Forms.Padding(0);
+            this.radOut.Name = "radOut";
+            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
+            this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
+            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄨ嚜鍔�"),
+            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍗婅嚜鍔�"),
+            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩")});
+            this.radOut.Size = new System.Drawing.Size(248, 31);
+            this.radOut.StyleController = this.layoutMx99;
+            this.radOut.TabIndex = 473;
             // 
-            // layoutControlItem12
+            // ucBtnPrint1
             // 
-            this.layoutControlItem12.Control = this.txt_daa016;
-            this.layoutControlItem12.Location = new System.Drawing.Point(542, 160);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem12.Text = "瀹為檯寮�宸ユ椂闂�";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(95, 18);
+            this.ucBtnPrint1.guidKey = null;
+            this.ucBtnPrint1.Location = new System.Drawing.Point(851, 41);
+            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
+            this.ucBtnPrint1.Name = "ucBtnPrint1";
+            this.ucBtnPrint1.rptParameter = null;
+            this.ucBtnPrint1.Size = new System.Drawing.Size(278, 31);
+            this.ucBtnPrint1.TabIndex = 464;
+            // 
+            // txt_iCount_1
+            // 
+            this.txt_iCount_1.Location = new System.Drawing.Point(659, 43);
+            this.txt_iCount_1.Name = "txt_iCount_1";
+            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
+            this.txt_iCount_1.Properties.ReadOnly = true;
+            this.txt_iCount_1.Size = new System.Drawing.Size(189, 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(659, 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(189, 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(379, 43);
+            this.txt_printRemark.Name = "txt_printRemark";
+            this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
+            this.txt_printRemark.Size = new System.Drawing.Size(189, 24);
+            this.txt_printRemark.StyleController = this.layoutMx99;
+            this.txt_printRemark.TabIndex = 334;
+            this.txt_printRemark.Tag = "readOnly-1";
+            // 
+            // txt_kQty
+            // 
+            this.txt_kQty.EditValue = "";
+            this.txt_kQty.Location = new System.Drawing.Point(379, 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(189, 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(99, 43);
+            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(189, 24);
+            this.txt_yQty.StyleController = this.layoutMx99;
+            this.txt_yQty.TabIndex = 470;
+            this.txt_yQty.Tag = "readonly";
+            // 
+            // txt_zQty
+            // 
+            this.txt_zQty.Location = new System.Drawing.Point(99, 12);
+            this.txt_zQty.Name = "txt_zQty";
+            this.txt_zQty.Properties.ReadOnly = true;
+            this.txt_zQty.Size = new System.Drawing.Size(189, 24);
+            this.txt_zQty.StyleController = this.layoutMx99;
+            this.txt_zQty.TabIndex = 474;
+            // 
+            // layoutControlGroup1
+            // 
+            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.layoutControlGroup1.GroupBordersVisible = false;
+            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem23,
+            this.layoutControlItem25,
+            this.layoutControlItem35,
+            this.layoutControlItem26,
+            this.layoutControlItem22,
+            this.layoutControlItem36,
+            this.layoutControlItem21,
+            this.layoutControlItem24});
+            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.AutoSize;
+            columnDefinition24.Width = 125D;
+            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition20,
+            columnDefinition21,
+            columnDefinition22,
+            columnDefinition23,
+            columnDefinition24});
+            rowDefinition16.Height = 100D;
+            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition17.Height = 100D;
+            rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition16,
+            rowDefinition17});
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1265, 82);
+            this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem23
             // 
+            this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
+            this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem23.Control = this.txt_kQty;
-            this.layoutControlItem23.Location = new System.Drawing.Point(813, 64);
+            this.layoutControlItem23.Location = new System.Drawing.Point(280, 0);
             this.layoutControlItem23.Name = "layoutControlItem23";
-            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem23.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem23.Text = "鍙墦鍗版�绘暟:";
-            this.layoutControlItem23.TextSize = new System.Drawing.Size(95, 18);
+            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem23.Size = new System.Drawing.Size(280, 31);
+            this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
+            this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
             // 
-            // layoutControlItem16
+            // layoutControlItem25
             // 
-            this.layoutControlItem16.Control = this.txt_daa017;
-            this.layoutControlItem16.Location = new System.Drawing.Point(542, 192);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(95, 18);
+            this.layoutControlItem25.AppearanceItemCaption.Options.UseTextOptions = true;
+            this.layoutControlItem25.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            this.layoutControlItem25.Control = this.txt_iCount_1;
+            this.layoutControlItem25.Location = new System.Drawing.Point(560, 31);
+            this.layoutControlItem25.Name = "layoutControlItem25";
+            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem25.Size = new System.Drawing.Size(280, 31);
+            this.layoutControlItem25.Text = "鎵撳嵃寮犳暟";
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem35
+            // 
+            this.layoutControlItem35.Control = this.radOut;
+            this.layoutControlItem35.Location = new System.Drawing.Point(840, 0);
+            this.layoutControlItem35.MaxSize = new System.Drawing.Size(251, 0);
+            this.layoutControlItem35.MinSize = new System.Drawing.Size(221, 20);
+            this.layoutControlItem35.Name = "layoutControlItem35";
+            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem35.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
+            this.layoutControlItem35.Size = new System.Drawing.Size(405, 31);
+            this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem35.Text = "鑷姩璁$畻";
+            this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem35.TextVisible = false;
+            // 
+            // layoutControlItem26
+            // 
+            this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
+            this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            this.layoutControlItem26.Control = this.ucBtnPrint1;
+            this.layoutControlItem26.Location = new System.Drawing.Point(840, 31);
+            this.layoutControlItem26.Name = "layoutControlItem26";
+            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
+            this.layoutControlItem26.Size = new System.Drawing.Size(280, 31);
+            this.layoutControlItem26.Text = "鎶ュ伐鎵撳嵃";
+            this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem26.TextVisible = false;
+            // 
+            // layoutControlItem22
+            // 
+            this.layoutControlItem22.AppearanceItemCaption.Options.UseTextOptions = true;
+            this.layoutControlItem22.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            this.layoutControlItem22.Control = this.txt_yQty;
+            this.layoutControlItem22.Location = new System.Drawing.Point(0, 31);
+            this.layoutControlItem22.Name = "layoutControlItem22";
+            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem22.Size = new System.Drawing.Size(280, 31);
+            this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem36
+            // 
+            this.layoutControlItem36.Control = this.txt_zQty;
+            this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem36.Name = "layoutControlItem36";
+            this.layoutControlItem36.Size = new System.Drawing.Size(280, 31);
+            this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
+            this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem21
             // 
+            this.layoutControlItem21.AppearanceItemCaption.Options.UseTextOptions = true;
+            this.layoutControlItem21.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem21.Control = this.txt_printRemark;
-            this.layoutControlItem21.Location = new System.Drawing.Point(813, 96);
+            this.layoutControlItem21.Location = new System.Drawing.Point(280, 31);
             this.layoutControlItem21.Name = "layoutControlItem21";
-            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem21.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem21.Text = "鎵撳嵃澶囨敞:";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(95, 18);
+            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem21.Size = new System.Drawing.Size(280, 31);
+            this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
             // 
-            // layoutControlItem8
+            // layoutControlItem24
             // 
-            this.layoutControlItem8.Control = this.txt_mesEndProd;
-            this.layoutControlItem8.Location = new System.Drawing.Point(542, 128);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem8.Text = "棰勮瀹屽伐鏃堕棿";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(95, 18);
+            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(560, 0);
+            this.layoutControlItem24.Name = "layoutControlItem24";
+            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem24.Size = new System.Drawing.Size(280, 31);
+            this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
+            this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // xtraTabPage3
+            // 
+            this.xtraTabPage3.Controls.Add(this.gcMx3);
+            this.xtraTabPage3.Controls.Add(this.panMx98);
+            this.xtraTabPage3.Name = "xtraTabPage3";
+            this.xtraTabPage3.Size = new System.Drawing.Size(1265, 481);
+            this.xtraTabPage3.Text = "杩芥函鐮佹槑缁�";
+            // 
+            // gcMx3
+            // 
+            this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx3.Location = new System.Drawing.Point(0, 54);
+            this.gcMx3.MainView = this.gvMx3;
+            this.gcMx3.Name = "gcMx3";
+            this.gcMx3.Size = new System.Drawing.Size(1265, 427);
+            this.gcMx3.TabIndex = 1;
+            this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx3});
+            // 
+            // gvMx3
+            // 
+            this.gvMx3.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx3.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx3.Appearance.Row.Options.UseFont = true;
+            this.gvMx3.ColumnPanelRowHeight = 50;
+            this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn33,
+            this.gridColumn38,
+            this.gridColumn36,
+            this.gridColumn37,
+            this.gridColumn42,
+            this.gridColumn43,
+            this.gridColumn34,
+            this.gridColumn35});
+            this.gvMx3.GridControl = this.gcMx3;
+            this.gvMx3.Name = "gvMx3";
+            this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx3.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx3.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn33
+            // 
+            this.gridColumn33.AppearanceCell.Options.UseFont = true;
+            this.gridColumn33.Caption = "guid ";
+            this.gridColumn33.FieldName = "guid";
+            this.gridColumn33.MinWidth = 50;
+            this.gridColumn33.Name = "gridColumn33";
+            this.gridColumn33.Tag = "query_a.guid";
+            this.gridColumn33.Width = 94;
+            // 
+            // gridColumn38
+            // 
+            this.gridColumn38.AppearanceCell.Options.UseFont = true;
+            this.gridColumn38.Caption = "宸ュ崟鍙�";
+            this.gridColumn38.FieldName = "daa001";
+            this.gridColumn38.MinWidth = 50;
+            this.gridColumn38.Name = "gridColumn38";
+            this.gridColumn38.Tag = "query_a.UNIT";
+            this.gridColumn38.Visible = true;
+            this.gridColumn38.VisibleIndex = 0;
+            this.gridColumn38.Width = 94;
+            // 
+            // gridColumn36
+            // 
+            this.gridColumn36.AppearanceCell.Options.UseFont = true;
+            this.gridColumn36.Caption = "杩芥函鐮�";
+            this.gridColumn36.FieldName = "barCode";
+            this.gridColumn36.MinWidth = 50;
+            this.gridColumn36.Name = "gridColumn36";
+            this.gridColumn36.Tag = "query_a.ITEM_BARCODE";
+            this.gridColumn36.Visible = true;
+            this.gridColumn36.VisibleIndex = 1;
+            this.gridColumn36.Width = 94;
+            // 
+            // gridColumn37
+            // 
+            this.gridColumn37.AppearanceCell.Options.UseFont = true;
+            this.gridColumn37.Caption = "鏁伴噺 ";
+            this.gridColumn37.FieldName = "quantity";
+            this.gridColumn37.MinWidth = 50;
+            this.gridColumn37.Name = "gridColumn37";
+            this.gridColumn37.Tag = "query_a.QUANTITY";
+            this.gridColumn37.Visible = true;
+            this.gridColumn37.VisibleIndex = 2;
+            this.gridColumn37.Width = 94;
+            // 
+            // gridColumn42
+            // 
+            this.gridColumn42.AppearanceCell.Options.UseFont = true;
+            this.gridColumn42.Caption = "鍒涘缓浜� ";
+            this.gridColumn42.FieldName = "createBy";
+            this.gridColumn42.MinWidth = 50;
+            this.gridColumn42.Name = "gridColumn42";
+            this.gridColumn42.Tag = "query_a.CREATE_BY";
+            this.gridColumn42.Visible = true;
+            this.gridColumn42.VisibleIndex = 3;
+            this.gridColumn42.Width = 94;
+            // 
+            // gridColumn43
+            // 
+            this.gridColumn43.AppearanceCell.Options.UseFont = true;
+            this.gridColumn43.Caption = "鍒涘缓鏃堕棿 ";
+            this.gridColumn43.FieldName = "createDate";
+            this.gridColumn43.MinWidth = 50;
+            this.gridColumn43.Name = "gridColumn43";
+            this.gridColumn43.Tag = "query_a.CREATE_DATE";
+            this.gridColumn43.Visible = true;
+            this.gridColumn43.VisibleIndex = 4;
+            this.gridColumn43.Width = 94;
+            // 
+            // gridColumn34
+            // 
+            this.gridColumn34.Caption = "绾垮埆ID";
+            this.gridColumn34.FieldName = "lineId";
+            this.gridColumn34.MinWidth = 25;
+            this.gridColumn34.Name = "gridColumn34";
+            this.gridColumn34.Visible = true;
+            this.gridColumn34.VisibleIndex = 5;
+            this.gridColumn34.Width = 94;
+            // 
+            // gridColumn35
+            // 
+            this.gridColumn35.Caption = "绾垮埆鍚嶇О";
+            this.gridColumn35.FieldName = "xtName";
+            this.gridColumn35.MinWidth = 25;
+            this.gridColumn35.Name = "gridColumn35";
+            this.gridColumn35.Visible = true;
+            this.gridColumn35.VisibleIndex = 6;
+            this.gridColumn35.Width = 94;
+            // 
+            // panMx98
+            // 
+            this.panMx98.Controls.Add(this.layoutMx98);
+            this.panMx98.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panMx98.Location = new System.Drawing.Point(0, 0);
+            this.panMx98.Name = "panMx98";
+            this.panMx98.Size = new System.Drawing.Size(1265, 54);
+            this.panMx98.TabIndex = 0;
+            // 
+            // layoutMx98
+            // 
+            this.layoutMx98.Controls.Add(this.ucBtnPrint98);
+            this.layoutMx98.Controls.Add(this.txt_yQty98);
+            this.layoutMx98.Controls.Add(this.txt_kQty98);
+            this.layoutMx98.Controls.Add(this.txt_printRemark98);
+            this.layoutMx98.Controls.Add(this.txt_iCount_98);
+            this.layoutMx98.Controls.Add(this.txt_zQty98);
+            this.layoutMx98.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutMx98.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx98.Name = "layoutMx98";
+            this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(96, 558, 812, 500);
+            this.layoutMx98.Root = this.layoutControlGroup2;
+            this.layoutMx98.Size = new System.Drawing.Size(1265, 54);
+            this.layoutMx98.TabIndex = 0;
+            this.layoutMx98.Text = "layoutControl1";
+            // 
+            // ucBtnPrint98
+            // 
+            this.ucBtnPrint98.guidKey = null;
+            this.ucBtnPrint98.Location = new System.Drawing.Point(1046, 10);
+            this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
+            this.ucBtnPrint98.Name = "ucBtnPrint98";
+            this.ucBtnPrint98.rptParameter = null;
+            this.ucBtnPrint98.Size = new System.Drawing.Size(208, 34);
+            this.ucBtnPrint98.TabIndex = 8;
+            // 
+            // txt_yQty98
+            // 
+            this.txt_yQty98.Location = new System.Drawing.Point(321, 12);
+            this.txt_yQty98.Name = "txt_yQty98";
+            this.txt_yQty98.Properties.ReadOnly = true;
+            this.txt_yQty98.Size = new System.Drawing.Size(101, 24);
+            this.txt_yQty98.StyleController = this.layoutMx98;
+            this.txt_yQty98.TabIndex = 4;
+            // 
+            // txt_kQty98
+            // 
+            this.txt_kQty98.Location = new System.Drawing.Point(528, 12);
+            this.txt_kQty98.Name = "txt_kQty98";
+            this.txt_kQty98.Properties.ReadOnly = true;
+            this.txt_kQty98.Size = new System.Drawing.Size(101, 24);
+            this.txt_kQty98.StyleController = this.layoutMx98;
+            this.txt_kQty98.TabIndex = 5;
+            // 
+            // txt_printRemark98
+            // 
+            this.txt_printRemark98.Location = new System.Drawing.Point(735, 12);
+            this.txt_printRemark98.Name = "txt_printRemark98";
+            this.txt_printRemark98.Size = new System.Drawing.Size(101, 24);
+            this.txt_printRemark98.StyleController = this.layoutMx98;
+            this.txt_printRemark98.TabIndex = 6;
+            // 
+            // txt_iCount_98
+            // 
+            this.txt_iCount_98.Location = new System.Drawing.Point(942, 12);
+            this.txt_iCount_98.Name = "txt_iCount_98";
+            this.txt_iCount_98.Size = new System.Drawing.Size(101, 24);
+            this.txt_iCount_98.StyleController = this.layoutMx98;
+            this.txt_iCount_98.TabIndex = 7;
+            // 
+            // txt_zQty98
+            // 
+            this.txt_zQty98.Location = new System.Drawing.Point(114, 12);
+            this.txt_zQty98.Name = "txt_zQty98";
+            this.txt_zQty98.Properties.ReadOnly = true;
+            this.txt_zQty98.Size = new System.Drawing.Size(101, 24);
+            this.txt_zQty98.StyleController = this.layoutMx98;
+            this.txt_zQty98.TabIndex = 9;
+            // 
+            // layoutControlGroup2
+            // 
+            this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.layoutControlGroup2.GroupBordersVisible = false;
+            this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem34,
+            this.layoutControlItem33,
+            this.layoutControlItem32,
+            this.layoutControlItem31,
+            this.layoutControlItem30,
+            this.layoutControlItem37});
+            this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.layoutControlGroup2.Name = "Root";
+            columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition25.Width = 100D;
+            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;
+            this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition25,
+            columnDefinition26,
+            columnDefinition27,
+            columnDefinition28,
+            columnDefinition29,
+            columnDefinition30});
+            rowDefinition18.Height = 100D;
+            rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition18});
+            this.layoutControlGroup2.Size = new System.Drawing.Size(1265, 54);
+            this.layoutControlGroup2.TextVisible = false;
+            // 
+            // layoutControlItem34
+            // 
+            this.layoutControlItem34.Control = this.ucBtnPrint98;
+            this.layoutControlItem34.Location = new System.Drawing.Point(1035, 0);
+            this.layoutControlItem34.Name = "layoutControlItem34";
+            this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 5;
+            this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
+            this.layoutControlItem34.Size = new System.Drawing.Size(210, 34);
+            this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳";
+            this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem34.TextVisible = false;
+            // 
+            // layoutControlItem33
+            // 
+            this.layoutControlItem33.Control = this.txt_iCount_98;
+            this.layoutControlItem33.Location = new System.Drawing.Point(828, 0);
+            this.layoutControlItem33.Name = "layoutControlItem33";
+            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 4;
+            this.layoutControlItem33.Size = new System.Drawing.Size(207, 34);
+            this.layoutControlItem33.Text = "鏈鎵撳嵃寮犳暟";
+            this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem32
+            // 
+            this.layoutControlItem32.Control = this.txt_printRemark98;
+            this.layoutControlItem32.Location = new System.Drawing.Point(621, 0);
+            this.layoutControlItem32.Name = "layoutControlItem32";
+            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem32.Size = new System.Drawing.Size(207, 34);
+            this.layoutControlItem32.Text = "鎵撳嵃澶囨敞";
+            this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem31
+            // 
+            this.layoutControlItem31.Control = this.txt_kQty98;
+            this.layoutControlItem31.Location = new System.Drawing.Point(414, 0);
+            this.layoutControlItem31.Name = "layoutControlItem31";
+            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem31.Size = new System.Drawing.Size(207, 34);
+            this.layoutControlItem31.Text = "鍙墦鍗版暟閲�";
+            this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem30
+            // 
+            this.layoutControlItem30.Control = this.txt_yQty98;
+            this.layoutControlItem30.Location = new System.Drawing.Point(207, 0);
+            this.layoutControlItem30.Name = "layoutControlItem30";
+            this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem30.Size = new System.Drawing.Size(207, 34);
+            this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
+            this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem37
+            // 
+            this.layoutControlItem37.Control = this.txt_zQty98;
+            this.layoutControlItem37.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem37.Name = "layoutControlItem37";
+            this.layoutControlItem37.Size = new System.Drawing.Size(207, 34);
+            this.layoutControlItem37.Text = "宸ュ崟鎬婚噺";
+            this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // xtraTabPage4
+            // 
+            this.xtraTabPage4.Controls.Add(this.gcMx4);
+            this.xtraTabPage4.Controls.Add(this.panMx100);
+            this.xtraTabPage4.Name = "xtraTabPage4";
+            this.xtraTabPage4.Size = new System.Drawing.Size(1265, 481);
+            this.xtraTabPage4.Text = "鍚庣洊鐮佹槑缁�";
+            // 
+            // gcMx4
+            // 
+            this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx4.Location = new System.Drawing.Point(0, 54);
+            this.gcMx4.MainView = this.gvMx4;
+            this.gcMx4.Name = "gcMx4";
+            this.gcMx4.Size = new System.Drawing.Size(1265, 427);
+            this.gcMx4.TabIndex = 2;
+            this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx4});
+            // 
+            // gvMx4
+            // 
+            this.gvMx4.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx4.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx4.Appearance.Row.Options.UseFont = true;
+            this.gvMx4.ColumnPanelRowHeight = 50;
+            this.gvMx4.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn39,
+            this.gridColumn40,
+            this.gridColumn41,
+            this.gridColumn44,
+            this.gridColumn45,
+            this.gridColumn46,
+            this.gridColumn47,
+            this.gridColumn48});
+            this.gvMx4.GridControl = this.gcMx4;
+            this.gvMx4.Name = "gvMx4";
+            this.gvMx4.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx4.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx4.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn39
+            // 
+            this.gridColumn39.AppearanceCell.Options.UseFont = true;
+            this.gridColumn39.Caption = "guid ";
+            this.gridColumn39.FieldName = "guid";
+            this.gridColumn39.MinWidth = 50;
+            this.gridColumn39.Name = "gridColumn39";
+            this.gridColumn39.Tag = "query_a.guid";
+            this.gridColumn39.Width = 94;
+            // 
+            // gridColumn40
+            // 
+            this.gridColumn40.AppearanceCell.Options.UseFont = true;
+            this.gridColumn40.Caption = "宸ュ崟鍙�";
+            this.gridColumn40.FieldName = "daa001";
+            this.gridColumn40.MinWidth = 50;
+            this.gridColumn40.Name = "gridColumn40";
+            this.gridColumn40.Tag = "query_a.UNIT";
+            this.gridColumn40.Visible = true;
+            this.gridColumn40.VisibleIndex = 0;
+            this.gridColumn40.Width = 94;
+            // 
+            // gridColumn41
+            // 
+            this.gridColumn41.AppearanceCell.Options.UseFont = true;
+            this.gridColumn41.Caption = "鍚庣洊鐮�";
+            this.gridColumn41.FieldName = "itemBarcode";
+            this.gridColumn41.MinWidth = 50;
+            this.gridColumn41.Name = "gridColumn41";
+            this.gridColumn41.Tag = "query_a.ITEM_BARCODE";
+            this.gridColumn41.Visible = true;
+            this.gridColumn41.VisibleIndex = 1;
+            this.gridColumn41.Width = 94;
+            // 
+            // gridColumn44
+            // 
+            this.gridColumn44.AppearanceCell.Options.UseFont = true;
+            this.gridColumn44.Caption = "鏁伴噺 ";
+            this.gridColumn44.FieldName = "quantity";
+            this.gridColumn44.MinWidth = 50;
+            this.gridColumn44.Name = "gridColumn44";
+            this.gridColumn44.Tag = "query_a.QUANTITY";
+            this.gridColumn44.Visible = true;
+            this.gridColumn44.VisibleIndex = 2;
+            this.gridColumn44.Width = 94;
+            // 
+            // gridColumn45
+            // 
+            this.gridColumn45.AppearanceCell.Options.UseFont = true;
+            this.gridColumn45.Caption = "鍒涘缓浜� ";
+            this.gridColumn45.FieldName = "createBy";
+            this.gridColumn45.MinWidth = 50;
+            this.gridColumn45.Name = "gridColumn45";
+            this.gridColumn45.Tag = "query_a.CREATE_BY";
+            this.gridColumn45.Visible = true;
+            this.gridColumn45.VisibleIndex = 3;
+            this.gridColumn45.Width = 94;
+            // 
+            // gridColumn46
+            // 
+            this.gridColumn46.AppearanceCell.Options.UseFont = true;
+            this.gridColumn46.Caption = "鍒涘缓鏃堕棿 ";
+            this.gridColumn46.FieldName = "createDate";
+            this.gridColumn46.MinWidth = 50;
+            this.gridColumn46.Name = "gridColumn46";
+            this.gridColumn46.Tag = "query_a.CREATE_DATE";
+            this.gridColumn46.Visible = true;
+            this.gridColumn46.VisibleIndex = 4;
+            this.gridColumn46.Width = 94;
+            // 
+            // gridColumn47
+            // 
+            this.gridColumn47.Caption = "宸茬粦鎵樻澘鐮�";
+            this.gridColumn47.FieldName = "aboutTbBarcode";
+            this.gridColumn47.MinWidth = 25;
+            this.gridColumn47.Name = "gridColumn47";
+            this.gridColumn47.Visible = true;
+            this.gridColumn47.VisibleIndex = 5;
+            this.gridColumn47.Width = 94;
+            // 
+            // gridColumn48
+            // 
+            this.gridColumn48.Caption = "宸茬粦杩芥函鐮�";
+            this.gridColumn48.FieldName = "aboutTracBarcode";
+            this.gridColumn48.MinWidth = 25;
+            this.gridColumn48.Name = "gridColumn48";
+            this.gridColumn48.Visible = true;
+            this.gridColumn48.VisibleIndex = 6;
+            this.gridColumn48.Width = 94;
+            // 
+            // panMx100
+            // 
+            this.panMx100.Controls.Add(this.ucBtnPrint100);
+            this.panMx100.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panMx100.Location = new System.Drawing.Point(0, 0);
+            this.panMx100.Name = "panMx100";
+            this.panMx100.Size = new System.Drawing.Size(1265, 54);
+            this.panMx100.TabIndex = 0;
+            // 
+            // ucBtnPrint100
+            // 
+            this.ucBtnPrint100.guidKey = null;
+            this.ucBtnPrint100.Location = new System.Drawing.Point(20, 10);
+            this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0);
+            this.ucBtnPrint100.Name = "ucBtnPrint100";
+            this.ucBtnPrint100.rptParameter = null;
+            this.ucBtnPrint100.Size = new System.Drawing.Size(232, 32);
+            this.ucBtnPrint100.TabIndex = 0;
             // 
             // Frm_Womdaa
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1128, 820);
+            this.ClientSize = new System.Drawing.Size(1269, 820);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_Womdaa";
@@ -2355,21 +2892,16 @@
             this.splitMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa009.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa013.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).EndInit();
             ((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();
@@ -2381,6 +2913,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa004.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -2393,16 +2926,18 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -2412,14 +2947,47 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            this.panMx99.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx99)).EndInit();
+            this.layoutMx99.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
+            this.xtraTabPage3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
+            this.panMx98.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx98)).EndInit();
+            this.layoutMx98.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark98.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty98.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
+            this.xtraTabPage4.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
+            this.panMx100.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -2433,10 +3001,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa027;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa018;
@@ -2454,7 +3019,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_cust;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa015;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa009;
         private DevExpress.XtraGrid.Columns.GridColumn gv_prepareTime;
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa028;
@@ -2472,19 +3036,12 @@
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
         private DevExpress.XtraEditors.SplitContainerControl splitMx1;
         private DevExpress.XtraEditors.TextEdit txt_daa013;
-        private DevExpress.XtraEditors.TextEdit txt_kQty;
-        private DevExpress.XtraEditors.TextEdit txt_yQty;
         private DevExpress.XtraEditors.TextEdit textEdit1;
         private DevExpress.XtraEditors.TextEdit txt_saleOrderNo;
-        private UserControl.UcBtnPrint ucBtnPrint1;
-        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 DevExpress.XtraEditors.TextEdit txt_printRemark;
-        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
-        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraEditors.TextEdit txt_daa014;
         private DevExpress.XtraEditors.TextEdit txt_daa017;
@@ -2512,13 +3069,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
         private DevExpress.XtraTab.XtraTabControl tabMx;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -2571,19 +3122,79 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
+        private System.Windows.Forms.Panel panMx99;
+        private DevExpress.XtraLayout.LayoutControl layoutMx99;
+        private DevExpress.XtraEditors.TextEdit txt_printRemark;
+        private DevExpress.XtraEditors.TextEdit txt_kQty;
+        private DevExpress.XtraEditors.TextEdit txt_yQty;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+        private UserControl.UcBtnPrint ucBtnPrint1;
+        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
+        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraGrid.GridControl gcMx3;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn42;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn43;
+        private System.Windows.Forms.Panel panMx98;
+        private DevExpress.XtraLayout.LayoutControl layoutMx98;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
+        private UserControl.UcBtnPrint ucBtnPrint98;
+        private DevExpress.XtraEditors.TextEdit txt_yQty98;
+        private DevExpress.XtraEditors.TextEdit txt_kQty98;
+        private DevExpress.XtraEditors.TextEdit txt_printRemark98;
+        private DevExpress.XtraEditors.TextEdit txt_iCount_98;
+        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;
+        private DevExpress.XtraEditors.RadioGroup radOut;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage4;
+        private System.Windows.Forms.Panel panMx100;
+        private DevExpress.XtraGrid.GridControl gcMx4;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn39;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn40;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn41;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn44;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn45;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn46;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn47;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn48;
+        private UserControl.UcBtnPrint ucBtnPrint100;
+        private DevExpress.XtraEditors.TextEdit txt_zQty;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
+        private DevExpress.XtraEditors.TextEdit txt_zQty98;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3