From 6c6960372db2f68615a4c927d0934693694c6a7c Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期三, 10 十二月 2025 23:16:49 +0800
Subject: [PATCH] 蓝宝优化项更新

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrksqDj.cs          |   71 +
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs      |   94 
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.resx             |    3 
 DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs    |    1 
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs            |   73 +
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs               |  144 ++
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs   |  742 ++++++++---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrksqDj.Designer.cs |  802 ++++++++---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs               |   23 
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs      | 1064 +++++++++++++++-
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs      |  788 ++++++-----
 11 files changed, 2,880 insertions(+), 925 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
index de39ac9..109842e 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
@@ -30,15 +30,15 @@
         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.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -66,6 +66,30 @@
             this.bandedGridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
+            this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMxL1 = new DevExpress.XtraGrid.GridControl();
+            this.gvMxL1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMxL2 = new DevExpress.XtraGrid.GridControl();
+            this.gvMxL2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+            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.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -88,6 +112,8 @@
             this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
             this.txt_guid = new DevExpress.XtraEditors.TextEdit();
             this.txt_tldh = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -97,8 +123,15 @@
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -125,15 +158,7 @@
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.gv_rkqty = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -141,9 +166,18 @@
             ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
             this.split1.Panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+            this.split1.Panel2.SuspendLayout();
             this.split1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
+            this.xtraTabControl2.SuspendLayout();
+            this.xtraTabPage4.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMxL1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMxL1)).BeginInit();
+            this.xtraTabPage5.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMxL2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMxL2)).BeginInit();
             this.xtraTabPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
@@ -171,6 +205,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_tldh.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -180,17 +216,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
-            this.tabMx.SuspendLayout();
-            this.tabMxPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            this.xtraTabPage3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
@@ -200,6 +225,15 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+            this.tabMx.SuspendLayout();
+            this.tabMxPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            this.xtraTabPage3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -253,10 +287,11 @@
             // 
             // split1.Panel2
             // 
+            this.split1.Panel2.Controls.Add(this.xtraTabControl2);
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.split1.Size = new System.Drawing.Size(1467, 570);
-            this.split1.SplitterPosition = 0;
+            this.split1.SplitterPosition = 211;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
@@ -265,7 +300,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(1467, 519);
+            this.gcMain1.Size = new System.Drawing.Size(1467, 308);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -283,6 +318,7 @@
             this.gv_lastupdateDate,
             this.gv_checkUser,
             this.gv_checkDate,
+            this.gv_rkqty,
             this.gv_taskNo,
             this.gridColumn8,
             this.gridColumn9,
@@ -344,7 +380,7 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.CREATE_BY";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 9;
+            this.gv_createBy.VisibleIndex = 10;
             this.gv_createBy.Width = 80;
             // 
             // gv_createDate
@@ -356,7 +392,7 @@
             this.gv_createDate.OptionsColumn.AllowEdit = false;
             this.gv_createDate.Tag = "query_a.CREATE_DATE";
             this.gv_createDate.Visible = true;
-            this.gv_createDate.VisibleIndex = 10;
+            this.gv_createDate.VisibleIndex = 11;
             this.gv_createDate.Width = 180;
             // 
             // gv_lastupdateBy
@@ -368,7 +404,7 @@
             this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
             this.gv_lastupdateBy.Visible = true;
-            this.gv_lastupdateBy.VisibleIndex = 11;
+            this.gv_lastupdateBy.VisibleIndex = 12;
             this.gv_lastupdateBy.Width = 94;
             // 
             // gv_lastupdateDate
@@ -380,7 +416,7 @@
             this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
             this.gv_lastupdateDate.Visible = true;
-            this.gv_lastupdateDate.VisibleIndex = 12;
+            this.gv_lastupdateDate.VisibleIndex = 13;
             this.gv_lastupdateDate.Width = 94;
             // 
             // gv_checkUser
@@ -392,7 +428,7 @@
             this.gv_checkUser.OptionsColumn.AllowEdit = false;
             this.gv_checkUser.Tag = "query_a.CHECK_USER";
             this.gv_checkUser.Visible = true;
-            this.gv_checkUser.VisibleIndex = 13;
+            this.gv_checkUser.VisibleIndex = 14;
             this.gv_checkUser.Width = 60;
             // 
             // gv_checkDate
@@ -404,7 +440,7 @@
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.CHECK_DATE";
             this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 14;
+            this.gv_checkDate.VisibleIndex = 15;
             this.gv_checkDate.Width = 180;
             // 
             // gv_taskNo
@@ -467,7 +503,7 @@
             this.bandedGridColumn2.Name = "bandedGridColumn2";
             this.bandedGridColumn2.Tag = "org.fnamber";
             this.bandedGridColumn2.Visible = true;
-            this.bandedGridColumn2.VisibleIndex = 15;
+            this.bandedGridColumn2.VisibleIndex = 16;
             this.bandedGridColumn2.Width = 250;
             // 
             // bandedGridColumn3
@@ -477,7 +513,7 @@
             this.bandedGridColumn3.MinWidth = 25;
             this.bandedGridColumn3.Name = "bandedGridColumn3";
             this.bandedGridColumn3.Visible = true;
-            this.bandedGridColumn3.VisibleIndex = 16;
+            this.bandedGridColumn3.VisibleIndex = 17;
             this.bandedGridColumn3.Width = 94;
             // 
             // bandedGridColumn4
@@ -507,7 +543,7 @@
             this.bandedGridColumn6.MinWidth = 25;
             this.bandedGridColumn6.Name = "bandedGridColumn6";
             this.bandedGridColumn6.Visible = true;
-            this.bandedGridColumn6.VisibleIndex = 17;
+            this.bandedGridColumn6.VisibleIndex = 18;
             this.bandedGridColumn6.Width = 94;
             // 
             // gridColumn7
@@ -517,20 +553,284 @@
             this.gridColumn7.MinWidth = 25;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 18;
+            this.gridColumn7.VisibleIndex = 19;
             this.gridColumn7.Width = 94;
             // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 519);
+            this.pageBar1.Location = new System.Drawing.Point(0, 308);
             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(1467, 39);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
+            // 
+            // xtraTabControl2
+            // 
+            this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
+            this.xtraTabControl2.Name = "xtraTabControl2";
+            this.xtraTabControl2.SelectedTabPage = this.xtraTabPage4;
+            this.xtraTabControl2.Size = new System.Drawing.Size(1467, 211);
+            this.xtraTabControl2.TabIndex = 4;
+            this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage4,
+            this.xtraTabPage5});
+            // 
+            // xtraTabPage4
+            // 
+            this.xtraTabPage4.Controls.Add(this.gcMxL1);
+            this.xtraTabPage4.Name = "xtraTabPage4";
+            this.xtraTabPage4.Size = new System.Drawing.Size(1465, 179);
+            this.xtraTabPage4.Text = "鐗╂枡鏄庣粏";
+            // 
+            // gcMxL1
+            // 
+            this.gcMxL1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMxL1.Location = new System.Drawing.Point(0, 0);
+            this.gcMxL1.MainView = this.gvMxL1;
+            this.gcMxL1.Name = "gcMxL1";
+            this.gcMxL1.Size = new System.Drawing.Size(1465, 179);
+            this.gcMxL1.TabIndex = 0;
+            this.gcMxL1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMxL1});
+            // 
+            // gvMxL1
+            // 
+            this.gvMxL1.Appearance.Row.Options.UseFont = true;
+            this.gvMxL1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn10,
+            this.gridColumn11,
+            this.gridColumn12,
+            this.gridColumn13,
+            this.gridColumn14,
+            this.gridColumn15,
+            this.gridColumn16});
+            this.gvMxL1.GridControl = this.gcMxL1;
+            this.gvMxL1.Name = "gvMxL1";
+            this.gvMxL1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+            this.gvMxL1.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMxL1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "鐗╂枡缂栧彿";
+            this.gridColumn10.FieldName = "itemNo";
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 0;
+            this.gridColumn10.Width = 94;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.AppearanceCell.Options.UseFont = true;
+            this.gridColumn11.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn11.FieldName = "itemName";
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Tag = "query_a.ITEM_SNAME";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 1;
+            this.gridColumn11.Width = 94;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn12.FieldName = "itemModel";
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 2;
+            this.gridColumn12.Width = 94;
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.AppearanceCell.Options.UseFont = true;
+            this.gridColumn13.Caption = "鏁伴噺";
+            this.gridColumn13.FieldName = "quantity";
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Tag = "query_a.QUANTITY";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 3;
+            this.gridColumn13.Width = 94;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.AppearanceCell.Options.UseFont = true;
+            this.gridColumn14.Caption = "搴撳瓨鍗曚綅";
+            this.gridColumn14.FieldName = "kcUnit";
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Tag = "query_a.UNIT";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 4;
+            this.gridColumn14.Width = 94;
+            // 
+            // gridColumn15
+            // 
+            this.gridColumn15.Caption = "寤虹珛鑰�";
+            this.gridColumn15.FieldName = "createBy";
+            this.gridColumn15.MinWidth = 25;
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 5;
+            this.gridColumn15.Width = 94;
+            // 
+            // gridColumn16
+            // 
+            this.gridColumn16.Caption = "寤虹珛鏃堕棿";
+            this.gridColumn16.FieldName = "createDate";
+            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 6;
+            this.gridColumn16.Width = 94;
+            // 
+            // xtraTabPage5
+            // 
+            this.xtraTabPage5.Controls.Add(this.gcMxL2);
+            this.xtraTabPage5.Name = "xtraTabPage5";
+            this.xtraTabPage5.Size = new System.Drawing.Size(1465, 179);
+            this.xtraTabPage5.Text = "鍏ュ簱鏉$爜";
+            // 
+            // gcMxL2
+            // 
+            this.gcMxL2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMxL2.Location = new System.Drawing.Point(0, 0);
+            this.gcMxL2.MainView = this.gvMxL2;
+            this.gcMxL2.Name = "gcMxL2";
+            this.gcMxL2.Size = new System.Drawing.Size(1465, 179);
+            this.gcMxL2.TabIndex = 1;
+            this.gcMxL2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMxL2});
+            // 
+            // gvMxL2
+            // 
+            this.gvMxL2.Appearance.Row.Options.UseFont = true;
+            this.gvMxL2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn17,
+            this.gridColumn18,
+            this.gridColumn19,
+            this.gridColumn20,
+            this.gridColumn21,
+            this.gridColumn22,
+            this.gridColumn23,
+            this.gridColumn24,
+            this.gridColumn25,
+            this.gridColumn26});
+            this.gvMxL2.GridControl = this.gcMxL2;
+            this.gvMxL2.Name = "gvMxL2";
+            this.gvMxL2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMxL2.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMxL2.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.AppearanceCell.Options.UseFont = true;
+            this.gridColumn17.Caption = "鐗╂枡鏉$爜";
+            this.gridColumn17.FieldName = "itemBarcode";
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Tag = "query_a.ITEM_BARCODE";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 0;
+            this.gridColumn17.Width = 250;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.AppearanceCell.Options.UseFont = true;
+            this.gridColumn18.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn18.FieldName = "itemNo";
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Tag = "query_a.C_ITEM_CODE";
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 1;
+            this.gridColumn18.Width = 100;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.AppearanceCell.Options.UseFont = true;
+            this.gridColumn19.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn19.FieldName = "itemName";
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Tag = "query_a.ITEM_SNAME";
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 2;
+            this.gridColumn19.Width = 250;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.AppearanceCell.Options.UseFont = true;
+            this.gridColumn20.Caption = "瑙勬牸鍨嬪彿";
+            this.gridColumn20.FieldName = "itemModel";
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Tag = "query_a.ITEM_NO";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 3;
+            this.gridColumn20.Width = 250;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.AppearanceCell.Options.UseFont = true;
+            this.gridColumn21.Caption = "鏁伴噺";
+            this.gridColumn21.FieldName = "quantity";
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Tag = "query_a.QUANTITY";
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 4;
+            this.gridColumn21.Width = 94;
+            // 
+            // gridColumn22
+            // 
+            this.gridColumn22.AppearanceCell.Options.UseFont = true;
+            this.gridColumn22.Caption = "搴撳瓨鍗曚綅";
+            this.gridColumn22.FieldName = "kcUnit";
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.Tag = "query_a.UNIT";
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 5;
+            this.gridColumn22.Width = 94;
+            // 
+            // gridColumn23
+            // 
+            this.gridColumn23.AppearanceCell.Options.UseFont = true;
+            this.gridColumn23.Caption = "璐т綅缂栫爜";
+            this.gridColumn23.FieldName = "depotSectionCode";
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.Tag = "query_a.DEPOT_SECTION_CODE";
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 6;
+            this.gridColumn23.Width = 94;
+            // 
+            // gridColumn24
+            // 
+            this.gridColumn24.AppearanceCell.Options.UseFont = true;
+            this.gridColumn24.Caption = "浠撳簱缂栫爜";
+            this.gridColumn24.FieldName = "depotCode";
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Tag = "query_a.DEPOT_CODE";
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 7;
+            this.gridColumn24.Width = 94;
+            // 
+            // gridColumn25
+            // 
+            this.gridColumn25.Caption = "寤虹珛鑰�";
+            this.gridColumn25.FieldName = "createBy";
+            this.gridColumn25.MinWidth = 25;
+            this.gridColumn25.Name = "gridColumn25";
+            this.gridColumn25.Visible = true;
+            this.gridColumn25.VisibleIndex = 8;
+            this.gridColumn25.Width = 94;
+            // 
+            // gridColumn26
+            // 
+            this.gridColumn26.Caption = "寤虹珛鏃堕棿";
+            this.gridColumn26.FieldName = "createDate";
+            this.gridColumn26.MinWidth = 25;
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Visible = true;
+            this.gridColumn26.VisibleIndex = 9;
+            this.gridColumn26.Width = 94;
             // 
             // xtraTabPage2
             // 
@@ -768,6 +1068,29 @@
             this.txt_tldh.StyleController = this.layoutMx1;
             this.txt_tldh.TabIndex = 609;
             // 
+            // layoutControlItem17
+            // 
+            this.layoutControlItem17.Control = this.lbGuid;
+            this.layoutControlItem17.Location = new System.Drawing.Point(1085, 90);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem17.Size = new System.Drawing.Size(362, 30);
+            this.layoutControlItem17.Text = "lbGuid";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem17.TextVisible = false;
+            // 
+            // layoutControlItem18
+            // 
+            this.layoutControlItem18.Control = this.txt_guid;
+            this.layoutControlItem18.Location = new System.Drawing.Point(1085, 120);
+            this.layoutControlItem18.Name = "layoutControlItem18";
+            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem18.Size = new System.Drawing.Size(362, 32);
+            this.layoutControlItem18.Text = "涓婚敭Guid";
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
+            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -792,35 +1115,35 @@
             this.layoutControlItem6});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition1.Width = 100D;
-            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition2.Width = 100D;
-            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition3.Width = 100D;
-            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition4.Width = 100D;
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
+            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7.Width = 100D;
+            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition8.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition1,
-            columnDefinition2,
-            columnDefinition3,
-            columnDefinition4});
-            rowDefinition1.Height = 100D;
-            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition2.Height = 100D;
-            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition3.Height = 100D;
-            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition4.Height = 100D;
-            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5,
+            columnDefinition6,
+            columnDefinition7,
+            columnDefinition8});
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition7.Height = 100D;
+            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition8.Height = 100D;
+            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition9.Height = 100D;
+            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition10.Height = 100D;
+            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3,
-            rowDefinition4,
-            rowDefinition5});
+            rowDefinition6,
+            rowDefinition7,
+            rowDefinition8,
+            rowDefinition9,
+            rowDefinition10});
             this.Root.Size = new System.Drawing.Size(1467, 172);
             this.Root.TextVisible = false;
             // 
@@ -906,28 +1229,103 @@
             this.layoutControlItem13.Text = "澶囨敞";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
             // 
-            // layoutControlItem17
+            // layoutControlItem16
             // 
-            this.layoutControlItem17.Control = this.lbGuid;
-            this.layoutControlItem17.Location = new System.Drawing.Point(1085, 90);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem17.Size = new System.Drawing.Size(362, 30);
-            this.layoutControlItem17.Text = "lbGuid";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem17.TextVisible = false;
+            this.layoutControlItem16.Control = this.txt_fstatus;
+            this.layoutControlItem16.Location = new System.Drawing.Point(1085, 120);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem16.Size = new System.Drawing.Size(362, 32);
+            this.layoutControlItem16.Text = "瀹℃牳鏍囪瘑";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem16.TextVisible = false;
             // 
-            // layoutControlItem18
+            // layoutControlItem15
             // 
-            this.layoutControlItem18.Control = this.txt_guid;
-            this.layoutControlItem18.Location = new System.Drawing.Point(1085, 120);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem18.Size = new System.Drawing.Size(362, 32);
-            this.layoutControlItem18.Text = "涓婚敭Guid";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem15.Control = this.txt_checkDate;
+            this.layoutControlItem15.Location = new System.Drawing.Point(1085, 90);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem15.Size = new System.Drawing.Size(362, 30);
+            this.layoutControlItem15.Text = "瀹℃牳鏃堕棿";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_fcheckUser;
+            this.layoutControlItem14.Location = new System.Drawing.Point(1085, 60);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem14.Size = new System.Drawing.Size(362, 30);
+            this.layoutControlItem14.Text = "瀹℃牳浜�";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_createBy;
+            this.layoutControlItem3.Location = new System.Drawing.Point(1085, 0);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem3.Size = new System.Drawing.Size(362, 30);
+            this.layoutControlItem3.Text = "鍒涘缓浜�";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_createDate;
+            this.layoutControlItem4.Location = new System.Drawing.Point(1085, 30);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem4.Size = new System.Drawing.Size(362, 30);
+            this.layoutControlItem4.Text = "鍒涘缓鏃堕棿";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_scOrg;
+            this.layoutControlItem8.Location = new System.Drawing.Point(723, 0);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem8.Size = new System.Drawing.Size(362, 30);
+            this.layoutControlItem8.Text = "鐢熶骇缁勭粐";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem19
+            // 
+            this.layoutControlItem19.Control = this.txt_tldh;
+            this.layoutControlItem19.Location = new System.Drawing.Point(361, 30);
+            this.layoutControlItem19.Name = "layoutControlItem19";
+            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem19.Size = new System.Drawing.Size(362, 30);
+            this.layoutControlItem19.Text = "鎶曟枡鍗曞彿";
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_dptName;
+            this.layoutControlItem10.Location = new System.Drawing.Point(723, 30);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem10.Size = new System.Drawing.Size(362, 30);
+            this.layoutControlItem10.Text = "鐢熶骇杞﹂棿";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_itemModel;
+            this.layoutControlItem6.Location = new System.Drawing.Point(361, 60);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem6.Size = new System.Drawing.Size(362, 30);
+            this.layoutControlItem6.Text = "瑙勬牸鍨嬪彿";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
             // 
             // tabMx
             // 
@@ -1051,7 +1449,7 @@
             // 
             this.xtraTabPage3.Controls.Add(this.gcMx2);
             this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1344, 354);
+            this.xtraTabPage3.Size = new System.Drawing.Size(1465, 354);
             this.xtraTabPage3.Text = "鍏ュ簱鏉$爜";
             // 
             // gcMx2
@@ -1060,7 +1458,7 @@
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1344, 354);
+            this.gcMx2.Size = new System.Drawing.Size(1465, 354);
             this.gcMx2.TabIndex = 1;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -1204,103 +1602,15 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // layoutControlItem16
+            // gv_rkqty
             // 
-            this.layoutControlItem16.Control = this.txt_fstatus;
-            this.layoutControlItem16.Location = new System.Drawing.Point(1085, 120);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem16.Size = new System.Drawing.Size(362, 32);
-            this.layoutControlItem16.Text = "瀹℃牳鏍囪瘑";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem16.TextVisible = false;
-            // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.txt_checkDate;
-            this.layoutControlItem15.Location = new System.Drawing.Point(1085, 90);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem15.Size = new System.Drawing.Size(362, 30);
-            this.layoutControlItem15.Text = "瀹℃牳鏃堕棿";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_fcheckUser;
-            this.layoutControlItem14.Location = new System.Drawing.Point(1085, 60);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(362, 30);
-            this.layoutControlItem14.Text = "瀹℃牳浜�";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txt_createBy;
-            this.layoutControlItem3.Location = new System.Drawing.Point(1085, 0);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem3.Size = new System.Drawing.Size(362, 30);
-            this.layoutControlItem3.Text = "鍒涘缓浜�";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.txt_createDate;
-            this.layoutControlItem4.Location = new System.Drawing.Point(1085, 30);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(362, 30);
-            this.layoutControlItem4.Text = "鍒涘缓鏃堕棿";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.txt_scOrg;
-            this.layoutControlItem8.Location = new System.Drawing.Point(723, 0);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(362, 30);
-            this.layoutControlItem8.Text = "鐢熶骇缁勭粐";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem19
-            // 
-            this.layoutControlItem19.Control = this.txt_tldh;
-            this.layoutControlItem19.Location = new System.Drawing.Point(361, 30);
-            this.layoutControlItem19.Name = "layoutControlItem19";
-            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem19.Size = new System.Drawing.Size(362, 30);
-            this.layoutControlItem19.Text = "鎶曟枡鍗曞彿";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txt_dptName;
-            this.layoutControlItem10.Location = new System.Drawing.Point(723, 30);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem10.Size = new System.Drawing.Size(362, 30);
-            this.layoutControlItem10.Text = "鐢熶骇杞﹂棿";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_itemModel;
-            this.layoutControlItem6.Location = new System.Drawing.Point(361, 60);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem6.Size = new System.Drawing.Size(362, 30);
-            this.layoutControlItem6.Text = "瑙勬牸鍨嬪彿";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+            this.gv_rkqty.Caption = "鍏ュ簱鏁伴噺";
+            this.gv_rkqty.FieldName = "rkQty";
+            this.gv_rkqty.MinWidth = 25;
+            this.gv_rkqty.Name = "gv_rkqty";
+            this.gv_rkqty.Visible = true;
+            this.gv_rkqty.VisibleIndex = 9;
+            this.gv_rkqty.Width = 138;
             // 
             // Frm_MesScrkDj
             // 
@@ -1318,10 +1628,19 @@
             ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
             this.split1.Panel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+            this.split1.Panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
             this.split1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
+            this.xtraTabControl2.ResumeLayout(false);
+            this.xtraTabPage4.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMxL1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMxL1)).EndInit();
+            this.xtraTabPage5.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMxL2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMxL2)).EndInit();
             this.xtraTabPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
             this.splitMx1.Panel1.ResumeLayout(false);
@@ -1349,6 +1668,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_tldh.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1358,17 +1679,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
-            this.tabMx.ResumeLayout(false);
-            this.tabMxPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            this.xtraTabPage3.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
@@ -1378,6 +1688,15 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+            this.tabMx.ResumeLayout(false);
+            this.tabMxPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            this.xtraTabPage3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1477,5 +1796,30 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl2;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage4;
+        private DevExpress.XtraGrid.GridControl gcMxL1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMxL1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage5;
+        private DevExpress.XtraGrid.GridControl gcMxL2;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMxL2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+        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 DevExpress.XtraGrid.Columns.GridColumn gv_rkqty;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
index 1158753..55d45fc 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
@@ -26,6 +26,12 @@
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
+            {
+                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+            }, tips, true, (strGuid) => {
+                getModelList(strGuid);
+            });
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -80,6 +86,73 @@
             _filterList = e.FilterList;
             getPageList(1);
         }
+
+        private void getModelList(string strGuid)
+        {
+            gcMxL1.DataSource = null;
+            gcMxL2.DataSource = null;
+
+            var _obj = new
+            {
+                guid = strGuid,//涓诲缓
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+
+                    JArray array1 = new JArray();
+                    foreach (var a in dy["list"])
+                    {
+                        array1.Add(a);
+                    }
+                    DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+                    if (dt1.Rows.Count > 0)
+                    {
+                        gcMxL1.BindingContext = new BindingContext();
+                        gcMxL1.DataSource = dt1;
+                        gcMxL1.ForceInitialize();
+                        gvMxL1.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMxL1);
+                    }
+                    else
+                    {
+                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMxL1, gvMxL1);
+                    }
+                    JArray array2 = new JArray();
+                    foreach (var a in dy["list2"])
+                    {
+                        array2.Add(a);
+                    }
+
+                    DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+                    if (dt2.Rows.Count > 0)
+                    {
+                        gcMxL2.BindingContext = new BindingContext();
+                        gcMxL2.DataSource = dt2;
+                        gcMxL2.ForceInitialize();
+                        gvMxL2.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMxL2);
+                    }
+                    else
+                    {
+                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMxL2, gvMxL2);
+                    }
+
+                }
+                else
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+
         /// <summary>
         /// 鏃ュ織
         /// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrksqDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrksqDj.Designer.cs
index 83b6a30..4732b2c 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrksqDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrksqDj.Designer.cs
@@ -57,6 +57,7 @@
             this.gv_taskNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_cj = new DevExpress.XtraGrid.Columns.GridColumn();
             this.bandedGridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_depotsId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.bandedGridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -66,6 +67,30 @@
             this.bandedGridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
+            this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMxL1 = new DevExpress.XtraGrid.GridControl();
+            this.gvMxL1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMxL2 = new DevExpress.XtraGrid.GridControl();
+            this.gvMxL2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+            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.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -134,7 +159,7 @@
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.gv_cj = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_rksqqty = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -142,9 +167,18 @@
             ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
             this.split1.Panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+            this.split1.Panel2.SuspendLayout();
             this.split1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
+            this.xtraTabControl2.SuspendLayout();
+            this.xtraTabPage4.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMxL1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMxL1)).BeginInit();
+            this.xtraTabPage5.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMxL2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMxL2)).BeginInit();
             this.xtraTabPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
@@ -212,10 +246,9 @@
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
-            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1180, 62);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1849, 80);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -223,11 +256,10 @@
             // xtraTabControl1
             // 
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
-            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            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(1180, 468);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1849, 601);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -236,9 +268,8 @@
             // xtraTabPage1
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
-            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1178, 442);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1847, 569);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -247,7 +278,6 @@
             this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
-            this.split1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.split1.Name = "split1";
             // 
             // split1.Panel1
@@ -258,21 +288,20 @@
             // 
             // split1.Panel2
             // 
+            this.split1.Panel2.Controls.Add(this.xtraTabControl2);
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1178, 442);
-            this.split1.SplitterPosition = 0;
+            this.split1.Size = new System.Drawing.Size(1847, 569);
+            this.split1.SplitterPosition = 192;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
-            this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1178, 402);
+            this.gcMain1.Size = new System.Drawing.Size(1847, 326);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -290,6 +319,7 @@
             this.gv_lastupdateDate,
             this.gv_checkUserName,
             this.gv_checkDate,
+            this.gv_rksqqty,
             this.gv_taskNo,
             this.gridColumn8,
             this.gridColumn9,
@@ -302,9 +332,8 @@
             this.bandedGridColumn5,
             this.bandedGridColumn6,
             this.gridColumn7});
-            this.gridView1.DetailHeight = 272;
             this.gridView1.GridControl = this.gcMain1;
-            this.gridView1.IndicatorWidth = 44;
+            this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -315,251 +344,537 @@
             this.gv_guid.AppearanceCell.Options.UseFont = true;
             this.gv_guid.Caption = "涓婚敭Guid";
             this.gv_guid.FieldName = "guid";
-            this.gv_guid.MinWidth = 44;
+            this.gv_guid.MinWidth = 50;
             this.gv_guid.Name = "gv_guid";
             this.gv_guid.OptionsColumn.AllowEdit = false;
             this.gv_guid.Tag = "query_a.GUID";
-            this.gv_guid.Width = 82;
+            this.gv_guid.Width = 94;
             // 
             // bandedGridColumn7
             // 
             this.bandedGridColumn7.Caption = "瀹℃牳";
             this.bandedGridColumn7.FieldName = "checkStatus";
-            this.bandedGridColumn7.MinWidth = 22;
+            this.bandedGridColumn7.MinWidth = 25;
             this.bandedGridColumn7.Name = "bandedGridColumn7";
             this.bandedGridColumn7.Tag = "query_a.BILL_NO";
             this.bandedGridColumn7.Visible = true;
             this.bandedGridColumn7.VisibleIndex = 0;
-            this.bandedGridColumn7.Width = 82;
+            this.bandedGridColumn7.Width = 94;
             // 
             // gv_billNo
             // 
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "鍏ュ簱鐢宠鍗曞彿 ";
             this.gv_billNo.FieldName = "billNo";
-            this.gv_billNo.MinWidth = 17;
+            this.gv_billNo.MinWidth = 19;
             this.gv_billNo.Name = "gv_billNo";
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.BILL_NO";
             this.gv_billNo.Visible = true;
             this.gv_billNo.VisibleIndex = 1;
-            this.gv_billNo.Width = 157;
+            this.gv_billNo.Width = 179;
             // 
             // gv_createName
             // 
             this.gv_createName.AppearanceCell.Options.UseFont = true;
             this.gv_createName.Caption = "鍒涘缓浜� ";
             this.gv_createName.FieldName = "createName";
-            this.gv_createName.MinWidth = 17;
+            this.gv_createName.MinWidth = 19;
             this.gv_createName.Name = "gv_createName";
             this.gv_createName.OptionsColumn.AllowEdit = false;
             this.gv_createName.Tag = "query_b.staff_name";
             this.gv_createName.Visible = true;
             this.gv_createName.VisibleIndex = 2;
-            this.gv_createName.Width = 70;
+            this.gv_createName.Width = 80;
             // 
             // gv_createDate
             // 
             this.gv_createDate.AppearanceCell.Options.UseFont = true;
             this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
             this.gv_createDate.FieldName = "createDate";
-            this.gv_createDate.MinWidth = 17;
+            this.gv_createDate.MinWidth = 19;
             this.gv_createDate.Name = "gv_createDate";
             this.gv_createDate.OptionsColumn.AllowEdit = false;
             this.gv_createDate.Tag = "query_a.CREATE_DATE";
             this.gv_createDate.Visible = true;
             this.gv_createDate.VisibleIndex = 3;
-            this.gv_createDate.Width = 157;
+            this.gv_createDate.Width = 179;
             // 
             // gv_lastupdateBy
             // 
             this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
             this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
             this.gv_lastupdateBy.FieldName = "lastupdateBy";
-            this.gv_lastupdateBy.MinWidth = 17;
+            this.gv_lastupdateBy.MinWidth = 19;
             this.gv_lastupdateBy.Name = "gv_lastupdateBy";
             this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
             this.gv_lastupdateBy.Visible = true;
             this.gv_lastupdateBy.VisibleIndex = 4;
-            this.gv_lastupdateBy.Width = 82;
+            this.gv_lastupdateBy.Width = 94;
             // 
             // gv_lastupdateDate
             // 
             this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
             this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
             this.gv_lastupdateDate.FieldName = "lastupdateDate";
-            this.gv_lastupdateDate.MinWidth = 17;
+            this.gv_lastupdateDate.MinWidth = 19;
             this.gv_lastupdateDate.Name = "gv_lastupdateDate";
             this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
             this.gv_lastupdateDate.Visible = true;
             this.gv_lastupdateDate.VisibleIndex = 5;
-            this.gv_lastupdateDate.Width = 82;
+            this.gv_lastupdateDate.Width = 94;
             // 
             // gv_checkUserName
             // 
             this.gv_checkUserName.AppearanceCell.Options.UseFont = true;
             this.gv_checkUserName.Caption = "瀹℃牳浜� ";
             this.gv_checkUserName.FieldName = "checkUserName";
-            this.gv_checkUserName.MinWidth = 17;
+            this.gv_checkUserName.MinWidth = 19;
             this.gv_checkUserName.Name = "gv_checkUserName";
             this.gv_checkUserName.OptionsColumn.AllowEdit = false;
             this.gv_checkUserName.Tag = "query_c.stauff_name";
             this.gv_checkUserName.Visible = true;
             this.gv_checkUserName.VisibleIndex = 6;
-            this.gv_checkUserName.Width = 52;
+            this.gv_checkUserName.Width = 59;
             // 
             // gv_checkDate
             // 
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
             this.gv_checkDate.FieldName = "checkDate";
-            this.gv_checkDate.MinWidth = 17;
+            this.gv_checkDate.MinWidth = 19;
             this.gv_checkDate.Name = "gv_checkDate";
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.CHECK_DATE";
             this.gv_checkDate.Visible = true;
             this.gv_checkDate.VisibleIndex = 7;
-            this.gv_checkDate.Width = 157;
+            this.gv_checkDate.Width = 179;
             // 
             // gv_taskNo
             // 
             this.gv_taskNo.AppearanceCell.Options.UseFont = true;
             this.gv_taskNo.Caption = "鐢熶骇宸ュ崟鍙�";
             this.gv_taskNo.FieldName = "taskNo";
-            this.gv_taskNo.MinWidth = 17;
+            this.gv_taskNo.MinWidth = 19;
             this.gv_taskNo.Name = "gv_taskNo";
             this.gv_taskNo.OptionsColumn.AllowEdit = false;
             this.gv_taskNo.Tag = "query_a.TASK_NO";
             this.gv_taskNo.Visible = true;
             this.gv_taskNo.VisibleIndex = 8;
-            this.gv_taskNo.Width = 82;
+            this.gv_taskNo.Width = 94;
             // 
             // gridColumn8
             // 
             this.gridColumn8.Caption = "浠诲姟鍗曞彿";
             this.gridColumn8.FieldName = "workNo";
-            this.gridColumn8.MinWidth = 22;
+            this.gridColumn8.MinWidth = 25;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Tag = "query_a.work_no";
             this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 9;
-            this.gridColumn8.Width = 82;
+            this.gridColumn8.VisibleIndex = 10;
+            this.gridColumn8.Width = 94;
             // 
             // gridColumn9
             // 
             this.gridColumn9.Caption = "鎶曟枡鍗曞彿";
             this.gridColumn9.FieldName = "tldh";
-            this.gridColumn9.MinWidth = 22;
+            this.gridColumn9.MinWidth = 25;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Tag = "query_daa.daa014";
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 10;
-            this.gridColumn9.Width = 82;
+            this.gridColumn9.VisibleIndex = 11;
+            this.gridColumn9.Width = 94;
+            // 
+            // gv_cj
+            // 
+            this.gv_cj.Caption = "杞﹂棿鍚嶇О";
+            this.gv_cj.FieldName = "cj";
+            this.gv_cj.MinWidth = 23;
+            this.gv_cj.Name = "gv_cj";
+            this.gv_cj.Visible = true;
+            this.gv_cj.VisibleIndex = 13;
+            this.gv_cj.Width = 86;
             // 
             // bandedGridColumn1
             // 
             this.bandedGridColumn1.Caption = "浠撳簱缂栧彿";
             this.bandedGridColumn1.FieldName = "depotCode";
-            this.bandedGridColumn1.MinWidth = 17;
+            this.bandedGridColumn1.MinWidth = 19;
             this.bandedGridColumn1.Name = "bandedGridColumn1";
             this.bandedGridColumn1.Visible = true;
-            this.bandedGridColumn1.VisibleIndex = 11;
-            this.bandedGridColumn1.Width = 87;
+            this.bandedGridColumn1.VisibleIndex = 12;
+            this.bandedGridColumn1.Width = 99;
             // 
             // gv_depotsId
             // 
             this.gv_depotsId.AppearanceCell.Options.UseFont = true;
             this.gv_depotsId.Caption = "浠撳簱鍚嶇О";
             this.gv_depotsId.FieldName = "depotName";
-            this.gv_depotsId.MinWidth = 17;
+            this.gv_depotsId.MinWidth = 19;
             this.gv_depotsId.Name = "gv_depotsId";
             this.gv_depotsId.OptionsColumn.AllowEdit = false;
             this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
             this.gv_depotsId.Visible = true;
-            this.gv_depotsId.VisibleIndex = 13;
-            this.gv_depotsId.Width = 87;
+            this.gv_depotsId.VisibleIndex = 14;
+            this.gv_depotsId.Width = 99;
             // 
             // bandedGridColumn2
             // 
             this.bandedGridColumn2.Caption = "鏀舵枡缁勭粐";
             this.bandedGridColumn2.FieldName = "rkOrg";
-            this.bandedGridColumn2.MinWidth = 17;
+            this.bandedGridColumn2.MinWidth = 19;
             this.bandedGridColumn2.Name = "bandedGridColumn2";
             this.bandedGridColumn2.Tag = "org.fnamber";
             this.bandedGridColumn2.Visible = true;
-            this.bandedGridColumn2.VisibleIndex = 14;
-            this.bandedGridColumn2.Width = 219;
+            this.bandedGridColumn2.VisibleIndex = 15;
+            this.bandedGridColumn2.Width = 250;
             // 
             // bandedGridColumn3
             // 
             this.bandedGridColumn3.Caption = "鐢熶骇缁勭粐";
             this.bandedGridColumn3.FieldName = "scOrg";
-            this.bandedGridColumn3.MinWidth = 22;
+            this.bandedGridColumn3.MinWidth = 25;
             this.bandedGridColumn3.Name = "bandedGridColumn3";
             this.bandedGridColumn3.Visible = true;
-            this.bandedGridColumn3.VisibleIndex = 15;
-            this.bandedGridColumn3.Width = 82;
+            this.bandedGridColumn3.VisibleIndex = 16;
+            this.bandedGridColumn3.Width = 94;
             // 
             // bandedGridColumn4
             // 
             this.bandedGridColumn4.Caption = "鐗╂枡缂栫爜";
             this.bandedGridColumn4.FieldName = "itemNo";
-            this.bandedGridColumn4.MinWidth = 22;
+            this.bandedGridColumn4.MinWidth = 25;
             this.bandedGridColumn4.Name = "bandedGridColumn4";
             this.bandedGridColumn4.Visible = true;
-            this.bandedGridColumn4.VisibleIndex = 16;
-            this.bandedGridColumn4.Width = 82;
+            this.bandedGridColumn4.VisibleIndex = 17;
+            this.bandedGridColumn4.Width = 94;
             // 
             // bandedGridColumn5
             // 
             this.bandedGridColumn5.Caption = "鐗╂枡鍚嶇О";
             this.bandedGridColumn5.FieldName = "itemName";
-            this.bandedGridColumn5.MinWidth = 22;
+            this.bandedGridColumn5.MinWidth = 25;
             this.bandedGridColumn5.Name = "bandedGridColumn5";
             this.bandedGridColumn5.Visible = true;
-            this.bandedGridColumn5.VisibleIndex = 17;
-            this.bandedGridColumn5.Width = 82;
+            this.bandedGridColumn5.VisibleIndex = 18;
+            this.bandedGridColumn5.Width = 94;
             // 
             // bandedGridColumn6
             // 
             this.bandedGridColumn6.Caption = "瑙勬牸鍨嬪彿";
             this.bandedGridColumn6.FieldName = "itemModel";
-            this.bandedGridColumn6.MinWidth = 22;
+            this.bandedGridColumn6.MinWidth = 25;
             this.bandedGridColumn6.Name = "bandedGridColumn6";
             this.bandedGridColumn6.Visible = true;
-            this.bandedGridColumn6.VisibleIndex = 18;
-            this.bandedGridColumn6.Width = 82;
+            this.bandedGridColumn6.VisibleIndex = 19;
+            this.bandedGridColumn6.Width = 94;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "鍏ュ簱绫诲瀷";
             this.gridColumn7.FieldName = "inType";
-            this.gridColumn7.MinWidth = 22;
+            this.gridColumn7.MinWidth = 25;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 19;
-            this.gridColumn7.Width = 82;
+            this.gridColumn7.VisibleIndex = 20;
+            this.gridColumn7.Width = 94;
             // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 402);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.pageBar1.Location = new System.Drawing.Point(0, 326);
+            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(1178, 30);
+            this.pageBar1.Size = new System.Drawing.Size(1847, 39);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
+            // 
+            // xtraTabControl2
+            // 
+            this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
+            this.xtraTabControl2.Name = "xtraTabControl2";
+            this.xtraTabControl2.SelectedTabPage = this.xtraTabPage4;
+            this.xtraTabControl2.Size = new System.Drawing.Size(1847, 192);
+            this.xtraTabControl2.TabIndex = 4;
+            this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage4,
+            this.xtraTabPage5});
+            // 
+            // xtraTabPage4
+            // 
+            this.xtraTabPage4.Controls.Add(this.gcMxL1);
+            this.xtraTabPage4.Name = "xtraTabPage4";
+            this.xtraTabPage4.Size = new System.Drawing.Size(1845, 160);
+            this.xtraTabPage4.Text = "鐗╂枡鏄庣粏";
+            // 
+            // gcMxL1
+            // 
+            this.gcMxL1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMxL1.Location = new System.Drawing.Point(0, 0);
+            this.gcMxL1.MainView = this.gvMxL1;
+            this.gcMxL1.Name = "gcMxL1";
+            this.gcMxL1.Size = new System.Drawing.Size(1845, 160);
+            this.gcMxL1.TabIndex = 0;
+            this.gcMxL1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMxL1});
+            // 
+            // gvMxL1
+            // 
+            this.gvMxL1.Appearance.Row.Options.UseFont = true;
+            this.gvMxL1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn10,
+            this.gridColumn11,
+            this.gridColumn12,
+            this.gridColumn13,
+            this.gridColumn14,
+            this.gridColumn15,
+            this.gridColumn16});
+            this.gvMxL1.GridControl = this.gcMxL1;
+            this.gvMxL1.Name = "gvMxL1";
+            this.gvMxL1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+            this.gvMxL1.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMxL1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "鐗╂枡缂栧彿";
+            this.gridColumn10.FieldName = "itemNo";
+            this.gridColumn10.MinWidth = 19;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 0;
+            this.gridColumn10.Width = 94;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.AppearanceCell.Options.UseFont = true;
+            this.gridColumn11.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn11.FieldName = "itemName";
+            this.gridColumn11.MinWidth = 19;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Tag = "query_a.ITEM_SNAME";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 1;
+            this.gridColumn11.Width = 94;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn12.FieldName = "itemModel";
+            this.gridColumn12.MinWidth = 19;
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 2;
+            this.gridColumn12.Width = 94;
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.AppearanceCell.Options.UseFont = true;
+            this.gridColumn13.Caption = "鏁伴噺";
+            this.gridColumn13.FieldName = "quantity";
+            this.gridColumn13.MinWidth = 19;
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Tag = "query_a.QUANTITY";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 3;
+            this.gridColumn13.Width = 94;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.AppearanceCell.Options.UseFont = true;
+            this.gridColumn14.Caption = "搴撳瓨鍗曚綅";
+            this.gridColumn14.FieldName = "kcUnit";
+            this.gridColumn14.MinWidth = 19;
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Tag = "query_a.UNIT";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 4;
+            this.gridColumn14.Width = 94;
+            // 
+            // gridColumn15
+            // 
+            this.gridColumn15.Caption = "寤虹珛鑰�";
+            this.gridColumn15.FieldName = "createBy";
+            this.gridColumn15.MinWidth = 25;
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 5;
+            this.gridColumn15.Width = 94;
+            // 
+            // gridColumn16
+            // 
+            this.gridColumn16.Caption = "寤虹珛鏃堕棿";
+            this.gridColumn16.FieldName = "createDate";
+            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 6;
+            this.gridColumn16.Width = 94;
+            // 
+            // xtraTabPage5
+            // 
+            this.xtraTabPage5.Controls.Add(this.gcMxL2);
+            this.xtraTabPage5.Name = "xtraTabPage5";
+            this.xtraTabPage5.Size = new System.Drawing.Size(1845, 160);
+            this.xtraTabPage5.Text = "鍏ュ簱鏉$爜";
+            // 
+            // gcMxL2
+            // 
+            this.gcMxL2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMxL2.Location = new System.Drawing.Point(0, 0);
+            this.gcMxL2.MainView = this.gvMxL2;
+            this.gcMxL2.Name = "gcMxL2";
+            this.gcMxL2.Size = new System.Drawing.Size(1845, 160);
+            this.gcMxL2.TabIndex = 1;
+            this.gcMxL2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMxL2});
+            // 
+            // gvMxL2
+            // 
+            this.gvMxL2.Appearance.Row.Options.UseFont = true;
+            this.gvMxL2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn17,
+            this.gridColumn18,
+            this.gridColumn19,
+            this.gridColumn20,
+            this.gridColumn21,
+            this.gridColumn22,
+            this.gridColumn23,
+            this.gridColumn24,
+            this.gridColumn25,
+            this.gridColumn26});
+            this.gvMxL2.GridControl = this.gcMxL2;
+            this.gvMxL2.Name = "gvMxL2";
+            this.gvMxL2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMxL2.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMxL2.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.AppearanceCell.Options.UseFont = true;
+            this.gridColumn17.Caption = "鐗╂枡鏉$爜";
+            this.gridColumn17.FieldName = "itemBarcode";
+            this.gridColumn17.MinWidth = 19;
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Tag = "query_a.ITEM_BARCODE";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 0;
+            this.gridColumn17.Width = 250;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.AppearanceCell.Options.UseFont = true;
+            this.gridColumn18.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn18.FieldName = "itemNo";
+            this.gridColumn18.MinWidth = 19;
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Tag = "query_a.C_ITEM_CODE";
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 1;
+            this.gridColumn18.Width = 99;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.AppearanceCell.Options.UseFont = true;
+            this.gridColumn19.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn19.FieldName = "itemName";
+            this.gridColumn19.MinWidth = 19;
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Tag = "query_a.ITEM_SNAME";
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 2;
+            this.gridColumn19.Width = 250;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.AppearanceCell.Options.UseFont = true;
+            this.gridColumn20.Caption = "瑙勬牸鍨嬪彿";
+            this.gridColumn20.FieldName = "itemModel";
+            this.gridColumn20.MinWidth = 19;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Tag = "query_a.ITEM_NO";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 3;
+            this.gridColumn20.Width = 250;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.AppearanceCell.Options.UseFont = true;
+            this.gridColumn21.Caption = "鏁伴噺";
+            this.gridColumn21.FieldName = "quantity";
+            this.gridColumn21.MinWidth = 19;
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Tag = "query_a.QUANTITY";
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 4;
+            this.gridColumn21.Width = 94;
+            // 
+            // gridColumn22
+            // 
+            this.gridColumn22.AppearanceCell.Options.UseFont = true;
+            this.gridColumn22.Caption = "搴撳瓨鍗曚綅";
+            this.gridColumn22.FieldName = "kcUnit";
+            this.gridColumn22.MinWidth = 19;
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.Tag = "query_a.UNIT";
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 5;
+            this.gridColumn22.Width = 94;
+            // 
+            // gridColumn23
+            // 
+            this.gridColumn23.AppearanceCell.Options.UseFont = true;
+            this.gridColumn23.Caption = "璐т綅缂栫爜";
+            this.gridColumn23.FieldName = "depotSectionCode";
+            this.gridColumn23.MinWidth = 19;
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.Tag = "query_a.DEPOT_SECTION_CODE";
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 6;
+            this.gridColumn23.Width = 94;
+            // 
+            // gridColumn24
+            // 
+            this.gridColumn24.AppearanceCell.Options.UseFont = true;
+            this.gridColumn24.Caption = "浠撳簱缂栫爜";
+            this.gridColumn24.FieldName = "depotCode";
+            this.gridColumn24.MinWidth = 19;
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Tag = "query_a.DEPOT_CODE";
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 7;
+            this.gridColumn24.Width = 94;
+            // 
+            // gridColumn25
+            // 
+            this.gridColumn25.Caption = "寤虹珛鑰�";
+            this.gridColumn25.FieldName = "createBy";
+            this.gridColumn25.MinWidth = 25;
+            this.gridColumn25.Name = "gridColumn25";
+            this.gridColumn25.Visible = true;
+            this.gridColumn25.VisibleIndex = 8;
+            this.gridColumn25.Width = 94;
+            // 
+            // gridColumn26
+            // 
+            this.gridColumn26.Caption = "寤虹珛鏃堕棿";
+            this.gridColumn26.FieldName = "createDate";
+            this.gridColumn26.MinWidth = 25;
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Visible = true;
+            this.gridColumn26.VisibleIndex = 9;
+            this.gridColumn26.Width = 94;
             // 
             // xtraTabPage2
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
-            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1178, 442);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1847, 569);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -567,7 +882,6 @@
             this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitMx1.Horizontal = false;
             this.splitMx1.Location = new System.Drawing.Point(0, 0);
-            this.splitMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.splitMx1.Name = "splitMx1";
             // 
             // splitMx1.Panel1
@@ -580,8 +894,8 @@
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx1.Size = new System.Drawing.Size(1178, 442);
-            this.splitMx1.SplitterPosition = 134;
+            this.splitMx1.Size = new System.Drawing.Size(1847, 569);
+            this.splitMx1.SplitterPosition = 172;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -611,205 +925,186 @@
             this.layoutControlItem17,
             this.layoutControlItem10});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
-            this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(843, 270, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1178, 134);
+            this.layoutMx1.Size = new System.Drawing.Size(1847, 172);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
             // lbGuid
             // 
-            this.lbGuid.Location = new System.Drawing.Point(868, 82);
+            this.lbGuid.Location = new System.Drawing.Point(992, 105);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(282, 20);
+            this.lbGuid.Size = new System.Drawing.Size(322, 26);
             this.lbGuid.TabIndex = 607;
             this.lbGuid.Text = "lbGuid";
             // 
             // txt_dptName
             // 
-            this.txt_dptName.Location = new System.Drawing.Point(378, 58);
-            this.txt_dptName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_dptName.Location = new System.Drawing.Point(432, 75);
             this.txt_dptName.Name = "txt_dptName";
             this.txt_dptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dptName.Size = new System.Drawing.Size(200, 20);
+            this.txt_dptName.Size = new System.Drawing.Size(229, 24);
             this.txt_dptName.StyleController = this.layoutMx1;
             this.txt_dptName.TabIndex = 605;
             this.txt_dptName.Tag = "readonly";
             // 
             // txt_fcheckUser
             // 
-            this.txt_fcheckUser.Location = new System.Drawing.Point(963, 12);
-            this.txt_fcheckUser.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_fcheckUser.Location = new System.Drawing.Point(1484, 12);
             this.txt_fcheckUser.Name = "txt_fcheckUser";
             this.txt_fcheckUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_fcheckUser.Size = new System.Drawing.Size(203, 20);
+            this.txt_fcheckUser.Size = new System.Drawing.Size(351, 24);
             this.txt_fcheckUser.StyleController = this.layoutMx1;
             this.txt_fcheckUser.TabIndex = 595;
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(963, 36);
-            this.txt_checkDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_checkDate.Location = new System.Drawing.Point(1484, 42);
             this.txt_checkDate.Name = "txt_checkDate";
             this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(203, 20);
+            this.txt_checkDate.Size = new System.Drawing.Size(351, 24);
             this.txt_checkDate.StyleController = this.layoutMx1;
             this.txt_checkDate.TabIndex = 587;
             // 
             // txt_itemName
             // 
-            this.txt_itemName.Location = new System.Drawing.Point(96, 84);
-            this.txt_itemName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_itemName.Location = new System.Drawing.Point(114, 102);
             this.txt_itemName.Name = "txt_itemName";
             this.txt_itemName.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemName.Size = new System.Drawing.Size(201, 20);
+            this.txt_itemName.Size = new System.Drawing.Size(350, 24);
             this.txt_itemName.StyleController = this.layoutMx1;
             this.txt_itemName.TabIndex = 599;
             this.txt_itemName.Tag = "readonly";
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(385, 84);
-            this.txt_itemNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_itemNo.Location = new System.Drawing.Point(570, 102);
             this.txt_itemNo.Name = "txt_itemNo";
             this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(201, 20);
+            this.txt_itemNo.Size = new System.Drawing.Size(351, 24);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 597;
             this.txt_itemNo.Tag = "readonly";
             // 
             // txt_scOrg
             // 
-            this.txt_scOrg.Location = new System.Drawing.Point(385, 36);
-            this.txt_scOrg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_scOrg.Location = new System.Drawing.Point(570, 42);
             this.txt_scOrg.Name = "txt_scOrg";
             this.txt_scOrg.Properties.Appearance.Options.UseFont = true;
-            this.txt_scOrg.Size = new System.Drawing.Size(201, 20);
+            this.txt_scOrg.Size = new System.Drawing.Size(351, 24);
             this.txt_scOrg.StyleController = this.layoutMx1;
             this.txt_scOrg.TabIndex = 603;
             this.txt_scOrg.Tag = "readonly";
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(96, 108);
-            this.txt_remark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_remark.Location = new System.Drawing.Point(114, 132);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(490, 20);
+            this.txt_remark.Size = new System.Drawing.Size(807, 24);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 240;
             // 
             // txt_itemModel
             // 
-            this.txt_itemModel.Location = new System.Drawing.Point(674, 84);
-            this.txt_itemModel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_itemModel.Location = new System.Drawing.Point(1027, 102);
             this.txt_itemModel.Name = "txt_itemModel";
             this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemModel.Size = new System.Drawing.Size(201, 20);
+            this.txt_itemModel.Size = new System.Drawing.Size(351, 24);
             this.txt_itemModel.StyleController = this.layoutMx1;
             this.txt_itemModel.TabIndex = 601;
             this.txt_itemModel.Tag = "readonly";
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(96, 12);
-            this.txt_billNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_billNo.Location = new System.Drawing.Point(114, 12);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(201, 20);
+            this.txt_billNo.Size = new System.Drawing.Size(350, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             // 
             // txt_rkOrg
             // 
-            this.txt_rkOrg.Location = new System.Drawing.Point(385, 12);
-            this.txt_rkOrg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_rkOrg.Location = new System.Drawing.Point(570, 12);
             this.txt_rkOrg.Name = "txt_rkOrg";
             this.txt_rkOrg.Properties.Appearance.Options.UseFont = true;
-            this.txt_rkOrg.Size = new System.Drawing.Size(201, 20);
+            this.txt_rkOrg.Size = new System.Drawing.Size(351, 24);
             this.txt_rkOrg.StyleController = this.layoutMx1;
             this.txt_rkOrg.TabIndex = 592;
             this.txt_rkOrg.Tag = "readonly";
             // 
             // txt_createName
             // 
-            this.txt_createName.Location = new System.Drawing.Point(674, 12);
-            this.txt_createName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_createName.Location = new System.Drawing.Point(1027, 12);
             this.txt_createName.Name = "txt_createName";
             this.txt_createName.Properties.Appearance.Options.UseFont = true;
-            this.txt_createName.Size = new System.Drawing.Size(201, 20);
+            this.txt_createName.Size = new System.Drawing.Size(351, 24);
             this.txt_createName.StyleController = this.layoutMx1;
             this.txt_createName.TabIndex = 219;
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(674, 36);
-            this.txt_createDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_createDate.Location = new System.Drawing.Point(1027, 42);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(201, 20);
+            this.txt_createDate.Size = new System.Drawing.Size(351, 24);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 222;
             // 
             // txt_depotName
             // 
-            this.txt_depotName.Location = new System.Drawing.Point(674, 60);
-            this.txt_depotName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_depotName.Location = new System.Drawing.Point(1027, 72);
             this.txt_depotName.Name = "txt_depotName";
             this.txt_depotName.Properties.Appearance.Options.UseFont = true;
-            this.txt_depotName.Size = new System.Drawing.Size(201, 20);
+            this.txt_depotName.Size = new System.Drawing.Size(351, 24);
             this.txt_depotName.StyleController = this.layoutMx1;
             this.txt_depotName.TabIndex = 593;
             this.txt_depotName.Tag = "readonly";
             // 
             // txt_cbillNo
             // 
-            this.txt_cbillNo.Location = new System.Drawing.Point(96, 36);
-            this.txt_cbillNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_cbillNo.Location = new System.Drawing.Point(114, 42);
             this.txt_cbillNo.Name = "txt_cbillNo";
             this.txt_cbillNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_cbillNo.Size = new System.Drawing.Size(201, 20);
+            this.txt_cbillNo.Size = new System.Drawing.Size(350, 24);
             this.txt_cbillNo.StyleController = this.layoutMx1;
             this.txt_cbillNo.TabIndex = 507;
             // 
             // txt_workNo
             // 
-            this.txt_workNo.Location = new System.Drawing.Point(96, 60);
-            this.txt_workNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_workNo.Location = new System.Drawing.Point(114, 72);
             this.txt_workNo.Name = "txt_workNo";
             this.txt_workNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_workNo.Size = new System.Drawing.Size(201, 20);
+            this.txt_workNo.Size = new System.Drawing.Size(350, 24);
             this.txt_workNo.StyleController = this.layoutMx1;
             this.txt_workNo.TabIndex = 243;
             // 
             // txt_status
             // 
-            this.txt_status.Location = new System.Drawing.Point(879, 60);
-            this.txt_status.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_status.Location = new System.Drawing.Point(1382, 72);
             this.txt_status.Name = "txt_status";
             this.txt_status.Properties.Caption = "瀹℃牳鐘舵��";
-            this.txt_status.Size = new System.Drawing.Size(287, 20);
+            this.txt_status.Size = new System.Drawing.Size(453, 24);
             this.txt_status.StyleController = this.layoutMx1;
             this.txt_status.TabIndex = 606;
             this.txt_status.Tag = "readonly";
             // 
             // txt_guid
             // 
-            this.txt_guid.Location = new System.Drawing.Point(950, 106);
-            this.txt_guid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_guid.Location = new System.Drawing.Point(1086, 136);
             this.txt_guid.Name = "txt_guid";
-            this.txt_guid.Size = new System.Drawing.Size(200, 20);
+            this.txt_guid.Size = new System.Drawing.Size(229, 24);
             this.txt_guid.StyleController = this.layoutMx1;
             this.txt_guid.TabIndex = 608;
             // 
             // txt_tldh
             // 
-            this.txt_tldh.Location = new System.Drawing.Point(385, 60);
-            this.txt_tldh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_tldh.Location = new System.Drawing.Point(570, 72);
             this.txt_tldh.Name = "txt_tldh";
-            this.txt_tldh.Size = new System.Drawing.Size(201, 20);
+            this.txt_tldh.Size = new System.Drawing.Size(351, 24);
             this.txt_tldh.StyleController = this.layoutMx1;
             this.txt_tldh.TabIndex = 609;
             // 
@@ -822,7 +1117,7 @@
             this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
             this.layoutControlItem18.Size = new System.Drawing.Size(286, 24);
             this.layoutControlItem18.Text = "涓婚敭Guid";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(52, 14);
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(59, 18);
             // 
             // layoutControlItem17
             // 
@@ -845,7 +1140,7 @@
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem10.Size = new System.Drawing.Size(286, 24);
             this.layoutControlItem10.Text = "鐢熶骇杞﹂棿";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(52, 14);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(59, 18);
             // 
             // Root
             // 
@@ -899,7 +1194,7 @@
             rowDefinition3,
             rowDefinition4,
             rowDefinition5});
-            this.Root.Size = new System.Drawing.Size(1178, 140);
+            this.Root.Size = new System.Drawing.Size(1847, 172);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -908,91 +1203,91 @@
             this.layoutControlItem1.CustomizationFormText = "鍏ュ簱鐢宠鍗曞彿";
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem1.Size = new System.Drawing.Size(456, 30);
             this.layoutControlItem1.Text = "鍏ュ簱鐢宠鍗曞彿";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_rkOrg;
-            this.layoutControlItem2.Location = new System.Drawing.Point(289, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(456, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem2.Size = new System.Drawing.Size(457, 30);
             this.layoutControlItem2.Text = "鍏ュ簱缁勭粐";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_createName;
-            this.layoutControlItem3.Location = new System.Drawing.Point(578, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(913, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem3.Size = new System.Drawing.Size(457, 30);
             this.layoutControlItem3.Text = "鍒涘缓浜�";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_createDate;
-            this.layoutControlItem4.Location = new System.Drawing.Point(578, 24);
+            this.layoutControlItem4.Location = new System.Drawing.Point(913, 30);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem4.Size = new System.Drawing.Size(457, 30);
             this.layoutControlItem4.Text = "鍒涘缓鏃堕棿";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_cbillNo;
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 24);
+            this.layoutControlItem7.Location = new System.Drawing.Point(0, 30);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem7.Size = new System.Drawing.Size(456, 30);
             this.layoutControlItem7.Text = "宸ュ崟鍗曞彿";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_scOrg;
-            this.layoutControlItem8.Location = new System.Drawing.Point(289, 24);
+            this.layoutControlItem8.Location = new System.Drawing.Point(456, 30);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem8.Size = new System.Drawing.Size(457, 30);
             this.layoutControlItem8.Text = "鐢熶骇缁勭粐";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_fcheckUser;
-            this.layoutControlItem14.Location = new System.Drawing.Point(867, 0);
+            this.layoutControlItem14.Location = new System.Drawing.Point(1370, 0);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(291, 24);
+            this.layoutControlItem14.Size = new System.Drawing.Size(457, 30);
             this.layoutControlItem14.Text = "瀹℃牳浜�";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_checkDate;
-            this.layoutControlItem15.Location = new System.Drawing.Point(867, 24);
+            this.layoutControlItem15.Location = new System.Drawing.Point(1370, 30);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem15.Size = new System.Drawing.Size(291, 24);
+            this.layoutControlItem15.Size = new System.Drawing.Size(457, 30);
             this.layoutControlItem15.Text = "瀹℃牳鏃堕棿";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txt_status;
-            this.layoutControlItem16.Location = new System.Drawing.Point(867, 48);
+            this.layoutControlItem16.Location = new System.Drawing.Point(1370, 60);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem16.Size = new System.Drawing.Size(291, 24);
+            this.layoutControlItem16.Size = new System.Drawing.Size(457, 30);
             this.layoutControlItem16.Text = "瀹℃牳鏍囪瘑";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem16.TextVisible = false;
@@ -1000,86 +1295,85 @@
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_remark;
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 96);
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 120);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem13.Size = new System.Drawing.Size(578, 24);
+            this.layoutControlItem13.Size = new System.Drawing.Size(913, 32);
             this.layoutControlItem13.Text = "澶囨敞";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_itemModel;
-            this.layoutControlItem6.Location = new System.Drawing.Point(578, 72);
+            this.layoutControlItem6.Location = new System.Drawing.Point(913, 90);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem6.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem6.Size = new System.Drawing.Size(457, 30);
             this.layoutControlItem6.Text = "瑙勬牸鍨嬪彿";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_itemNo;
-            this.layoutControlItem12.Location = new System.Drawing.Point(289, 72);
+            this.layoutControlItem12.Location = new System.Drawing.Point(456, 90);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem12.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem12.Size = new System.Drawing.Size(457, 30);
             this.layoutControlItem12.Text = "浜у搧鍚嶇О";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_itemName;
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 72);
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 90);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem11.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem11.Size = new System.Drawing.Size(456, 30);
             this.layoutControlItem11.Text = "浜у搧缂栫爜";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_depotName;
-            this.layoutControlItem5.Location = new System.Drawing.Point(578, 48);
+            this.layoutControlItem5.Location = new System.Drawing.Point(913, 60);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem5.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem5.Size = new System.Drawing.Size(457, 30);
             this.layoutControlItem5.Text = "浠撳簱鍚嶇О";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_tldh;
-            this.layoutControlItem19.Location = new System.Drawing.Point(289, 48);
+            this.layoutControlItem19.Location = new System.Drawing.Point(456, 60);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem19.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem19.Size = new System.Drawing.Size(457, 30);
             this.layoutControlItem19.Text = "鎶曟枡鍗曞彿";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_workNo;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 48);
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 60);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem9.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem9.Size = new System.Drawing.Size(456, 30);
             this.layoutControlItem9.Text = "浠诲姟鍗曞彿";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
             // 
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabMx.Location = new System.Drawing.Point(0, 0);
-            this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage2;
-            this.tabMx.Size = new System.Drawing.Size(1178, 298);
+            this.tabMx.Size = new System.Drawing.Size(1847, 385);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage2,
@@ -1088,20 +1382,17 @@
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.gcMx1);
-            this.tabMxPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1176, 272);
+            this.tabMxPage2.Size = new System.Drawing.Size(1845, 353);
             this.tabMxPage2.Text = "鐗╂枡鏄庣粏";
             // 
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
-            this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1176, 272);
+            this.gcMx1.Size = new System.Drawing.Size(1845, 353);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1117,7 +1408,6 @@
             this.gvMx2unit,
             this.gridColumn5,
             this.gridColumn6});
-            this.gvMx1.DetailHeight = 272;
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1128,95 +1418,92 @@
             // 
             this.gridColumn2.Caption = "鐗╂枡缂栧彿";
             this.gridColumn2.FieldName = "itemNo";
-            this.gridColumn2.MinWidth = 17;
+            this.gridColumn2.MinWidth = 19;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 0;
-            this.gridColumn2.Width = 82;
+            this.gridColumn2.Width = 94;
             // 
             // gvMx2itemSname
             // 
             this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О";
             this.gvMx2itemSname.FieldName = "itemName";
-            this.gvMx2itemSname.MinWidth = 17;
+            this.gvMx2itemSname.MinWidth = 19;
             this.gvMx2itemSname.Name = "gvMx2itemSname";
             this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
             this.gvMx2itemSname.Visible = true;
             this.gvMx2itemSname.VisibleIndex = 1;
-            this.gvMx2itemSname.Width = 82;
+            this.gvMx2itemSname.Width = 94;
             // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn1.FieldName = "itemModel";
-            this.gridColumn1.MinWidth = 17;
+            this.gridColumn1.MinWidth = 19;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 2;
-            this.gridColumn1.Width = 82;
+            this.gridColumn1.Width = 94;
             // 
             // gvMx2quantity
             // 
             this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
             this.gvMx2quantity.Caption = "鏁伴噺";
             this.gvMx2quantity.FieldName = "quantity";
-            this.gvMx2quantity.MinWidth = 17;
+            this.gvMx2quantity.MinWidth = 19;
             this.gvMx2quantity.Name = "gvMx2quantity";
             this.gvMx2quantity.Tag = "query_a.QUANTITY";
             this.gvMx2quantity.Visible = true;
             this.gvMx2quantity.VisibleIndex = 3;
-            this.gvMx2quantity.Width = 82;
+            this.gvMx2quantity.Width = 94;
             // 
             // gvMx2unit
             // 
             this.gvMx2unit.AppearanceCell.Options.UseFont = true;
             this.gvMx2unit.Caption = "搴撳瓨鍗曚綅";
             this.gvMx2unit.FieldName = "kcUnit";
-            this.gvMx2unit.MinWidth = 17;
+            this.gvMx2unit.MinWidth = 19;
             this.gvMx2unit.Name = "gvMx2unit";
             this.gvMx2unit.Tag = "query_a.UNIT";
             this.gvMx2unit.Visible = true;
             this.gvMx2unit.VisibleIndex = 4;
-            this.gvMx2unit.Width = 82;
+            this.gvMx2unit.Width = 94;
             // 
             // gridColumn5
             // 
             this.gridColumn5.Caption = "寤虹珛鑰�";
             this.gridColumn5.FieldName = "createBy";
-            this.gridColumn5.MinWidth = 22;
+            this.gridColumn5.MinWidth = 25;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 5;
-            this.gridColumn5.Width = 82;
+            this.gridColumn5.Width = 94;
             // 
             // gridColumn6
             // 
             this.gridColumn6.Caption = "寤虹珛鏃堕棿";
             this.gridColumn6.FieldName = "createDate";
-            this.gridColumn6.MinWidth = 22;
+            this.gridColumn6.MinWidth = 25;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 6;
-            this.gridColumn6.Width = 82;
+            this.gridColumn6.Width = 94;
             // 
             // xtraTabPage3
             // 
             this.xtraTabPage3.Controls.Add(this.gcMx2);
-            this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1176, 272);
+            this.xtraTabPage3.Size = new System.Drawing.Size(1845, 353);
             this.xtraTabPage3.Text = "鍏ュ簱鏉$爜";
             // 
             // gcMx2
             // 
             this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
-            this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1176, 272);
+            this.gcMx2.Size = new System.Drawing.Size(1845, 353);
             this.gcMx2.TabIndex = 1;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -1235,7 +1522,6 @@
             this.gvMx1depotCode,
             this.gridColumn3,
             this.gridColumn4});
-            this.gvMx2.DetailHeight = 272;
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1247,146 +1533,146 @@
             this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemBarcode.Caption = "鐗╂枡鏉$爜";
             this.gvMx1itemBarcode.FieldName = "itemBarcode";
-            this.gvMx1itemBarcode.MinWidth = 17;
+            this.gvMx1itemBarcode.MinWidth = 19;
             this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
             this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
             this.gvMx1itemBarcode.Visible = true;
             this.gvMx1itemBarcode.VisibleIndex = 0;
-            this.gvMx1itemBarcode.Width = 219;
+            this.gvMx1itemBarcode.Width = 250;
             // 
             // gvMx1cItemCode
             // 
             this.gvMx1cItemCode.AppearanceCell.Options.UseFont = true;
             this.gvMx1cItemCode.Caption = "鐗╂枡缂栫爜";
             this.gvMx1cItemCode.FieldName = "itemNo";
-            this.gvMx1cItemCode.MinWidth = 17;
+            this.gvMx1cItemCode.MinWidth = 19;
             this.gvMx1cItemCode.Name = "gvMx1cItemCode";
             this.gvMx1cItemCode.Tag = "query_a.C_ITEM_CODE";
             this.gvMx1cItemCode.Visible = true;
             this.gvMx1cItemCode.VisibleIndex = 1;
-            this.gvMx1cItemCode.Width = 87;
+            this.gvMx1cItemCode.Width = 99;
             // 
             // gvMx1itemSname
             // 
             this.gvMx1itemSname.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemSname.Caption = "鐗╂枡鍚嶇О";
             this.gvMx1itemSname.FieldName = "itemName";
-            this.gvMx1itemSname.MinWidth = 17;
+            this.gvMx1itemSname.MinWidth = 19;
             this.gvMx1itemSname.Name = "gvMx1itemSname";
             this.gvMx1itemSname.Tag = "query_a.ITEM_SNAME";
             this.gvMx1itemSname.Visible = true;
             this.gvMx1itemSname.VisibleIndex = 2;
-            this.gvMx1itemSname.Width = 219;
+            this.gvMx1itemSname.Width = 250;
             // 
             // gvMx1itemNo
             // 
             this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemNo.Caption = "瑙勬牸鍨嬪彿";
             this.gvMx1itemNo.FieldName = "itemModel";
-            this.gvMx1itemNo.MinWidth = 17;
+            this.gvMx1itemNo.MinWidth = 19;
             this.gvMx1itemNo.Name = "gvMx1itemNo";
             this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
             this.gvMx1itemNo.Visible = true;
             this.gvMx1itemNo.VisibleIndex = 3;
-            this.gvMx1itemNo.Width = 219;
+            this.gvMx1itemNo.Width = 250;
             // 
             // gvMx1quantity
             // 
             this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
             this.gvMx1quantity.Caption = "鏁伴噺";
             this.gvMx1quantity.FieldName = "quantity";
-            this.gvMx1quantity.MinWidth = 17;
+            this.gvMx1quantity.MinWidth = 19;
             this.gvMx1quantity.Name = "gvMx1quantity";
             this.gvMx1quantity.Tag = "query_a.QUANTITY";
             this.gvMx1quantity.Visible = true;
             this.gvMx1quantity.VisibleIndex = 4;
-            this.gvMx1quantity.Width = 82;
+            this.gvMx1quantity.Width = 94;
             // 
             // gvMx1unit
             // 
             this.gvMx1unit.AppearanceCell.Options.UseFont = true;
             this.gvMx1unit.Caption = "搴撳瓨鍗曚綅";
             this.gvMx1unit.FieldName = "kcUnit";
-            this.gvMx1unit.MinWidth = 17;
+            this.gvMx1unit.MinWidth = 19;
             this.gvMx1unit.Name = "gvMx1unit";
             this.gvMx1unit.Tag = "query_a.UNIT";
             this.gvMx1unit.Visible = true;
             this.gvMx1unit.VisibleIndex = 5;
-            this.gvMx1unit.Width = 82;
+            this.gvMx1unit.Width = 94;
             // 
             // gvMx1depotSectionCode
             // 
             this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
             this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜";
             this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
-            this.gvMx1depotSectionCode.MinWidth = 17;
+            this.gvMx1depotSectionCode.MinWidth = 19;
             this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
             this.gvMx1depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
             this.gvMx1depotSectionCode.Visible = true;
             this.gvMx1depotSectionCode.VisibleIndex = 6;
-            this.gvMx1depotSectionCode.Width = 82;
+            this.gvMx1depotSectionCode.Width = 94;
             // 
             // gvMx1depotCode
             // 
             this.gvMx1depotCode.AppearanceCell.Options.UseFont = true;
             this.gvMx1depotCode.Caption = "浠撳簱缂栫爜";
             this.gvMx1depotCode.FieldName = "depotCode";
-            this.gvMx1depotCode.MinWidth = 17;
+            this.gvMx1depotCode.MinWidth = 19;
             this.gvMx1depotCode.Name = "gvMx1depotCode";
             this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
             this.gvMx1depotCode.Visible = true;
             this.gvMx1depotCode.VisibleIndex = 7;
-            this.gvMx1depotCode.Width = 82;
+            this.gvMx1depotCode.Width = 94;
             // 
             // gridColumn3
             // 
             this.gridColumn3.Caption = "寤虹珛鑰�";
             this.gridColumn3.FieldName = "createBy";
-            this.gridColumn3.MinWidth = 22;
+            this.gridColumn3.MinWidth = 25;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
             this.gridColumn3.VisibleIndex = 8;
-            this.gridColumn3.Width = 82;
+            this.gridColumn3.Width = 94;
             // 
             // gridColumn4
             // 
             this.gridColumn4.Caption = "寤虹珛鏃堕棿";
             this.gridColumn4.FieldName = "createDate";
-            this.gridColumn4.MinWidth = 22;
+            this.gridColumn4.MinWidth = 25;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 9;
-            this.gridColumn4.Width = 82;
+            this.gridColumn4.Width = 94;
             // 
             // picCheckBox
             // 
             this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(841, 43);
-            this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.picCheckBox.Location = new System.Drawing.Point(961, 55);
             this.picCheckBox.Name = "picCheckBox";
-            this.picCheckBox.Size = new System.Drawing.Size(88, 39);
+            this.picCheckBox.Size = new System.Drawing.Size(101, 50);
             this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.picCheckBox.TabIndex = 6;
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // gv_cj
+            // gv_rksqqty
             // 
-            this.gv_cj.Caption = "杞﹂棿鍚嶇О";
-            this.gv_cj.FieldName = "cj";
-            this.gv_cj.Name = "gv_cj";
-            this.gv_cj.Visible = true;
-            this.gv_cj.VisibleIndex = 12;
+            this.gv_rksqqty.Caption = "鍏ュ簱鐢宠鏁伴噺";
+            this.gv_rksqqty.FieldName = "rksqQty";
+            this.gv_rksqqty.MinWidth = 25;
+            this.gv_rksqqty.Name = "gv_rksqqty";
+            this.gv_rksqqty.Visible = true;
+            this.gv_rksqqty.VisibleIndex = 9;
+            this.gv_rksqqty.Width = 94;
             // 
             // Frm_MesScrksqDj
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1180, 530);
+            this.ClientSize = new System.Drawing.Size(1849, 681);
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "Frm_MesScrksqDj";
             this.Text = "浜у搧鍏ュ簱鍗�";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1395,10 +1681,19 @@
             ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
             this.split1.Panel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+            this.split1.Panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
             this.split1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
+            this.xtraTabControl2.ResumeLayout(false);
+            this.xtraTabPage4.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMxL1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMxL1)).EndInit();
+            this.xtraTabPage5.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMxL2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMxL2)).EndInit();
             this.xtraTabPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
             this.splitMx1.Panel1.ResumeLayout(false);
@@ -1555,5 +1850,30 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraGrid.Columns.GridColumn gv_cj;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl2;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage4;
+        private DevExpress.XtraGrid.GridControl gcMxL1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMxL1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage5;
+        private DevExpress.XtraGrid.GridControl gcMxL2;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMxL2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+        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 DevExpress.XtraGrid.Columns.GridColumn gv_rksqqty;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrksqDj.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrksqDj.cs
index 1839838..7ca78b6 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrksqDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrksqDj.cs
@@ -27,6 +27,12 @@
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
+            {
+                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+            }, tips, true, (strGuid) => {
+                getModelList(strGuid);
+            });
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -265,6 +271,71 @@
             }
         }
 
+        private void getModelList(string strGuid)
+        {
+            gcMxL1.DataSource = null;
+            gcMxL2.DataSource = null;
+
+            var _obj = new
+            {
+                guid = strGuid,//涓诲缓
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+
+                    JArray array1 = new JArray();
+                    foreach (var a in dy["list"])
+                    {
+                        array1.Add(a);
+                    }
+                    DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+                    if (dt1.Rows.Count > 0)
+                    {
+                        gcMxL1.BindingContext = new BindingContext();
+                        gcMxL1.DataSource = dt1;
+                        gcMxL1.ForceInitialize();
+                        gvMxL1.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMxL1);
+                    }
+                    else
+                    {
+                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMxL1, gvMxL1);
+                    }
+                    JArray array2 = new JArray();
+                    foreach (var a in dy["list2"])
+                    {
+                        array2.Add(a);
+                    }
+
+                    DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+                    if (dt2.Rows.Count > 0)
+                    {
+                        gcMxL2.BindingContext = new BindingContext();
+                        gcMxL2.DataSource = dt2;
+                        gcMxL2.ForceInitialize();
+                        gvMxL2.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMxL2);
+                    }
+                    else
+                    {
+                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMxL2, gvMxL2);
+                    }
+
+                }
+                else
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
         /// <summary>
         /// 
         /// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index 8bddabd..e544871 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -30,17 +30,17 @@
         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.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+            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();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -587,12 +587,14 @@
             // gv_saleOrderNo
             // 
             this.gv_saleOrderNo.AppearanceCell.Options.UseFont = true;
-            this.gv_saleOrderNo.Caption = "闇�姹傚崟鎹彿";
+            this.gv_saleOrderNo.Caption = "閿�鍞鍗曞彿";
             this.gv_saleOrderNo.FieldName = "saleOrderNo";
             this.gv_saleOrderNo.MinWidth = 50;
             this.gv_saleOrderNo.Name = "gv_saleOrderNo";
             this.gv_saleOrderNo.OptionsColumn.AllowEdit = false;
             this.gv_saleOrderNo.Tag = "query_a.SALE_ORDER_NO";
+            this.gv_saleOrderNo.Visible = true;
+            this.gv_saleOrderNo.VisibleIndex = 1;
             this.gv_saleOrderNo.Width = 100;
             // 
             // gv_saleOrderEntryseq
@@ -605,6 +607,8 @@
             this.gv_saleOrderEntryseq.Name = "gv_saleOrderEntryseq";
             this.gv_saleOrderEntryseq.OptionsColumn.AllowEdit = false;
             this.gv_saleOrderEntryseq.Tag = "query_a.SALE_ORDER_ENTRYSEQ";
+            this.gv_saleOrderEntryseq.Visible = true;
+            this.gv_saleOrderEntryseq.VisibleIndex = 0;
             this.gv_saleOrderEntryseq.Width = 50;
             // 
             // gridColumn2
@@ -1341,41 +1345,41 @@
             this.layoutControlItem23});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition1.Width = 100D;
-            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition2.Width = 100D;
-            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition3.Width = 100D;
-            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition4.Width = 100D;
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
+            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7.Width = 100D;
+            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition8.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition1,
-            columnDefinition2,
-            columnDefinition3,
-            columnDefinition4});
-            rowDefinition1.Height = 100D;
-            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition2.Height = 100D;
-            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition3.Height = 100D;
-            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition4.Height = 100D;
-            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition6.Height = 100D;
-            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition7.Height = 100D;
-            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5,
+            columnDefinition6,
+            columnDefinition7,
+            columnDefinition8});
+            rowDefinition8.Height = 100D;
+            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            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;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3,
-            rowDefinition4,
-            rowDefinition5,
-            rowDefinition6,
-            rowDefinition7});
+            rowDefinition8,
+            rowDefinition9,
+            rowDefinition10,
+            rowDefinition11,
+            rowDefinition12,
+            rowDefinition13,
+            rowDefinition14});
             this.Root.Size = new System.Drawing.Size(1464, 221);
             this.Root.TextVisible = false;
             // 
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 1261de9..da1c089 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -30,40 +30,40 @@
         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.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.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.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition31 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition32 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition33 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition34 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition35 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition36 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition37 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition38 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition39 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition40 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition21 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition41 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition42 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition43 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition44 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition45 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition46 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition22 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -347,6 +347,12 @@
             this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
             this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.gridColumn88 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn89 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn90 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn91 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn92 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn93 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -648,7 +654,7 @@
             this.gv_fxk.MinWidth = 23;
             this.gv_fxk.Name = "gv_fxk";
             this.gv_fxk.Visible = true;
-            this.gv_fxk.VisibleIndex = 0;
+            this.gv_fxk.VisibleIndex = 1;
             this.gv_fxk.Width = 86;
             // 
             // gridColumn5
@@ -669,6 +675,8 @@
             this.gridColumn7.MinWidth = 50;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Tag = "query_a.jabs";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 0;
             this.gridColumn7.Width = 50;
             // 
             // gridColumn10
@@ -680,7 +688,7 @@
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Tag = "query_a.jabs";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 17;
+            this.gridColumn10.VisibleIndex = 18;
             this.gridColumn10.Width = 50;
             // 
             // gridColumn8
@@ -690,7 +698,7 @@
             this.gridColumn8.MinWidth = 23;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 16;
+            this.gridColumn8.VisibleIndex = 17;
             this.gridColumn8.Width = 86;
             // 
             // gridColumn12
@@ -712,7 +720,7 @@
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Tag = "query_a.jabs";
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 1;
+            this.gridColumn6.VisibleIndex = 2;
             this.gridColumn6.Width = 50;
             // 
             // gridColumn27
@@ -733,7 +741,7 @@
             this.gv_daa018.OptionsColumn.AllowEdit = false;
             this.gv_daa018.Tag = "query_a.daa018";
             this.gv_daa018.Visible = true;
-            this.gv_daa018.VisibleIndex = 2;
+            this.gv_daa018.VisibleIndex = 3;
             this.gv_daa018.Width = 93;
             // 
             // gridColoun100
@@ -755,7 +763,7 @@
             this.gv_daa001.OptionsColumn.AllowEdit = false;
             this.gv_daa001.Tag = "query_a.daa001";
             this.gv_daa001.Visible = true;
-            this.gv_daa001.VisibleIndex = 4;
+            this.gv_daa001.VisibleIndex = 5;
             this.gv_daa001.Width = 71;
             // 
             // gv_daa021
@@ -776,7 +784,7 @@
             this.gridColumn3.MinWidth = 50;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 5;
+            this.gridColumn3.VisibleIndex = 6;
             this.gridColumn3.Width = 80;
             // 
             // gv_daa003
@@ -789,7 +797,7 @@
             this.gv_daa003.OptionsColumn.AllowEdit = false;
             this.gv_daa003.Tag = "query_a.daa003";
             this.gv_daa003.Visible = true;
-            this.gv_daa003.VisibleIndex = 6;
+            this.gv_daa003.VisibleIndex = 7;
             this.gv_daa003.Width = 86;
             // 
             // gv_daa004
@@ -802,7 +810,7 @@
             this.gv_daa004.OptionsColumn.AllowEdit = false;
             this.gv_daa004.Tag = "query_a.daa004";
             this.gv_daa004.Visible = true;
-            this.gv_daa004.VisibleIndex = 7;
+            this.gv_daa004.VisibleIndex = 8;
             this.gv_daa004.Width = 86;
             // 
             // gv_daa008
@@ -816,7 +824,7 @@
             this.gv_daa008.OptionsColumn.AllowEdit = false;
             this.gv_daa008.Tag = "query_a.daa008";
             this.gv_daa008.Visible = true;
-            this.gv_daa008.VisibleIndex = 10;
+            this.gv_daa008.VisibleIndex = 11;
             this.gv_daa008.Width = 50;
             // 
             // gv_daa011
@@ -830,7 +838,7 @@
             this.gv_daa011.OptionsColumn.AllowEdit = false;
             this.gv_daa011.Tag = "query_a.daa011";
             this.gv_daa011.Visible = true;
-            this.gv_daa011.VisibleIndex = 11;
+            this.gv_daa011.VisibleIndex = 12;
             this.gv_daa011.Width = 50;
             // 
             // gridColumn4
@@ -845,7 +853,7 @@
             this.gridColumn4.MinWidth = 50;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 12;
+            this.gridColumn4.VisibleIndex = 13;
             this.gridColumn4.Width = 50;
             // 
             // gv_daa010
@@ -859,7 +867,7 @@
             this.gv_daa010.OptionsColumn.AllowEdit = false;
             this.gv_daa010.Tag = "query_a.daa010";
             this.gv_daa010.Visible = true;
-            this.gv_daa010.VisibleIndex = 13;
+            this.gv_daa010.VisibleIndex = 14;
             this.gv_daa010.Width = 50;
             // 
             // gv_daa005
@@ -873,7 +881,7 @@
             this.gv_daa005.OptionsColumn.AllowEdit = false;
             this.gv_daa005.Tag = "query_a.daa005";
             this.gv_daa005.Visible = true;
-            this.gv_daa005.VisibleIndex = 14;
+            this.gv_daa005.VisibleIndex = 15;
             this.gv_daa005.Width = 50;
             // 
             // gv_cust
@@ -894,7 +902,7 @@
             this.gridColumn1.MinWidth = 50;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 8;
+            this.gridColumn1.VisibleIndex = 9;
             this.gridColumn1.Width = 51;
             // 
             // gv_daa015
@@ -907,7 +915,7 @@
             this.gv_daa015.OptionsColumn.AllowEdit = false;
             this.gv_daa015.Tag = "query_a.daa015";
             this.gv_daa015.Visible = true;
-            this.gv_daa015.VisibleIndex = 9;
+            this.gv_daa015.VisibleIndex = 10;
             this.gv_daa015.Width = 51;
             // 
             // gv_daa009
@@ -920,7 +928,7 @@
             this.gv_daa009.OptionsColumn.AllowEdit = false;
             this.gv_daa009.Tag = "query_a.daa009";
             this.gv_daa009.Visible = true;
-            this.gv_daa009.VisibleIndex = 15;
+            this.gv_daa009.VisibleIndex = 16;
             this.gv_daa009.Width = 51;
             // 
             // gv_prepareTime
@@ -955,7 +963,7 @@
             this.gv_daa016.OptionsColumn.AllowEdit = false;
             this.gv_daa016.Tag = "query_a.daa016";
             this.gv_daa016.Visible = true;
-            this.gv_daa016.VisibleIndex = 18;
+            this.gv_daa016.VisibleIndex = 19;
             this.gv_daa016.Width = 103;
             // 
             // gv_daa017
@@ -968,7 +976,7 @@
             this.gv_daa017.OptionsColumn.AllowEdit = false;
             this.gv_daa017.Tag = "query_a.daa017";
             this.gv_daa017.Visible = true;
-            this.gv_daa017.VisibleIndex = 19;
+            this.gv_daa017.VisibleIndex = 20;
             this.gv_daa017.Width = 103;
             // 
             // gv_mesStartProd
@@ -981,7 +989,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 = 20;
+            this.gv_mesStartProd.VisibleIndex = 21;
             this.gv_mesStartProd.Width = 103;
             // 
             // gv_mesEndProd
@@ -994,7 +1002,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 = 21;
+            this.gv_mesEndProd.VisibleIndex = 22;
             this.gv_mesEndProd.Width = 103;
             // 
             // gridColumn21
@@ -1012,7 +1020,7 @@
             this.gridColumn22.MinWidth = 25;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 22;
+            this.gridColumn22.VisibleIndex = 23;
             this.gridColumn22.Width = 45;
             // 
             // gridColumn23
@@ -1030,7 +1038,7 @@
             this.gridColumn24.MinWidth = 25;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
-            this.gridColumn24.VisibleIndex = 23;
+            this.gridColumn24.VisibleIndex = 24;
             this.gridColumn24.Width = 25;
             // 
             // gridColumn25
@@ -1040,7 +1048,7 @@
             this.gridColumn25.MinWidth = 25;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
-            this.gridColumn25.VisibleIndex = 3;
+            this.gridColumn25.VisibleIndex = 4;
             this.gridColumn25.Width = 114;
             // 
             // pageBar1
@@ -1103,6 +1111,9 @@
             this.gridColumn53,
             this.gridColumn54,
             this.gridColumn55,
+            this.gridColumn92,
+            this.gridColumn91,
+            this.gridColumn93,
             this.gridColumn56,
             this.gridColumn57,
             this.gridColumn58,
@@ -1435,7 +1446,7 @@
             // 
             this.xtraTabPage7.Controls.Add(this.splitContainerControl1);
             this.xtraTabPage7.Name = "xtraTabPage7";
-            this.xtraTabPage7.Size = new System.Drawing.Size(1648, 250);
+            this.xtraTabPage7.Size = new System.Drawing.Size(1649, 250);
             this.xtraTabPage7.Text = "鎵樻澘鐮佹槑缁�";
             // 
             // splitContainerControl1
@@ -1454,7 +1465,7 @@
             this.splitContainerControl1.Panel2.Controls.Add(this.gcMxL2);
             this.splitContainerControl1.Panel2.Text = "Panel2";
             this.splitContainerControl1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitContainerControl1.Size = new System.Drawing.Size(1648, 250);
+            this.splitContainerControl1.Size = new System.Drawing.Size(1649, 250);
             this.splitContainerControl1.SplitterPosition = 0;
             this.splitContainerControl1.TabIndex = 2;
             // 
@@ -1466,7 +1477,7 @@
             this.gcMxL2.Name = "gcMxL2";
             this.gcMxL2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit2});
-            this.gcMxL2.Size = new System.Drawing.Size(1648, 238);
+            this.gcMxL2.Size = new System.Drawing.Size(1649, 238);
             this.gcMxL2.TabIndex = 0;
             this.gcMxL2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMxL2});
@@ -1725,7 +1736,7 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1651, 708);
-            this.splitMx1.SplitterPosition = 330;
+            this.splitMx1.SplitterPosition = 329;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -1766,7 +1777,7 @@
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(657, 373, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1651, 330);
+            this.layoutMx1.Size = new System.Drawing.Size(1651, 329);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -1781,10 +1792,10 @@
             // 
             // txt_daa009
             // 
-            this.txt_daa009.Location = new System.Drawing.Point(144, 269);
+            this.txt_daa009.Location = new System.Drawing.Point(141, 267);
             this.txt_daa009.Name = "txt_daa009";
             this.txt_daa009.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa009.Size = new System.Drawing.Size(679, 24);
+            this.txt_daa009.Size = new System.Drawing.Size(682, 24);
             this.txt_daa009.StyleController = this.layoutMx1;
             this.txt_daa009.TabIndex = 240;
             this.txt_daa009.Tag = "";
@@ -1801,170 +1812,170 @@
             // 
             // txt_daa001
             // 
-            this.txt_daa001.Location = new System.Drawing.Point(144, 16);
+            this.txt_daa001.Location = new System.Drawing.Point(141, 12);
             this.txt_daa001.Name = "txt_daa001";
             this.txt_daa001.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa001.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa001.Size = new System.Drawing.Size(274, 24);
             this.txt_daa001.StyleController = this.layoutMx1;
             this.txt_daa001.TabIndex = 216;
             this.txt_daa001.Tag = "readonly";
             // 
             // txt_daa008
             // 
-            this.txt_daa008.Location = new System.Drawing.Point(958, 16);
+            this.txt_daa008.Location = new System.Drawing.Point(956, 12);
             this.txt_daa008.Name = "txt_daa008";
             this.txt_daa008.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa008.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa008.Size = new System.Drawing.Size(275, 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(958, 218);
+            this.txt_saleOrderNo.Location = new System.Drawing.Point(956, 216);
             this.txt_saleOrderNo.Name = "txt_saleOrderNo";
             this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_saleOrderNo.Size = new System.Drawing.Size(272, 24);
+            this.txt_saleOrderNo.Size = new System.Drawing.Size(275, 24);
             this.txt_saleOrderNo.StyleController = this.layoutMx1;
             this.txt_saleOrderNo.TabIndex = 465;
             this.txt_saleOrderNo.Tag = "readonly";
             // 
             // txt_mesStartProdn
             // 
-            this.txt_mesStartProdn.Location = new System.Drawing.Point(1365, 16);
+            this.txt_mesStartProdn.Location = new System.Drawing.Point(1364, 12);
             this.txt_mesStartProdn.Name = "txt_mesStartProdn";
             this.txt_mesStartProdn.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesStartProdn.Size = new System.Drawing.Size(273, 24);
+            this.txt_mesStartProdn.Size = new System.Drawing.Size(275, 24);
             this.txt_mesStartProdn.StyleController = this.layoutMx1;
             this.txt_mesStartProdn.TabIndex = 336;
             this.txt_mesStartProdn.Tag = "readonly";
             // 
             // txt_daa014
             // 
-            this.txt_daa014.Location = new System.Drawing.Point(144, 65);
+            this.txt_daa014.Location = new System.Drawing.Point(141, 63);
             this.txt_daa014.Name = "txt_daa014";
             this.txt_daa014.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa014.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa014.Size = new System.Drawing.Size(274, 24);
             this.txt_daa014.StyleController = this.layoutMx1;
             this.txt_daa014.TabIndex = 327;
             this.txt_daa014.Tag = "readonly";
             // 
             // txt_daa022Remark
             // 
-            this.txt_daa022Remark.Location = new System.Drawing.Point(551, 16);
+            this.txt_daa022Remark.Location = new System.Drawing.Point(548, 12);
             this.txt_daa022Remark.Name = "txt_daa022Remark";
             this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa022Remark.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa022Remark.Size = new System.Drawing.Size(275, 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(958, 65);
+            this.txt_daa010.Location = new System.Drawing.Point(956, 63);
             this.txt_daa010.Name = "txt_daa010";
             this.txt_daa010.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa010.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa010.Size = new System.Drawing.Size(275, 24);
             this.txt_daa010.StyleController = this.layoutMx1;
             this.txt_daa010.TabIndex = 243;
             this.txt_daa010.Tag = "readonly";
             // 
             // txt_mesEndProdn
             // 
-            this.txt_mesEndProdn.Location = new System.Drawing.Point(1365, 65);
+            this.txt_mesEndProdn.Location = new System.Drawing.Point(1364, 63);
             this.txt_mesEndProdn.Name = "txt_mesEndProdn";
             this.txt_mesEndProdn.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesEndProdn.Size = new System.Drawing.Size(273, 24);
+            this.txt_mesEndProdn.Size = new System.Drawing.Size(275, 24);
             this.txt_mesEndProdn.StyleController = this.layoutMx1;
             this.txt_mesEndProdn.TabIndex = 338;
             this.txt_mesEndProdn.Tag = "readonly";
             // 
             // txt_daa011
             // 
-            this.txt_daa011.Location = new System.Drawing.Point(958, 116);
+            this.txt_daa011.Location = new System.Drawing.Point(956, 114);
             this.txt_daa011.Name = "txt_daa011";
             this.txt_daa011.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa011.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa011.Size = new System.Drawing.Size(275, 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(551, 116);
+            this.txt_dptName.Location = new System.Drawing.Point(548, 114);
             this.txt_dptName.Name = "txt_dptName";
             this.txt_dptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dptName.Size = new System.Drawing.Size(272, 24);
+            this.txt_dptName.Size = new System.Drawing.Size(275, 24);
             this.txt_dptName.StyleController = this.layoutMx1;
             this.txt_dptName.TabIndex = 258;
             this.txt_dptName.Tag = "readonly";
             // 
             // txt_daa016n
             // 
-            this.txt_daa016n.Location = new System.Drawing.Point(1365, 116);
+            this.txt_daa016n.Location = new System.Drawing.Point(1364, 114);
             this.txt_daa016n.Name = "txt_daa016n";
             this.txt_daa016n.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa016n.Size = new System.Drawing.Size(273, 24);
+            this.txt_daa016n.Size = new System.Drawing.Size(275, 24);
             this.txt_daa016n.StyleController = this.layoutMx1;
             this.txt_daa016n.TabIndex = 273;
             this.txt_daa016n.Tag = "readonly";
             // 
             // txt_daa029
             // 
-            this.txt_daa029.Location = new System.Drawing.Point(144, 116);
+            this.txt_daa029.Location = new System.Drawing.Point(141, 114);
             this.txt_daa029.Name = "txt_daa029";
             this.txt_daa029.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa029.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa029.Size = new System.Drawing.Size(274, 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(551, 167);
+            this.txt_lineName.Location = new System.Drawing.Point(548, 165);
             this.txt_lineName.Name = "txt_lineName";
             this.txt_lineName.Properties.Appearance.Options.UseFont = true;
-            this.txt_lineName.Size = new System.Drawing.Size(272, 24);
+            this.txt_lineName.Size = new System.Drawing.Size(275, 24);
             this.txt_lineName.StyleController = this.layoutMx1;
             this.txt_lineName.TabIndex = 267;
             this.txt_lineName.Tag = "readonly";
             // 
             // txt_daa017n
             // 
-            this.txt_daa017n.Location = new System.Drawing.Point(1365, 167);
+            this.txt_daa017n.Location = new System.Drawing.Point(1364, 165);
             this.txt_daa017n.Name = "txt_daa017n";
             this.txt_daa017n.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa017n.Size = new System.Drawing.Size(273, 24);
+            this.txt_daa017n.Size = new System.Drawing.Size(275, 24);
             this.txt_daa017n.StyleController = this.layoutMx1;
             this.txt_daa017n.TabIndex = 280;
             this.txt_daa017n.Tag = "readonly";
             // 
             // txt_daa003
             // 
-            this.txt_daa003.Location = new System.Drawing.Point(144, 167);
+            this.txt_daa003.Location = new System.Drawing.Point(141, 165);
             this.txt_daa003.Name = "txt_daa003";
             this.txt_daa003.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa003.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa003.Size = new System.Drawing.Size(274, 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(958, 167);
+            this.txt_dwName.Location = new System.Drawing.Point(956, 165);
             this.txt_dwName.Name = "txt_dwName";
             this.txt_dwName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dwName.Size = new System.Drawing.Size(272, 24);
+            this.txt_dwName.Size = new System.Drawing.Size(275, 24);
             this.txt_dwName.StyleController = this.layoutMx1;
             this.txt_dwName.TabIndex = 226;
             this.txt_dwName.Tag = "readonly";
             // 
             // txt_daa004
             // 
-            this.txt_daa004.Location = new System.Drawing.Point(144, 218);
+            this.txt_daa004.Location = new System.Drawing.Point(141, 216);
             this.txt_daa004.Name = "txt_daa004";
             this.txt_daa004.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa004.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa004.Size = new System.Drawing.Size(274, 24);
             this.txt_daa004.StyleController = this.layoutMx1;
             this.txt_daa004.TabIndex = 222;
             this.txt_daa004.Tag = "readonly";
@@ -1972,24 +1983,24 @@
             // txt_daa015
             // 
             this.txt_daa015.IsReadly = false;
-            this.txt_daa015.Location = new System.Drawing.Point(1365, 218);
+            this.txt_daa015.Location = new System.Drawing.Point(1364, 216);
             this.txt_daa015.Name = "txt_daa015";
-            this.txt_daa015.Size = new System.Drawing.Size(273, 24);
+            this.txt_daa015.Size = new System.Drawing.Size(275, 24);
             this.txt_daa015.TabIndex = 473;
             // 
             // txt_lineNo
             // 
-            this.txt_lineNo.Location = new System.Drawing.Point(551, 218);
+            this.txt_lineNo.Location = new System.Drawing.Point(548, 216);
             this.txt_lineNo.Name = "txt_lineNo";
-            this.txt_lineNo.Size = new System.Drawing.Size(272, 24);
+            this.txt_lineNo.Size = new System.Drawing.Size(275, 24);
             this.txt_lineNo.StyleController = this.layoutMx1;
             this.txt_lineNo.TabIndex = 474;
             // 
             // txt_dptNo
             // 
-            this.txt_dptNo.Location = new System.Drawing.Point(551, 65);
+            this.txt_dptNo.Location = new System.Drawing.Point(548, 63);
             this.txt_dptNo.Name = "txt_dptNo";
-            this.txt_dptNo.Size = new System.Drawing.Size(272, 24);
+            this.txt_dptNo.Size = new System.Drawing.Size(275, 24);
             this.txt_dptNo.StyleController = this.layoutMx1;
             this.txt_dptNo.TabIndex = 475;
             // 
@@ -2004,10 +2015,10 @@
             // 
             // txt_daa018Txt
             // 
-            this.txt_daa018Txt.Location = new System.Drawing.Point(958, 269);
+            this.txt_daa018Txt.Location = new System.Drawing.Point(956, 267);
             this.txt_daa018Txt.Name = "txt_daa018Txt";
             this.txt_daa018Txt.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa018Txt.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa018Txt.Size = new System.Drawing.Size(275, 24);
             this.txt_daa018Txt.StyleController = this.layoutMx1;
             this.txt_daa018Txt.TabIndex = 465;
             this.txt_daa018Txt.Tag = "readonly";
@@ -2015,14 +2026,14 @@
             // txt_xgdate
             // 
             this.txt_xgdate.EditValue = null;
-            this.txt_xgdate.Location = new System.Drawing.Point(1365, 269);
+            this.txt_xgdate.Location = new System.Drawing.Point(1364, 267);
             this.txt_xgdate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_xgdate.Name = "txt_xgdate";
             this.txt_xgdate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txt_xgdate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_xgdate.Size = new System.Drawing.Size(273, 24);
+            this.txt_xgdate.Size = new System.Drawing.Size(275, 24);
             this.txt_xgdate.StyleController = this.layoutMx1;
             this.txt_xgdate.TabIndex = 477;
             // 
@@ -2098,55 +2109,55 @@
             this.txt_xg});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition1.Width = 100D;
-            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition2.Width = 100D;
-            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition3.Width = 100D;
-            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition4.Width = 100D;
+            columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition24.Width = 100D;
+            columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition25.Width = 100D;
+            columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition26.Width = 100D;
+            columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition27.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition1,
-            columnDefinition2,
-            columnDefinition3,
-            columnDefinition4});
-            rowDefinition1.Height = 100D;
-            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition2.Height = 100D;
-            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition3.Height = 100D;
-            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition4.Height = 100D;
-            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition6.Height = 100D;
-            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition24,
+            columnDefinition25,
+            columnDefinition26,
+            columnDefinition27});
+            rowDefinition12.Height = 100D;
+            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition13.Height = 100D;
+            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition14.Height = 100D;
+            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition15.Height = 100D;
+            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition16.Height = 100D;
+            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition17.Height = 100D;
+            rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3,
-            rowDefinition4,
-            rowDefinition5,
-            rowDefinition6});
-            this.Root.Size = new System.Drawing.Size(1651, 330);
+            rowDefinition12,
+            rowDefinition13,
+            rowDefinition14,
+            rowDefinition15,
+            rowDefinition16,
+            rowDefinition17});
+            this.Root.Size = new System.Drawing.Size(1651, 329);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_daa008;
-            this.layoutControlItem3.Location = new System.Drawing.Point(814, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(815, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(407, 49);
+            this.layoutControlItem3.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(117, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_daa014;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 49);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 51);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem5.Size = new System.Drawing.Size(407, 51);
@@ -2156,22 +2167,22 @@
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_daa010;
-            this.layoutControlItem7.Location = new System.Drawing.Point(814, 49);
+            this.layoutControlItem7.Location = new System.Drawing.Point(815, 51);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem7.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(117, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_daa011;
-            this.layoutControlItem11.Location = new System.Drawing.Point(814, 100);
+            this.layoutControlItem11.Location = new System.Drawing.Point(815, 102);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem11.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem11.Text = "宸茬敓浜ч噺";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(117, 18);
             // 
@@ -2181,29 +2192,29 @@
             this.layoutControlItem6.Location = new System.Drawing.Point(407, 0);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(407, 49);
+            this.layoutControlItem6.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem6.Text = "閫氱煡澶囨枡";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(117, 18);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_lineName;
-            this.layoutControlItem14.Location = new System.Drawing.Point(407, 151);
+            this.layoutControlItem14.Location = new System.Drawing.Point(407, 153);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem14.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem14.Text = "鐢熶骇绾垮埆";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(117, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_dwName;
-            this.layoutControlItem15.Location = new System.Drawing.Point(814, 151);
+            this.layoutControlItem15.Location = new System.Drawing.Point(815, 153);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem15.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem15.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem15.Text = "鍗曚綅";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(117, 18);
             // 
@@ -2211,17 +2222,17 @@
             // 
             this.layoutControlItem4.Control = this.txt_mesStartProdn;
             this.layoutControlItem4.CustomizationFormText = "Mes棰勮寮�宸�";
-            this.layoutControlItem4.Location = new System.Drawing.Point(1221, 0);
+            this.layoutControlItem4.Location = new System.Drawing.Point(1223, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem4.Size = new System.Drawing.Size(408, 49);
+            this.layoutControlItem4.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem4.Text = "Mes棰勮寮�宸�";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(117, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_mesEndProdn;
-            this.layoutControlItem8.Location = new System.Drawing.Point(1221, 49);
+            this.layoutControlItem8.Location = new System.Drawing.Point(1223, 51);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
@@ -2232,7 +2243,7 @@
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_daa016n;
-            this.layoutControlItem12.Location = new System.Drawing.Point(1221, 100);
+            this.layoutControlItem12.Location = new System.Drawing.Point(1223, 102);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
@@ -2243,7 +2254,7 @@
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txt_daa017n;
-            this.layoutControlItem16.Location = new System.Drawing.Point(1221, 151);
+            this.layoutControlItem16.Location = new System.Drawing.Point(1223, 153);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
@@ -2254,29 +2265,29 @@
             // layoutControlItem40
             // 
             this.layoutControlItem40.Control = this.txt_lineNo;
-            this.layoutControlItem40.Location = new System.Drawing.Point(407, 202);
+            this.layoutControlItem40.Location = new System.Drawing.Point(407, 204);
             this.layoutControlItem40.Name = "layoutControlItem40";
             this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem40.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem40.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem40.Text = "绾垮埆缂栫爜";
             this.layoutControlItem40.TextSize = new System.Drawing.Size(117, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_saleOrderNo;
-            this.layoutControlItem9.Location = new System.Drawing.Point(814, 202);
+            this.layoutControlItem9.Location = new System.Drawing.Point(815, 204);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem9.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem9.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(117, 18);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_daa029;
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 100);
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 102);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem13.Size = new System.Drawing.Size(407, 51);
@@ -2286,7 +2297,7 @@
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_daa003;
-            this.layoutControlItem19.Location = new System.Drawing.Point(0, 151);
+            this.layoutControlItem19.Location = new System.Drawing.Point(0, 153);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem19.Size = new System.Drawing.Size(407, 51);
@@ -2296,7 +2307,7 @@
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txt_daa004;
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 202);
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 204);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
             this.layoutControlItem17.Size = new System.Drawing.Size(407, 51);
@@ -2306,22 +2317,22 @@
             // layoutControlItem28
             // 
             this.layoutControlItem28.Control = this.txt_daa009;
-            this.layoutControlItem28.Location = new System.Drawing.Point(0, 253);
+            this.layoutControlItem28.Location = new System.Drawing.Point(0, 255);
             this.layoutControlItem28.Name = "layoutControlItem28";
             this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem28.Size = new System.Drawing.Size(814, 51);
+            this.layoutControlItem28.Size = new System.Drawing.Size(815, 54);
             this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
             this.layoutControlItem28.TextSize = new System.Drawing.Size(117, 18);
             // 
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_dptName;
-            this.layoutControlItem20.Location = new System.Drawing.Point(407, 100);
+            this.layoutControlItem20.Location = new System.Drawing.Point(407, 102);
             this.layoutControlItem20.Name = "layoutControlItem20";
             this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem20.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem20.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
             this.layoutControlItem20.TextSize = new System.Drawing.Size(117, 18);
             // 
@@ -2329,11 +2340,11 @@
             // 
             this.layoutControlItem41.Control = this.txt_dptNo;
             this.layoutControlItem41.CustomizationFormText = "浠诲姟鍗曞崟鍙�";
-            this.layoutControlItem41.Location = new System.Drawing.Point(407, 49);
+            this.layoutControlItem41.Location = new System.Drawing.Point(407, 51);
             this.layoutControlItem41.Name = "layoutControlItem41";
             this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem41.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem41.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem41.Text = "浠诲姟鍗曞崟鍙�";
             this.layoutControlItem41.TextSize = new System.Drawing.Size(117, 18);
             // 
@@ -2342,18 +2353,18 @@
             this.layoutControlItem47.Control = this.txt_daa018Txt;
             this.layoutControlItem47.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem47.CustomizationFormText = "宸ュ崟鐘舵��";
-            this.layoutControlItem47.Location = new System.Drawing.Point(814, 253);
+            this.layoutControlItem47.Location = new System.Drawing.Point(815, 255);
             this.layoutControlItem47.Name = "layoutControlItem47";
             this.layoutControlItem47.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem47.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem47.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem47.Size = new System.Drawing.Size(408, 54);
             this.layoutControlItem47.Text = "宸ュ崟鐘舵��";
             this.layoutControlItem47.TextSize = new System.Drawing.Size(117, 18);
             // 
             // txt_daa015label
             // 
             this.txt_daa015label.Control = this.txt_daa015;
-            this.txt_daa015label.Location = new System.Drawing.Point(1221, 202);
+            this.txt_daa015label.Location = new System.Drawing.Point(1223, 204);
             this.txt_daa015label.Name = "txt_daa015label";
             this.txt_daa015label.OptionsTableLayoutItem.ColumnIndex = 3;
             this.txt_daa015label.OptionsTableLayoutItem.RowIndex = 4;
@@ -2366,18 +2377,18 @@
             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(407, 49);
+            this.layoutControlItem1.Size = new System.Drawing.Size(407, 51);
             this.layoutControlItem1.Text = "宸ュ崟鍗曞彿";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(117, 18);
             // 
             // txt_xg
             // 
             this.txt_xg.Control = this.txt_xgdate;
-            this.txt_xg.Location = new System.Drawing.Point(1221, 253);
+            this.txt_xg.Location = new System.Drawing.Point(1223, 255);
             this.txt_xg.Name = "txt_xg";
             this.txt_xg.OptionsTableLayoutItem.ColumnIndex = 3;
             this.txt_xg.OptionsTableLayoutItem.RowIndex = 5;
-            this.txt_xg.Size = new System.Drawing.Size(408, 51);
+            this.txt_xg.Size = new System.Drawing.Size(408, 54);
             this.txt_xg.Text = "鎺掍骇鏃堕棿(鍙慨鏀�)";
             this.txt_xg.TextSize = new System.Drawing.Size(117, 18);
             // 
@@ -2387,7 +2398,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1651, 366);
+            this.tabMx.Size = new System.Drawing.Size(1651, 367);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -2400,7 +2411,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1649, 334);
+            this.tabMxPage1.Size = new System.Drawing.Size(1649, 335);
             this.tabMxPage1.Text = "澶囨枡鍗曡韩";
             // 
             // gcMx1
@@ -2409,7 +2420,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(1649, 334);
+            this.gcMx1.Size = new System.Drawing.Size(1649, 335);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -2432,6 +2443,9 @@
             this.gvMx1dab014,
             this.gridColumn15,
             this.gridColumn16,
+            this.gridColumn89,
+            this.gridColumn88,
+            this.gridColumn90,
             this.gvMx1dab012,
             this.gvMx1dab009,
             this.gvMx1scrapqty,
@@ -2607,7 +2621,7 @@
             this.gvMx1dab009.Name = "gvMx1dab009";
             this.gvMx1dab009.Tag = "query_a.dab009";
             this.gvMx1dab009.Visible = true;
-            this.gvMx1dab009.VisibleIndex = 12;
+            this.gvMx1dab009.VisibleIndex = 15;
             this.gvMx1dab009.Width = 94;
             // 
             // gvMx1scrapqty
@@ -2639,7 +2653,7 @@
             this.gvMx1zyBl.Name = "gvMx1zyBl";
             this.gvMx1zyBl.Tag = "query_a.zy_bl";
             this.gvMx1zyBl.Visible = true;
-            this.gvMx1zyBl.VisibleIndex = 17;
+            this.gvMx1zyBl.VisibleIndex = 20;
             this.gvMx1zyBl.Width = 94;
             // 
             // gvMx1llBl
@@ -2651,7 +2665,7 @@
             this.gvMx1llBl.Name = "gvMx1llBl";
             this.gvMx1llBl.Tag = "query_a.ll_bl";
             this.gvMx1llBl.Visible = true;
-            this.gvMx1llBl.VisibleIndex = 15;
+            this.gvMx1llBl.VisibleIndex = 18;
             this.gvMx1llBl.Width = 94;
             // 
             // gvMx1lpTl
@@ -2663,7 +2677,7 @@
             this.gvMx1lpTl.Name = "gvMx1lpTl";
             this.gvMx1lpTl.Tag = "query_a.lp_tl";
             this.gvMx1lpTl.Visible = true;
-            this.gvMx1lpTl.VisibleIndex = 16;
+            this.gvMx1lpTl.VisibleIndex = 19;
             this.gvMx1lpTl.Width = 94;
             // 
             // gvMx1dab021
@@ -2675,7 +2689,7 @@
             this.gvMx1dab021.Name = "gvMx1dab021";
             this.gvMx1dab021.Tag = "query_a.dab021";
             this.gvMx1dab021.Visible = true;
-            this.gvMx1dab021.VisibleIndex = 13;
+            this.gvMx1dab021.VisibleIndex = 16;
             this.gvMx1dab021.Width = 94;
             // 
             // gvMx1dab010
@@ -2757,14 +2771,14 @@
             this.gvMx1dab023.Name = "gvMx1dab023";
             this.gvMx1dab023.Tag = "query_a.dab023";
             this.gvMx1dab023.Visible = true;
-            this.gvMx1dab023.VisibleIndex = 14;
+            this.gvMx1dab023.VisibleIndex = 17;
             this.gvMx1dab023.Width = 94;
             // 
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.splitMx99);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1649, 334);
+            this.tabMxPage2.Size = new System.Drawing.Size(1649, 335);
             this.tabMxPage2.Text = "鎵樻澘鐮佹槑缁�";
             // 
             // splitMx99
@@ -2784,7 +2798,7 @@
             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(1649, 334);
+            this.splitMx99.Size = new System.Drawing.Size(1649, 335);
             this.splitMx99.SplitterPosition = 84;
             this.splitMx99.TabIndex = 2;
             // 
@@ -2811,29 +2825,29 @@
             // 
             this.layShuLiang.Controls.Add(this.txt_iCount_1);
             this.layShuLiang.Controls.Add(this.txt_yuliang_1);
-            this.layShuLiang.Location = new System.Drawing.Point(721, 52);
+            this.layShuLiang.Location = new System.Drawing.Point(664, 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(350, 30);
+            this.layShuLiang.Size = new System.Drawing.Size(322, 28);
             this.layShuLiang.TabIndex = 475;
             this.layShuLiang.Text = "dataLayoutControl1";
             // 
             // txt_iCount_1
             // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(91, 3);
+            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(82, 24);
+            this.txt_iCount_1.Size = new System.Drawing.Size(70, 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(266, 3);
+            this.txt_yuliang_1.Location = new System.Drawing.Point(250, 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(82, 24);
+            this.txt_yuliang_1.Size = new System.Drawing.Size(70, 24);
             this.txt_yuliang_1.StyleController = this.layShuLiang;
             this.txt_yuliang_1.TabIndex = 6;
             // 
@@ -2846,19 +2860,19 @@
             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;
+            columnDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition28.Width = 100D;
+            columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition29.Width = 100D;
             this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition5,
-            columnDefinition6});
-            rowDefinition7.Height = 100D;
-            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition28,
+            columnDefinition29});
+            rowDefinition18.Height = 100D;
+            rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition7});
+            rowDefinition18});
             this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup3.Size = new System.Drawing.Size(350, 30);
+            this.layoutControlGroup3.Size = new System.Drawing.Size(322, 28);
             this.layoutControlGroup3.TextVisible = false;
             // 
             // layoutControlItem25
@@ -2866,7 +2880,7 @@
             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(175, 30);
+            this.layoutControlItem25.Size = new System.Drawing.Size(161, 28);
             this.layoutControlItem25.Text = "鎵撳嵃鏁村紶鏁�";
             this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -2874,16 +2888,16 @@
             // 
             this.layoutControlItem39.Control = this.txt_yuliang_1;
             this.layoutControlItem39.CustomizationFormText = "鎵撳嵃浣欐暟";
-            this.layoutControlItem39.Location = new System.Drawing.Point(175, 0);
+            this.layoutControlItem39.Location = new System.Drawing.Point(161, 0);
             this.layoutControlItem39.Name = "layoutControlItem39";
             this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem39.Size = new System.Drawing.Size(175, 30);
+            this.layoutControlItem39.Size = new System.Drawing.Size(161, 28);
             this.layoutControlItem39.Text = "鎵撳嵃浣欐暟";
             this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
             // 
             // radOut
             // 
-            this.radOut.Location = new System.Drawing.Point(1073, 13);
+            this.radOut.Location = new System.Drawing.Point(988, 10);
             this.radOut.Margin = new System.Windows.Forms.Padding(0);
             this.radOut.Name = "radOut";
             this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2892,7 +2906,7 @@
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
             this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
-            this.radOut.Size = new System.Drawing.Size(354, 36);
+            this.radOut.Size = new System.Drawing.Size(326, 32);
             this.radOut.StyleController = this.layoutMx99;
             this.radOut.TabIndex = 473;
             // 
@@ -2900,29 +2914,29 @@
             // 
             this.ucBtnPrint1.allClickKey = null;
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(1073, 49);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(988, 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(354, 36);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(326, 32);
             this.ucBtnPrint1.TabIndex = 464;
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(810, 16);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(751, 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(261, 24);
+            this.txt_psnQty_1.Size = new System.Drawing.Size(235, 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(456, 52);
+            this.txt_printRemark.Location = new System.Drawing.Point(425, 44);
             this.txt_printRemark.Name = "txt_printRemark";
             this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
-            this.txt_printRemark.Size = new System.Drawing.Size(261, 24);
+            this.txt_printRemark.Size = new System.Drawing.Size(235, 24);
             this.txt_printRemark.StyleController = this.layoutMx99;
             this.txt_printRemark.TabIndex = 334;
             this.txt_printRemark.Tag = "readOnly-1";
@@ -2930,32 +2944,32 @@
             // txt_kQty
             // 
             this.txt_kQty.EditValue = "";
-            this.txt_kQty.Location = new System.Drawing.Point(456, 16);
+            this.txt_kQty.Location = new System.Drawing.Point(425, 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(261, 24);
+            this.txt_kQty.Size = new System.Drawing.Size(235, 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(102, 52);
+            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(261, 24);
+            this.txt_yQty.Size = new System.Drawing.Size(235, 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(102, 16);
+            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(261, 24);
+            this.txt_zQty.Size = new System.Drawing.Size(235, 24);
             this.txt_zQty.StyleController = this.layoutMx99;
             this.txt_zQty.TabIndex = 474;
             // 
@@ -2974,30 +2988,30 @@
             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 = 190D;
+            columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition30.Width = 100D;
+            columnDefinition31.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition31.Width = 100D;
+            columnDefinition32.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition32.Width = 100D;
+            columnDefinition33.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition33.Width = 100D;
+            columnDefinition34.SizeType = System.Windows.Forms.SizeType.AutoSize;
+            columnDefinition34.Width = 325D;
             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;
+            columnDefinition30,
+            columnDefinition31,
+            columnDefinition32,
+            columnDefinition33,
+            columnDefinition34});
+            rowDefinition19.Height = 100D;
+            rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition20.Height = 100D;
+            rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition8,
-            rowDefinition9});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1628, 98);
+            rowDefinition19,
+            rowDefinition20});
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1649, 84);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem23
@@ -3005,21 +3019,21 @@
             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(354, 0);
+            this.layoutControlItem23.Location = new System.Drawing.Point(326, 0);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem23.Size = new System.Drawing.Size(354, 36);
+            this.layoutControlItem23.Size = new System.Drawing.Size(326, 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(1062, 0);
+            this.layoutControlItem35.Location = new System.Drawing.Point(978, 0);
             this.layoutControlItem35.Name = "layoutControlItem35";
             this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlItem35.Size = new System.Drawing.Size(354, 36);
+            this.layoutControlItem35.Size = new System.Drawing.Size(326, 32);
             this.layoutControlItem35.Text = "鑷姩璁$畻";
             this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem35.TextVisible = false;
@@ -3029,12 +3043,12 @@
             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(1062, 36);
+            this.layoutControlItem26.Location = new System.Drawing.Point(978, 32);
             this.layoutControlItem26.Name = "layoutControlItem26";
             this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlItem26.Size = new System.Drawing.Size(354, 36);
+            this.layoutControlItem26.Size = new System.Drawing.Size(326, 32);
             this.layoutControlItem26.Text = "鎵樻澘鎵撳嵃";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem26.TextVisible = false;
@@ -3044,21 +3058,21 @@
             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, 36);
+            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(354, 36);
+            this.layoutControlItem22.Size = new System.Drawing.Size(326, 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(354, 36);
+            this.layoutControlItem21.Location = new System.Drawing.Point(326, 32);
             this.layoutControlItem21.Name = "layoutControlItem21";
             this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem21.Size = new System.Drawing.Size(354, 36);
+            this.layoutControlItem21.Size = new System.Drawing.Size(326, 32);
             this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
             this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -3068,21 +3082,21 @@
             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(708, 0);
+            this.layoutControlItem24.Location = new System.Drawing.Point(652, 0);
             this.layoutControlItem24.Name = "layoutControlItem24";
             this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem24.Size = new System.Drawing.Size(354, 36);
+            this.layoutControlItem24.Size = new System.Drawing.Size(326, 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(708, 36);
+            this.layoutControlItem38.Location = new System.Drawing.Point(652, 32);
             this.layoutControlItem38.Name = "layoutControlItem38";
             this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem38.Size = new System.Drawing.Size(354, 36);
+            this.layoutControlItem38.Size = new System.Drawing.Size(326, 32);
             this.layoutControlItem38.Text = "鎵撳嵃鏁伴噺";
             this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem38.TextVisible = false;
@@ -3092,7 +3106,7 @@
             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(354, 36);
+            this.layoutControlItem36.Size = new System.Drawing.Size(326, 32);
             this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
             this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -3104,7 +3118,7 @@
             this.gcMx2.Name = "gcMx2";
             this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit1});
-            this.gcMx2.Size = new System.Drawing.Size(1649, 238);
+            this.gcMx2.Size = new System.Drawing.Size(1649, 239);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -3343,7 +3357,7 @@
             this.xtraTabPage3.Controls.Add(this.splitMx98);
             this.xtraTabPage3.Name = "xtraTabPage3";
             this.xtraTabPage3.PageVisible = false;
-            this.xtraTabPage3.Size = new System.Drawing.Size(1649, 334);
+            this.xtraTabPage3.Size = new System.Drawing.Size(1649, 335);
             this.xtraTabPage3.Text = "杩芥函鐮佹槑缁�";
             // 
             // splitMx98
@@ -3363,7 +3377,7 @@
             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(1649, 334);
+            this.splitMx98.Size = new System.Drawing.Size(1649, 335);
             this.splitMx98.SplitterPosition = 51;
             this.splitMx98.TabIndex = 2;
             // 
@@ -3388,53 +3402,53 @@
             // 
             this.ucBtnPrint98.allClickKey = null;
             this.ucBtnPrint98.guidKey = null;
-            this.ucBtnPrint98.Location = new System.Drawing.Point(1349, 13);
+            this.ucBtnPrint98.Location = new System.Drawing.Point(1365, 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(268, 30);
+            this.ucBtnPrint98.Size = new System.Drawing.Size(274, 31);
             this.ucBtnPrint98.TabIndex = 8;
             // 
             // txt_yQty98
             // 
-            this.txt_yQty98.Location = new System.Drawing.Point(383, 16);
+            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(160, 24);
+            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(651, 16);
+            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(160, 24);
+            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(919, 16);
+            this.txt_printRemark98.Location = new System.Drawing.Point(927, 12);
             this.txt_printRemark98.Name = "txt_printRemark98";
-            this.txt_printRemark98.Size = new System.Drawing.Size(160, 24);
+            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(1187, 16);
+            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(160, 24);
+            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(117, 16);
+            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(158, 24);
+            this.txt_zQty98.Size = new System.Drawing.Size(165, 24);
             this.txt_zQty98.StyleController = this.layoutMx98;
             this.txt_zQty98.TabIndex = 9;
             // 
@@ -3451,40 +3465,40 @@
             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;
+            columnDefinition35.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition35.Width = 100D;
+            columnDefinition36.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition36.Width = 100D;
+            columnDefinition37.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition37.Width = 100D;
+            columnDefinition38.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition38.Width = 100D;
+            columnDefinition39.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition39.Width = 100D;
+            columnDefinition40.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition40.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;
+            columnDefinition35,
+            columnDefinition36,
+            columnDefinition37,
+            columnDefinition38,
+            columnDefinition39,
+            columnDefinition40});
+            rowDefinition21.Height = 100D;
+            rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition10});
-            this.layoutControlGroup2.Size = new System.Drawing.Size(1628, 56);
+            rowDefinition21});
+            this.layoutControlGroup2.Size = new System.Drawing.Size(1649, 51);
             this.layoutControlGroup2.TextVisible = false;
             // 
             // layoutControlItem34
             // 
             this.layoutControlItem34.Control = this.ucBtnPrint98;
-            this.layoutControlItem34.Location = new System.Drawing.Point(1338, 0);
+            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(0, 0, 0, 0);
-            this.layoutControlItem34.Size = new System.Drawing.Size(268, 30);
+            this.layoutControlItem34.Size = new System.Drawing.Size(274, 31);
             this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem34.TextVisible = false;
@@ -3492,40 +3506,40 @@
             // layoutControlItem33
             // 
             this.layoutControlItem33.Control = this.txt_iCount_98;
-            this.layoutControlItem33.Location = new System.Drawing.Point(1070, 0);
+            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(268, 30);
+            this.layoutControlItem33.Size = new System.Drawing.Size(271, 31);
             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(802, 0);
+            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(268, 30);
+            this.layoutControlItem32.Size = new System.Drawing.Size(271, 31);
             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(534, 0);
+            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(268, 30);
+            this.layoutControlItem31.Size = new System.Drawing.Size(271, 31);
             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(266, 0);
+            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(268, 30);
+            this.layoutControlItem30.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
             this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -3534,7 +3548,7 @@
             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(266, 30);
+            this.layoutControlItem37.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem37.Text = "宸ュ崟鎬婚噺";
             this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -3544,7 +3558,7 @@
             this.gcMx3.Location = new System.Drawing.Point(0, 0);
             this.gcMx3.MainView = this.gvMx3;
             this.gcMx3.Name = "gcMx3";
-            this.gcMx3.Size = new System.Drawing.Size(1649, 271);
+            this.gcMx3.Size = new System.Drawing.Size(1649, 272);
             this.gcMx3.TabIndex = 1;
             this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx3});
@@ -3676,7 +3690,7 @@
             this.xtraTabPage4.Controls.Add(this.splitMx100);
             this.xtraTabPage4.Name = "xtraTabPage4";
             this.xtraTabPage4.PageVisible = false;
-            this.xtraTabPage4.Size = new System.Drawing.Size(1648, 329);
+            this.xtraTabPage4.Size = new System.Drawing.Size(1649, 335);
             this.xtraTabPage4.Text = "鍚庣洊鐮佹槑缁�";
             // 
             // splitMx100
@@ -3696,7 +3710,7 @@
             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, 329);
+            this.splitMx100.Size = new System.Drawing.Size(1649, 335);
             this.splitMx100.SplitterPosition = 51;
             this.splitMx100.TabIndex = 3;
             // 
@@ -3713,7 +3727,7 @@
             this.layMx100.Name = "layMx100";
             this.layMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(274, 530, 812, 500);
             this.layMx100.Root = this.layoutControlGroup4;
-            this.layMx100.Size = new System.Drawing.Size(1648, 51);
+            this.layMx100.Size = new System.Drawing.Size(1649, 51);
             this.layMx100.TabIndex = 2;
             this.layMx100.Text = "dataLayoutControl1";
             // 
@@ -3721,17 +3735,17 @@
             // 
             this.ucBtnPrint100.allClickKey = null;
             this.ucBtnPrint100.guidKey = null;
-            this.ucBtnPrint100.Location = new System.Drawing.Point(1191, 13);
+            this.ucBtnPrint100.Location = new System.Drawing.Point(1193, 10);
             this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint100.Name = "ucBtnPrint100";
             this.ucBtnPrint100.rptParameter = null;
-            this.ucBtnPrint100.Size = new System.Drawing.Size(296, 33);
+            this.ucBtnPrint100.Size = new System.Drawing.Size(296, 31);
             this.ucBtnPrint100.TabIndex = 0;
             // 
             // btnIn
             // 
             this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttoxls_16x16;
-            this.btnIn.Location = new System.Drawing.Point(1489, 16);
+            this.btnIn.Location = new System.Drawing.Point(1491, 12);
             this.btnIn.Name = "btnIn";
             this.btnIn.Size = new System.Drawing.Size(146, 27);
             this.btnIn.StyleController = this.layMx100;
@@ -3740,36 +3754,36 @@
             // 
             // txt_zQty100
             // 
-            this.txt_zQty100.Location = new System.Drawing.Point(117, 16);
+            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(187, 24);
+            this.txt_zQty100.Size = new System.Drawing.Size(189, 24);
             this.txt_zQty100.StyleController = this.layMx100;
             this.txt_zQty100.TabIndex = 4;
             // 
             // txt_yQty100
             // 
-            this.txt_yQty100.Location = new System.Drawing.Point(412, 16);
+            this.txt_yQty100.Location = new System.Drawing.Point(409, 12);
             this.txt_yQty100.Name = "txt_yQty100";
             this.txt_yQty100.Properties.ReadOnly = true;
-            this.txt_yQty100.Size = new System.Drawing.Size(187, 24);
+            this.txt_yQty100.Size = new System.Drawing.Size(190, 24);
             this.txt_yQty100.StyleController = this.layMx100;
             this.txt_yQty100.TabIndex = 5;
             // 
             // txt_kQty100
             // 
-            this.txt_kQty100.Location = new System.Drawing.Point(707, 16);
+            this.txt_kQty100.Location = new System.Drawing.Point(705, 12);
             this.txt_kQty100.Name = "txt_kQty100";
             this.txt_kQty100.Properties.ReadOnly = true;
-            this.txt_kQty100.Size = new System.Drawing.Size(187, 24);
+            this.txt_kQty100.Size = new System.Drawing.Size(190, 24);
             this.txt_kQty100.StyleController = this.layMx100;
             this.txt_kQty100.TabIndex = 6;
             // 
             // txt_iCount_100
             // 
-            this.txt_iCount_100.Location = new System.Drawing.Point(1002, 16);
+            this.txt_iCount_100.Location = new System.Drawing.Point(1001, 12);
             this.txt_iCount_100.Name = "txt_iCount_100";
-            this.txt_iCount_100.Size = new System.Drawing.Size(187, 24);
+            this.txt_iCount_100.Size = new System.Drawing.Size(190, 24);
             this.txt_iCount_100.StyleController = this.layMx100;
             this.txt_iCount_100.TabIndex = 7;
             // 
@@ -3786,30 +3800,30 @@
             this.layoutControlItem45});
             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.Percent;
-            columnDefinition22.Width = 100D;
-            columnDefinition23.SizeType = System.Windows.Forms.SizeType.Absolute;
-            columnDefinition23.Width = 150D;
+            columnDefinition41.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition41.Width = 100D;
+            columnDefinition42.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition42.Width = 100D;
+            columnDefinition43.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition43.Width = 100D;
+            columnDefinition44.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition44.Width = 100D;
+            columnDefinition45.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition45.Width = 100D;
+            columnDefinition46.SizeType = System.Windows.Forms.SizeType.Absolute;
+            columnDefinition46.Width = 150D;
             this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition18,
-            columnDefinition19,
-            columnDefinition20,
-            columnDefinition21,
-            columnDefinition22,
-            columnDefinition23});
-            rowDefinition11.Height = 100D;
-            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition41,
+            columnDefinition42,
+            columnDefinition43,
+            columnDefinition44,
+            columnDefinition45,
+            columnDefinition46});
+            rowDefinition22.Height = 100D;
+            rowDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition11});
-            this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 59);
+            rowDefinition22});
+            this.layoutControlGroup4.Size = new System.Drawing.Size(1649, 51);
             this.layoutControlGroup4.TextVisible = false;
             // 
             // layoutControlItem42
@@ -3817,7 +3831,7 @@
             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(295, 33);
+            this.layoutControlItem42.Size = new System.Drawing.Size(295, 31);
             this.layoutControlItem42.Text = "宸ュ崟鎬婚噺";
             this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -3827,7 +3841,7 @@
             this.layoutControlItem43.Location = new System.Drawing.Point(295, 0);
             this.layoutControlItem43.Name = "layoutControlItem43";
             this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem43.Size = new System.Drawing.Size(295, 33);
+            this.layoutControlItem43.Size = new System.Drawing.Size(296, 31);
             this.layoutControlItem43.Text = "宸叉墦鍗版暟";
             this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -3835,20 +3849,20 @@
             // 
             this.layoutControlItem44.Control = this.txt_kQty100;
             this.layoutControlItem44.CustomizationFormText = "鍙墦鍗版暟";
-            this.layoutControlItem44.Location = new System.Drawing.Point(590, 0);
+            this.layoutControlItem44.Location = new System.Drawing.Point(591, 0);
             this.layoutControlItem44.Name = "layoutControlItem44";
             this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem44.Size = new System.Drawing.Size(295, 33);
+            this.layoutControlItem44.Size = new System.Drawing.Size(296, 31);
             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(1476, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(1479, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 5;
-            this.layoutControlItem2.Size = new System.Drawing.Size(150, 33);
+            this.layoutControlItem2.Size = new System.Drawing.Size(150, 31);
             this.layoutControlItem2.Text = "瀵煎叆鎸夐挳";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem2.TextVisible = false;
@@ -3856,11 +3870,11 @@
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.ucBtnPrint100;
-            this.layoutControlItem10.Location = new System.Drawing.Point(1180, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(1183, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 4;
             this.layoutControlItem10.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlItem10.Size = new System.Drawing.Size(296, 33);
+            this.layoutControlItem10.Size = new System.Drawing.Size(296, 31);
             this.layoutControlItem10.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem10.TextVisible = false;
@@ -3868,10 +3882,10 @@
             // layoutControlItem45
             // 
             this.layoutControlItem45.Control = this.txt_iCount_100;
-            this.layoutControlItem45.Location = new System.Drawing.Point(885, 0);
+            this.layoutControlItem45.Location = new System.Drawing.Point(887, 0);
             this.layoutControlItem45.Name = "layoutControlItem45";
             this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem45.Size = new System.Drawing.Size(295, 33);
+            this.layoutControlItem45.Size = new System.Drawing.Size(296, 31);
             this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
             this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -3881,7 +3895,7 @@
             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, 266);
+            this.gcMx4.Size = new System.Drawing.Size(1649, 272);
             this.gcMx4.TabIndex = 2;
             this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx4});
@@ -4013,7 +4027,7 @@
             this.xtraTabPage5.Controls.Add(this.ucBtnPrint101);
             this.xtraTabPage5.Name = "xtraTabPage5";
             this.xtraTabPage5.PageVisible = false;
-            this.xtraTabPage5.Size = new System.Drawing.Size(1649, 334);
+            this.xtraTabPage5.Size = new System.Drawing.Size(1649, 335);
             this.xtraTabPage5.Text = "鐗╂枡榻愬鏍囪瘑鍗�";
             // 
             // ucBtnPrint101
@@ -4026,6 +4040,66 @@
             this.ucBtnPrint101.rptParameter = null;
             this.ucBtnPrint101.Size = new System.Drawing.Size(415, 59);
             this.ucBtnPrint101.TabIndex = 0;
+            // 
+            // gridColumn88
+            // 
+            this.gridColumn88.Caption = "鍒嗘瘝";
+            this.gridColumn88.FieldName = "denominator";
+            this.gridColumn88.MinWidth = 25;
+            this.gridColumn88.Name = "gridColumn88";
+            this.gridColumn88.Visible = true;
+            this.gridColumn88.VisibleIndex = 13;
+            this.gridColumn88.Width = 94;
+            // 
+            // gridColumn89
+            // 
+            this.gridColumn89.Caption = "鍒嗗瓙";
+            this.gridColumn89.FieldName = "numerator";
+            this.gridColumn89.MinWidth = 25;
+            this.gridColumn89.Name = "gridColumn89";
+            this.gridColumn89.Visible = true;
+            this.gridColumn89.VisibleIndex = 12;
+            this.gridColumn89.Width = 94;
+            // 
+            // gridColumn90
+            // 
+            this.gridColumn90.Caption = "搴撳瓨鏁�";
+            this.gridColumn90.FieldName = "stkQty";
+            this.gridColumn90.MinWidth = 25;
+            this.gridColumn90.Name = "gridColumn90";
+            this.gridColumn90.Visible = true;
+            this.gridColumn90.VisibleIndex = 14;
+            this.gridColumn90.Width = 94;
+            // 
+            // gridColumn91
+            // 
+            this.gridColumn91.Caption = "鍒嗘瘝";
+            this.gridColumn91.FieldName = "denominator";
+            this.gridColumn91.MinWidth = 25;
+            this.gridColumn91.Name = "gridColumn91";
+            this.gridColumn91.Visible = true;
+            this.gridColumn91.VisibleIndex = 13;
+            this.gridColumn91.Width = 94;
+            // 
+            // gridColumn92
+            // 
+            this.gridColumn92.Caption = "鍒嗗瓙";
+            this.gridColumn92.FieldName = "numerator";
+            this.gridColumn92.MinWidth = 25;
+            this.gridColumn92.Name = "gridColumn92";
+            this.gridColumn92.Visible = true;
+            this.gridColumn92.VisibleIndex = 12;
+            this.gridColumn92.Width = 94;
+            // 
+            // gridColumn93
+            // 
+            this.gridColumn93.Caption = "搴撳瓨鏁�";
+            this.gridColumn93.FieldName = "stkQty";
+            this.gridColumn93.MinWidth = 25;
+            this.gridColumn93.Name = "gridColumn93";
+            this.gridColumn93.Visible = true;
+            this.gridColumn93.VisibleIndex = 14;
+            this.gridColumn93.Width = 94;
             // 
             // Frm_Womdaa
             // 
@@ -4495,5 +4569,11 @@
         private DevExpress.XtraEditors.DateEdit txt_xgdate;
         private DevExpress.XtraLayout.LayoutControlItem txt_xg;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fxk;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn89;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn88;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn90;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn92;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn91;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn93;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index b7c3b66..4613fe1 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -613,7 +613,7 @@
                 guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
                 sjxt = txt_daa015.GetId(), //绾夸綋
                 bz = txt_daa009.Text.Trim(),//澶囨敞
-                xgdate = txt_xgdate.Text.Trim(),
+                xgdate = txt_xgdate.Text.Trim()
             };
             try
             {
@@ -854,9 +854,9 @@
             string strMsg = "";
             switch (_inFieldValue)
             {
-                //case 1:
-                //    strMsg = "寰呭紑宸�";
-                //    break;
+                case 1:
+                    strMsg = "寰呭紑宸�";
+                    break;
                 case 2:
                     strMsg = "宸ュ崟鏆傚仠";
                     break;
@@ -875,9 +875,9 @@
                 case 7:
                     strMsg = "閫氱煡澶囨枡";
                     break;
-                //case 8:
-                //    strMsg = "寮�宸�";
-                //    break;
+                case 8:
+                    strMsg = "寮�宸�";
+                    break;
                 case 9:
                     strMsg = "鎵嬪姩瀹屽伐";
                     break;
@@ -1021,6 +1021,15 @@
                 return;
             }
 
+            if (gdzt != "M:鐢熶骇涓�")
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("鏈紑宸ヤ笉鍙墦鍗版潯鐮侊紒");
+                this.ucBtnPrint1.rptParameter = "return false";
+                return;
+            }
+
+
+
             if (rowGuid.Length < 36)
             {
                 Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犺鎵撳嵃鐨勮锛�");
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index 46b7b08..b432c25 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -43,6 +43,10 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Wompba));
+            this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
+            this.repositoryItemDateEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
+            this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -60,6 +64,31 @@
             this.gv_pba009 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
+            this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage6 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMxL1 = new DevExpress.XtraGrid.GridControl();
+            this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn27 = 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.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -84,6 +113,9 @@
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.tableMxContainer = new System.Windows.Forms.TableLayoutPanel();
+            this.panelMxButtons = new System.Windows.Forms.Panel();
+            this.btnMultiSelect = new DevExpress.XtraEditors.SimpleButton();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -113,8 +145,44 @@
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn50 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn51 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn56 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn57 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn58 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn59 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn60 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn61 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn62 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn63 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn64 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn65 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn66 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn67 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn68 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn69 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn70 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn71 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit4.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -122,9 +190,15 @@
             ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
             this.split1.Panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+            this.split1.Panel2.SuspendLayout();
             this.split1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
+            this.xtraTabControl2.SuspendLayout();
+            this.xtraTabPage6.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMxL1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
             this.xtraTabPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
@@ -152,6 +226,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
+            this.tableMxContainer.SuspendLayout();
+            this.panelMxButtons.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).BeginInit();
@@ -162,7 +238,57 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
             this.SuspendLayout();
+            // 
+            // repositoryItemDateEdit1
+            // 
+            this.repositoryItemDateEdit1.AutoHeight = false;
+            this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit1.DisplayFormat.FormatString = "D";
+            this.repositoryItemDateEdit1.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.repositoryItemDateEdit1.EditFormat.FormatString = "D";
+            this.repositoryItemDateEdit1.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.repositoryItemDateEdit1.MaskSettings.Set("mask", "D");
+            this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1";
+            // 
+            // repositoryItemDateEdit4
+            // 
+            this.repositoryItemDateEdit4.AutoHeight = false;
+            this.repositoryItemDateEdit4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit4.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit4.Name = "repositoryItemDateEdit4";
+            // 
+            // repositoryItemComboBox2
+            // 
+            this.repositoryItemComboBox2.AutoHeight = false;
+            this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
+            this.repositoryItemComboBox2.NullText = "-璇烽�夋嫨-";
+            this.repositoryItemComboBox2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            // 
+            // repositoryItemComboBox3
+            // 
+            this.repositoryItemComboBox3.AutoHeight = false;
+            this.repositoryItemComboBox3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox3.Items.AddRange(new object[] {
+            "F-閲忎骇",
+            "S-璇曚骇",
+            "C-鎷嗘満杩斿伐",
+            "W-缁翠慨杩斿伐",
+            "G-杩斿伐",
+            "O-澶栧彂"});
+            this.repositoryItemComboBox3.Name = "repositoryItemComboBox3";
+            this.repositoryItemComboBox3.NullText = "-璇烽�夋嫨-";
+            this.repositoryItemComboBox3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             // 
             // toolBarMenu1
             // 
@@ -175,7 +301,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(1628, 80);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -186,7 +312,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, 602);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1628, 740);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -196,7 +322,7 @@
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1626, 708);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -215,10 +341,11 @@
             // 
             // split1.Panel2
             // 
+            this.split1.Panel2.Controls.Add(this.xtraTabControl2);
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1126, 570);
-            this.split1.SplitterPosition = 0;
+            this.split1.Size = new System.Drawing.Size(1626, 708);
+            this.split1.SplitterPosition = 289;
             this.split1.TabIndex = 4;
             // 
             // gcMain1
@@ -227,7 +354,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, 519);
+            this.gcMain1.Size = new System.Drawing.Size(1626, 368);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -372,19 +499,368 @@
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 519);
+            this.pageBar1.Location = new System.Drawing.Point(0, 368);
             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(1626, 39);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
+            // 
+            // xtraTabControl2
+            // 
+            this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
+            this.xtraTabControl2.Name = "xtraTabControl2";
+            this.xtraTabControl2.SelectedTabPage = this.xtraTabPage6;
+            this.xtraTabControl2.Size = new System.Drawing.Size(1626, 289);
+            this.xtraTabControl2.TabIndex = 5;
+            this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage6});
+            // 
+            // xtraTabPage6
+            // 
+            this.xtraTabPage6.Controls.Add(this.gcMxL1);
+            this.xtraTabPage6.Name = "xtraTabPage6";
+            this.xtraTabPage6.Size = new System.Drawing.Size(1624, 257);
+            this.xtraTabPage6.Text = "浠诲姟鍗曟槑缁�";
+            // 
+            // gcMxL1
+            // 
+            this.gcMxL1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMxL1.Location = new System.Drawing.Point(0, 0);
+            this.gcMxL1.MainView = this.gridView4;
+            this.gcMxL1.Name = "gcMxL1";
+            this.gcMxL1.Size = new System.Drawing.Size(1624, 257);
+            this.gcMxL1.TabIndex = 1;
+            this.gcMxL1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView4});
+            // 
+            // gridView4
+            // 
+            this.gridView4.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView4.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView4.ColumnPanelRowHeight = 50;
+            this.gridView4.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn8,
+            this.gridColumn9,
+            this.gridColumn10,
+            this.gridColumn12,
+            this.gridColumn13,
+            this.gridColumn14,
+            this.gridColumn15,
+            this.gridColumn16,
+            this.gridColumn17,
+            this.gridColumn18,
+            this.gridColumn19,
+            this.gridColumn21,
+            this.gridColumn22,
+            this.gridColumn23,
+            this.gridColumn24,
+            this.gridColumn25,
+            this.gridColumn27,
+            this.gridColumn30,
+            this.gridColumn31,
+            this.gridColumn32,
+            this.gridColumn34});
+            this.gridView4.GridControl = this.gcMxL1;
+            this.gridView4.Name = "gridView4";
+            this.gridView4.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView4.OptionsView.ShowAutoFilterRow = true;
+            this.gridView4.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.AppearanceCell.Options.UseFont = true;
+            this.gridColumn8.Caption = "鏄庣粏Guid";
+            this.gridColumn8.FieldName = "guid";
+            this.gridColumn8.MinWidth = 50;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.OptionsColumn.ReadOnly = true;
+            this.gridColumn8.Tag = "query_a.guid";
+            this.gridColumn8.Width = 94;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "caaGuid";
+            this.gridColumn9.FieldName = "caaGuid";
+            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.OptionsColumn.ReadOnly = true;
+            this.gridColumn9.Width = 94;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.AppearanceCell.Options.UseFont = true;
+            this.gridColumn10.Caption = "宸ュ崟鍗曞彿";
+            this.gridColumn10.FieldName = "daa001";
+            this.gridColumn10.MinWidth = 50;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.OptionsColumn.ReadOnly = true;
+            this.gridColumn10.Tag = "query_a.daa002";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 0;
+            this.gridColumn10.Width = 50;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.AppearanceCell.Options.UseFont = true;
+            this.gridColumn12.Caption = "浠诲姟鍗曞彿";
+            this.gridColumn12.FieldName = "daa021";
+            this.gridColumn12.MinWidth = 50;
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.OptionsColumn.ReadOnly = true;
+            this.gridColumn12.Tag = "query_a.daa010";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 1;
+            this.gridColumn12.Width = 50;
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.AppearanceCell.Options.UseFont = true;
+            this.gridColumn13.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn13.FieldName = "itemNo";
+            this.gridColumn13.MinWidth = 50;
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.OptionsColumn.ReadOnly = true;
+            this.gridColumn13.Tag = "query_a.daa005";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 2;
+            this.gridColumn13.Width = 50;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.AppearanceCell.Options.UseFont = true;
+            this.gridColumn14.Caption = "浜у搧鍚嶇О";
+            this.gridColumn14.FieldName = "daa003";
+            this.gridColumn14.MinWidth = 50;
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.OptionsColumn.ReadOnly = true;
+            this.gridColumn14.Tag = "query_a.daa003";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 3;
+            this.gridColumn14.Width = 50;
+            // 
+            // gridColumn15
+            // 
+            this.gridColumn15.AppearanceCell.Options.UseFont = true;
+            this.gridColumn15.Caption = "浜у搧瑙勬牸";
+            this.gridColumn15.FieldName = "daa004";
+            this.gridColumn15.MinWidth = 50;
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.OptionsColumn.ReadOnly = true;
+            this.gridColumn15.Tag = "query_a.daa004";
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 4;
+            this.gridColumn15.Width = 50;
+            // 
+            // gridColumn16
+            // 
+            this.gridColumn16.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn16.AppearanceCell.Options.UseFont = true;
+            this.gridColumn16.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn16.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn16.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn16.Caption = "Mes棰勮寮�宸�";
+            this.gridColumn16.ColumnEdit = this.repositoryItemDateEdit1;
+            this.gridColumn16.FieldName = "mesStartProd";
+            this.gridColumn16.MinWidth = 50;
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Tag = "edit";
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 6;
+            this.gridColumn16.Width = 78;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn17.AppearanceCell.Options.UseFont = true;
+            this.gridColumn17.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn17.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn17.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn17.Caption = "Mes棰勮瀹屽伐";
+            this.gridColumn17.ColumnEdit = this.repositoryItemDateEdit4;
+            this.gridColumn17.FieldName = "mesEndProd";
+            this.gridColumn17.MinWidth = 50;
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Tag = "edit";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 7;
+            this.gridColumn17.Width = 50;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.AppearanceCell.Options.UseFont = true;
+            this.gridColumn18.Caption = "宸ュ崟鎬绘暟";
+            this.gridColumn18.FieldName = "caa012";
+            this.gridColumn18.MaxWidth = 50;
+            this.gridColumn18.MinWidth = 50;
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.OptionsColumn.ReadOnly = true;
+            this.gridColumn18.Tag = "query_a.daa008";
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 8;
+            this.gridColumn18.Width = 50;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.AppearanceCell.Options.UseFont = true;
+            this.gridColumn19.Caption = "鍗曚綅";
+            this.gridColumn19.FieldName = "fname";
+            this.gridColumn19.MaxWidth = 50;
+            this.gridColumn19.MinWidth = 50;
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.OptionsColumn.ReadOnly = true;
+            this.gridColumn19.Tag = "query_a.daa006";
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 9;
+            this.gridColumn19.Width = 50;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.AppearanceCell.Options.UseFont = true;
+            this.gridColumn21.Caption = "宸叉帓";
+            this.gridColumn21.FieldName = "yp";
+            this.gridColumn21.MaxWidth = 50;
+            this.gridColumn21.MinWidth = 50;
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.OptionsColumn.ReadOnly = true;
+            this.gridColumn21.Tag = "query_a.daa007";
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 10;
+            this.gridColumn21.Width = 50;
+            // 
+            // gridColumn22
+            // 
+            this.gridColumn22.AppearanceCell.Options.UseFont = true;
+            this.gridColumn22.Caption = "鏈帓";
+            this.gridColumn22.FieldName = "wp";
+            this.gridColumn22.MaxWidth = 50;
+            this.gridColumn22.MinWidth = 50;
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.OptionsColumn.ReadOnly = true;
+            this.gridColumn22.Tag = "query_a.daa009";
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 11;
+            this.gridColumn22.Width = 50;
+            // 
+            // gridColumn23
+            // 
+            this.gridColumn23.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn23.AppearanceCell.Options.UseFont = true;
+            this.gridColumn23.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn23.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn23.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn23.Caption = "鏈鎺掓暟閲�";
+            this.gridColumn23.FieldName = "daa008";
+            this.gridColumn23.MaxWidth = 50;
+            this.gridColumn23.MinWidth = 60;
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.Tag = "yz_quantity_0_edit";
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 12;
+            this.gridColumn23.Width = 60;
+            // 
+            // gridColumn24
+            // 
+            this.gridColumn24.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn24.AppearanceCell.Options.UseFont = true;
+            this.gridColumn24.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn24.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn24.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn24.Caption = "绾垮埆缂栫爜";
+            this.gridColumn24.ColumnEdit = this.repositoryItemComboBox2;
+            this.gridColumn24.FieldName = "daa015LineName";
+            this.gridColumn24.MinWidth = 150;
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Tag = "edit";
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 13;
+            this.gridColumn24.Width = 153;
+            // 
+            // gridColumn25
+            // 
+            this.gridColumn25.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn25.AppearanceCell.Options.UseFont = true;
+            this.gridColumn25.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn25.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn25.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn25.Caption = "澶囨敞";
+            this.gridColumn25.FieldName = "daa009";
+            this.gridColumn25.MinWidth = 50;
+            this.gridColumn25.Name = "gridColumn25";
+            this.gridColumn25.Tag = "edit";
+            this.gridColumn25.Visible = true;
+            this.gridColumn25.VisibleIndex = 14;
+            this.gridColumn25.Width = 102;
+            // 
+            // gridColumn27
+            // 
+            this.gridColumn27.AppearanceCell.Options.UseFont = true;
+            this.gridColumn27.Caption = "鎶曟枡鍗曞崟鍙�";
+            this.gridColumn27.FieldName = "daa014";
+            this.gridColumn27.MinWidth = 50;
+            this.gridColumn27.Name = "gridColumn27";
+            this.gridColumn27.OptionsColumn.ReadOnly = true;
+            this.gridColumn27.Tag = "query_a.daa014";
+            this.gridColumn27.Visible = true;
+            this.gridColumn27.VisibleIndex = 15;
+            this.gridColumn27.Width = 51;
+            // 
+            // gridColumn30
+            // 
+            this.gridColumn30.Caption = "绾夸綋ID";
+            this.gridColumn30.FieldName = "daa015";
+            this.gridColumn30.MinWidth = 25;
+            this.gridColumn30.Name = "gridColumn30";
+            this.gridColumn30.Visible = true;
+            this.gridColumn30.VisibleIndex = 16;
+            this.gridColumn30.Width = 94;
+            // 
+            // gridColumn31
+            // 
+            this.gridColumn31.AppearanceCell.Options.UseFont = true;
+            this.gridColumn31.Caption = "闇�姹傚崟鍙�";
+            this.gridColumn31.FieldName = "caa015";
+            this.gridColumn31.MinWidth = 50;
+            this.gridColumn31.Name = "gridColumn31";
+            this.gridColumn31.OptionsColumn.ReadOnly = true;
+            this.gridColumn31.Tag = "query_a.fstatus";
+            this.gridColumn31.Visible = true;
+            this.gridColumn31.VisibleIndex = 17;
+            this.gridColumn31.Width = 76;
+            // 
+            // gridColumn32
+            // 
+            this.gridColumn32.Caption = "娆″簭";
+            this.gridColumn32.FieldName = "scheduleOrder";
+            this.gridColumn32.MinWidth = 25;
+            this.gridColumn32.Name = "gridColumn32";
+            this.gridColumn32.Visible = true;
+            this.gridColumn32.VisibleIndex = 18;
+            this.gridColumn32.Width = 94;
+            // 
+            // gridColumn34
+            // 
+            this.gridColumn34.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn34.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn34.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn34.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn34.Caption = "鐢熶骇绫诲瀷";
+            this.gridColumn34.ColumnEdit = this.repositoryItemComboBox3;
+            this.gridColumn34.FieldName = "daa025";
+            this.gridColumn34.MinWidth = 25;
+            this.gridColumn34.Name = "gridColumn34";
+            this.gridColumn34.Tag = "edit";
+            this.gridColumn34.Visible = true;
+            this.gridColumn34.VisibleIndex = 5;
+            this.gridColumn34.Width = 94;
             // 
             // xtraTabPage2
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1626, 708);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -404,7 +880,7 @@
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx1.Size = new System.Drawing.Size(1126, 570);
+            this.splitMx1.Size = new System.Drawing.Size(1626, 708);
             this.splitMx1.SplitterPosition = 109;
             this.splitMx1.TabIndex = 0;
             // 
@@ -426,7 +902,7 @@
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(816, 394, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1126, 109);
+            this.layoutMx1.Size = new System.Drawing.Size(1626, 109);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -454,7 +930,7 @@
             this.txt_pba013.IsReadly = false;
             this.txt_pba013.Location = new System.Drawing.Point(89, 43);
             this.txt_pba013.Name = "txt_pba013";
-            this.txt_pba013.Size = new System.Drawing.Size(190, 24);
+            this.txt_pba013.Size = new System.Drawing.Size(320, 24);
             this.txt_pba013.TabIndex = 459;
             // 
             // txt_erpSczz
@@ -462,54 +938,54 @@
             this.txt_erpSczz.IsReadly = false;
             this.txt_erpSczz.Location = new System.Drawing.Point(89, 12);
             this.txt_erpSczz.Name = "txt_erpSczz";
-            this.txt_erpSczz.Size = new System.Drawing.Size(190, 24);
+            this.txt_erpSczz.Size = new System.Drawing.Size(320, 24);
             this.txt_erpSczz.TabIndex = 460;
             // 
             // txt_hNo
             // 
-            this.txt_hNo.Location = new System.Drawing.Point(360, 12);
+            this.txt_hNo.Location = new System.Drawing.Point(490, 12);
             this.txt_hNo.Name = "txt_hNo";
             this.txt_hNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_hNo.Size = new System.Drawing.Size(190, 24);
+            this.txt_hNo.Size = new System.Drawing.Size(320, 24);
             this.txt_hNo.StyleController = this.layoutMx1;
             this.txt_hNo.TabIndex = 458;
             this.txt_hNo.Tag = "readonly";
             // 
             // txt_pba009
             // 
-            this.txt_pba009.Location = new System.Drawing.Point(360, 43);
+            this.txt_pba009.Location = new System.Drawing.Point(490, 43);
             this.txt_pba009.Name = "txt_pba009";
             this.txt_pba009.Properties.Appearance.Options.UseFont = true;
-            this.txt_pba009.Size = new System.Drawing.Size(461, 24);
+            this.txt_pba009.Size = new System.Drawing.Size(721, 24);
             this.txt_pba009.StyleController = this.layoutMx1;
             this.txt_pba009.TabIndex = 240;
             // 
             // txt_checkUser
             // 
-            this.txt_checkUser.Location = new System.Drawing.Point(902, 12);
+            this.txt_checkUser.Location = new System.Drawing.Point(1292, 12);
             this.txt_checkUser.Name = "txt_checkUser";
             this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkUser.Size = new System.Drawing.Size(191, 24);
+            this.txt_checkUser.Size = new System.Drawing.Size(322, 24);
             this.txt_checkUser.StyleController = this.layoutMx1;
             this.txt_checkUser.TabIndex = 273;
             this.txt_checkUser.Tag = "readonly";
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(631, 12);
+            this.txt_checkDate.Location = new System.Drawing.Point(891, 12);
             this.txt_checkDate.Name = "txt_checkDate";
             this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(190, 24);
+            this.txt_checkDate.Size = new System.Drawing.Size(320, 24);
             this.txt_checkDate.StyleController = this.layoutMx1;
             this.txt_checkDate.TabIndex = 267;
             this.txt_checkDate.Tag = "readonly";
             // 
             // txt_fstatus
             // 
-            this.txt_fstatus.Location = new System.Drawing.Point(825, 43);
+            this.txt_fstatus.Location = new System.Drawing.Point(1215, 43);
             this.txt_fstatus.Name = "txt_fstatus";
             this.txt_fstatus.Properties.Caption = "瀹℃牳鐘舵��";
-            this.txt_fstatus.Size = new System.Drawing.Size(268, 24);
+            this.txt_fstatus.Size = new System.Drawing.Size(399, 24);
             this.txt_fstatus.StyleController = this.layoutMx1;
             this.txt_fstatus.TabIndex = 461;
             this.txt_fstatus.Tag = "readonly";
@@ -564,7 +1040,7 @@
             rowDefinition1,
             rowDefinition2,
             rowDefinition3});
-            this.Root.Size = new System.Drawing.Size(1105, 113);
+            this.Root.Size = new System.Drawing.Size(1626, 113);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -572,27 +1048,27 @@
             this.layoutControlItem1.Control = this.txt_erpSczz;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem1.Size = new System.Drawing.Size(401, 31);
             this.layoutControlItem1.Text = "鐢熶骇缁勭粐";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_hNo;
-            this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(401, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem2.Size = new System.Drawing.Size(401, 31);
             this.layoutControlItem2.Text = "鎺掍骇缂栧彿";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_checkDate;
-            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(802, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem3.Size = new System.Drawing.Size(401, 31);
             this.layoutControlItem3.Text = "瀹℃牳鏃ユ湡 ";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18);
             // 
@@ -602,28 +1078,28 @@
             this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem4.Size = new System.Drawing.Size(401, 31);
             this.layoutControlItem4.Text = "宸ヤ綔杞﹂棿";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_checkUser;
-            this.layoutControlItem5.Location = new System.Drawing.Point(813, 0);
+            this.layoutControlItem5.Location = new System.Drawing.Point(1203, 0);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem5.Size = new System.Drawing.Size(272, 31);
+            this.layoutControlItem5.Size = new System.Drawing.Size(403, 31);
             this.layoutControlItem5.Text = "瀹℃牳浜哄憳";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_fstatus;
-            this.layoutControlItem6.Location = new System.Drawing.Point(813, 31);
+            this.layoutControlItem6.Location = new System.Drawing.Point(1203, 31);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(272, 31);
+            this.layoutControlItem6.Size = new System.Drawing.Size(403, 31);
             this.layoutControlItem6.Text = "瀹℃牳鐘舵��";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem6.TextVisible = false;
@@ -631,12 +1107,12 @@
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_pba009;
-            this.layoutControlItem7.Location = new System.Drawing.Point(271, 31);
+            this.layoutControlItem7.Location = new System.Drawing.Point(401, 31);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
+            this.layoutControlItem7.Size = new System.Drawing.Size(802, 31);
             this.layoutControlItem7.Text = "鎺掍骇澶囨敞";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(65, 18);
             // 
@@ -648,7 +1124,7 @@
             this.layoutControlItem8.MinSize = new System.Drawing.Size(105, 31);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem8.Size = new System.Drawing.Size(401, 31);
             this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem8.Text = "閫夋嫨鎶曟枡鍗�";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
@@ -660,22 +1136,59 @@
             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, 449);
+            this.tabMx.Size = new System.Drawing.Size(1626, 587);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
             // 
             // tabMxPage1
             // 
-            this.tabMxPage1.Controls.Add(this.gcMx1);
+            this.tabMxPage1.Controls.Add(this.tableMxContainer);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 417);
+            this.tabMxPage1.Size = new System.Drawing.Size(1624, 555);
             this.tabMxPage1.Text = "浠诲姟鍗曟槑缁�";
+            // 
+            // tableMxContainer
+            // 
+            this.tableMxContainer.ColumnCount = 1;
+            this.tableMxContainer.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableMxContainer.Controls.Add(this.panelMxButtons, 0, 0);
+            this.tableMxContainer.Controls.Add(this.gcMx1, 0, 1);
+            this.tableMxContainer.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableMxContainer.Location = new System.Drawing.Point(0, 0);
+            this.tableMxContainer.Name = "tableMxContainer";
+            this.tableMxContainer.RowCount = 2;
+            this.tableMxContainer.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 62F));
+            this.tableMxContainer.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableMxContainer.Size = new System.Drawing.Size(1624, 555);
+            this.tableMxContainer.TabIndex = 0;
+            // 
+            // panelMxButtons
+            // 
+            this.panelMxButtons.Controls.Add(this.btnMultiSelect);
+            this.panelMxButtons.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panelMxButtons.Location = new System.Drawing.Point(3, 4);
+            this.panelMxButtons.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.panelMxButtons.Name = "panelMxButtons";
+            this.panelMxButtons.Size = new System.Drawing.Size(1618, 54);
+            this.panelMxButtons.TabIndex = 1;
+            // 
+            // btnMultiSelect
+            // 
+            this.btnMultiSelect.Location = new System.Drawing.Point(11, 6);
+            this.btnMultiSelect.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.btnMultiSelect.Name = "btnMultiSelect";
+            this.btnMultiSelect.Size = new System.Drawing.Size(137, 32);
+            this.btnMultiSelect.TabIndex = 0;
+            this.btnMultiSelect.Text = "鎵归噺鍗曟嵁鍙嶅鏍�";
+            this.btnMultiSelect.Click += new System.EventHandler(this.btnMultiSelect_Click);
             // 
             // gcMx1
             // 
-            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.Location = new System.Drawing.Point(0, 0);
+            this.gcMx1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.gcMx1.Location = new System.Drawing.Point(3, 65);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
@@ -684,7 +1197,7 @@
             this.rptJYBZ,
             this.repositoryItemDateEdit3,
             this.repositoryItemComboBox1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 417);
+            this.gcMx1.Size = new System.Drawing.Size(1618, 487);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -721,6 +1234,8 @@
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
             this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx1.OptionsSelection.MultiSelect = true;
+            this.gvMx1.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect;
             this.gvMx1.OptionsView.ShowGroupPanel = false;
             // 
             // gvMx1guid
@@ -753,7 +1268,7 @@
             this.gvMx1daa002.OptionsColumn.ReadOnly = true;
             this.gvMx1daa002.Tag = "query_a.daa002";
             this.gvMx1daa002.Visible = true;
-            this.gvMx1daa002.VisibleIndex = 0;
+            this.gvMx1daa002.VisibleIndex = 1;
             this.gvMx1daa002.Width = 50;
             // 
             // gvMx1daa010
@@ -766,7 +1281,7 @@
             this.gvMx1daa010.OptionsColumn.ReadOnly = true;
             this.gvMx1daa010.Tag = "query_a.daa010";
             this.gvMx1daa010.Visible = true;
-            this.gvMx1daa010.VisibleIndex = 1;
+            this.gvMx1daa010.VisibleIndex = 2;
             this.gvMx1daa010.Width = 50;
             // 
             // gvMx1daa005
@@ -779,7 +1294,7 @@
             this.gvMx1daa005.OptionsColumn.ReadOnly = true;
             this.gvMx1daa005.Tag = "query_a.daa005";
             this.gvMx1daa005.Visible = true;
-            this.gvMx1daa005.VisibleIndex = 2;
+            this.gvMx1daa005.VisibleIndex = 3;
             this.gvMx1daa005.Width = 50;
             // 
             // gvMx1daa003
@@ -792,7 +1307,7 @@
             this.gvMx1daa003.OptionsColumn.ReadOnly = true;
             this.gvMx1daa003.Tag = "query_a.daa003";
             this.gvMx1daa003.Visible = true;
-            this.gvMx1daa003.VisibleIndex = 3;
+            this.gvMx1daa003.VisibleIndex = 4;
             this.gvMx1daa003.Width = 50;
             // 
             // gvMx1daa004
@@ -805,7 +1320,7 @@
             this.gvMx1daa004.OptionsColumn.ReadOnly = true;
             this.gvMx1daa004.Tag = "query_a.daa004";
             this.gvMx1daa004.Visible = true;
-            this.gvMx1daa004.VisibleIndex = 4;
+            this.gvMx1daa004.VisibleIndex = 5;
             this.gvMx1daa004.Width = 50;
             // 
             // gvMx1daa016
@@ -822,7 +1337,7 @@
             this.gvMx1daa016.Name = "gvMx1daa016";
             this.gvMx1daa016.Tag = "edit";
             this.gvMx1daa016.Visible = true;
-            this.gvMx1daa016.VisibleIndex = 6;
+            this.gvMx1daa016.VisibleIndex = 7;
             this.gvMx1daa016.Width = 78;
             // 
             // repositoryItemDateEdit2
@@ -853,7 +1368,7 @@
             this.gvMx1daa018.Name = "gvMx1daa018";
             this.gvMx1daa018.Tag = "edit";
             this.gvMx1daa018.Visible = true;
-            this.gvMx1daa018.VisibleIndex = 7;
+            this.gvMx1daa018.VisibleIndex = 8;
             this.gvMx1daa018.Width = 50;
             // 
             // repositoryItemDateEdit3
@@ -876,7 +1391,7 @@
             this.gvMx1daa008.OptionsColumn.ReadOnly = true;
             this.gvMx1daa008.Tag = "query_a.daa008";
             this.gvMx1daa008.Visible = true;
-            this.gvMx1daa008.VisibleIndex = 8;
+            this.gvMx1daa008.VisibleIndex = 9;
             this.gvMx1daa008.Width = 50;
             // 
             // gvMx1daa006
@@ -890,7 +1405,7 @@
             this.gvMx1daa006.OptionsColumn.ReadOnly = true;
             this.gvMx1daa006.Tag = "query_a.daa006";
             this.gvMx1daa006.Visible = true;
-            this.gvMx1daa006.VisibleIndex = 9;
+            this.gvMx1daa006.VisibleIndex = 10;
             this.gvMx1daa006.Width = 50;
             // 
             // gvMx1daa007
@@ -904,7 +1419,7 @@
             this.gvMx1daa007.OptionsColumn.ReadOnly = true;
             this.gvMx1daa007.Tag = "query_a.daa007";
             this.gvMx1daa007.Visible = true;
-            this.gvMx1daa007.VisibleIndex = 10;
+            this.gvMx1daa007.VisibleIndex = 11;
             this.gvMx1daa007.Width = 50;
             // 
             // gvMx1daa009
@@ -918,7 +1433,7 @@
             this.gvMx1daa009.OptionsColumn.ReadOnly = true;
             this.gvMx1daa009.Tag = "query_a.daa009";
             this.gvMx1daa009.Visible = true;
-            this.gvMx1daa009.VisibleIndex = 11;
+            this.gvMx1daa009.VisibleIndex = 12;
             this.gvMx1daa009.Width = 50;
             // 
             // gvMx1daa011
@@ -935,7 +1450,7 @@
             this.gvMx1daa011.Name = "gvMx1daa011";
             this.gvMx1daa011.Tag = "yz_quantity_0_edit";
             this.gvMx1daa011.Visible = true;
-            this.gvMx1daa011.VisibleIndex = 12;
+            this.gvMx1daa011.VisibleIndex = 13;
             this.gvMx1daa011.Width = 60;
             // 
             // gvMx1daa012
@@ -952,7 +1467,7 @@
             this.gvMx1daa012.Name = "gvMx1daa012";
             this.gvMx1daa012.Tag = "edit";
             this.gvMx1daa012.Visible = true;
-            this.gvMx1daa012.VisibleIndex = 13;
+            this.gvMx1daa012.VisibleIndex = 14;
             this.gvMx1daa012.Width = 153;
             // 
             // rptJYBZ
@@ -978,7 +1493,7 @@
             this.gvMx1reporttime.Name = "gvMx1reporttime";
             this.gvMx1reporttime.Tag = "edit";
             this.gvMx1reporttime.Visible = true;
-            this.gvMx1reporttime.VisibleIndex = 14;
+            this.gvMx1reporttime.VisibleIndex = 15;
             this.gvMx1reporttime.Width = 102;
             // 
             // gvMx1daa014
@@ -991,7 +1506,7 @@
             this.gvMx1daa014.OptionsColumn.ReadOnly = true;
             this.gvMx1daa014.Tag = "query_a.daa014";
             this.gvMx1daa014.Visible = true;
-            this.gvMx1daa014.VisibleIndex = 15;
+            this.gvMx1daa014.VisibleIndex = 16;
             this.gvMx1daa014.Width = 51;
             // 
             // gridColumn3
@@ -1012,7 +1527,7 @@
             this.gvMx1fstatus.OptionsColumn.ReadOnly = true;
             this.gvMx1fstatus.Tag = "query_a.fstatus";
             this.gvMx1fstatus.Visible = true;
-            this.gvMx1fstatus.VisibleIndex = 16;
+            this.gvMx1fstatus.VisibleIndex = 17;
             this.gvMx1fstatus.Width = 76;
             // 
             // gridColumn6
@@ -1022,7 +1537,7 @@
             this.gridColumn6.MinWidth = 25;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 17;
+            this.gridColumn6.VisibleIndex = 18;
             this.gridColumn6.Width = 94;
             // 
             // gvMxDel
@@ -1032,7 +1547,7 @@
             this.gvMxDel.MinWidth = 80;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 18;
+            this.gvMxDel.VisibleIndex = 19;
             this.gvMxDel.Width = 84;
             // 
             // repositoryItemButtonEdit1
@@ -1059,7 +1574,7 @@
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Tag = "edit";
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 5;
+            this.gridColumn7.VisibleIndex = 6;
             this.gridColumn7.Width = 94;
             // 
             // repositoryItemComboBox1
@@ -1078,6 +1593,312 @@
             this.repositoryItemComboBox1.NullText = "-璇烽�夋嫨-";
             this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "gvMx1Guid";
+            this.gridColumn11.FieldName = "guid";
+            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Width = 94;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.Caption = "搴忓彿";
+            this.gridColumn20.FieldName = "dab002";
+            this.gridColumn20.MinWidth = 25;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 0;
+            this.gridColumn20.Width = 94;
+            // 
+            // gridColumn26
+            // 
+            this.gridColumn26.AppearanceCell.Options.UseFont = true;
+            this.gridColumn26.Caption = "宸ュ崟鍗曞彿";
+            this.gridColumn26.FieldName = "dab001";
+            this.gridColumn26.MinWidth = 50;
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Tag = "query_a.dab001";
+            this.gridColumn26.Visible = true;
+            this.gridColumn26.VisibleIndex = 1;
+            this.gridColumn26.Width = 94;
+            // 
+            // gridColumn28
+            // 
+            this.gridColumn28.AppearanceCell.Options.UseFont = true;
+            this.gridColumn28.Caption = "鏉愭枡缂栫爜";
+            this.gridColumn28.FieldName = "itemNo";
+            this.gridColumn28.MinWidth = 50;
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.Tag = "query_a.dab003";
+            this.gridColumn28.Visible = true;
+            this.gridColumn28.VisibleIndex = 2;
+            this.gridColumn28.Width = 94;
+            // 
+            // gridColumn29
+            // 
+            this.gridColumn29.AppearanceCell.Options.UseFont = true;
+            this.gridColumn29.Caption = "鏉愭枡鍚嶇О";
+            this.gridColumn29.FieldName = "itemName";
+            this.gridColumn29.MinWidth = 50;
+            this.gridColumn29.Name = "gridColumn29";
+            this.gridColumn29.Tag = "query_a.dab004";
+            this.gridColumn29.Visible = true;
+            this.gridColumn29.VisibleIndex = 3;
+            this.gridColumn29.Width = 94;
+            // 
+            // gridColumn49
+            // 
+            this.gridColumn49.AppearanceCell.Options.UseFont = true;
+            this.gridColumn49.Caption = "鏉愭枡瑙勬牸";
+            this.gridColumn49.FieldName = "itemModel";
+            this.gridColumn49.MinWidth = 50;
+            this.gridColumn49.Name = "gridColumn49";
+            this.gridColumn49.Tag = "query_a.dab005";
+            this.gridColumn49.Visible = true;
+            this.gridColumn49.VisibleIndex = 4;
+            this.gridColumn49.Width = 94;
+            // 
+            // gridColumn50
+            // 
+            this.gridColumn50.AppearanceCell.Options.UseFont = true;
+            this.gridColumn50.Caption = "闇�棰嗙敤閲�";
+            this.gridColumn50.FieldName = "dab006";
+            this.gridColumn50.MinWidth = 50;
+            this.gridColumn50.Name = "gridColumn50";
+            this.gridColumn50.Tag = "query_a.dab006";
+            this.gridColumn50.Visible = true;
+            this.gridColumn50.VisibleIndex = 5;
+            this.gridColumn50.Width = 94;
+            // 
+            // gridColumn51
+            // 
+            this.gridColumn51.AppearanceCell.Options.UseFont = true;
+            this.gridColumn51.Caption = "宸查鐢ㄩ噺";
+            this.gridColumn51.FieldName = "ylQty";
+            this.gridColumn51.MinWidth = 50;
+            this.gridColumn51.Name = "gridColumn51";
+            this.gridColumn51.Tag = "query_a.dab007";
+            this.gridColumn51.Visible = true;
+            this.gridColumn51.VisibleIndex = 6;
+            this.gridColumn51.Width = 94;
+            // 
+            // gridColumn52
+            // 
+            this.gridColumn52.Caption = "鍓╀綑鍙";
+            this.gridColumn52.FieldName = "klQty";
+            this.gridColumn52.MinWidth = 25;
+            this.gridColumn52.Name = "gridColumn52";
+            this.gridColumn52.Visible = true;
+            this.gridColumn52.VisibleIndex = 7;
+            this.gridColumn52.Width = 94;
+            // 
+            // gridColumn53
+            // 
+            this.gridColumn53.AppearanceCell.Options.UseFont = true;
+            this.gridColumn53.Caption = "鏄惁鏇挎枡";
+            this.gridColumn53.FieldName = "dab014Txt";
+            this.gridColumn53.MinWidth = 50;
+            this.gridColumn53.Name = "gridColumn53";
+            this.gridColumn53.Tag = "query_a.dab014";
+            this.gridColumn53.Visible = true;
+            this.gridColumn53.VisibleIndex = 8;
+            this.gridColumn53.Width = 94;
+            // 
+            // gridColumn54
+            // 
+            this.gridColumn54.Caption = "寤鸿浠撳簱";
+            this.gridColumn54.FieldName = "erpCk";
+            this.gridColumn54.MinWidth = 25;
+            this.gridColumn54.Name = "gridColumn54";
+            this.gridColumn54.Visible = true;
+            this.gridColumn54.VisibleIndex = 9;
+            this.gridColumn54.Width = 94;
+            // 
+            // gridColumn55
+            // 
+            this.gridColumn55.Caption = "鍙戞枡鏂瑰紡";
+            this.gridColumn55.FieldName = "issueType";
+            this.gridColumn55.MinWidth = 25;
+            this.gridColumn55.Name = "gridColumn55";
+            this.gridColumn55.Visible = true;
+            this.gridColumn55.VisibleIndex = 10;
+            this.gridColumn55.Width = 94;
+            // 
+            // gridColumn56
+            // 
+            this.gridColumn56.AppearanceCell.Options.UseFont = true;
+            this.gridColumn56.Caption = "缁勬垚鐢ㄩ噺";
+            this.gridColumn56.FieldName = "dab012";
+            this.gridColumn56.MinWidth = 50;
+            this.gridColumn56.Name = "gridColumn56";
+            this.gridColumn56.Tag = "query_a.dab012";
+            this.gridColumn56.Visible = true;
+            this.gridColumn56.VisibleIndex = 11;
+            this.gridColumn56.Width = 94;
+            // 
+            // gridColumn57
+            // 
+            this.gridColumn57.AppearanceCell.Options.UseFont = true;
+            this.gridColumn57.Caption = "鍗曚綅";
+            this.gridColumn57.FieldName = "dwName";
+            this.gridColumn57.MinWidth = 50;
+            this.gridColumn57.Name = "gridColumn57";
+            this.gridColumn57.Tag = "query_a.dab009";
+            this.gridColumn57.Visible = true;
+            this.gridColumn57.VisibleIndex = 12;
+            this.gridColumn57.Width = 94;
+            // 
+            // gridColumn58
+            // 
+            this.gridColumn58.AppearanceCell.Options.UseFont = true;
+            this.gridColumn58.Caption = "鍥哄畾鎹熻��";
+            this.gridColumn58.FieldName = "scrapqty";
+            this.gridColumn58.MinWidth = 50;
+            this.gridColumn58.Name = "gridColumn58";
+            this.gridColumn58.Tag = "query_a.scrapqty";
+            this.gridColumn58.Width = 94;
+            // 
+            // gridColumn59
+            // 
+            this.gridColumn59.AppearanceCell.Options.UseFont = true;
+            this.gridColumn59.Caption = "鍙樺姩鎹熻�楃巼";
+            this.gridColumn59.FieldName = "scraprate";
+            this.gridColumn59.MinWidth = 50;
+            this.gridColumn59.Name = "gridColumn59";
+            this.gridColumn59.Tag = "query_a.scraprate";
+            this.gridColumn59.Width = 94;
+            // 
+            // gridColumn60
+            // 
+            this.gridColumn60.AppearanceCell.Options.UseFont = true;
+            this.gridColumn60.Caption = "浣滀笟涓嶈壇閫�鏂�";
+            this.gridColumn60.FieldName = "zyBl";
+            this.gridColumn60.MinWidth = 50;
+            this.gridColumn60.Name = "gridColumn60";
+            this.gridColumn60.Tag = "query_a.zy_bl";
+            this.gridColumn60.Visible = true;
+            this.gridColumn60.VisibleIndex = 17;
+            this.gridColumn60.Width = 94;
+            // 
+            // gridColumn61
+            // 
+            this.gridColumn61.AppearanceCell.Options.UseFont = true;
+            this.gridColumn61.Caption = "鏉ユ枡涓嶈壇閫�鏂�";
+            this.gridColumn61.FieldName = "llBl";
+            this.gridColumn61.MinWidth = 50;
+            this.gridColumn61.Name = "gridColumn61";
+            this.gridColumn61.Tag = "query_a.ll_bl";
+            this.gridColumn61.Visible = true;
+            this.gridColumn61.VisibleIndex = 15;
+            this.gridColumn61.Width = 94;
+            // 
+            // gridColumn62
+            // 
+            this.gridColumn62.AppearanceCell.Options.UseFont = true;
+            this.gridColumn62.Caption = "鑹搧閫�鏂�";
+            this.gridColumn62.FieldName = "lpTl";
+            this.gridColumn62.MinWidth = 50;
+            this.gridColumn62.Name = "gridColumn62";
+            this.gridColumn62.Tag = "query_a.lp_tl";
+            this.gridColumn62.Visible = true;
+            this.gridColumn62.VisibleIndex = 16;
+            this.gridColumn62.Width = 94;
+            // 
+            // gridColumn63
+            // 
+            this.gridColumn63.AppearanceCell.Options.UseFont = true;
+            this.gridColumn63.Caption = "琛ユ枡鏁伴噺";
+            this.gridColumn63.FieldName = "blQty";
+            this.gridColumn63.MinWidth = 50;
+            this.gridColumn63.Name = "gridColumn63";
+            this.gridColumn63.Tag = "query_a.dab021";
+            this.gridColumn63.Visible = true;
+            this.gridColumn63.VisibleIndex = 13;
+            this.gridColumn63.Width = 94;
+            // 
+            // gridColumn64
+            // 
+            this.gridColumn64.AppearanceCell.Options.UseFont = true;
+            this.gridColumn64.Caption = "鏉愭枡绫诲瀷";
+            this.gridColumn64.FieldName = "dab010";
+            this.gridColumn64.MinWidth = 50;
+            this.gridColumn64.Name = "gridColumn64";
+            this.gridColumn64.Tag = "query_a.dab010";
+            this.gridColumn64.Width = 94;
+            // 
+            // gridColumn65
+            // 
+            this.gridColumn65.AppearanceCell.Options.UseFont = true;
+            this.gridColumn65.Caption = "涓绘枡";
+            this.gridColumn65.FieldName = "dab011";
+            this.gridColumn65.MinWidth = 50;
+            this.gridColumn65.Name = "gridColumn65";
+            this.gridColumn65.Tag = "query_a.dab011";
+            this.gridColumn65.Width = 94;
+            // 
+            // gridColumn66
+            // 
+            this.gridColumn66.AppearanceCell.Options.UseFont = true;
+            this.gridColumn66.Caption = "搴曟暟";
+            this.gridColumn66.FieldName = "dab013";
+            this.gridColumn66.MinWidth = 50;
+            this.gridColumn66.Name = "gridColumn66";
+            this.gridColumn66.Tag = "query_a.dab013";
+            this.gridColumn66.Width = 94;
+            // 
+            // gridColumn67
+            // 
+            this.gridColumn67.AppearanceCell.Options.UseFont = true;
+            this.gridColumn67.Caption = "鐐逛綅";
+            this.gridColumn67.FieldName = "dab015";
+            this.gridColumn67.MinWidth = 50;
+            this.gridColumn67.Name = "gridColumn67";
+            this.gridColumn67.Tag = "query_a.dab015";
+            this.gridColumn67.Width = 94;
+            // 
+            // gridColumn68
+            // 
+            this.gridColumn68.AppearanceCell.Options.UseFont = true;
+            this.gridColumn68.Caption = "棰嗘枡鏂瑰紡";
+            this.gridColumn68.FieldName = "dab019";
+            this.gridColumn68.MinWidth = 50;
+            this.gridColumn68.Name = "gridColumn68";
+            this.gridColumn68.Tag = "query_a.dab019";
+            this.gridColumn68.Width = 94;
+            // 
+            // gridColumn69
+            // 
+            this.gridColumn69.AppearanceCell.Options.UseFont = true;
+            this.gridColumn69.Caption = "瀹為鐢ㄩ噺";
+            this.gridColumn69.FieldName = "slQty";
+            this.gridColumn69.MinWidth = 50;
+            this.gridColumn69.Name = "gridColumn69";
+            this.gridColumn69.Tag = "query_v.slQty";
+            this.gridColumn69.Width = 94;
+            // 
+            // gridColumn70
+            // 
+            this.gridColumn70.AppearanceCell.Options.UseFont = true;
+            this.gridColumn70.Caption = "閫�鏂欐�绘暟";
+            this.gridColumn70.FieldName = "ztsl";
+            this.gridColumn70.MinWidth = 50;
+            this.gridColumn70.Name = "gridColumn70";
+            this.gridColumn70.Tag = "query_a.dab022";
+            this.gridColumn70.Width = 94;
+            // 
+            // gridColumn71
+            // 
+            this.gridColumn71.AppearanceCell.Options.UseFont = true;
+            this.gridColumn71.Caption = "瓒呴鏁伴噺";
+            this.gridColumn71.FieldName = "clQty";
+            this.gridColumn71.MinWidth = 50;
+            this.gridColumn71.Name = "gridColumn71";
+            this.gridColumn71.Tag = "query_a.dab023";
+            this.gridColumn71.Visible = true;
+            this.gridColumn71.VisibleIndex = 14;
+            this.gridColumn71.Width = 94;
+            // 
             // picCheckBox
             // 
             this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
@@ -1089,26 +1910,46 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
+            // gridView2
+            // 
+            this.gridView2.Name = "gridView2";
+            // 
+            // gridView3
+            // 
+            this.gridView3.Name = "gridView3";
+            // 
             // Frm_Wompba
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1128, 682);
+            this.ClientSize = new System.Drawing.Size(1628, 820);
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_Wompba";
             this.Text = "鎵归噺鎺掍骇";
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit4.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
             this.xtraTabControl1.ResumeLayout(false);
             this.xtraTabPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
             this.split1.Panel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+            this.split1.Panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
             this.split1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
+            this.xtraTabControl2.ResumeLayout(false);
+            this.xtraTabPage6.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMxL1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
             this.xtraTabPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
             this.splitMx1.Panel1.ResumeLayout(false);
@@ -1136,6 +1977,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
+            this.tableMxContainer.ResumeLayout(false);
+            this.panelMxButtons.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).EndInit();
@@ -1146,6 +1989,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1167,6 +2012,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_pba006;
         private DevExpress.XtraGrid.Columns.GridColumn gv_pba009;
         private UserControls.Data.UcPageBar pageBar1;
+        private System.Windows.Forms.Panel panelMxButtons;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
         private DevExpress.XtraEditors.SplitContainerControl splitMx1;
         private DevExpress.XtraLayout.LayoutControl layoutMx1;
@@ -1187,20 +2033,59 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraTab.XtraTabControl tabMx;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl2;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage6;
+        private DevExpress.XtraEditors.SimpleButton btnMultiSelect;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMxL1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn49;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn50;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn51;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn52;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn53;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn56;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn57;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn58;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn59;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn60;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn61;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn62;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn63;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn64;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn65;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn66;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn67;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn68;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn69;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn70;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn71;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
         private DevExpress.XtraGrid.GridControl gcMx1;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
         private DevExpress.XtraGrid.Columns.GridColumn caaGuid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstatus;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa002;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa010;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa005;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa003;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa016;
         private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit2;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa018;
         private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit3;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa002;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa005;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa003;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa010;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa008;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa006;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa007;
@@ -1208,19 +2093,42 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa011;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa012;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa014;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1reporttime;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa014;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstatus;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
         private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.Utils.ToolTipController tips;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
+        private System.Windows.Forms.TableLayoutPanel tableMxContainer;
+        private DevExpress.XtraGrid.GridControl gcMxL1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
+        private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
+        private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit4;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3;
     }
-}
\ No newline at end of file
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index e07ea37..360aeb4 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -33,6 +33,12 @@
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
+            {
+                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+            }, tips, true, (strGuid) => {
+                getModelList(strGuid);
+            });
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fstatus", "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -44,6 +50,8 @@
             {
                 getPageList(this.pageBar1.CurrentPage);
             }, lbGuid);
+
+
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
             //閫夊瓨缁勭粐锛堝彉鏄庣粏涓殑鐗╂枡鍜岃溅闂达級
@@ -596,6 +604,57 @@
         }
 
         /// <summary>
+        ///  鏂板鏂规硶锛氬垪琛ㄦ樉绀�
+        /// </summary>
+        /// <param name="strGuid">涓昏〃id</param>
+
+        private void getModelList(string strGuid)
+        {
+            gcMxL1.DataSource = null;
+
+            var _obj = new
+            {
+                guid = strGuid,//涓诲缓
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+
+                    JArray array1 = new JArray();
+                    foreach (var a in dy["list"])
+                    {
+                        array1.Add(a);
+                    }
+                    DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+                    if (dt1.Rows.Count > 0)
+                    {
+                        gcMxL1.BindingContext = new BindingContext();
+                        gcMxL1.DataSource = dt1;
+                        gcMxL1.ForceInitialize();
+                        gridView4.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView4);
+                    }
+                    else
+                    {
+                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMxL1, gridView4);
+                    }
+                    
+
+                }
+                else
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
         /// 宸ュ叿鏉′簨浠�
         /// </summary>
         /// <param name="inFieldValue"></param>
@@ -650,5 +709,88 @@
                 MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
+
+        /// <summary>
+        /// 鎵归噺澶勭悊鏄庣粏鎸夐挳鐐瑰嚮浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnMultiSelect_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                // 鑾峰彇鏄庣粏琛ㄦ牸鐨凣ridView
+                GridView myView = (gcMx1.MainView as GridView);
+                if (myView == null)
+                {
+                    MsgHelper.Warning("鏃犳硶鑾峰彇鏄庣粏琛ㄦ牸锛�");
+                    return;
+                }
+
+                // 鑾峰彇閫変腑鐨勮
+                int[] selectedRows = myView.GetSelectedRows();
+                if (selectedRows == null || selectedRows.Length == 0)
+                {
+                    MsgHelper.Warning("璇峰厛閫夋嫨瑕佸鐞嗙殑鏄庣粏琛岋紒");
+                    return;
+                }
+
+                // 鏋勫缓閫変腑琛岀殑鏁版嵁鍒楄〃
+                var selectedData = new List<object>();
+                foreach (int rowHandle in selectedRows)
+                {
+                    if (rowHandle >= 0) // 纭繚鏄湁鏁堢殑鏁版嵁琛�
+                    {
+                        var rowData = new
+                        {
+                            guid = myView.GetRowCellValue(rowHandle, "guid")?.ToString(),
+                            daa002 = myView.GetRowCellValue(rowHandle, "daa002")?.ToString(),
+                            daa003 = myView.GetRowCellValue(rowHandle, "daa003")?.ToString(),
+                            daa005 = myView.GetRowCellValue(rowHandle, "daa005")?.ToString(),
+                            daa010 = myView.GetRowCellValue(rowHandle, "daa010")?.ToString()
+                        };
+                        selectedData.Add(rowData);
+                    }
+                }
+
+                if (selectedData.Count == 0)
+                {
+                    MsgHelper.Warning("娌℃湁鏈夋晥鐨勬槑缁嗘暟鎹閫変腑锛�");
+                    return;
+                }
+
+                // 纭鎿嶄綔
+                if (!MsgHelper.AskQuestion($"鎮ㄩ�夋嫨浜� {selectedData.Count} 鏉℃槑缁嗚褰曪紝纭畾瑕佽繘琛屾壒閲忓鐞嗗悧锛�"))
+                    return;
+
+                // 鏋勫缓API璇锋眰鍙傛暟
+                var requestData = new
+                {
+                    selectedDetails = selectedData,
+                    operationType = "BatchProcess", // 鎿嶄綔绫诲瀷
+                    operatorGuid = lbGuid.Text.Trim() // 褰撳墠鎿嶄綔鐨勪富鍗曟嵁GUID
+                };
+
+                // 璋冪敤API锛堜豢鐓х幇鏈夌殑API璋冪敤妯″紡锛�
+                string apiUrl = "WompbaGxManager/BatchProcessDetails"; // API鍦板潃
+                var strJson = UtilityHelper.HttpPost("", apiUrl, JsonConvert.SerializeObject(requestData));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+
+                // 澶勭悊杩斿洖缁撴灉
+                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
+                {
+                    // 鎴愬姛鍚庡埛鏂版槑缁嗘暟鎹�
+                    getModel(lbGuid.Text.Trim());
+                    //MsgHelper.Information("鎵归噺澶勭悊瀹屾垚锛�");
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎵归噺澶勭悊澶辫触锛�" + ex.Message);
+            }
+        }
+
+
     }
-}
\ No newline at end of file
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.resx b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.resx
index 5c79094..81653b6 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.resx
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.resx
@@ -237,4 +237,7 @@
   <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs
index b7a7101..8b51131 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/showZhongTai.Designer.cs
@@ -53,6 +53,7 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.comZt.Properties.Items.AddRange(new object[] {
             "-璇烽�夋嫨-",
+            "1,D:寰呭紑宸�",
             "2,S:鏆傚仠",
             "3,Q:娓呭熬",
             "4,绱ф�ュ鏂�",

--
Gitblit v1.9.3