From 9ce8cb1ee053fb5ad4b51d724a5736e0e27ff0aa Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 23 五月 2025 09:10:52 +0800
Subject: [PATCH] 仓库

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs     |   90 ---
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs   |   17 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs |  988 ++++++++++++++++++++++++++--------------------------
 DevApp/Gs.DevApp/App.config                                  |    4 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs          |    4 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs |    4 
 6 files changed, 531 insertions(+), 576 deletions(-)

diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 057f052..cee2aa3 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
 		</assemblyBinding>
 	</runtime>
     <appSettings>
-		 <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
-		<add key="WebApiUrl" value="http://192.168.1.145:81/" /> 
+		 <add key="WebApiUrl" value="http://localhost:5263/" />
+		<!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> 
         <add key="LogPath" value="logs" />
         <add key="ProductName" value="G-MES V2.0" />
         <add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
index d28d3f8..6fadff6 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -99,6 +99,7 @@
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -750,7 +751,8 @@
             this.gvMx1description,
             this.gvMx1lastupdateBy,
             this.gvMx1lastupdateDate,
-            this.gvMxDel});
+            this.gvMxDel,
+            this.gridColumn11});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -838,7 +840,7 @@
             this.gvMxDel.MinWidth = 25;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 5;
+            this.gvMxDel.VisibleIndex = 6;
             this.gvMxDel.Width = 100;
             // 
             // repositoryItemButtonEdit1
@@ -851,6 +853,16 @@
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "鎵�灞炰粨搴揑D";
+            this.gridColumn11.FieldName = "depotGuid";
+            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 5;
+            this.gridColumn11.Width = 94;
             // 
             // Frm_MesDepot
             // 
@@ -966,5 +978,6 @@
         private DevExpress.XtraEditors.TextEdit txt_isNg;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
index c15e364..889b4cd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
@@ -207,12 +207,8 @@
             this.gvMx1terminaterId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1srcType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1srcBillNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1deliQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1stockOutQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1baseRetNoticeQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1baseReturnQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1baseRemainOutQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1basearqty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1custIno = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1custInm = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1custImd = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -2008,12 +2004,8 @@
             this.gvMx1terminaterId,
             this.gvMx1srcType,
             this.gvMx1srcBillNo,
-            this.gvMx1deliQty,
             this.gvMx1stockOutQty,
-            this.gvMx1baseRetNoticeQty,
             this.gvMx1baseReturnQty,
-            this.gvMx1baseRemainOutQty,
-            this.gvMx1basearqty,
             this.gvMx1custIno,
             this.gvMx1custInm,
             this.gvMx1custImd,
@@ -2143,7 +2135,7 @@
             this.gvMx1deliveryDate.Name = "gvMx1deliveryDate";
             this.gvMx1deliveryDate.Tag = "query_a.delivery_date";
             this.gvMx1deliveryDate.Visible = true;
-            this.gvMx1deliveryDate.VisibleIndex = 7;
+            this.gvMx1deliveryDate.VisibleIndex = 9;
             this.gvMx1deliveryDate.Width = 94;
             // 
             // gvMx1isFree
@@ -2155,7 +2147,7 @@
             this.gvMx1isFree.Name = "gvMx1isFree";
             this.gvMx1isFree.Tag = "query_a.is_free";
             this.gvMx1isFree.Visible = true;
-            this.gvMx1isFree.VisibleIndex = 8;
+            this.gvMx1isFree.VisibleIndex = 10;
             this.gvMx1isFree.Width = 94;
             // 
             // gvMx1ownerTypeId
@@ -2167,7 +2159,7 @@
             this.gvMx1ownerTypeId.Name = "gvMx1ownerTypeId";
             this.gvMx1ownerTypeId.Tag = "query_a.owner_type_id";
             this.gvMx1ownerTypeId.Visible = true;
-            this.gvMx1ownerTypeId.VisibleIndex = 9;
+            this.gvMx1ownerTypeId.VisibleIndex = 25;
             this.gvMx1ownerTypeId.Width = 94;
             // 
             // gvMx1ownerId
@@ -2179,7 +2171,7 @@
             this.gvMx1ownerId.Name = "gvMx1ownerId";
             this.gvMx1ownerId.Tag = "query_a.owner_id";
             this.gvMx1ownerId.Visible = true;
-            this.gvMx1ownerId.VisibleIndex = 10;
+            this.gvMx1ownerId.VisibleIndex = 26;
             this.gvMx1ownerId.Width = 94;
             // 
             // gvMx1entryNote
@@ -2324,77 +2316,29 @@
             this.gvMx1srcBillNo.VisibleIndex = 21;
             this.gvMx1srcBillNo.Width = 94;
             // 
-            // gvMx1deliQty
-            // 
-            this.gvMx1deliQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1deliQty.Caption = "绱鍙戣揣閫氱煡鏁伴噺 ";
-            this.gvMx1deliQty.FieldName = "deliQty";
-            this.gvMx1deliQty.MinWidth = 50;
-            this.gvMx1deliQty.Name = "gvMx1deliQty";
-            this.gvMx1deliQty.Tag = "query_a.deli_qty";
-            this.gvMx1deliQty.Visible = true;
-            this.gvMx1deliQty.VisibleIndex = 22;
-            this.gvMx1deliQty.Width = 94;
-            // 
             // gvMx1stockOutQty
             // 
             this.gvMx1stockOutQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1stockOutQty.Caption = "绱鍑哄簱鏁伴噺 ";
-            this.gvMx1stockOutQty.FieldName = "stockOutQty";
+            this.gvMx1stockOutQty.FieldName = "ckQty";
             this.gvMx1stockOutQty.MinWidth = 50;
             this.gvMx1stockOutQty.Name = "gvMx1stockOutQty";
             this.gvMx1stockOutQty.Tag = "query_a.stock_out_qty";
             this.gvMx1stockOutQty.Visible = true;
-            this.gvMx1stockOutQty.VisibleIndex = 23;
+            this.gvMx1stockOutQty.VisibleIndex = 7;
             this.gvMx1stockOutQty.Width = 94;
-            // 
-            // gvMx1baseRetNoticeQty
-            // 
-            this.gvMx1baseRetNoticeQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1baseRetNoticeQty.Caption = "绱閫�璐ч�氱煡鏁伴噺锛堥攢鍞熀鏈級 ";
-            this.gvMx1baseRetNoticeQty.FieldName = "baseRetNoticeQty";
-            this.gvMx1baseRetNoticeQty.MinWidth = 50;
-            this.gvMx1baseRetNoticeQty.Name = "gvMx1baseRetNoticeQty";
-            this.gvMx1baseRetNoticeQty.Tag = "query_a.base_ret_notice_qty";
-            this.gvMx1baseRetNoticeQty.Visible = true;
-            this.gvMx1baseRetNoticeQty.VisibleIndex = 24;
-            this.gvMx1baseRetNoticeQty.Width = 94;
             // 
             // gvMx1baseReturnQty
             // 
             this.gvMx1baseReturnQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1baseReturnQty.Caption = "绱閫�璐ф暟閲忥紙閿�鍞熀鏈級 ";
-            this.gvMx1baseReturnQty.FieldName = "baseReturnQty";
+            this.gvMx1baseReturnQty.Caption = "绱閫�璐ф暟閲�";
+            this.gvMx1baseReturnQty.FieldName = "thQty";
             this.gvMx1baseReturnQty.MinWidth = 50;
             this.gvMx1baseReturnQty.Name = "gvMx1baseReturnQty";
             this.gvMx1baseReturnQty.Tag = "query_a.base_return_qty";
             this.gvMx1baseReturnQty.Visible = true;
-            this.gvMx1baseReturnQty.VisibleIndex = 25;
+            this.gvMx1baseReturnQty.VisibleIndex = 8;
             this.gvMx1baseReturnQty.Width = 94;
-            // 
-            // gvMx1baseRemainOutQty
-            // 
-            this.gvMx1baseRemainOutQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1baseRemainOutQty.Caption = "鍓╀綑鏈嚭鏁伴噺锛堥攢鍞熀鏈級 ";
-            this.gvMx1baseRemainOutQty.FieldName = "baseRemainOutQty";
-            this.gvMx1baseRemainOutQty.MinWidth = 50;
-            this.gvMx1baseRemainOutQty.Name = "gvMx1baseRemainOutQty";
-            this.gvMx1baseRemainOutQty.Tag = "query_a.base_remain_out_qty";
-            this.gvMx1baseRemainOutQty.Visible = true;
-            this.gvMx1baseRemainOutQty.VisibleIndex = 26;
-            this.gvMx1baseRemainOutQty.Width = 94;
-            // 
-            // gvMx1basearqty
-            // 
-            this.gvMx1basearqty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1basearqty.Caption = "绱搴旀敹鏁伴噺锛堥攢鍞熀鏈級 ";
-            this.gvMx1basearqty.FieldName = "basearqty";
-            this.gvMx1basearqty.MinWidth = 50;
-            this.gvMx1basearqty.Name = "gvMx1basearqty";
-            this.gvMx1basearqty.Tag = "query_a.basearqty";
-            this.gvMx1basearqty.Visible = true;
-            this.gvMx1basearqty.VisibleIndex = 27;
-            this.gvMx1basearqty.Width = 94;
             // 
             // gvMx1custIno
             // 
@@ -2503,7 +2447,7 @@
             this.gridColumn8.MinWidth = 25;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 28;
+            this.gridColumn8.VisibleIndex = 22;
             this.gridColumn8.Width = 94;
             // 
             // gridColumn9
@@ -2513,7 +2457,7 @@
             this.gridColumn9.MinWidth = 25;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 29;
+            this.gridColumn9.VisibleIndex = 23;
             this.gridColumn9.Width = 94;
             // 
             // gridColumn10
@@ -2523,7 +2467,7 @@
             this.gridColumn10.MinWidth = 25;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 30;
+            this.gridColumn10.VisibleIndex = 24;
             this.gridColumn10.Width = 94;
             // 
             // gridColumn11
@@ -2533,7 +2477,7 @@
             this.gridColumn11.MinWidth = 25;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 31;
+            this.gridColumn11.VisibleIndex = 27;
             this.gridColumn11.Width = 94;
             // 
             // gridColumn12
@@ -2543,7 +2487,7 @@
             this.gridColumn12.MinWidth = 25;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 32;
+            this.gridColumn12.VisibleIndex = 28;
             this.gridColumn12.Width = 94;
             // 
             // gridColumn13
@@ -2553,7 +2497,7 @@
             this.gridColumn13.MinWidth = 25;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 33;
+            this.gridColumn13.VisibleIndex = 29;
             this.gridColumn13.Width = 94;
             // 
             // picCheckBox
@@ -2721,12 +2665,8 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1terminaterId;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1srcType;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1srcBillNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1deliQty;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1stockOutQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1baseRetNoticeQty;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1baseReturnQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1baseRemainOutQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1basearqty;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1custIno;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1custInm;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1custImd;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
index 8916162..1802830 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
@@ -37,6 +37,16 @@
             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.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = 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.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -47,16 +57,6 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition 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.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -110,6 +110,36 @@
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.layout99 = new DevExpress.XtraLayout.LayoutControl();
+            this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
+            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
+            this.radOut = new DevExpress.XtraEditors.RadioGroup();
+            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtWlid = new DevExpress.XtraEditors.TextEdit();
+            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
+            this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
+            this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
+            this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
+            this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
+            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -133,17 +163,6 @@
             this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.radOut = new DevExpress.XtraEditors.RadioGroup();
-            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
-            this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
-            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
-            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
-            this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
-            this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
-            this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
-            this.txtWlid = new DevExpress.XtraEditors.TextEdit();
             this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx2 = new DevExpress.XtraGrid.GridControl();
             this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -157,28 +176,9 @@
             this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
-            this.layout99 = new DevExpress.XtraLayout.LayoutControl();
-            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -224,25 +224,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
-            this.xtraTabPage3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit();
             this.split99.Panel1.SuspendLayout();
@@ -251,6 +232,22 @@
             this.split99.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layout99)).BeginInit();
             this.layout99.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
+            this.layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
@@ -259,16 +256,19 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
-            this.layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            this.xtraTabPage3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -906,6 +906,395 @@
             this.tabMxPage1.Size = new System.Drawing.Size(1165, 422);
             this.tabMxPage1.Text = "鐗╂枡鏄庣粏";
             // 
+            // split99
+            // 
+            this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split99.Horizontal = false;
+            this.split99.Location = new System.Drawing.Point(0, 0);
+            this.split99.Name = "split99";
+            // 
+            // split99.Panel1
+            // 
+            this.split99.Panel1.Controls.Add(this.layout99);
+            this.split99.Panel1.Text = "Panel1";
+            // 
+            // split99.Panel2
+            // 
+            this.split99.Panel2.Controls.Add(this.gcMx1);
+            this.split99.Panel2.Text = "Panel2";
+            this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split99.Size = new System.Drawing.Size(1165, 422);
+            this.split99.SplitterPosition = 126;
+            this.split99.TabIndex = 3;
+            // 
+            // layout99
+            // 
+            this.layout99.Controls.Add(this.lbMxGuid);
+            this.layout99.Controls.Add(this.ucBtnPrint1);
+            this.layout99.Controls.Add(this.radOut);
+            this.layout99.Controls.Add(this.layoutControl1);
+            this.layout99.Controls.Add(this.txtWlid);
+            this.layout99.Controls.Add(this.txt_psnQty_1);
+            this.layout99.Controls.Add(this.txtWlmc);
+            this.layout99.Controls.Add(this.txtWlgg);
+            this.layout99.Controls.Add(this.txt_kQty);
+            this.layout99.Controls.Add(this.txtQuantity);
+            this.layout99.Controls.Add(this.txtYdy);
+            this.layout99.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem26});
+            this.layout99.Location = new System.Drawing.Point(0, 0);
+            this.layout99.Name = "layout99";
+            this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(121, 456, 812, 500);
+            this.layout99.Root = this.layoutControlGroup1;
+            this.layout99.Size = new System.Drawing.Size(1165, 126);
+            this.layout99.TabIndex = 0;
+            this.layout99.Text = "layoutControl1";
+            // 
+            // lbMxGuid
+            // 
+            this.lbMxGuid.Location = new System.Drawing.Point(1032, 104);
+            this.lbMxGuid.Name = "lbMxGuid";
+            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
+            this.lbMxGuid.StyleController = this.layout99;
+            this.lbMxGuid.TabIndex = 229;
+            this.lbMxGuid.Text = "lbMxGuid";
+            this.lbMxGuid.Visible = false;
+            // 
+            // ucBtnPrint1
+            // 
+            this.ucBtnPrint1.guidKey = null;
+            this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 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(338, 32);
+            this.ucBtnPrint1.TabIndex = 230;
+            // 
+            // radOut
+            // 
+            this.radOut.Location = new System.Drawing.Point(1033, 10);
+            this.radOut.Margin = new System.Windows.Forms.Padding(0);
+            this.radOut.Name = "radOut";
+            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
+            this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
+            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
+            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
+            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
+            this.radOut.Size = new System.Drawing.Size(227, 28);
+            this.radOut.StyleController = this.layout99;
+            this.radOut.TabIndex = 476;
+            // 
+            // layoutControl1
+            // 
+            this.layoutControl1.Controls.Add(this.txt_iCount_1);
+            this.layoutControl1.Controls.Add(this.txt_yuliang_1);
+            this.layoutControl1.Location = new System.Drawing.Point(692, 76);
+            this.layoutControl1.Name = "layoutControl1";
+            this.layoutControl1.Root = this.layoutControlGroup2;
+            this.layoutControl1.Size = new System.Drawing.Size(336, 28);
+            this.layoutControl1.TabIndex = 227;
+            this.layoutControl1.Text = "layoutControl1";
+            // 
+            // txt_iCount_1
+            // 
+            this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
+            this.txt_iCount_1.Name = "txt_iCount_1";
+            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
+            this.txt_iCount_1.Properties.ReadOnly = true;
+            this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
+            this.txt_iCount_1.StyleController = this.layoutControl1;
+            this.txt_iCount_1.TabIndex = 228;
+            // 
+            // txt_yuliang_1
+            // 
+            this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
+            this.txt_yuliang_1.Name = "txt_yuliang_1";
+            this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
+            this.txt_yuliang_1.StyleController = this.layoutControl1;
+            this.txt_yuliang_1.TabIndex = 229;
+            // 
+            // layoutControlGroup2
+            // 
+            this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.layoutControlGroup2.GroupBordersVisible = false;
+            this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem22,
+            this.layoutControlItem23});
+            this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.layoutControlGroup2.Name = "layoutControlGroup2";
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
+            this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition5,
+            columnDefinition6});
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition4});
+            this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
+            this.layoutControlGroup2.TextVisible = false;
+            // 
+            // layoutControlItem22
+            // 
+            this.layoutControlItem22.Control = this.txt_iCount_1;
+            this.layoutControlItem22.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem22.Name = "layoutControlItem22";
+            this.layoutControlItem22.Size = new System.Drawing.Size(168, 28);
+            this.layoutControlItem22.Text = "鎵撳嵃鏁村紶鏁板��";
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem23
+            // 
+            this.layoutControlItem23.Control = this.txt_yuliang_1;
+            this.layoutControlItem23.Location = new System.Drawing.Point(168, 0);
+            this.layoutControlItem23.Name = "layoutControlItem23";
+            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem23.Size = new System.Drawing.Size(168, 28);
+            this.layoutControlItem23.Text = "鎵撳嵃浣欐暟";
+            this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // txtWlid
+            // 
+            this.txtWlid.Location = new System.Drawing.Point(114, 12);
+            this.txtWlid.Name = "txtWlid";
+            this.txtWlid.Properties.Appearance.Options.UseFont = true;
+            this.txtWlid.Properties.ReadOnly = true;
+            this.txtWlid.Size = new System.Drawing.Size(234, 24);
+            this.txtWlid.StyleController = this.layout99;
+            this.txtWlid.TabIndex = 214;
+            // 
+            // txt_psnQty_1
+            // 
+            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44);
+            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(234, 24);
+            this.txt_psnQty_1.StyleController = this.layout99;
+            this.txt_psnQty_1.TabIndex = 226;
+            // 
+            // txtWlmc
+            // 
+            this.txtWlmc.Location = new System.Drawing.Point(114, 44);
+            this.txtWlmc.Name = "txtWlmc";
+            this.txtWlmc.Properties.Appearance.Options.UseFont = true;
+            this.txtWlmc.Properties.ReadOnly = true;
+            this.txtWlmc.Size = new System.Drawing.Size(234, 24);
+            this.txtWlmc.StyleController = this.layout99;
+            this.txtWlmc.TabIndex = 216;
+            // 
+            // txtWlgg
+            // 
+            this.txtWlgg.Location = new System.Drawing.Point(114, 76);
+            this.txtWlgg.Name = "txtWlgg";
+            this.txtWlgg.Properties.Appearance.Options.UseFont = true;
+            this.txtWlgg.Properties.ReadOnly = true;
+            this.txtWlgg.Size = new System.Drawing.Size(574, 24);
+            this.txtWlgg.StyleController = this.layout99;
+            this.txtWlgg.TabIndex = 218;
+            // 
+            // txt_kQty
+            // 
+            this.txt_kQty.Location = new System.Drawing.Point(794, 12);
+            this.txt_kQty.Name = "txt_kQty";
+            this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
+            this.txt_kQty.Properties.Appearance.Options.UseFont = true;
+            this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
+            this.txt_kQty.Properties.ReadOnly = true;
+            this.txt_kQty.Size = new System.Drawing.Size(234, 24);
+            this.txt_kQty.StyleController = this.layout99;
+            this.txt_kQty.TabIndex = 224;
+            // 
+            // txtQuantity
+            // 
+            this.txtQuantity.Location = new System.Drawing.Point(454, 12);
+            this.txtQuantity.Name = "txtQuantity";
+            this.txtQuantity.Properties.Appearance.Options.UseFont = true;
+            this.txtQuantity.Properties.ReadOnly = true;
+            this.txtQuantity.Size = new System.Drawing.Size(234, 24);
+            this.txtQuantity.StyleController = this.layout99;
+            this.txtQuantity.TabIndex = 220;
+            // 
+            // txtYdy
+            // 
+            this.txtYdy.Location = new System.Drawing.Point(454, 44);
+            this.txtYdy.Name = "txtYdy";
+            this.txtYdy.Properties.Appearance.Options.UseFont = true;
+            this.txtYdy.Properties.ReadOnly = true;
+            this.txtYdy.Size = new System.Drawing.Size(234, 24);
+            this.txtYdy.StyleController = this.layout99;
+            this.txtYdy.TabIndex = 222;
+            // 
+            // layoutControlItem26
+            // 
+            this.layoutControlItem26.Control = this.lbMxGuid;
+            this.layoutControlItem26.Location = new System.Drawing.Point(1020, 92);
+            this.layoutControlItem26.Name = "layoutControlItem26";
+            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem26.Size = new System.Drawing.Size(340, 46);
+            this.layoutControlItem26.Text = "lbMxGuid";
+            this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem26.TextVisible = false;
+            // 
+            // layoutControlGroup1
+            // 
+            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.layoutControlGroup1.GroupBordersVisible = false;
+            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem5,
+            this.layoutControlItem7,
+            this.layoutControlItem16,
+            this.layoutControlItem17,
+            this.layoutControlItem18,
+            this.layoutControlItem19,
+            this.layoutControlItem20,
+            this.layoutControlItem21,
+            this.layoutControlItem25,
+            this.layoutControlItem24});
+            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;
+            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition7,
+            columnDefinition8,
+            columnDefinition9,
+            columnDefinition10});
+            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;
+            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition5,
+            rowDefinition6,
+            rowDefinition7});
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
+            this.layoutControlGroup1.TextVisible = false;
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txtWlid;
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txtWlmc;
+            this.layoutControlItem7.Location = new System.Drawing.Point(0, 32);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem7.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem7.Text = "鐗╂枡鍚嶇О";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.txtWlgg;
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 64);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem16.Size = new System.Drawing.Size(680, 32);
+            this.layoutControlItem16.Text = "鐗╂枡瑙勬牸";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem17
+            // 
+            this.layoutControlItem17.Control = this.txtQuantity;
+            this.layoutControlItem17.Location = new System.Drawing.Point(340, 0);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem17.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem17.Text = "鏈鐢宠鎬婚噺";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem18
+            // 
+            this.layoutControlItem18.Control = this.txtYdy;
+            this.layoutControlItem18.Location = new System.Drawing.Point(340, 32);
+            this.layoutControlItem18.Name = "layoutControlItem18";
+            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem18.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem18.Text = "宸叉墦鍗版�婚噺";
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem19
+            // 
+            this.layoutControlItem19.Control = this.txt_kQty;
+            this.layoutControlItem19.Location = new System.Drawing.Point(680, 0);
+            this.layoutControlItem19.Name = "layoutControlItem19";
+            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem19.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem19.Text = "鍙墦鍗版�绘暟";
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem20
+            // 
+            this.layoutControlItem20.Control = this.txt_psnQty_1;
+            this.layoutControlItem20.Location = new System.Drawing.Point(680, 32);
+            this.layoutControlItem20.Name = "layoutControlItem20";
+            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem20.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem20.Text = "姣忓紶鏉$爜鏁伴噺";
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem21
+            // 
+            this.layoutControlItem21.Control = this.layoutControl1;
+            this.layoutControlItem21.Location = new System.Drawing.Point(680, 64);
+            this.layoutControlItem21.Name = "layoutControlItem21";
+            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem21.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem21.Text = "鎵撳嵃鏁伴噺";
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem21.TextVisible = false;
+            // 
+            // layoutControlItem25
+            // 
+            this.layoutControlItem25.Control = this.ucBtnPrint1;
+            this.layoutControlItem25.Location = new System.Drawing.Point(1020, 32);
+            this.layoutControlItem25.Name = "layoutControlItem25";
+            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem25.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
+            this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem25.Text = "鎵撳嵃鎸夐挳";
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem25.TextVisible = false;
+            // 
+            // layoutControlItem24
+            // 
+            this.layoutControlItem24.Control = this.radOut;
+            this.layoutControlItem24.Location = new System.Drawing.Point(1020, 0);
+            this.layoutControlItem24.MaxSize = new System.Drawing.Size(230, 28);
+            this.layoutControlItem24.MinSize = new System.Drawing.Size(230, 28);
+            this.layoutControlItem24.Name = "layoutControlItem24";
+            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem24.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
+            this.layoutControlItem24.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem24.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem24.Text = "璁$畻鏂瑰紡";
+            this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem24.TextVisible = false;
+            // 
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1194,121 +1583,6 @@
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
-            // radOut
-            // 
-            this.radOut.Location = new System.Drawing.Point(797, 10);
-            this.radOut.Margin = new System.Windows.Forms.Padding(0);
-            this.radOut.Name = "radOut";
-            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
-            this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
-            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
-            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
-            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
-            this.radOut.Size = new System.Drawing.Size(227, 28);
-            this.radOut.StyleController = this.layout99;
-            this.radOut.TabIndex = 476;
-            // 
-            // ucBtnPrint1
-            // 
-            this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(795, 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(338, 32);
-            this.ucBtnPrint1.TabIndex = 230;
-            // 
-            // lbMxGuid
-            // 
-            this.lbMxGuid.Location = new System.Drawing.Point(1032, 104);
-            this.lbMxGuid.Name = "lbMxGuid";
-            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
-            this.lbMxGuid.StyleController = this.layout99;
-            this.lbMxGuid.TabIndex = 229;
-            this.lbMxGuid.Text = "lbMxGuid";
-            this.lbMxGuid.Visible = false;
-            // 
-            // txt_iCount_1
-            // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
-            this.txt_iCount_1.Name = "txt_iCount_1";
-            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_iCount_1.Properties.ReadOnly = true;
-            this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
-            this.txt_iCount_1.StyleController = this.layoutControl1;
-            this.txt_iCount_1.TabIndex = 228;
-            // 
-            // txt_psnQty_1
-            // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(558, 44);
-            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(234, 24);
-            this.txt_psnQty_1.StyleController = this.layout99;
-            this.txt_psnQty_1.TabIndex = 226;
-            // 
-            // txt_kQty
-            // 
-            this.txt_kQty.Location = new System.Drawing.Point(558, 12);
-            this.txt_kQty.Name = "txt_kQty";
-            this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
-            this.txt_kQty.Properties.Appearance.Options.UseFont = true;
-            this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
-            this.txt_kQty.Properties.ReadOnly = true;
-            this.txt_kQty.Size = new System.Drawing.Size(234, 24);
-            this.txt_kQty.StyleController = this.layout99;
-            this.txt_kQty.TabIndex = 224;
-            // 
-            // txtYdy
-            // 
-            this.txtYdy.Location = new System.Drawing.Point(218, 44);
-            this.txtYdy.Name = "txtYdy";
-            this.txtYdy.Properties.Appearance.Options.UseFont = true;
-            this.txtYdy.Properties.ReadOnly = true;
-            this.txtYdy.Size = new System.Drawing.Size(234, 24);
-            this.txtYdy.StyleController = this.layout99;
-            this.txtYdy.TabIndex = 222;
-            // 
-            // txtQuantity
-            // 
-            this.txtQuantity.Location = new System.Drawing.Point(218, 12);
-            this.txtQuantity.Name = "txtQuantity";
-            this.txtQuantity.Properties.Appearance.Options.UseFont = true;
-            this.txtQuantity.Properties.ReadOnly = true;
-            this.txtQuantity.Size = new System.Drawing.Size(234, 24);
-            this.txtQuantity.StyleController = this.layout99;
-            this.txtQuantity.TabIndex = 220;
-            // 
-            // txtWlgg
-            // 
-            this.txtWlgg.Location = new System.Drawing.Point(-122, 76);
-            this.txtWlgg.Name = "txtWlgg";
-            this.txtWlgg.Properties.Appearance.Options.UseFont = true;
-            this.txtWlgg.Properties.ReadOnly = true;
-            this.txtWlgg.Size = new System.Drawing.Size(574, 24);
-            this.txtWlgg.StyleController = this.layout99;
-            this.txtWlgg.TabIndex = 218;
-            // 
-            // txtWlmc
-            // 
-            this.txtWlmc.Location = new System.Drawing.Point(-122, 44);
-            this.txtWlmc.Name = "txtWlmc";
-            this.txtWlmc.Properties.Appearance.Options.UseFont = true;
-            this.txtWlmc.Properties.ReadOnly = true;
-            this.txtWlmc.Size = new System.Drawing.Size(234, 24);
-            this.txtWlmc.StyleController = this.layout99;
-            this.txtWlmc.TabIndex = 216;
-            // 
-            // txtWlid
-            // 
-            this.txtWlid.Location = new System.Drawing.Point(-122, 12);
-            this.txtWlid.Name = "txtWlid";
-            this.txtWlid.Properties.Appearance.Options.UseFont = true;
-            this.txtWlid.Properties.ReadOnly = true;
-            this.txtWlid.Size = new System.Drawing.Size(234, 24);
-            this.txtWlid.StyleController = this.layout99;
-            this.txtWlid.TabIndex = 214;
-            // 
             // xtraTabPage3
             // 
             this.xtraTabPage3.Controls.Add(this.gcMx2);
@@ -1323,7 +1597,7 @@
             this.gcMx2.MainView = this.gvMx2;
             this.gcMx2.Name = "gcMx2";
             this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit2});
+            this.rptChongDa});
             this.gcMx2.Size = new System.Drawing.Size(1165, 422);
             this.gcMx2.TabIndex = 2;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -1448,24 +1722,24 @@
             // 
             // gvBtnAlawys
             // 
-            this.gvBtnAlawys.Caption = "绉诲嚭";
-            this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2;
+            this.gvBtnAlawys.Caption = "閲嶆墦";
+            this.gvBtnAlawys.ColumnEdit = this.rptChongDa;
             this.gvBtnAlawys.MinWidth = 25;
             this.gvBtnAlawys.Name = "gvBtnAlawys";
             this.gvBtnAlawys.Visible = true;
             this.gvBtnAlawys.VisibleIndex = 8;
             this.gvBtnAlawys.Width = 94;
             // 
-            // repositoryItemButtonEdit2
+            // rptChongDa
             // 
-            this.repositoryItemButtonEdit2.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            this.rptChongDa.AutoHeight = false;
+            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
             editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
-            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
+            this.rptChongDa.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶆墦", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.rptChongDa.Name = "rptChongDa";
+            this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
             // 
             // picCheckBox
             // 
@@ -1477,280 +1751,6 @@
             this.picCheckBox.TabIndex = 5;
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
-            // 
-            // split99
-            // 
-            this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.split99.Horizontal = false;
-            this.split99.Location = new System.Drawing.Point(0, 0);
-            this.split99.Name = "split99";
-            // 
-            // split99.split99_Panel1
-            // 
-            this.split99.Panel1.Controls.Add(this.layout99);
-            this.split99.Panel1.Text = "Panel1";
-            // 
-            // split99.split99_Panel2
-            // 
-            this.split99.Panel2.Controls.Add(this.gcMx1);
-            this.split99.Panel2.Text = "Panel2";
-            this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split99.Size = new System.Drawing.Size(1165, 422);
-            this.split99.SplitterPosition = 126;
-            this.split99.TabIndex = 3;
-            // 
-            // layout99
-            // 
-            this.layout99.Controls.Add(this.lbMxGuid);
-            this.layout99.Controls.Add(this.ucBtnPrint1);
-            this.layout99.Controls.Add(this.radOut);
-            this.layout99.Controls.Add(this.layoutControl1);
-            this.layout99.Controls.Add(this.txtWlid);
-            this.layout99.Controls.Add(this.txt_psnQty_1);
-            this.layout99.Controls.Add(this.txtWlmc);
-            this.layout99.Controls.Add(this.txtWlgg);
-            this.layout99.Controls.Add(this.txt_kQty);
-            this.layout99.Controls.Add(this.txtQuantity);
-            this.layout99.Controls.Add(this.txtYdy);
-            this.layout99.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem26});
-            this.layout99.Location = new System.Drawing.Point(0, 0);
-            this.layout99.Name = "layout99";
-            this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(121, 456, 812, 500);
-            this.layout99.Root = this.layoutControlGroup1;
-            this.layout99.Size = new System.Drawing.Size(1165, 126);
-            this.layout99.TabIndex = 0;
-            this.layout99.Text = "layoutControl1";
-            // 
-            // layoutControlGroup1
-            // 
-            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.layoutControlGroup1.GroupBordersVisible = false;
-            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem5,
-            this.layoutControlItem7,
-            this.layoutControlItem16,
-            this.layoutControlItem17,
-            this.layoutControlItem18,
-            this.layoutControlItem19,
-            this.layoutControlItem20,
-            this.layoutControlItem21,
-            this.layoutControlItem25,
-            this.layoutControlItem24});
-            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;
-            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition7,
-            columnDefinition8,
-            columnDefinition9,
-            columnDefinition10});
-            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;
-            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition5,
-            rowDefinition6,
-            rowDefinition7});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
-            this.layoutControlGroup1.TextVisible = false;
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.txtWlid;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(340, 32);
-            this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txtWlmc;
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 32);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(340, 32);
-            this.layoutControlItem7.Text = "鐗╂枡鍚嶇О";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem16
-            // 
-            this.layoutControlItem16.Control = this.txtWlgg;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 64);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem16.Size = new System.Drawing.Size(680, 32);
-            this.layoutControlItem16.Text = "鐗╂枡瑙勬牸";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem17
-            // 
-            this.layoutControlItem17.Control = this.txtQuantity;
-            this.layoutControlItem17.Location = new System.Drawing.Point(340, 0);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem17.Size = new System.Drawing.Size(340, 32);
-            this.layoutControlItem17.Text = "鏈鐢宠鎬婚噺";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem18
-            // 
-            this.layoutControlItem18.Control = this.txtYdy;
-            this.layoutControlItem18.Location = new System.Drawing.Point(340, 32);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem18.Size = new System.Drawing.Size(340, 32);
-            this.layoutControlItem18.Text = "宸叉墦鍗版�婚噺";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem19
-            // 
-            this.layoutControlItem19.Control = this.txt_kQty;
-            this.layoutControlItem19.Location = new System.Drawing.Point(680, 0);
-            this.layoutControlItem19.Name = "layoutControlItem19";
-            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem19.Size = new System.Drawing.Size(340, 32);
-            this.layoutControlItem19.Text = "鍙墦鍗版�绘暟";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem20
-            // 
-            this.layoutControlItem20.Control = this.txt_psnQty_1;
-            this.layoutControlItem20.Location = new System.Drawing.Point(680, 32);
-            this.layoutControlItem20.Name = "layoutControlItem20";
-            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem20.Size = new System.Drawing.Size(340, 32);
-            this.layoutControlItem20.Text = "姣忓紶鏉$爜鏁伴噺";
-            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControl1
-            // 
-            this.layoutControl1.Controls.Add(this.txt_iCount_1);
-            this.layoutControl1.Controls.Add(this.txt_yuliang_1);
-            this.layoutControl1.Location = new System.Drawing.Point(456, 76);
-            this.layoutControl1.Name = "layoutControl1";
-            this.layoutControl1.Root = this.layoutControlGroup2;
-            this.layoutControl1.Size = new System.Drawing.Size(336, 28);
-            this.layoutControl1.TabIndex = 227;
-            this.layoutControl1.Text = "layoutControl1";
-            // 
-            // layoutControlItem21
-            // 
-            this.layoutControlItem21.Control = this.layoutControl1;
-            this.layoutControlItem21.Location = new System.Drawing.Point(680, 64);
-            this.layoutControlItem21.Name = "layoutControlItem21";
-            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem21.Size = new System.Drawing.Size(340, 32);
-            this.layoutControlItem21.Text = "鎵撳嵃鏁伴噺";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem21.TextVisible = false;
-            // 
-            // layoutControlGroup2
-            // 
-            this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.layoutControlGroup2.GroupBordersVisible = false;
-            this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem22,
-            this.layoutControlItem23});
-            this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
-            this.layoutControlGroup2.Name = "layoutControlGroup2";
-            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition5.Width = 100D;
-            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition6.Width = 100D;
-            this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition5,
-            columnDefinition6});
-            rowDefinition4.Height = 100D;
-            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition4});
-            this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
-            this.layoutControlGroup2.TextVisible = false;
-            // 
-            // layoutControlItem22
-            // 
-            this.layoutControlItem22.Control = this.txt_iCount_1;
-            this.layoutControlItem22.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem22.Name = "layoutControlItem22";
-            this.layoutControlItem22.Size = new System.Drawing.Size(168, 28);
-            this.layoutControlItem22.Text = "鎵撳嵃鏁村紶鏁板��";
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // txt_yuliang_1
-            // 
-            this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
-            this.txt_yuliang_1.Name = "txt_yuliang_1";
-            this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
-            this.txt_yuliang_1.StyleController = this.layoutControl1;
-            this.txt_yuliang_1.TabIndex = 229;
-            // 
-            // layoutControlItem23
-            // 
-            this.layoutControlItem23.Control = this.txt_yuliang_1;
-            this.layoutControlItem23.Location = new System.Drawing.Point(168, 0);
-            this.layoutControlItem23.Name = "layoutControlItem23";
-            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem23.Size = new System.Drawing.Size(168, 28);
-            this.layoutControlItem23.Text = "鎵撳嵃浣欐暟";
-            this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem25
-            // 
-            this.layoutControlItem25.Control = this.ucBtnPrint1;
-            this.layoutControlItem25.Location = new System.Drawing.Point(1020, 32);
-            this.layoutControlItem25.Name = "layoutControlItem25";
-            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem25.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
-            this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
-            this.layoutControlItem25.Text = "鎵撳嵃鎸夐挳";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem25.TextVisible = false;
-            // 
-            // layoutControlItem26
-            // 
-            this.layoutControlItem26.Control = this.lbMxGuid;
-            this.layoutControlItem26.Location = new System.Drawing.Point(1020, 92);
-            this.layoutControlItem26.Name = "layoutControlItem26";
-            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem26.Size = new System.Drawing.Size(340, 46);
-            this.layoutControlItem26.Text = "lbMxGuid";
-            this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem26.TextVisible = false;
-            // 
-            // layoutControlItem24
-            // 
-            this.layoutControlItem24.Control = this.radOut;
-            this.layoutControlItem24.Location = new System.Drawing.Point(1020, 0);
-            this.layoutControlItem24.MaxSize = new System.Drawing.Size(230, 28);
-            this.layoutControlItem24.MinSize = new System.Drawing.Size(230, 28);
-            this.layoutControlItem24.Name = "layoutControlItem24";
-            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem24.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
-            this.layoutControlItem24.Size = new System.Drawing.Size(340, 32);
-            this.layoutControlItem24.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem24.Text = "璁$畻鏂瑰紡";
-            this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem24.TextVisible = false;
             // 
             // Frm_MesShouTuo
             // 
@@ -1807,25 +1807,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
-            this.xtraTabPage3.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit();
             this.split99.Panel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit();
@@ -1834,6 +1815,22 @@
             this.split99.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit();
             this.layout99.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
+            this.layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
@@ -1842,16 +1839,19 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
-            this.layoutControl1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            this.xtraTabPage3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1936,7 +1936,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate;
         private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptChongDa;
         private DevExpress.XtraEditors.TextEdit txt_createBy;
         private DevExpress.XtraEditors.TextEdit txt_createDate;
         private UserControl.UcLookCustomer txt_fCustId;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
index 58e0d98..531b7e8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
@@ -662,12 +662,14 @@
             }
         }
         /// <summary>
-        /// 绉诲嚭鏉$爜
+        /// 閲嶆墦鏉$爜
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
+            MsgHelper.ShowInformation("鍔熻兘寮�鍙戜腑锛�");
+            return;
             var rowhandle = gvMx2.FocusedRowHandle;
             if (rowhandle < 0)
                 return;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs
index 46d78ed..c5ce73a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs
@@ -14,9 +14,9 @@
         public Guid? Guid { get; set; }
 
         /// <summary>
+        /// 浠ュ悗瀛榞uid,鍚庢潵鏀瑰瓨浠撳簱id浜�
         /// </summary>
-
-        public Guid? DepotGuid { get; set; }
+        public Int64 DepotGuid { get; set; }
 
         /// <summary>
         ///     ID(SEQ_INV_ID)锛圗RPID锛�

--
Gitblit v1.9.3