From 89776d6f53dff45b1ac0ee20438f5aa8dab2d0e5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 16 六月 2025 17:13:31 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 2734 ++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 1,686 insertions(+), 1,048 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 221b5a2..2af68bd 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -29,39 +29,47 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -69,12 +77,8 @@
             this.gcMain1 = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             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();
@@ -93,7 +97,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();
@@ -106,23 +109,19 @@
             this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
             this.lbGuid = new System.Windows.Forms.Label();
-            this.txt_sjXt = new Gs.DevApp.UserControl.UcLookWorkline();
             this.txt_daa009 = new DevExpress.XtraEditors.TextEdit();
             this.txt_daa013 = new DevExpress.XtraEditors.TextEdit();
             this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
-            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
             this.txt_daa008 = 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();
@@ -134,30 +133,35 @@
             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.txt_lineNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_dptNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_isQiTao = new DevExpress.XtraEditors.CheckEdit();
             this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem41 = 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.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem46 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -191,10 +195,33 @@
             this.gvMx1dab022 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1dab023 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.splitMx99 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.layoutMx99 = new DevExpress.XtraLayout.LayoutControl();
+            this.layShuLiang = new DevExpress.XtraDataLayout.DataLayoutControl();
+            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.radOut = new DevExpress.XtraEditors.RadioGroup();
+            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
+            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.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
             this.gcMx2 = new DevExpress.XtraGrid.GridControl();
             this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -204,53 +231,68 @@
             this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2createBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2createDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.panMx99 = new System.Windows.Forms.Panel();
-            this.layoutMx99 = new DevExpress.XtraLayout.LayoutControl();
-            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.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             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.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.panMx98 = new System.Windows.Forms.Panel();
+            this.splitMx98 = new DevExpress.XtraEditors.SplitContainerControl();
             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.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
             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.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.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
+            this.splitMx100 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.layMx100 = new DevExpress.XtraDataLayout.DataLayoutControl();
+            this.ucBtnPrint100 = new Gs.DevApp.UserControl.UcBtnPrint();
+            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+            this.txt_zQty100 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_yQty100 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_kQty100 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_iCount_100 = new DevExpress.XtraEditors.TextEdit();
+            this.btnDeleteBar = new DevExpress.XtraEditors.SimpleButton();
+            this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem42 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem43 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem44 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem45 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem47 = new DevExpress.XtraLayout.LayoutControlItem();
+            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.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
+            this.ucBtnPrint101 = 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();
@@ -273,13 +315,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa009.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa013.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa008.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();
@@ -291,71 +331,121 @@
             ((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.txt_lineNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_dptNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).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.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             this.tabMxPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            this.panMx99.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx99)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx99.Panel1)).BeginInit();
+            this.splitMx99.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx99.Panel2)).BeginInit();
+            this.splitMx99.Panel2.SuspendLayout();
+            this.splitMx99.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx99)).BeginInit();
             this.layoutMx99.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layShuLiang)).BeginInit();
+            this.layShuLiang.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.radOut.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.layoutControlItem22)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit();
             this.xtraTabPage3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
-            this.panMx98.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).BeginInit();
+            this.splitMx98.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).BeginInit();
+            this.splitMx98.Panel2.SuspendLayout();
+            this.splitMx98.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.layoutControlItem30)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).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();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
+            this.xtraTabPage4.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx100)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel1)).BeginInit();
+            this.splitMx100.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel2)).BeginInit();
+            this.splitMx100.Panel2.SuspendLayout();
+            this.splitMx100.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layMx100)).BeginInit();
+            this.layMx100.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty100.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty100.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty100.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_100.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem47)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
+            this.xtraTabPage5.SuspendLayout();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -369,7 +459,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(1652, 80);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -380,7 +470,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(1652, 740);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -390,12 +480,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(1650, 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";
@@ -409,8 +500,9 @@
             // 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(1650, 708);
+            this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
@@ -419,7 +511,7 @@
             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(1650, 657);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -432,12 +524,8 @@
             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,
@@ -456,7 +544,6 @@
             this.gv_cust,
             this.gridColumn1,
             this.gv_daa015,
-            this.gridColumn2,
             this.gv_daa009,
             this.gv_prepareTime,
             this.gv_daa028,
@@ -468,8 +555,7 @@
             this.gridColumn22,
             this.gridColumn23,
             this.gridColumn24,
-            this.gridColumn25,
-            this.gridColumn26});
+            this.gridColumn25});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -480,7 +566,7 @@
             // gridColumn5
             // 
             this.gridColumn5.Caption = "缁撴鏍囪瘑";
-            this.gridColumn5.FieldName = "jabs";
+            this.gridColumn5.FieldName = "jabzChk";
             this.gridColumn5.MaxWidth = 50;
             this.gridColumn5.MinWidth = 50;
             this.gridColumn5.Name = "gridColumn5";
@@ -489,81 +575,29 @@
             this.gridColumn5.VisibleIndex = 0;
             this.gridColumn5.Width = 50;
             // 
-            // gv_daa027
-            // 
-            this.gv_daa027.AppearanceCell.Options.UseFont = true;
-            this.gv_daa027.AppearanceHeader.Options.UseTextOptions = true;
-            this.gv_daa027.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gv_daa027.Caption = "澶囨枡瀹屾垚";
-            this.gv_daa027.FieldName = "daa027Chk";
-            this.gv_daa027.MaxWidth = 50;
-            this.gv_daa027.MinWidth = 50;
-            this.gv_daa027.Name = "gv_daa027";
-            this.gv_daa027.OptionsColumn.AllowEdit = false;
-            this.gv_daa027.Tag = "query_a.daa027";
-            this.gv_daa027.Visible = true;
-            this.gv_daa027.VisibleIndex = 1;
-            this.gv_daa027.Width = 50;
-            // 
             // gridColumn7
             // 
-            this.gridColumn7.Caption = "鏄惁榻愬";
+            this.gridColumn7.Caption = "澶囨枡榻愬";
             this.gridColumn7.FieldName = "isQt";
             this.gridColumn7.MaxWidth = 50;
             this.gridColumn7.MinWidth = 50;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Tag = "query_a.jabs";
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 2;
+            this.gridColumn7.VisibleIndex = 1;
             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 = "鏄惁棣栨";
+            this.gridColumn10.Caption = "棣栨鍚堟牸";
             this.gridColumn10.FieldName = "isSj";
             this.gridColumn10.MaxWidth = 50;
             this.gridColumn10.MinWidth = 50;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Tag = "query_a.jabs";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 5;
+            this.gridColumn10.VisibleIndex = 2;
             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
             // 
@@ -574,7 +608,7 @@
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Tag = "query_a.jabs";
             this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 7;
+            this.gridColumn12.VisibleIndex = 3;
             this.gridColumn12.Width = 50;
             // 
             // gridColumn6
@@ -586,30 +620,30 @@
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Tag = "query_a.jabs";
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 8;
+            this.gridColumn6.VisibleIndex = 4;
             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 = 6;
             this.gridColumn27.Width = 94;
             // 
             // gv_daa018
             // 
             this.gv_daa018.AppearanceCell.Options.UseFont = true;
             this.gv_daa018.Caption = "宸ュ崟鐘舵��";
-            this.gv_daa018.FieldName = "daa018";
+            this.gv_daa018.FieldName = "daa018Txt";
             this.gv_daa018.MinWidth = 90;
             this.gv_daa018.Name = "gv_daa018";
             this.gv_daa018.OptionsColumn.AllowEdit = false;
             this.gv_daa018.Tag = "query_a.daa018";
             this.gv_daa018.Visible = true;
-            this.gv_daa018.VisibleIndex = 10;
+            this.gv_daa018.VisibleIndex = 5;
             this.gv_daa018.Width = 90;
             // 
             // gridColoun100
@@ -620,7 +654,7 @@
             this.gridColoun100.Name = "gridColoun100";
             this.gridColoun100.Tag = "org.fnamber";
             this.gridColoun100.Visible = true;
-            this.gridColoun100.VisibleIndex = 11;
+            this.gridColoun100.VisibleIndex = 28;
             this.gridColoun100.Width = 250;
             // 
             // gv_daa001
@@ -633,7 +667,7 @@
             this.gv_daa001.OptionsColumn.AllowEdit = false;
             this.gv_daa001.Tag = "query_a.daa001";
             this.gv_daa001.Visible = true;
-            this.gv_daa001.VisibleIndex = 12;
+            this.gv_daa001.VisibleIndex = 7;
             this.gv_daa001.Width = 120;
             // 
             // gv_daa021
@@ -646,7 +680,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 = 8;
             this.gv_daa021.Width = 100;
             // 
             // gridColumn3
@@ -656,7 +690,7 @@
             this.gridColumn3.MinWidth = 50;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 14;
+            this.gridColumn3.VisibleIndex = 9;
             this.gridColumn3.Width = 94;
             // 
             // gv_daa003
@@ -669,7 +703,7 @@
             this.gv_daa003.OptionsColumn.AllowEdit = false;
             this.gv_daa003.Tag = "query_a.daa003";
             this.gv_daa003.Visible = true;
-            this.gv_daa003.VisibleIndex = 15;
+            this.gv_daa003.VisibleIndex = 10;
             this.gv_daa003.Width = 150;
             // 
             // gv_daa004
@@ -682,7 +716,7 @@
             this.gv_daa004.OptionsColumn.AllowEdit = false;
             this.gv_daa004.Tag = "query_a.daa004";
             this.gv_daa004.Visible = true;
-            this.gv_daa004.VisibleIndex = 16;
+            this.gv_daa004.VisibleIndex = 11;
             this.gv_daa004.Width = 150;
             // 
             // gv_daa008
@@ -696,7 +730,7 @@
             this.gv_daa008.OptionsColumn.AllowEdit = false;
             this.gv_daa008.Tag = "query_a.daa008";
             this.gv_daa008.Visible = true;
-            this.gv_daa008.VisibleIndex = 17;
+            this.gv_daa008.VisibleIndex = 12;
             this.gv_daa008.Width = 50;
             // 
             // gv_daa011
@@ -710,18 +744,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 = 13;
             this.gv_daa011.Width = 50;
             // 
             // gridColumn4
             // 
+            this.gridColumn4.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn4.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn4.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn4.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn4.Caption = "寰呯敓浜ч噺";
             this.gridColumn4.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 = 14;
             this.gridColumn4.Width = 50;
             // 
             // gv_daa010
@@ -735,7 +773,7 @@
             this.gv_daa010.OptionsColumn.AllowEdit = false;
             this.gv_daa010.Tag = "query_a.daa010";
             this.gv_daa010.Visible = true;
-            this.gv_daa010.VisibleIndex = 21;
+            this.gv_daa010.VisibleIndex = 16;
             this.gv_daa010.Width = 50;
             // 
             // gv_daa005
@@ -749,7 +787,7 @@
             this.gv_daa005.OptionsColumn.AllowEdit = false;
             this.gv_daa005.Tag = "query_a.daa005";
             this.gv_daa005.Visible = true;
-            this.gv_daa005.VisibleIndex = 22;
+            this.gv_daa005.VisibleIndex = 17;
             this.gv_daa005.Width = 50;
             // 
             // gv_cust
@@ -761,8 +799,6 @@
             this.gv_cust.Name = "gv_cust";
             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.Width = 100;
             // 
             // gridColumn1
@@ -772,7 +808,7 @@
             this.gridColumn1.MinWidth = 50;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 24;
+            this.gridColumn1.VisibleIndex = 18;
             this.gridColumn1.Width = 94;
             // 
             // gv_daa015
@@ -785,18 +821,8 @@
             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 = 19;
             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
             // 
@@ -808,7 +834,7 @@
             this.gv_daa009.OptionsColumn.AllowEdit = false;
             this.gv_daa009.Tag = "query_a.daa009";
             this.gv_daa009.Visible = true;
-            this.gv_daa009.VisibleIndex = 20;
+            this.gv_daa009.VisibleIndex = 15;
             this.gv_daa009.Width = 94;
             // 
             // gv_prepareTime
@@ -820,8 +846,6 @@
             this.gv_prepareTime.Name = "gv_prepareTime";
             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.Width = 180;
             // 
             // gv_daa028
@@ -833,8 +857,6 @@
             this.gv_daa028.Name = "gv_daa028";
             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.Width = 180;
             // 
             // gv_daa016
@@ -847,7 +869,7 @@
             this.gv_daa016.OptionsColumn.AllowEdit = false;
             this.gv_daa016.Tag = "query_a.daa016";
             this.gv_daa016.Visible = true;
-            this.gv_daa016.VisibleIndex = 29;
+            this.gv_daa016.VisibleIndex = 20;
             this.gv_daa016.Width = 180;
             // 
             // gv_daa017
@@ -860,7 +882,7 @@
             this.gv_daa017.OptionsColumn.AllowEdit = false;
             this.gv_daa017.Tag = "query_a.daa017";
             this.gv_daa017.Visible = true;
-            this.gv_daa017.VisibleIndex = 30;
+            this.gv_daa017.VisibleIndex = 21;
             this.gv_daa017.Width = 180;
             // 
             // gv_mesStartProd
@@ -873,7 +895,7 @@
             this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
             this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
             this.gv_mesStartProd.Visible = true;
-            this.gv_mesStartProd.VisibleIndex = 31;
+            this.gv_mesStartProd.VisibleIndex = 22;
             this.gv_mesStartProd.Width = 180;
             // 
             // gv_mesEndProd
@@ -886,7 +908,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 = 23;
             this.gv_mesEndProd.Width = 180;
             // 
             // gridColumn21
@@ -896,7 +918,7 @@
             this.gridColumn21.MinWidth = 25;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 33;
+            this.gridColumn21.VisibleIndex = 24;
             this.gridColumn21.Width = 94;
             // 
             // gridColumn22
@@ -906,7 +928,7 @@
             this.gridColumn22.MinWidth = 25;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 34;
+            this.gridColumn22.VisibleIndex = 25;
             this.gridColumn22.Width = 94;
             // 
             // gridColumn23
@@ -924,7 +946,7 @@
             this.gridColumn24.MinWidth = 25;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
-            this.gridColumn24.VisibleIndex = 35;
+            this.gridColumn24.VisibleIndex = 26;
             this.gridColumn24.Width = 94;
             // 
             // gridColumn25
@@ -934,18 +956,8 @@
             this.gridColumn25.MinWidth = 25;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
-            this.gridColumn25.VisibleIndex = 36;
+            this.gridColumn25.VisibleIndex = 27;
             this.gridColumn25.Width = 94;
-            // 
-            // gridColumn26
-            // 
-            this.gridColumn26.Caption = "棣栦欢妫�楠岀粨鏋�";
-            this.gridColumn26.FieldName = "daa026";
-            this.gridColumn26.MinWidth = 25;
-            this.gridColumn26.Name = "gridColumn26";
-            this.gridColumn26.Visible = true;
-            this.gridColumn26.VisibleIndex = 37;
-            this.gridColumn26.Width = 94;
             // 
             // pageBar1
             // 
@@ -955,7 +967,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(1650, 39);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
@@ -963,7 +975,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(1650, 708);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -982,24 +994,22 @@
             // 
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
-            this.splitMx1.Size = new System.Drawing.Size(1126, 708);
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx1.Size = new System.Drawing.Size(1650, 708);
             this.splitMx1.SplitterPosition = 183;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
             this.layoutMx1.Controls.Add(this.lbGuid);
-            this.layoutMx1.Controls.Add(this.txt_sjXt);
             this.layoutMx1.Controls.Add(this.txt_daa009);
             this.layoutMx1.Controls.Add(this.txt_daa013);
             this.layoutMx1.Controls.Add(this.txt_daa001);
-            this.layoutMx1.Controls.Add(this.textEdit1);
             this.layoutMx1.Controls.Add(this.txt_daa008);
             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);
@@ -1011,14 +1021,20 @@
             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.Controls.Add(this.txt_lineNo);
+            this.layoutMx1.Controls.Add(this.txt_dptNo);
+            this.layoutMx1.Controls.Add(this.txt_isQiTao);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem29});
+            this.layoutControlItem29,
+            this.layoutControlItem27,
+            this.layoutControlItem18});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
             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, 183);
+            this.layoutMx1.Size = new System.Drawing.Size(1650, 183);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -1031,30 +1047,22 @@
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
             // 
-            // txt_sjXt
-            // 
-            this.txt_sjXt.IsReadly = false;
-            this.txt_sjXt.Location = new System.Drawing.Point(385, 152);
-            this.txt_sjXt.Name = "txt_sjXt";
-            this.txt_sjXt.Size = new System.Drawing.Size(165, 24);
-            this.txt_sjXt.TabIndex = 334;
-            // 
             // txt_daa009
             // 
-            this.txt_daa009.Location = new System.Drawing.Point(656, 124);
+            this.txt_daa009.Location = new System.Drawing.Point(114, 152);
             this.txt_daa009.Name = "txt_daa009";
             this.txt_daa009.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa009.Size = new System.Drawing.Size(165, 24);
+            this.txt_daa009.Size = new System.Drawing.Size(698, 24);
             this.txt_daa009.StyleController = this.layoutMx1;
             this.txt_daa009.TabIndex = 240;
             this.txt_daa009.Tag = "";
             // 
             // txt_daa013
             // 
-            this.txt_daa013.Location = new System.Drawing.Point(656, 96);
+            this.txt_daa013.Location = new System.Drawing.Point(726, 119);
             this.txt_daa013.Name = "txt_daa013";
             this.txt_daa013.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa013.Size = new System.Drawing.Size(165, 24);
+            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";
@@ -1064,57 +1072,37 @@
             this.txt_daa001.Location = new System.Drawing.Point(114, 12);
             this.txt_daa001.Name = "txt_daa001";
             this.txt_daa001.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa001.Size = new System.Drawing.Size(165, 24);
+            this.txt_daa001.Size = new System.Drawing.Size(296, 24);
             this.txt_daa001.StyleController = this.layoutMx1;
             this.txt_daa001.TabIndex = 216;
             this.txt_daa001.Tag = "readonly";
             // 
-            // textEdit1
-            // 
-            this.textEdit1.Location = new System.Drawing.Point(385, 40);
-            this.textEdit1.Name = "textEdit1";
-            this.textEdit1.Properties.Appearance.Options.UseFont = true;
-            this.textEdit1.Size = new System.Drawing.Size(165, 24);
-            this.textEdit1.StyleController = this.layoutMx1;
-            this.textEdit1.TabIndex = 467;
-            this.textEdit1.Tag = "readonly";
-            // 
             // txt_daa008
             // 
-            this.txt_daa008.Location = new System.Drawing.Point(656, 12);
+            this.txt_daa008.Location = new System.Drawing.Point(918, 12);
             this.txt_daa008.Name = "txt_daa008";
             this.txt_daa008.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa008.Size = new System.Drawing.Size(165, 24);
+            this.txt_daa008.Size = new System.Drawing.Size(296, 24);
             this.txt_daa008.StyleController = this.layoutMx1;
             this.txt_daa008.TabIndex = 235;
             this.txt_daa008.Tag = "readonly";
             // 
             // txt_saleOrderNo
             // 
-            this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 68);
+            this.txt_saleOrderNo.Location = new System.Drawing.Point(918, 124);
             this.txt_saleOrderNo.Name = "txt_saleOrderNo";
             this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_saleOrderNo.Size = new System.Drawing.Size(165, 24);
+            this.txt_saleOrderNo.Size = new System.Drawing.Size(296, 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(385, 68);
-            this.txt_daa028.Name = "txt_daa028";
-            this.txt_daa028.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa028.Size = new System.Drawing.Size(165, 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(927, 40);
+            this.txt_mesStartProd.Location = new System.Drawing.Point(1320, 12);
             this.txt_mesStartProd.Name = "txt_mesStartProd";
             this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesStartProd.Size = new System.Drawing.Size(166, 24);
+            this.txt_mesStartProd.Size = new System.Drawing.Size(297, 24);
             this.txt_mesStartProd.StyleController = this.layoutMx1;
             this.txt_mesStartProd.TabIndex = 336;
             this.txt_mesStartProd.Tag = "readonly";
@@ -1124,117 +1112,117 @@
             this.txt_daa014.Location = new System.Drawing.Point(114, 40);
             this.txt_daa014.Name = "txt_daa014";
             this.txt_daa014.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa014.Size = new System.Drawing.Size(165, 24);
+            this.txt_daa014.Size = new System.Drawing.Size(296, 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(385, 12);
-            this.txt_daa022Txt.Name = "txt_daa022Txt";
-            this.txt_daa022Txt.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa022Txt.Size = new System.Drawing.Size(165, 24);
-            this.txt_daa022Txt.StyleController = this.layoutMx1;
-            this.txt_daa022Txt.TabIndex = 462;
-            this.txt_daa022Txt.Tag = "readonly";
+            this.txt_daa022Remark.Location = new System.Drawing.Point(516, 12);
+            this.txt_daa022Remark.Name = "txt_daa022Remark";
+            this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true;
+            this.txt_daa022Remark.Size = new System.Drawing.Size(296, 24);
+            this.txt_daa022Remark.StyleController = this.layoutMx1;
+            this.txt_daa022Remark.TabIndex = 462;
+            this.txt_daa022Remark.Tag = "readonly";
             // 
             // txt_daa010
             // 
-            this.txt_daa010.Location = new System.Drawing.Point(656, 40);
+            this.txt_daa010.Location = new System.Drawing.Point(918, 40);
             this.txt_daa010.Name = "txt_daa010";
             this.txt_daa010.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa010.Size = new System.Drawing.Size(165, 24);
+            this.txt_daa010.Size = new System.Drawing.Size(296, 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(927, 68);
+            this.txt_mesEndProd.Location = new System.Drawing.Point(1320, 40);
             this.txt_mesEndProd.Name = "txt_mesEndProd";
             this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesEndProd.Size = new System.Drawing.Size(166, 24);
+            this.txt_mesEndProd.Size = new System.Drawing.Size(297, 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(656, 68);
+            this.txt_daa011.Location = new System.Drawing.Point(918, 68);
             this.txt_daa011.Name = "txt_daa011";
             this.txt_daa011.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa011.Size = new System.Drawing.Size(165, 24);
+            this.txt_daa011.Size = new System.Drawing.Size(296, 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(385, 124);
+            this.txt_dptName.Location = new System.Drawing.Point(516, 40);
             this.txt_dptName.Name = "txt_dptName";
             this.txt_dptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dptName.Size = new System.Drawing.Size(165, 24);
+            this.txt_dptName.Size = new System.Drawing.Size(296, 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(927, 96);
+            this.txt_daa016.Location = new System.Drawing.Point(1320, 68);
             this.txt_daa016.Name = "txt_daa016";
             this.txt_daa016.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa016.Size = new System.Drawing.Size(166, 24);
+            this.txt_daa016.Size = new System.Drawing.Size(297, 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(114, 96);
+            this.txt_daa029.Location = new System.Drawing.Point(114, 68);
             this.txt_daa029.Name = "txt_daa029";
             this.txt_daa029.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa029.Size = new System.Drawing.Size(165, 24);
+            this.txt_daa029.Size = new System.Drawing.Size(296, 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(385, 96);
+            this.txt_lineName.Location = new System.Drawing.Point(516, 96);
             this.txt_lineName.Name = "txt_lineName";
             this.txt_lineName.Properties.Appearance.Options.UseFont = true;
-            this.txt_lineName.Size = new System.Drawing.Size(165, 24);
+            this.txt_lineName.Size = new System.Drawing.Size(296, 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(927, 124);
+            this.txt_daa017.Location = new System.Drawing.Point(1320, 96);
             this.txt_daa017.Name = "txt_daa017";
             this.txt_daa017.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa017.Size = new System.Drawing.Size(166, 24);
+            this.txt_daa017.Size = new System.Drawing.Size(297, 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(114, 152);
+            this.txt_daa003.Location = new System.Drawing.Point(114, 96);
             this.txt_daa003.Name = "txt_daa003";
             this.txt_daa003.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa003.Size = new System.Drawing.Size(165, 24);
+            this.txt_daa003.Size = new System.Drawing.Size(296, 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(927, 12);
+            this.txt_dwName.Location = new System.Drawing.Point(918, 96);
             this.txt_dwName.Name = "txt_dwName";
             this.txt_dwName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dwName.Size = new System.Drawing.Size(166, 24);
+            this.txt_dwName.Size = new System.Drawing.Size(296, 24);
             this.txt_dwName.StyleController = this.layoutMx1;
             this.txt_dwName.TabIndex = 226;
             this.txt_dwName.Tag = "readonly";
@@ -1244,10 +1232,43 @@
             this.txt_daa004.Location = new System.Drawing.Point(114, 124);
             this.txt_daa004.Name = "txt_daa004";
             this.txt_daa004.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa004.Size = new System.Drawing.Size(165, 24);
+            this.txt_daa004.Size = new System.Drawing.Size(296, 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;
+            // 
+            // txt_lineNo
+            // 
+            this.txt_lineNo.Location = new System.Drawing.Point(516, 124);
+            this.txt_lineNo.Name = "txt_lineNo";
+            this.txt_lineNo.Size = new System.Drawing.Size(296, 24);
+            this.txt_lineNo.StyleController = this.layoutMx1;
+            this.txt_lineNo.TabIndex = 474;
+            // 
+            // txt_dptNo
+            // 
+            this.txt_dptNo.Location = new System.Drawing.Point(516, 68);
+            this.txt_dptNo.Name = "txt_dptNo";
+            this.txt_dptNo.Size = new System.Drawing.Size(296, 24);
+            this.txt_dptNo.StyleController = this.layoutMx1;
+            this.txt_dptNo.TabIndex = 475;
+            // 
+            // txt_isQiTao
+            // 
+            this.txt_isQiTao.Location = new System.Drawing.Point(1218, 124);
+            this.txt_isQiTao.Name = "txt_isQiTao";
+            this.txt_isQiTao.Properties.Caption = "澶囨枡榻愬";
+            this.txt_isQiTao.Size = new System.Drawing.Size(399, 24);
+            this.txt_isQiTao.StyleController = this.layoutMx1;
+            this.txt_isQiTao.TabIndex = 476;
             // 
             // layoutControlItem29
             // 
@@ -1261,6 +1282,29 @@
             this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem29.TextVisible = false;
             // 
+            // 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);
+            // 
+            // 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);
+            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -1270,59 +1314,58 @@
             this.layoutControlItem3,
             this.layoutControlItem5,
             this.layoutControlItem7,
-            this.layoutControlItem9,
-            this.layoutControlItem10,
             this.layoutControlItem11,
-            this.layoutControlItem13,
-            this.layoutControlItem14,
-            this.layoutControlItem17,
-            this.layoutControlItem19,
             this.layoutControlItem6,
-            this.layoutControlItem2,
+            this.layoutControlItem14,
+            this.layoutControlItem20,
+            this.layoutControlItem41,
             this.layoutControlItem15,
             this.layoutControlItem4,
             this.layoutControlItem8,
             this.layoutControlItem12,
             this.layoutControlItem16,
-            this.layoutControlItem18,
-            this.layoutControlItem20,
+            this.layoutControlItem40,
+            this.layoutControlItem9,
+            this.layoutControlItem13,
+            this.layoutControlItem19,
+            this.layoutControlItem17,
             this.layoutControlItem28,
-            this.layoutControlItem27});
+            this.layoutControlItem46});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition16.Width = 100D;
-            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition17.Width = 100D;
-            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition18.Width = 100D;
-            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition19.Width = 100D;
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition16,
-            columnDefinition17,
-            columnDefinition18,
-            columnDefinition19});
-            rowDefinition9.Height = 100D;
-            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition10.Height = 100D;
-            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition11.Height = 100D;
-            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition12.Height = 100D;
-            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition13.Height = 100D;
-            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition14.Height = 100D;
-            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition9,
-            rowDefinition10,
-            rowDefinition11,
-            rowDefinition12,
-            rowDefinition13,
-            rowDefinition14});
-            this.Root.Size = new System.Drawing.Size(1105, 188);
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4,
+            rowDefinition5,
+            rowDefinition6});
+            this.Root.Size = new System.Drawing.Size(1629, 188);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -1330,17 +1373,17 @@
             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, 28);
+            this.layoutControlItem1.Size = new System.Drawing.Size(402, 28);
             this.layoutControlItem1.Text = "宸ュ崟鍗曞彿";
             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(804, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem3.Size = new System.Drawing.Size(402, 28);
             this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1350,73 +1393,171 @@
             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, 28);
+            this.layoutControlItem5.Size = new System.Drawing.Size(402, 28);
             this.layoutControlItem5.Text = "鎶曟枡鍗曞彿";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_daa010;
-            this.layoutControlItem7.Location = new System.Drawing.Point(542, 28);
+            this.layoutControlItem7.Location = new System.Drawing.Point(804, 28);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem7.Size = new System.Drawing.Size(402, 28);
             this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.txt_saleOrderNo;
-            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, 28);
-            this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txt_daa028;
-            this.layoutControlItem10.Location = new System.Drawing.Point(271, 56);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem10.Size = new System.Drawing.Size(271, 28);
-            this.layoutControlItem10.Text = "澶囨枡鏃堕棿";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_daa011;
-            this.layoutControlItem11.Location = new System.Drawing.Point(542, 56);
+            this.layoutControlItem11.Location = new System.Drawing.Point(804, 56);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem11.Size = new System.Drawing.Size(402, 28);
             this.layoutControlItem11.Text = "宸茬敓浜ч噺";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
             // 
-            // layoutControlItem13
+            // layoutControlItem6
             // 
-            this.layoutControlItem13.Control = this.txt_daa029;
-            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, 28);
-            this.layoutControlItem13.Text = "浜у搧缂栫爜";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem6.Control = this.txt_daa022Remark;
+            this.layoutControlItem6.Location = new System.Drawing.Point(402, 0);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem6.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem6.Text = "閫氱煡澶囨枡";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_lineName;
-            this.layoutControlItem14.Location = new System.Drawing.Point(271, 84);
+            this.layoutControlItem14.Location = new System.Drawing.Point(402, 84);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem14.Size = new System.Drawing.Size(402, 28);
             this.layoutControlItem14.Text = "鐢熶骇绾垮埆";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem20
+            // 
+            this.layoutControlItem20.Control = this.txt_dptName;
+            this.layoutControlItem20.Location = new System.Drawing.Point(402, 28);
+            this.layoutControlItem20.Name = "layoutControlItem20";
+            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem20.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem41
+            // 
+            this.layoutControlItem41.Control = this.txt_dptNo;
+            this.layoutControlItem41.Location = new System.Drawing.Point(402, 56);
+            this.layoutControlItem41.Name = "layoutControlItem41";
+            this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem41.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem41.Text = "杞﹂棿缂栫爜";
+            this.layoutControlItem41.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_dwName;
+            this.layoutControlItem15.Location = new System.Drawing.Point(804, 84);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem15.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem15.Text = "鍗曚綅";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_mesStartProd;
+            this.layoutControlItem4.CustomizationFormText = "Mes棰勮寮�宸�";
+            this.layoutControlItem4.Location = new System.Drawing.Point(1206, 0);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem4.Size = new System.Drawing.Size(403, 28);
+            this.layoutControlItem4.Text = "Mes棰勮寮�宸�";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_mesEndProd;
+            this.layoutControlItem8.Location = new System.Drawing.Point(1206, 28);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem8.Size = new System.Drawing.Size(403, 28);
+            this.layoutControlItem8.Text = "Mes棰勮瀹屽伐";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_daa016;
+            this.layoutControlItem12.Location = new System.Drawing.Point(1206, 56);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem12.Size = new System.Drawing.Size(403, 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(1206, 84);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem16.Size = new System.Drawing.Size(403, 28);
+            this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem40
+            // 
+            this.layoutControlItem40.Control = this.txt_lineNo;
+            this.layoutControlItem40.Location = new System.Drawing.Point(402, 112);
+            this.layoutControlItem40.Name = "layoutControlItem40";
+            this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem40.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem40.Text = "绾垮埆缂栫爜";
+            this.layoutControlItem40.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txt_saleOrderNo;
+            this.layoutControlItem9.Location = new System.Drawing.Point(804, 112);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem9.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_daa029;
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 56);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem13.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem13.Text = "浜у搧缂栫爜";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem19
+            // 
+            this.layoutControlItem19.Control = this.txt_daa003;
+            this.layoutControlItem19.Location = new System.Drawing.Point(0, 84);
+            this.layoutControlItem19.Name = "layoutControlItem19";
+            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem19.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem19.Text = "浜у搧鍚嶇О";
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem17
             // 
@@ -1424,138 +1565,31 @@
             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, 28);
+            this.layoutControlItem17.Size = new System.Drawing.Size(402, 28);
             this.layoutControlItem17.Text = "浜у搧瑙勬牸";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem19
-            // 
-            this.layoutControlItem19.Control = this.txt_daa003;
-            this.layoutControlItem19.Location = new System.Drawing.Point(0, 140);
-            this.layoutControlItem19.Name = "layoutControlItem19";
-            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem19.Size = new System.Drawing.Size(271, 28);
-            this.layoutControlItem19.Text = "浜у搧鍚嶇О";
-            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.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(271, 28);
-            this.layoutControlItem6.Text = "閫氱煡澶囨枡";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.textEdit1;
-            this.layoutControlItem2.Location = new System.Drawing.Point(271, 28);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
-            this.layoutControlItem2.Text = "澶囨枡鐘舵��";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem15
-            // 
-            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, 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(813, 28);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(272, 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(813, 56);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(272, 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(813, 84);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem12.Size = new System.Drawing.Size(272, 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(813, 112);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem16.Size = new System.Drawing.Size(272, 28);
-            this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem18
-            // 
-            this.layoutControlItem18.Control = this.txt_daa013;
-            this.layoutControlItem18.Location = new System.Drawing.Point(542, 84);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem18.Size = new System.Drawing.Size(271, 28);
-            this.layoutControlItem18.Text = "鐢熶骇杞﹂棿";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem20
-            // 
-            this.layoutControlItem20.Control = this.txt_dptName;
-            this.layoutControlItem20.Location = new System.Drawing.Point(271, 112);
-            this.layoutControlItem20.Name = "layoutControlItem20";
-            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem20.Size = new System.Drawing.Size(271, 28);
-            this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
-            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem28
             // 
             this.layoutControlItem28.Control = this.txt_daa009;
-            this.layoutControlItem28.Location = new System.Drawing.Point(542, 112);
+            this.layoutControlItem28.Location = new System.Drawing.Point(0, 140);
             this.layoutControlItem28.Name = "layoutControlItem28";
-            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem28.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem28.Size = new System.Drawing.Size(804, 28);
             this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
             this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
             // 
-            // layoutControlItem27
+            // layoutControlItem46
             // 
-            this.layoutControlItem27.Control = this.txt_sjXt;
-            this.layoutControlItem27.Location = new System.Drawing.Point(271, 140);
-            this.layoutControlItem27.Name = "layoutControlItem27";
-            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem27.Size = new System.Drawing.Size(271, 28);
-            this.layoutControlItem27.Text = "瀹為檯绾夸綋";
-            this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem46.Control = this.txt_isQiTao;
+            this.layoutControlItem46.Location = new System.Drawing.Point(1206, 112);
+            this.layoutControlItem46.Name = "layoutControlItem46";
+            this.layoutControlItem46.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem46.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem46.Size = new System.Drawing.Size(403, 28);
+            this.layoutControlItem46.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem46.TextVisible = false;
             // 
             // tabMx
             // 
@@ -1563,18 +1597,20 @@
             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, 513);
+            this.tabMx.Size = new System.Drawing.Size(1650, 513);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
             this.tabMxPage2,
-            this.xtraTabPage3});
+            this.xtraTabPage3,
+            this.xtraTabPage4,
+            this.xtraTabPage5});
             // 
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 481);
+            this.tabMxPage1.Size = new System.Drawing.Size(1648, 481);
             this.tabMxPage1.Text = "澶囨枡鍗曡韩";
             // 
             // gcMx1
@@ -1583,7 +1619,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, 481);
+            this.gcMx1.Size = new System.Drawing.Size(1648, 481);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1674,7 +1710,7 @@
             // 
             this.gvMx1dab004.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab004.Caption = "鏉愭枡鍚嶇О";
-            this.gvMx1dab004.FieldName = "dab004";
+            this.gvMx1dab004.FieldName = "itemName";
             this.gvMx1dab004.MinWidth = 50;
             this.gvMx1dab004.Name = "gvMx1dab004";
             this.gvMx1dab004.Tag = "query_a.dab004";
@@ -1686,7 +1722,7 @@
             // 
             this.gvMx1dab005.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab005.Caption = "鏉愭枡瑙勬牸";
-            this.gvMx1dab005.FieldName = "dab005";
+            this.gvMx1dab005.FieldName = "itemModel";
             this.gvMx1dab005.MinWidth = 50;
             this.gvMx1dab005.Name = "gvMx1dab005";
             this.gvMx1dab005.Tag = "query_a.dab005";
@@ -1710,7 +1746,7 @@
             // 
             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";
@@ -1721,6 +1757,7 @@
             // gridColumn14
             // 
             this.gridColumn14.Caption = "鍓╀綑鍙";
+            this.gridColumn14.FieldName = "klQty";
             this.gridColumn14.MinWidth = 25;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
@@ -1742,6 +1779,7 @@
             // gridColumn15
             // 
             this.gridColumn15.Caption = "寤鸿浠撳簱";
+            this.gridColumn15.FieldName = "erpCk";
             this.gridColumn15.MinWidth = 25;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
@@ -1805,21 +1843,25 @@
             // gvMx1zyBl
             // 
             this.gvMx1zyBl.AppearanceCell.Options.UseFont = true;
-            this.gvMx1zyBl.Caption = "浣滀笟涓嶈壇";
+            this.gvMx1zyBl.Caption = "浣滀笟涓嶈壇閫�鏂�";
             this.gvMx1zyBl.FieldName = "zyBl";
             this.gvMx1zyBl.MinWidth = 50;
             this.gvMx1zyBl.Name = "gvMx1zyBl";
             this.gvMx1zyBl.Tag = "query_a.zy_bl";
+            this.gvMx1zyBl.Visible = true;
+            this.gvMx1zyBl.VisibleIndex = 17;
             this.gvMx1zyBl.Width = 94;
             // 
             // gvMx1llBl
             // 
             this.gvMx1llBl.AppearanceCell.Options.UseFont = true;
-            this.gvMx1llBl.Caption = "鏉ユ枡涓嶈壇";
+            this.gvMx1llBl.Caption = "鏉ユ枡涓嶈壇閫�鏂�";
             this.gvMx1llBl.FieldName = "llBl";
             this.gvMx1llBl.MinWidth = 50;
             this.gvMx1llBl.Name = "gvMx1llBl";
             this.gvMx1llBl.Tag = "query_a.ll_bl";
+            this.gvMx1llBl.Visible = true;
+            this.gvMx1llBl.VisibleIndex = 15;
             this.gvMx1llBl.Width = 94;
             // 
             // gvMx1lpTl
@@ -1830,16 +1872,20 @@
             this.gvMx1lpTl.MinWidth = 50;
             this.gvMx1lpTl.Name = "gvMx1lpTl";
             this.gvMx1lpTl.Tag = "query_a.lp_tl";
+            this.gvMx1lpTl.Visible = true;
+            this.gvMx1lpTl.VisibleIndex = 16;
             this.gvMx1lpTl.Width = 94;
             // 
             // gvMx1dab021
             // 
             this.gvMx1dab021.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dab021.Caption = "琛ラ鏁伴噺";
-            this.gvMx1dab021.FieldName = "dab021";
+            this.gvMx1dab021.Caption = "琛ユ枡鏁伴噺";
+            this.gvMx1dab021.FieldName = "blQty";
             this.gvMx1dab021.MinWidth = 50;
             this.gvMx1dab021.Name = "gvMx1dab021";
             this.gvMx1dab021.Tag = "query_a.dab021";
+            this.gvMx1dab021.Visible = true;
+            this.gvMx1dab021.VisibleIndex = 13;
             this.gvMx1dab021.Width = 94;
             // 
             // gvMx1dab010
@@ -1905,8 +1951,8 @@
             // gvMx1dab022
             // 
             this.gvMx1dab022.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dab022.Caption = "閫�鏂欐暟閲�";
-            this.gvMx1dab022.FieldName = "dab022";
+            this.gvMx1dab022.Caption = "閫�鏂欐�绘暟";
+            this.gvMx1dab022.FieldName = "ztsl";
             this.gvMx1dab022.MinWidth = 50;
             this.gvMx1dab022.Name = "gvMx1dab022";
             this.gvMx1dab022.Tag = "query_a.dab022";
@@ -1916,29 +1962,360 @@
             // 
             this.gvMx1dab023.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab023.Caption = "瓒呴鏁伴噺";
-            this.gvMx1dab023.FieldName = "dab023";
+            this.gvMx1dab023.FieldName = "clQty";
             this.gvMx1dab023.MinWidth = 50;
             this.gvMx1dab023.Name = "gvMx1dab023";
             this.gvMx1dab023.Tag = "query_a.dab023";
+            this.gvMx1dab023.Visible = true;
+            this.gvMx1dab023.VisibleIndex = 14;
             this.gvMx1dab023.Width = 94;
             // 
             // tabMxPage2
             // 
-            this.tabMxPage2.Controls.Add(this.gcMx2);
-            this.tabMxPage2.Controls.Add(this.panMx99);
+            this.tabMxPage2.Controls.Add(this.splitMx99);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1124, 481);
-            this.tabMxPage2.Text = "鎶ュ伐鏉$爜鏄庣粏";
+            this.tabMxPage2.Size = new System.Drawing.Size(1648, 481);
+            this.tabMxPage2.Text = "鎵樻澘鐮佹槑缁�";
+            // 
+            // splitMx99
+            // 
+            this.splitMx99.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitMx99.Horizontal = false;
+            this.splitMx99.Location = new System.Drawing.Point(0, 0);
+            this.splitMx99.Name = "splitMx99";
+            // 
+            // splitMx99.Panel1
+            // 
+            this.splitMx99.Panel1.Controls.Add(this.layoutMx99);
+            this.splitMx99.Panel1.Text = "Panel1";
+            // 
+            // splitMx99.Panel2
+            // 
+            this.splitMx99.Panel2.Controls.Add(this.gcMx2);
+            this.splitMx99.Panel2.Text = "Panel2";
+            this.splitMx99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx99.Size = new System.Drawing.Size(1648, 481);
+            this.splitMx99.SplitterPosition = 83;
+            this.splitMx99.TabIndex = 2;
+            // 
+            // layoutMx99
+            // 
+            this.layoutMx99.Controls.Add(this.layShuLiang);
+            this.layoutMx99.Controls.Add(this.radOut);
+            this.layoutMx99.Controls.Add(this.ucBtnPrint1);
+            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(312, 530, 812, 500);
+            this.layoutMx99.Root = this.layoutControlGroup1;
+            this.layoutMx99.Size = new System.Drawing.Size(1648, 83);
+            this.layoutMx99.TabIndex = 0;
+            this.layoutMx99.Text = "layoutControl1";
+            // 
+            // layShuLiang
+            // 
+            this.layShuLiang.Controls.Add(this.txt_iCount_1);
+            this.layShuLiang.Controls.Add(this.txt_yuliang_1);
+            this.layShuLiang.Location = new System.Drawing.Point(802, 44);
+            this.layShuLiang.Name = "layShuLiang";
+            this.layShuLiang.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(133, 518, 812, 500);
+            this.layShuLiang.Root = this.layoutControlGroup3;
+            this.layShuLiang.Size = new System.Drawing.Size(391, 28);
+            this.layShuLiang.TabIndex = 475;
+            this.layShuLiang.Text = "dataLayoutControl1";
+            // 
+            // txt_iCount_1
+            // 
+            this.txt_iCount_1.Location = new System.Drawing.Point(89, 2);
+            this.txt_iCount_1.Name = "txt_iCount_1";
+            this.txt_iCount_1.Properties.ReadOnly = true;
+            this.txt_iCount_1.Size = new System.Drawing.Size(104, 24);
+            this.txt_iCount_1.StyleController = this.layShuLiang;
+            this.txt_iCount_1.TabIndex = 5;
+            // 
+            // txt_yuliang_1
+            // 
+            this.txt_yuliang_1.Location = new System.Drawing.Point(284, 2);
+            this.txt_yuliang_1.Name = "txt_yuliang_1";
+            this.txt_yuliang_1.Properties.ReadOnly = true;
+            this.txt_yuliang_1.Size = new System.Drawing.Size(105, 24);
+            this.txt_yuliang_1.StyleController = this.layShuLiang;
+            this.txt_yuliang_1.TabIndex = 6;
+            // 
+            // layoutControlGroup3
+            // 
+            this.layoutControlGroup3.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.layoutControlGroup3.GroupBordersVisible = false;
+            this.layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem25,
+            this.layoutControlItem39});
+            this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.layoutControlGroup3.Name = "Root";
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
+            this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition5,
+            columnDefinition6});
+            rowDefinition7.Height = 100D;
+            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition7});
+            this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            this.layoutControlGroup3.Size = new System.Drawing.Size(391, 28);
+            this.layoutControlGroup3.TextVisible = false;
+            // 
+            // layoutControlItem25
+            // 
+            this.layoutControlItem25.Control = this.txt_iCount_1;
+            this.layoutControlItem25.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem25.Name = "layoutControlItem25";
+            this.layoutControlItem25.Size = new System.Drawing.Size(195, 28);
+            this.layoutControlItem25.Text = "鎵撳嵃鏁村紶鏁�";
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem39
+            // 
+            this.layoutControlItem39.Control = this.txt_yuliang_1;
+            this.layoutControlItem39.CustomizationFormText = "鎵撳嵃浣欐暟";
+            this.layoutControlItem39.Location = new System.Drawing.Point(195, 0);
+            this.layoutControlItem39.Name = "layoutControlItem39";
+            this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem39.Size = new System.Drawing.Size(196, 28);
+            this.layoutControlItem39.Text = "鎵撳嵃浣欐暟";
+            this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // radOut
+            // 
+            this.radOut.Location = new System.Drawing.Point(1198, 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(237, 28);
+            this.radOut.StyleController = this.layoutMx99;
+            this.radOut.TabIndex = 473;
+            // 
+            // ucBtnPrint1
+            // 
+            this.ucBtnPrint1.guidKey = null;
+            this.ucBtnPrint1.Location = new System.Drawing.Point(1196, 42);
+            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
+            this.ucBtnPrint1.Name = "ucBtnPrint1";
+            this.ucBtnPrint1.rptParameter = null;
+            this.ucBtnPrint1.Size = new System.Drawing.Size(393, 32);
+            this.ucBtnPrint1.TabIndex = 464;
+            // 
+            // txt_psnQty_1
+            // 
+            this.txt_psnQty_1.Location = new System.Drawing.Point(889, 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(304, 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(494, 44);
+            this.txt_printRemark.Name = "txt_printRemark";
+            this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
+            this.txt_printRemark.Size = new System.Drawing.Size(304, 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(494, 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(304, 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, 44);
+            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(304, 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(304, 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.layoutControlItem35,
+            this.layoutControlItem26,
+            this.layoutControlItem22,
+            this.layoutControlItem21,
+            this.layoutControlItem24,
+            this.layoutControlItem38,
+            this.layoutControlItem36});
+            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.layoutControlGroup1.Name = "Root";
+            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7.Width = 100D;
+            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition8.Width = 100D;
+            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition9.Width = 100D;
+            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition10.Width = 100D;
+            columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
+            columnDefinition11.Width = 27D;
+            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition7,
+            columnDefinition8,
+            columnDefinition9,
+            columnDefinition10,
+            columnDefinition11});
+            rowDefinition8.Height = 100D;
+            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition9.Height = 100D;
+            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition8,
+            rowDefinition9});
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1627, 84);
+            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(395, 0);
+            this.layoutControlItem23.Name = "layoutControlItem23";
+            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem23.Size = new System.Drawing.Size(395, 32);
+            this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
+            this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem35
+            // 
+            this.layoutControlItem35.Control = this.radOut;
+            this.layoutControlItem35.Location = new System.Drawing.Point(1185, 0);
+            this.layoutControlItem35.MaxSize = new System.Drawing.Size(240, 28);
+            this.layoutControlItem35.MinSize = new System.Drawing.Size(240, 28);
+            this.layoutControlItem35.Name = "layoutControlItem35";
+            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
+            this.layoutControlItem35.Size = new System.Drawing.Size(395, 32);
+            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(1185, 32);
+            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(395, 32);
+            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, 32);
+            this.layoutControlItem22.Name = "layoutControlItem22";
+            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem22.Size = new System.Drawing.Size(395, 32);
+            this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem21
+            // 
+            this.layoutControlItem21.Control = this.txt_printRemark;
+            this.layoutControlItem21.Location = new System.Drawing.Point(395, 32);
+            this.layoutControlItem21.Name = "layoutControlItem21";
+            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem21.Size = new System.Drawing.Size(395, 32);
+            this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem24
+            // 
+            this.layoutControlItem24.AppearanceItemCaption.Options.UseTextOptions = true;
+            this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            this.layoutControlItem24.Control = this.txt_psnQty_1;
+            this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�";
+            this.layoutControlItem24.Location = new System.Drawing.Point(790, 0);
+            this.layoutControlItem24.Name = "layoutControlItem24";
+            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem24.Size = new System.Drawing.Size(395, 32);
+            this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
+            this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem38
+            // 
+            this.layoutControlItem38.Control = this.layShuLiang;
+            this.layoutControlItem38.Location = new System.Drawing.Point(790, 32);
+            this.layoutControlItem38.Name = "layoutControlItem38";
+            this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem38.Size = new System.Drawing.Size(395, 32);
+            this.layoutControlItem38.Text = "鎵撳嵃鏁伴噺";
+            this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem38.TextVisible = false;
+            // 
+            // 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(395, 32);
+            this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
+            this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
             // 
             // gcMx2
             // 
             this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx2.Location = new System.Drawing.Point(0, 54);
+            this.gcMx2.Location = new System.Drawing.Point(0, 0);
             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, 427);
+            this.rptChongDa});
+            this.gcMx2.Size = new System.Drawing.Size(1648, 386);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -1951,7 +2328,6 @@
             this.gvMx2.ColumnPanelRowHeight = 50;
             this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx2guid,
-            this.gridColumn20,
             this.gridColumn19,
             this.gvMx2itemBarcode,
             this.gvMx2quantity,
@@ -1961,8 +2337,6 @@
             this.gridColumn17,
             this.gvMx2createBy,
             this.gvMx2createDate,
-            this.gridColumn28,
-            this.gridColumn29,
             this.gridColumn30,
             this.gridColumn31,
             this.gridColumn32,
@@ -1971,6 +2345,7 @@
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
             this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx2.OptionsView.ShowFooter = true;
             this.gvMx2.OptionsView.ShowGroupPanel = false;
             // 
             // gvMx2guid
@@ -1983,17 +2358,6 @@
             this.gvMx2guid.Tag = "query_a.guid";
             this.gvMx2guid.Width = 94;
             // 
-            // gridColumn20
-            // 
-            this.gridColumn20.Caption = "鎶ュ伐鏍囪瘑";
-            this.gridColumn20.FieldName = "isBg";
-            this.gridColumn20.MaxWidth = 50;
-            this.gridColumn20.MinWidth = 50;
-            this.gridColumn20.Name = "gridColumn20";
-            this.gridColumn20.Visible = true;
-            this.gridColumn20.VisibleIndex = 0;
-            this.gridColumn20.Width = 50;
-            // 
             // gridColumn19
             // 
             this.gridColumn19.Caption = "鍏ュ簱鏍囪瘑";
@@ -2002,31 +2366,33 @@
             this.gridColumn19.MinWidth = 50;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 1;
+            this.gridColumn19.VisibleIndex = 0;
             this.gridColumn19.Width = 50;
             // 
             // gvMx2itemBarcode
             // 
             this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜 ";
+            this.gvMx2itemBarcode.Caption = "鎵樻澘鏉$爜";
             this.gvMx2itemBarcode.FieldName = "itemBarcode";
             this.gvMx2itemBarcode.MinWidth = 50;
             this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
             this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
             this.gvMx2itemBarcode.Visible = true;
-            this.gvMx2itemBarcode.VisibleIndex = 2;
+            this.gvMx2itemBarcode.VisibleIndex = 1;
             this.gvMx2itemBarcode.Width = 94;
             // 
             // gvMx2quantity
             // 
             this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
-            this.gvMx2quantity.Caption = "鏁伴噺 ";
+            this.gvMx2quantity.Caption = "鍐呭寘瑁呮暟閲� ";
             this.gvMx2quantity.FieldName = "quantity";
             this.gvMx2quantity.MinWidth = 50;
             this.gvMx2quantity.Name = "gvMx2quantity";
+            this.gvMx2quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣锛歿0:0.##}")});
             this.gvMx2quantity.Tag = "query_a.QUANTITY";
             this.gvMx2quantity.Visible = true;
-            this.gvMx2quantity.VisibleIndex = 3;
+            this.gvMx2quantity.VisibleIndex = 2;
             this.gvMx2quantity.Width = 94;
             // 
             // gvMx2unit
@@ -2038,7 +2404,7 @@
             this.gvMx2unit.Name = "gvMx2unit";
             this.gvMx2unit.Tag = "query_a.UNIT";
             this.gvMx2unit.Visible = true;
-            this.gvMx2unit.VisibleIndex = 4;
+            this.gvMx2unit.VisibleIndex = 3;
             this.gvMx2unit.Width = 94;
             // 
             // gridColumn18
@@ -2048,7 +2414,7 @@
             this.gridColumn18.MinWidth = 25;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 5;
+            this.gridColumn18.VisibleIndex = 4;
             this.gridColumn18.Width = 94;
             // 
             // gvMx2itemSname
@@ -2060,7 +2426,7 @@
             this.gvMx2itemSname.Name = "gvMx2itemSname";
             this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
             this.gvMx2itemSname.Visible = true;
-            this.gvMx2itemSname.VisibleIndex = 6;
+            this.gvMx2itemSname.VisibleIndex = 5;
             this.gvMx2itemSname.Width = 94;
             // 
             // gridColumn17
@@ -2070,7 +2436,7 @@
             this.gridColumn17.MinWidth = 25;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 7;
+            this.gridColumn17.VisibleIndex = 6;
             this.gridColumn17.Width = 94;
             // 
             // gvMx2createBy
@@ -2082,7 +2448,7 @@
             this.gvMx2createBy.Name = "gvMx2createBy";
             this.gvMx2createBy.Tag = "query_a.CREATE_BY";
             this.gvMx2createBy.Visible = true;
-            this.gvMx2createBy.VisibleIndex = 8;
+            this.gvMx2createBy.VisibleIndex = 7;
             this.gvMx2createBy.Width = 94;
             // 
             // gvMx2createDate
@@ -2094,28 +2460,8 @@
             this.gvMx2createDate.Name = "gvMx2createDate";
             this.gvMx2createDate.Tag = "query_a.CREATE_DATE";
             this.gvMx2createDate.Visible = true;
-            this.gvMx2createDate.VisibleIndex = 9;
+            this.gvMx2createDate.VisibleIndex = 8;
             this.gvMx2createDate.Width = 94;
-            // 
-            // gridColumn28
-            // 
-            this.gridColumn28.Caption = "鎶ュ伐浜�";
-            this.gridColumn28.FieldName = "bgYg";
-            this.gridColumn28.MinWidth = 25;
-            this.gridColumn28.Name = "gridColumn28";
-            this.gridColumn28.Visible = true;
-            this.gridColumn28.VisibleIndex = 10;
-            this.gridColumn28.Width = 94;
-            // 
-            // gridColumn29
-            // 
-            this.gridColumn29.Caption = "鎶ュ伐鏃堕棿";
-            this.gridColumn29.FieldName = "bgTime";
-            this.gridColumn29.MinWidth = 25;
-            this.gridColumn29.Name = "gridColumn29";
-            this.gridColumn29.Visible = true;
-            this.gridColumn29.VisibleIndex = 11;
-            this.gridColumn29.Width = 94;
             // 
             // gridColumn30
             // 
@@ -2124,7 +2470,7 @@
             this.gridColumn30.MinWidth = 25;
             this.gridColumn30.Name = "gridColumn30";
             this.gridColumn30.Visible = true;
-            this.gridColumn30.VisibleIndex = 12;
+            this.gridColumn30.VisibleIndex = 9;
             this.gridColumn30.Width = 94;
             // 
             // gridColumn31
@@ -2134,7 +2480,7 @@
             this.gridColumn31.MinWidth = 25;
             this.gridColumn31.Name = "gridColumn31";
             this.gridColumn31.Visible = true;
-            this.gridColumn31.VisibleIndex = 13;
+            this.gridColumn31.VisibleIndex = 10;
             this.gridColumn31.Width = 94;
             // 
             // gridColumn32
@@ -2144,235 +2490,235 @@
             this.gridColumn32.MinWidth = 25;
             this.gridColumn32.Name = "gridColumn32";
             this.gridColumn32.Visible = true;
-            this.gridColumn32.VisibleIndex = 14;
+            this.gridColumn32.VisibleIndex = 11;
             this.gridColumn32.Width = 94;
             // 
             // gvBtnAlawys
             // 
-            this.gvBtnAlawys.Caption = "绉诲嚭";
-            this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gvBtnAlawys.Caption = "閲嶆墦";
+            this.gvBtnAlawys.ColumnEdit = this.rptChongDa;
             this.gvBtnAlawys.MinWidth = 25;
             this.gvBtnAlawys.Name = "gvBtnAlawys";
             this.gvBtnAlawys.Visible = true;
-            this.gvBtnAlawys.VisibleIndex = 15;
+            this.gvBtnAlawys.VisibleIndex = 12;
             this.gvBtnAlawys.Width = 94;
             // 
-            // repositoryItemButtonEdit1
+            // rptChongDa
             // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions4.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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", 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);
-            // 
-            // panMx99
-            // 
-            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(1124, 54);
-            this.panMx99.TabIndex = 1;
-            // 
-            // layoutMx99
-            // 
-            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.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(1108, 65, 812, 500);
-            this.layoutMx99.Root = this.layoutControlGroup1;
-            this.layoutMx99.Size = new System.Drawing.Size(1124, 54);
-            this.layoutMx99.TabIndex = 0;
-            this.layoutMx99.Text = "layoutControl1";
-            // 
-            // ucBtnPrint1
-            // 
-            this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(932, 12);
-            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
-            this.ucBtnPrint1.Name = "ucBtnPrint1";
-            this.ucBtnPrint1.rptParameter = null;
-            this.ucBtnPrint1.Size = new System.Drawing.Size(180, 30);
-            this.ucBtnPrint1.TabIndex = 464;
-            // 
-            // txt_iCount_1
-            // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(850, 12);
-            this.txt_iCount_1.Name = "txt_iCount_1";
-            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_iCount_1.Size = new System.Drawing.Size(78, 24);
-            this.txt_iCount_1.StyleController = this.layoutMx99;
-            this.txt_iCount_1.TabIndex = 332;
-            this.txt_iCount_1.Tag = "readOnly-1";
-            // 
-            // txt_psnQty_1
-            // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(666, 12);
-            this.txt_psnQty_1.Name = "txt_psnQty_1";
-            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_psnQty_1.Size = new System.Drawing.Size(78, 24);
-            this.txt_psnQty_1.StyleController = this.layoutMx99;
-            this.txt_psnQty_1.TabIndex = 330;
-            this.txt_psnQty_1.Tag = "readOnly-1";
-            // 
-            // txt_printRemark
-            // 
-            this.txt_printRemark.Location = new System.Drawing.Point(482, 12);
-            this.txt_printRemark.Name = "txt_printRemark";
-            this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
-            this.txt_printRemark.Size = new System.Drawing.Size(78, 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(298, 12);
-            this.txt_kQty.Name = "txt_kQty";
-            this.txt_kQty.Properties.Appearance.Options.UseFont = true;
-            this.txt_kQty.Properties.ReadOnly = true;
-            this.txt_kQty.Size = new System.Drawing.Size(78, 24);
-            this.txt_kQty.StyleController = this.layoutMx99;
-            this.txt_kQty.TabIndex = 472;
-            this.txt_kQty.Tag = "readonly";
-            // 
-            // txt_yQty
-            // 
-            this.txt_yQty.Location = new System.Drawing.Point(114, 12);
-            this.txt_yQty.Name = "txt_yQty";
-            this.txt_yQty.Properties.Appearance.Options.UseFont = true;
-            this.txt_yQty.Properties.ReadOnly = true;
-            this.txt_yQty.Size = new System.Drawing.Size(78, 24);
-            this.txt_yQty.StyleController = this.layoutMx99;
-            this.txt_yQty.TabIndex = 470;
-            this.txt_yQty.Tag = "readonly";
-            // 
-            // layoutControlGroup1
-            // 
-            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.layoutControlGroup1.GroupBordersVisible = false;
-            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem22,
-            this.layoutControlItem23,
-            this.layoutControlItem21,
-            this.layoutControlItem24,
-            this.layoutControlItem25,
-            this.layoutControlItem26});
-            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
-            this.layoutControlGroup1.Name = "Root";
-            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition20.Width = 100D;
-            columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition21.Width = 100D;
-            columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition22.Width = 100D;
-            columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition23.Width = 100D;
-            columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition24.Width = 100D;
-            columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition25.Width = 100D;
-            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition20,
-            columnDefinition21,
-            columnDefinition22,
-            columnDefinition23,
-            columnDefinition24,
-            columnDefinition25});
-            rowDefinition15.Height = 100D;
-            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
-            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition15});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1124, 54);
-            this.layoutControlGroup1.TextVisible = false;
-            // 
-            // layoutControlItem22
-            // 
-            this.layoutControlItem22.Control = this.txt_yQty;
-            this.layoutControlItem22.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem22.Name = "layoutControlItem22";
-            this.layoutControlItem22.Size = new System.Drawing.Size(184, 34);
-            this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem23
-            // 
-            this.layoutControlItem23.Control = this.txt_kQty;
-            this.layoutControlItem23.Location = new System.Drawing.Point(184, 0);
-            this.layoutControlItem23.Name = "layoutControlItem23";
-            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem23.Size = new System.Drawing.Size(184, 34);
-            this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
-            this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem21
-            // 
-            this.layoutControlItem21.Control = this.txt_printRemark;
-            this.layoutControlItem21.Location = new System.Drawing.Point(368, 0);
-            this.layoutControlItem21.Name = "layoutControlItem21";
-            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem21.Size = new System.Drawing.Size(184, 34);
-            this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem24
-            // 
-            this.layoutControlItem24.Control = this.txt_psnQty_1;
-            this.layoutControlItem24.Location = new System.Drawing.Point(552, 0);
-            this.layoutControlItem24.Name = "layoutControlItem24";
-            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem24.Size = new System.Drawing.Size(184, 34);
-            this.layoutControlItem24.Text = "姣忓紶鏉$爜鏁伴噺";
-            this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem25
-            // 
-            this.layoutControlItem25.Control = this.txt_iCount_1;
-            this.layoutControlItem25.Location = new System.Drawing.Point(736, 0);
-            this.layoutControlItem25.Name = "layoutControlItem25";
-            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 4;
-            this.layoutControlItem25.Size = new System.Drawing.Size(184, 34);
-            this.layoutControlItem25.Text = "鎵撳嵃鏉$爜寮犳暟";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem26
-            // 
-            this.layoutControlItem26.Control = this.ucBtnPrint1;
-            this.layoutControlItem26.Location = new System.Drawing.Point(920, 0);
-            this.layoutControlItem26.Name = "layoutControlItem26";
-            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 5;
-            this.layoutControlItem26.Size = new System.Drawing.Size(184, 34);
-            this.layoutControlItem26.Text = "鎶ュ伐鎵撳嵃";
-            this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem26.TextVisible = false;
+            this.rptChongDa.AutoHeight = false;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.rptChongDa.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)});
+            this.rptChongDa.Name = "rptChongDa";
+            this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
             // xtraTabPage3
             // 
-            this.xtraTabPage3.Controls.Add(this.gcMx3);
-            this.xtraTabPage3.Controls.Add(this.panMx98);
+            this.xtraTabPage3.Controls.Add(this.splitMx98);
             this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1124, 481);
-            this.xtraTabPage3.Text = "宸ュ崟杩芥函鐮�";
+            this.xtraTabPage3.Size = new System.Drawing.Size(1648, 481);
+            this.xtraTabPage3.Text = "杩芥函鐮佹槑缁�";
+            // 
+            // splitMx98
+            // 
+            this.splitMx98.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitMx98.Horizontal = false;
+            this.splitMx98.Location = new System.Drawing.Point(0, 0);
+            this.splitMx98.Name = "splitMx98";
+            // 
+            // splitMx98.Panel1
+            // 
+            this.splitMx98.Panel1.Controls.Add(this.layoutMx98);
+            this.splitMx98.Panel1.Text = "Panel1";
+            // 
+            // splitMx98.Panel2
+            // 
+            this.splitMx98.Panel2.Controls.Add(this.gcMx3);
+            this.splitMx98.Panel2.Text = "Panel2";
+            this.splitMx98.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx98.Size = new System.Drawing.Size(1648, 481);
+            this.splitMx98.SplitterPosition = 52;
+            this.splitMx98.TabIndex = 2;
+            // 
+            // 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(1648, 52);
+            this.layoutMx98.TabIndex = 0;
+            this.layoutMx98.Text = "layoutControl1";
+            // 
+            // ucBtnPrint98
+            // 
+            this.ucBtnPrint98.guidKey = null;
+            this.ucBtnPrint98.Location = new System.Drawing.Point(1366, 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(271, 32);
+            this.ucBtnPrint98.TabIndex = 8;
+            // 
+            // txt_yQty98
+            // 
+            this.txt_yQty98.Location = new System.Drawing.Point(385, 12);
+            this.txt_yQty98.Name = "txt_yQty98";
+            this.txt_yQty98.Properties.ReadOnly = true;
+            this.txt_yQty98.Size = new System.Drawing.Size(165, 24);
+            this.txt_yQty98.StyleController = this.layoutMx98;
+            this.txt_yQty98.TabIndex = 4;
+            // 
+            // txt_kQty98
+            // 
+            this.txt_kQty98.Location = new System.Drawing.Point(656, 12);
+            this.txt_kQty98.Name = "txt_kQty98";
+            this.txt_kQty98.Properties.ReadOnly = true;
+            this.txt_kQty98.Size = new System.Drawing.Size(165, 24);
+            this.txt_kQty98.StyleController = this.layoutMx98;
+            this.txt_kQty98.TabIndex = 5;
+            // 
+            // txt_printRemark98
+            // 
+            this.txt_printRemark98.Location = new System.Drawing.Point(927, 12);
+            this.txt_printRemark98.Name = "txt_printRemark98";
+            this.txt_printRemark98.Size = new System.Drawing.Size(165, 24);
+            this.txt_printRemark98.StyleController = this.layoutMx98;
+            this.txt_printRemark98.TabIndex = 6;
+            // 
+            // txt_iCount_98
+            // 
+            this.txt_iCount_98.Location = new System.Drawing.Point(1198, 12);
+            this.txt_iCount_98.Name = "txt_iCount_98";
+            this.txt_iCount_98.Size = new System.Drawing.Size(165, 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(165, 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";
+            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition12.Width = 100D;
+            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition13.Width = 100D;
+            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition14.Width = 100D;
+            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition15.Width = 100D;
+            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition16.Width = 100D;
+            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition17.Width = 100D;
+            this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition12,
+            columnDefinition13,
+            columnDefinition14,
+            columnDefinition15,
+            columnDefinition16,
+            columnDefinition17});
+            rowDefinition10.Height = 100D;
+            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition10});
+            this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 52);
+            this.layoutControlGroup2.TextVisible = false;
+            // 
+            // layoutControlItem34
+            // 
+            this.layoutControlItem34.Control = this.ucBtnPrint98;
+            this.layoutControlItem34.Location = new System.Drawing.Point(1355, 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(273, 32);
+            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(1084, 0);
+            this.layoutControlItem33.Name = "layoutControlItem33";
+            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 4;
+            this.layoutControlItem33.Size = new System.Drawing.Size(271, 32);
+            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(813, 0);
+            this.layoutControlItem32.Name = "layoutControlItem32";
+            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem32.Size = new System.Drawing.Size(271, 32);
+            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(542, 0);
+            this.layoutControlItem31.Name = "layoutControlItem31";
+            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem31.Size = new System.Drawing.Size(271, 32);
+            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(271, 0);
+            this.layoutControlItem30.Name = "layoutControlItem30";
+            this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem30.Size = new System.Drawing.Size(271, 32);
+            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(271, 32);
+            this.layoutControlItem37.Text = "宸ュ崟鎬婚噺";
+            this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
             // 
             // gcMx3
             // 
             this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx3.Location = new System.Drawing.Point(0, 48);
+            this.gcMx3.Location = new System.Drawing.Point(0, 0);
             this.gcMx3.MainView = this.gvMx3;
             this.gcMx3.Name = "gcMx3";
-            this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit2});
-            this.gcMx3.Size = new System.Drawing.Size(1124, 433);
+            this.gcMx3.Size = new System.Drawing.Size(1648, 417);
             this.gcMx3.TabIndex = 1;
             this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx3});
@@ -2386,16 +2732,17 @@
             this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn33,
             this.gridColumn38,
-            this.gridColumn34,
             this.gridColumn36,
             this.gridColumn37,
             this.gridColumn42,
             this.gridColumn43,
-            this.gridColumn49});
+            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.ShowFooter = true;
             this.gvMx3.OptionsView.ShowGroupPanel = false;
             // 
             // gridColumn33
@@ -2407,6 +2754,18 @@
             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
             // 
@@ -2427,22 +2786,12 @@
             this.gridColumn37.FieldName = "quantity";
             this.gridColumn37.MinWidth = 50;
             this.gridColumn37.Name = "gridColumn37";
+            this.gridColumn37.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣锛歿0:0.##}")});
             this.gridColumn37.Tag = "query_a.QUANTITY";
             this.gridColumn37.Visible = true;
             this.gridColumn37.VisibleIndex = 2;
             this.gridColumn37.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;
             // 
             // gridColumn42
             // 
@@ -2468,193 +2817,400 @@
             this.gridColumn43.VisibleIndex = 4;
             this.gridColumn43.Width = 94;
             // 
-            // gridColumn49
-            // 
-            this.gridColumn49.Caption = "绉诲嚭";
-            this.gridColumn49.ColumnEdit = this.repositoryItemButtonEdit2;
-            this.gridColumn49.MinWidth = 25;
-            this.gridColumn49.Name = "gridColumn49";
-            this.gridColumn49.Visible = true;
-            this.gridColumn49.VisibleIndex = 6;
-            this.gridColumn49.Width = 94;
-            // 
-            // repositoryItemButtonEdit2
-            // 
-            this.repositoryItemButtonEdit2.AutoHeight = false;
-            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
-            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            // 
-            // 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(1124, 48);
-            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.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutMx98.Location = new System.Drawing.Point(0, 0);
-            this.layoutMx98.Name = "layoutMx98";
-            this.layoutMx98.Root = this.layoutControlGroup2;
-            this.layoutMx98.Size = new System.Drawing.Size(1124, 48);
-            this.layoutMx98.TabIndex = 0;
-            this.layoutMx98.Text = "layoutControl1";
-            // 
-            // ucBtnPrint98
-            // 
-            this.ucBtnPrint98.guidKey = null;
-            this.ucBtnPrint98.Location = new System.Drawing.Point(895, 12);
-            this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
-            this.ucBtnPrint98.Name = "ucBtnPrint98";
-            this.ucBtnPrint98.rptParameter = null;
-            this.ucBtnPrint98.Size = new System.Drawing.Size(217, 24);
-            this.ucBtnPrint98.TabIndex = 8;
-            // 
-            // txt_yQty98
-            // 
-            this.txt_yQty98.Location = new System.Drawing.Point(114, 12);
-            this.txt_yQty98.Name = "txt_yQty98";
-            this.txt_yQty98.Properties.ReadOnly = true;
-            this.txt_yQty98.Size = new System.Drawing.Size(114, 24);
-            this.txt_yQty98.StyleController = this.layoutMx98;
-            this.txt_yQty98.TabIndex = 4;
-            // 
-            // txt_kQty98
-            // 
-            this.txt_kQty98.Location = new System.Drawing.Point(334, 12);
-            this.txt_kQty98.Name = "txt_kQty98";
-            this.txt_kQty98.Properties.ReadOnly = true;
-            this.txt_kQty98.Size = new System.Drawing.Size(115, 24);
-            this.txt_kQty98.StyleController = this.layoutMx98;
-            this.txt_kQty98.TabIndex = 5;
-            // 
-            // txt_printRemark98
-            // 
-            this.txt_printRemark98.Location = new System.Drawing.Point(555, 12);
-            this.txt_printRemark98.Name = "txt_printRemark98";
-            this.txt_printRemark98.Size = new System.Drawing.Size(115, 24);
-            this.txt_printRemark98.StyleController = this.layoutMx98;
-            this.txt_printRemark98.TabIndex = 6;
-            // 
-            // txt_iCount_98
-            // 
-            this.txt_iCount_98.Location = new System.Drawing.Point(776, 12);
-            this.txt_iCount_98.Name = "txt_iCount_98";
-            this.txt_iCount_98.Size = new System.Drawing.Size(115, 24);
-            this.txt_iCount_98.StyleController = this.layoutMx98;
-            this.txt_iCount_98.TabIndex = 7;
-            // 
-            // layoutControlGroup2
-            // 
-            this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.layoutControlGroup2.GroupBordersVisible = false;
-            this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem30,
-            this.layoutControlItem31,
-            this.layoutControlItem32,
-            this.layoutControlItem33,
-            this.layoutControlItem34});
-            this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
-            this.layoutControlGroup2.Name = "layoutControlGroup2";
-            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[] {
-            columnDefinition26,
-            columnDefinition27,
-            columnDefinition28,
-            columnDefinition29,
-            columnDefinition30});
-            rowDefinition16.Height = 100D;
-            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
-            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition16});
-            this.layoutControlGroup2.Size = new System.Drawing.Size(1124, 48);
-            this.layoutControlGroup2.TextVisible = false;
-            // 
-            // layoutControlItem30
-            // 
-            this.layoutControlItem30.Control = this.txt_yQty98;
-            this.layoutControlItem30.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem30.Name = "layoutControlItem30";
-            this.layoutControlItem30.Size = new System.Drawing.Size(220, 28);
-            this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
-            this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem31
-            // 
-            this.layoutControlItem31.Control = this.txt_kQty98;
-            this.layoutControlItem31.Location = new System.Drawing.Point(220, 0);
-            this.layoutControlItem31.Name = "layoutControlItem31";
-            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem31.Size = new System.Drawing.Size(221, 28);
-            this.layoutControlItem31.Text = "鍙墦鍗版暟閲�";
-            this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem32
-            // 
-            this.layoutControlItem32.Control = this.txt_printRemark98;
-            this.layoutControlItem32.Location = new System.Drawing.Point(441, 0);
-            this.layoutControlItem32.Name = "layoutControlItem32";
-            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem32.Size = new System.Drawing.Size(221, 28);
-            this.layoutControlItem32.Text = "鎵撳嵃澶囨敞";
-            this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem33
-            // 
-            this.layoutControlItem33.Control = this.txt_iCount_98;
-            this.layoutControlItem33.Location = new System.Drawing.Point(662, 0);
-            this.layoutControlItem33.Name = "layoutControlItem33";
-            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem33.Size = new System.Drawing.Size(221, 28);
-            this.layoutControlItem33.Text = "鏈鎵撳嵃寮犳暟";
-            this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem34
-            // 
-            this.layoutControlItem34.Control = this.ucBtnPrint98;
-            this.layoutControlItem34.Location = new System.Drawing.Point(883, 0);
-            this.layoutControlItem34.Name = "layoutControlItem34";
-            this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 4;
-            this.layoutControlItem34.Size = new System.Drawing.Size(221, 28);
-            this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem34.TextVisible = false;
-            // 
             // gridColumn34
             // 
-            this.gridColumn34.Caption = "绾垮埆";
+            this.gridColumn34.Caption = "绾垮埆ID";
             this.gridColumn34.FieldName = "lineId";
             this.gridColumn34.MinWidth = 25;
             this.gridColumn34.Name = "gridColumn34";
             this.gridColumn34.Visible = true;
-            this.gridColumn34.VisibleIndex = 1;
+            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;
+            // 
+            // xtraTabPage4
+            // 
+            this.xtraTabPage4.Controls.Add(this.splitMx100);
+            this.xtraTabPage4.Name = "xtraTabPage4";
+            this.xtraTabPage4.Size = new System.Drawing.Size(1648, 481);
+            this.xtraTabPage4.Text = "鍚庣洊鐮佹槑缁�";
+            // 
+            // splitMx100
+            // 
+            this.splitMx100.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitMx100.Horizontal = false;
+            this.splitMx100.Location = new System.Drawing.Point(0, 0);
+            this.splitMx100.Name = "splitMx100";
+            // 
+            // splitMx100.Panel1
+            // 
+            this.splitMx100.Panel1.Controls.Add(this.layMx100);
+            this.splitMx100.Panel1.Text = "Panel1";
+            // 
+            // splitMx100.Panel2
+            // 
+            this.splitMx100.Panel2.Controls.Add(this.gcMx4);
+            this.splitMx100.Panel2.Text = "Panel2";
+            this.splitMx100.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx100.Size = new System.Drawing.Size(1648, 481);
+            this.splitMx100.SplitterPosition = 52;
+            this.splitMx100.TabIndex = 3;
+            // 
+            // layMx100
+            // 
+            this.layMx100.Controls.Add(this.ucBtnPrint100);
+            this.layMx100.Controls.Add(this.btnIn);
+            this.layMx100.Controls.Add(this.txt_zQty100);
+            this.layMx100.Controls.Add(this.txt_yQty100);
+            this.layMx100.Controls.Add(this.txt_kQty100);
+            this.layMx100.Controls.Add(this.txt_iCount_100);
+            this.layMx100.Controls.Add(this.btnDeleteBar);
+            this.layMx100.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layMx100.Location = new System.Drawing.Point(0, 0);
+            this.layMx100.Name = "layMx100";
+            this.layMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(359, 336, 812, 500);
+            this.layMx100.Root = this.layoutControlGroup4;
+            this.layMx100.Size = new System.Drawing.Size(1648, 52);
+            this.layMx100.TabIndex = 2;
+            this.layMx100.Text = "dataLayoutControl1";
+            // 
+            // ucBtnPrint100
+            // 
+            this.ucBtnPrint100.guidKey = null;
+            this.ucBtnPrint100.Location = new System.Drawing.Point(1169, 12);
+            this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0);
+            this.ucBtnPrint100.Name = "ucBtnPrint100";
+            this.ucBtnPrint100.rptParameter = null;
+            this.ucBtnPrint100.Size = new System.Drawing.Size(146, 31);
+            this.ucBtnPrint100.TabIndex = 0;
+            // 
+            // btnIn
+            // 
+            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttoxls_16x16;
+            this.btnIn.Location = new System.Drawing.Point(1319, 12);
+            this.btnIn.Name = "btnIn";
+            this.btnIn.Size = new System.Drawing.Size(146, 27);
+            this.btnIn.StyleController = this.layMx100;
+            this.btnIn.TabIndex = 1;
+            this.btnIn.Text = "瀵煎叆鏉$爜";
+            // 
+            // txt_zQty100
+            // 
+            this.txt_zQty100.Location = new System.Drawing.Point(114, 12);
+            this.txt_zQty100.Name = "txt_zQty100";
+            this.txt_zQty100.Properties.ReadOnly = true;
+            this.txt_zQty100.Size = new System.Drawing.Size(183, 24);
+            this.txt_zQty100.StyleController = this.layMx100;
+            this.txt_zQty100.TabIndex = 4;
+            // 
+            // txt_yQty100
+            // 
+            this.txt_yQty100.Location = new System.Drawing.Point(403, 12);
+            this.txt_yQty100.Name = "txt_yQty100";
+            this.txt_yQty100.Properties.ReadOnly = true;
+            this.txt_yQty100.Size = new System.Drawing.Size(183, 24);
+            this.txt_yQty100.StyleController = this.layMx100;
+            this.txt_yQty100.TabIndex = 5;
+            // 
+            // txt_kQty100
+            // 
+            this.txt_kQty100.Location = new System.Drawing.Point(692, 12);
+            this.txt_kQty100.Name = "txt_kQty100";
+            this.txt_kQty100.Properties.ReadOnly = true;
+            this.txt_kQty100.Size = new System.Drawing.Size(183, 24);
+            this.txt_kQty100.StyleController = this.layMx100;
+            this.txt_kQty100.TabIndex = 6;
+            // 
+            // txt_iCount_100
+            // 
+            this.txt_iCount_100.Location = new System.Drawing.Point(981, 12);
+            this.txt_iCount_100.Name = "txt_iCount_100";
+            this.txt_iCount_100.Size = new System.Drawing.Size(184, 24);
+            this.txt_iCount_100.StyleController = this.layMx100;
+            this.txt_iCount_100.TabIndex = 7;
+            // 
+            // btnDeleteBar
+            // 
+            this.btnDeleteBar.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            this.btnDeleteBar.Location = new System.Drawing.Point(1469, 12);
+            this.btnDeleteBar.Name = "btnDeleteBar";
+            this.btnDeleteBar.Size = new System.Drawing.Size(146, 27);
+            this.btnDeleteBar.StyleController = this.layMx100;
+            this.btnDeleteBar.TabIndex = 8;
+            this.btnDeleteBar.Text = "鎵归噺鍒犻櫎鏉$爜";
+            // 
+            // layoutControlGroup4
+            // 
+            this.layoutControlGroup4.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.layoutControlGroup4.GroupBordersVisible = false;
+            this.layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem42,
+            this.layoutControlItem43,
+            this.layoutControlItem44,
+            this.layoutControlItem2,
+            this.layoutControlItem10,
+            this.layoutControlItem45,
+            this.layoutControlItem47});
+            this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.layoutControlGroup4.Name = "Root";
+            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition18.Width = 100D;
+            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition19.Width = 100D;
+            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.Absolute;
+            columnDefinition22.Width = 150D;
+            columnDefinition23.SizeType = System.Windows.Forms.SizeType.Absolute;
+            columnDefinition23.Width = 150D;
+            columnDefinition24.SizeType = System.Windows.Forms.SizeType.Absolute;
+            columnDefinition24.Width = 150D;
+            this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition18,
+            columnDefinition19,
+            columnDefinition20,
+            columnDefinition21,
+            columnDefinition22,
+            columnDefinition23,
+            columnDefinition24});
+            rowDefinition11.Height = 100D;
+            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition11});
+            this.layoutControlGroup4.Size = new System.Drawing.Size(1627, 55);
+            this.layoutControlGroup4.TextVisible = false;
+            // 
+            // layoutControlItem42
+            // 
+            this.layoutControlItem42.Control = this.txt_zQty100;
+            this.layoutControlItem42.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem42.Name = "layoutControlItem42";
+            this.layoutControlItem42.Size = new System.Drawing.Size(289, 35);
+            this.layoutControlItem42.Text = "宸ュ崟鎬婚噺";
+            this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem43
+            // 
+            this.layoutControlItem43.Control = this.txt_yQty100;
+            this.layoutControlItem43.Location = new System.Drawing.Point(289, 0);
+            this.layoutControlItem43.Name = "layoutControlItem43";
+            this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem43.Size = new System.Drawing.Size(289, 35);
+            this.layoutControlItem43.Text = "宸叉墦鍗版暟";
+            this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem44
+            // 
+            this.layoutControlItem44.Control = this.txt_kQty100;
+            this.layoutControlItem44.CustomizationFormText = "鍙墦鍗版暟";
+            this.layoutControlItem44.Location = new System.Drawing.Point(578, 0);
+            this.layoutControlItem44.Name = "layoutControlItem44";
+            this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem44.Size = new System.Drawing.Size(289, 35);
+            this.layoutControlItem44.Text = "鍙墦鍗版暟瀛�";
+            this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.btnIn;
+            this.layoutControlItem2.Location = new System.Drawing.Point(1307, 0);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 5;
+            this.layoutControlItem2.Size = new System.Drawing.Size(150, 35);
+            this.layoutControlItem2.Text = "瀵煎叆鎸夐挳";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem2.TextVisible = false;
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.ucBtnPrint100;
+            this.layoutControlItem10.Location = new System.Drawing.Point(1157, 0);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 4;
+            this.layoutControlItem10.Size = new System.Drawing.Size(150, 35);
+            this.layoutControlItem10.Text = "鎵撳嵃鎸夐挳";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem10.TextVisible = false;
+            // 
+            // layoutControlItem45
+            // 
+            this.layoutControlItem45.Control = this.txt_iCount_100;
+            this.layoutControlItem45.Location = new System.Drawing.Point(867, 0);
+            this.layoutControlItem45.Name = "layoutControlItem45";
+            this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem45.Size = new System.Drawing.Size(290, 35);
+            this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
+            this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem47
+            // 
+            this.layoutControlItem47.Control = this.btnDeleteBar;
+            this.layoutControlItem47.Location = new System.Drawing.Point(1457, 0);
+            this.layoutControlItem47.Name = "layoutControlItem47";
+            this.layoutControlItem47.OptionsTableLayoutItem.ColumnIndex = 6;
+            this.layoutControlItem47.Size = new System.Drawing.Size(150, 35);
+            this.layoutControlItem47.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem47.TextVisible = false;
+            // 
+            // gcMx4
+            // 
+            this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx4.Location = new System.Drawing.Point(0, 0);
+            this.gcMx4.MainView = this.gvMx4;
+            this.gcMx4.Name = "gcMx4";
+            this.gcMx4.Size = new System.Drawing.Size(1648, 417);
+            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.ShowFooter = true;
+            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.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣锛歿0:0.##}")});
+            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;
+            // 
+            // xtraTabPage5
+            // 
+            this.xtraTabPage5.Controls.Add(this.ucBtnPrint101);
+            this.xtraTabPage5.Name = "xtraTabPage5";
+            this.xtraTabPage5.PageVisible = false;
+            this.xtraTabPage5.Size = new System.Drawing.Size(1648, 481);
+            this.xtraTabPage5.Text = "鐗╂枡榻愬鏍囪瘑鍗�";
+            // 
+            // ucBtnPrint101
+            // 
+            this.ucBtnPrint101.guidKey = null;
+            this.ucBtnPrint101.Location = new System.Drawing.Point(7, 19);
+            this.ucBtnPrint101.Margin = new System.Windows.Forms.Padding(0);
+            this.ucBtnPrint101.Name = "ucBtnPrint101";
+            this.ucBtnPrint101.rptParameter = null;
+            this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32);
+            this.ucBtnPrint101.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(1652, 820);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_Womdaa";
@@ -2681,13 +3237,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa009.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa013.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa008.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();
@@ -2699,71 +3253,121 @@
             ((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.txt_lineNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_dptNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).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.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             this.tabMxPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            this.panMx99.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx99.Panel1)).EndInit();
+            this.splitMx99.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx99.Panel2)).EndInit();
+            this.splitMx99.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx99)).EndInit();
+            this.splitMx99.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx99)).EndInit();
             this.layoutMx99.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layShuLiang)).EndInit();
+            this.layShuLiang.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.radOut.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.layoutControlItem22)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit();
             this.xtraTabPage3.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
-            this.panMx98.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).EndInit();
+            this.splitMx98.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).EndInit();
+            this.splitMx98.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).EndInit();
+            this.splitMx98.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.layoutControlItem30)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).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();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
+            this.xtraTabPage4.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel1)).EndInit();
+            this.splitMx100.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel2)).EndInit();
+            this.splitMx100.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx100)).EndInit();
+            this.splitMx100.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layMx100)).EndInit();
+            this.layMx100.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty100.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty100.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty100.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_100.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem47)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
+            this.xtraTabPage5.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -2775,12 +3379,8 @@
         private DevExpress.XtraGrid.GridControl gcMain1;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
         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;
@@ -2798,7 +3398,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;
@@ -2811,18 +3410,14 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
         private UserControls.Data.UcPageBar pageBar1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
         private DevExpress.XtraEditors.SplitContainerControl splitMx1;
         private DevExpress.XtraEditors.TextEdit txt_daa013;
-        private DevExpress.XtraEditors.TextEdit textEdit1;
         private DevExpress.XtraEditors.TextEdit txt_saleOrderNo;
-        private DevExpress.XtraEditors.TextEdit txt_daa022Txt;
-        private DevExpress.XtraEditors.TextEdit txt_daa028;
+        private DevExpress.XtraEditors.TextEdit txt_daa022Remark;
         private DevExpress.XtraEditors.TextEdit txt_mesEndProd;
         private DevExpress.XtraEditors.TextEdit txt_mesStartProd;
-        private UserControl.UcLookWorkline txt_sjXt;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraEditors.TextEdit txt_daa014;
         private DevExpress.XtraEditors.TextEdit txt_daa017;
@@ -2844,13 +3439,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
         private DevExpress.XtraTab.XtraTabControl tabMx;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -2888,7 +3477,6 @@
         private DevExpress.XtraGrid.GridControl gcMx2;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2guid;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemBarcode;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
@@ -2899,40 +3487,21 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2createBy;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2createDate;
         private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptChongDa;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        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.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 layoutControlItem22;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
-        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 layoutControlItem24;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
         private DevExpress.XtraGrid.GridControl gcMx3;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
@@ -2941,9 +3510,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn42;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn43;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn49;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
-        private System.Windows.Forms.Panel panMx98;
         private DevExpress.XtraLayout.LayoutControl layoutMx98;
         private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
         private UserControl.UcBtnPrint ucBtnPrint98;
@@ -2951,11 +3517,83 @@
         private DevExpress.XtraEditors.TextEdit txt_kQty98;
         private DevExpress.XtraEditors.TextEdit txt_printRemark98;
         private DevExpress.XtraEditors.TextEdit txt_iCount_98;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraEditors.TextEdit txt_daa015;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+        private DevExpress.XtraEditors.RadioGroup radOut;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage4;
+        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.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;
+        private DevExpress.XtraDataLayout.DataLayoutControl layShuLiang;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
+        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
+        private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
+        private DevExpress.XtraEditors.SplitContainerControl splitMx99;
+        private DevExpress.XtraEditors.TextEdit txt_lineNo;
+        private DevExpress.XtraEditors.TextEdit txt_dptNo;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem41;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+        private DevExpress.XtraDataLayout.DataLayoutControl layMx100;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup4;
+        private DevExpress.XtraEditors.SimpleButton btnIn;
+        private DevExpress.XtraEditors.TextEdit txt_zQty100;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem42;
+        private DevExpress.XtraEditors.TextEdit txt_yQty100;
+        private DevExpress.XtraEditors.TextEdit txt_kQty100;
+        private DevExpress.XtraEditors.TextEdit txt_iCount_100;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem43;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem44;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem45;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage5;
+        private UserControl.UcBtnPrint ucBtnPrint101;
+        private DevExpress.XtraEditors.CheckEdit txt_isQiTao;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem46;
+        private DevExpress.XtraEditors.SplitContainerControl splitMx98;
+        private DevExpress.XtraEditors.SplitContainerControl splitMx100;
+        private DevExpress.XtraEditors.SimpleButton btnDeleteBar;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem47;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3