From 02fc46d07a9cb7740bb8ab8ceec03281e15e8cec Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 15 八月 2025 10:31:09 +0800
Subject: [PATCH] 受托入库检验

---
 DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs                   |    7 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs |  862 +++++++++++++-------------------------------------
 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs               |   13 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs          |  120 ------
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs          |    2 
 5 files changed, 247 insertions(+), 757 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index 0e26bbc..8b8ac2d 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -444,8 +444,12 @@
             //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
             txt_lotNo.Enabled = false;
             txt_kbList.Enabled = false;
-            //  txt_fPurchaserId.IsReadly = true;
-
+            //txt_fPurchaserId.IsReadly = true;
+            this.txt_msg.Enabled = true;
+            this.txt_fngHandle.Enabled = true;
+            this.txt_zrType.Enabled = true;
+            this.txt_fzrId.Enabled = true;
+            this.txt_fmrmode.Enabled = true;
         }
 
         /// <summary>
@@ -762,11 +766,6 @@
                         Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                     }
                     getGxList(dy.aboutGuid.ToString());
-
-                    //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
-                    txt_lotNo.Enabled = false;
-                    txt_kbList.Enabled = false;
-                    //  txt_fPurchaserId.IsReadly = true;
                 }
                 else
                     ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
index d6fee45..bfab458 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
@@ -64,7 +64,11 @@
             btnIpt.Click += BtnIpt_Click;
             string rptName = "";
             if (strType == QcSeason.鍙楁墭鍏ュ簱.ToString())
+            {
                 rptName = "rpt_Strk";
+                layoutControlItem25.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+                layoutControlItem27.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            }
             else
                   if (strType == QcSeason.鍏跺畠鍏ュ簱妫�.ToString())
             {
@@ -439,7 +443,8 @@
             toolBarMenu1.isSetBtn = false;
             string rkckid = txt_rkCkId.GetId();
             if (strType == QcSeason.瓒呮湡妫�.ToString()
-                || strType == QcSeason.鍏跺畠鍏ュ簱妫�.ToString())
+                || strType == QcSeason.鍏跺畠鍏ュ簱妫�.ToString()
+                || strType == QcSeason.鍙楁墭鍏ュ簱.ToString())
             {
 
             }
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
index aad5477..78015d1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
@@ -53,7 +53,7 @@
                     return;
                 txt_fCustId.getSuppler(orgId, _ucKh);
                 //2025-08-11鍔犱笂鍙兘鏄唬绠′粨
-                txt_fStockId.getSuppler(orgId, _ucCk, " and a.depot_id in(select [浠撳簱Id] from [dbo].[浠撳簱灞炴� where [鏄惁浠g涓嶈壇鍝佷粨]=1 )");
+                txt_fStockId.getSuppler(orgId, _ucCk, " and a.depot_id in(select [浠撳簱Id] from [dbo].[浠撳簱灞炴� where [鏄惁浠g鑹搧浠揮=1 )");
             };
             //閫夋嫨闇�瑕佺殑鏄庣粏
             btnSelect.Click += (s, e) =>
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
index 490e421..02ebeb0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
@@ -37,16 +37,7 @@
             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();
@@ -90,52 +81,28 @@
             this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_guid = new DevExpress.XtraEditors.TextEdit();
             this.txt_isFinish = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_qt034 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_qt033 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_qt032 = new DevExpress.XtraEditors.CheckEdit();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            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.tabMx = new DevExpress.XtraTab.XtraTabControl();
+            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -174,6 +141,7 @@
             this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -202,58 +170,33 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit();
-            this.split99.Panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).BeginInit();
             this.split99.Panel2.SuspendLayout();
             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();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).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();
@@ -263,6 +206,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -558,7 +502,7 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1167, 570);
-            this.splitMx1.SplitterPosition = 104;
+            this.splitMx1.SplitterPosition = 134;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -576,6 +520,9 @@
             this.layoutMx1.Controls.Add(this.txt_createDate);
             this.layoutMx1.Controls.Add(this.txt_guid);
             this.layoutMx1.Controls.Add(this.txt_isFinish);
+            this.layoutMx1.Controls.Add(this.txt_qt034);
+            this.layoutMx1.Controls.Add(this.txt_qt033);
+            this.layoutMx1.Controls.Add(this.txt_qt032);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem2,
@@ -584,16 +531,16 @@
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(567, 356, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1167, 104);
+            this.layoutMx1.Size = new System.Drawing.Size(1167, 134);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
             // txt_fCustId
             // 
             this.txt_fCustId.IsReadly = false;
-            this.txt_fCustId.Location = new System.Drawing.Point(370, 40);
+            this.txt_fCustId.Location = new System.Drawing.Point(385, 68);
             this.txt_fCustId.Name = "txt_fCustId";
-            this.txt_fCustId.Size = new System.Drawing.Size(211, 24);
+            this.txt_fCustId.Size = new System.Drawing.Size(196, 24);
             this.txt_fCustId.TabIndex = 333;
             // 
             // lbGuid
@@ -607,28 +554,28 @@
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(84, 68);
+            this.txt_remark.Location = new System.Drawing.Point(99, 96);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(497, 24);
+            this.txt_remark.Size = new System.Drawing.Size(482, 24);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 240;
             // 
             // txt_fStockId
             // 
             this.txt_fStockId.IsReadly = false;
-            this.txt_fStockId.Location = new System.Drawing.Point(370, 12);
+            this.txt_fStockId.Location = new System.Drawing.Point(99, 68);
             this.txt_fStockId.Margin = new System.Windows.Forms.Padding(0);
             this.txt_fStockId.Name = "txt_fStockId";
-            this.txt_fStockId.Size = new System.Drawing.Size(211, 24);
+            this.txt_fStockId.Size = new System.Drawing.Size(195, 24);
             this.txt_fStockId.TabIndex = 301;
             // 
             // txt_checkBy
             // 
-            this.txt_checkBy.Location = new System.Drawing.Point(944, 12);
+            this.txt_checkBy.Location = new System.Drawing.Point(672, 12);
             this.txt_checkBy.Name = "txt_checkBy";
             this.txt_checkBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkBy.Size = new System.Drawing.Size(211, 24);
+            this.txt_checkBy.Size = new System.Drawing.Size(196, 24);
             this.txt_checkBy.StyleController = this.layoutMx1;
             this.txt_checkBy.TabIndex = 267;
             this.txt_checkBy.Tag = "readonly";
@@ -636,36 +583,36 @@
             // txt_fStockOrgId
             // 
             this.txt_fStockOrgId.IsReadly = false;
-            this.txt_fStockOrgId.Location = new System.Drawing.Point(84, 40);
+            this.txt_fStockOrgId.Location = new System.Drawing.Point(99, 40);
             this.txt_fStockOrgId.Name = "txt_fStockOrgId";
-            this.txt_fStockOrgId.Size = new System.Drawing.Size(210, 24);
+            this.txt_fStockOrgId.Size = new System.Drawing.Size(195, 24);
             this.txt_fStockOrgId.TabIndex = 326;
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(84, 12);
+            this.txt_billNo.Location = new System.Drawing.Point(99, 12);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(210, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(195, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 213;
             this.txt_billNo.Tag = "readonly";
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(944, 40);
+            this.txt_checkDate.Location = new System.Drawing.Point(672, 40);
             this.txt_checkDate.Name = "txt_checkDate";
             this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(211, 24);
+            this.txt_checkDate.Size = new System.Drawing.Size(196, 24);
             this.txt_checkDate.StyleController = this.layoutMx1;
             this.txt_checkDate.TabIndex = 217;
             this.txt_checkDate.Tag = "readonly";
             // 
             // txt_isCheck
             // 
-            this.txt_isCheck.Location = new System.Drawing.Point(872, 68);
+            this.txt_isCheck.Location = new System.Drawing.Point(585, 68);
             this.txt_isCheck.Name = "txt_isCheck";
-            this.txt_isCheck.Properties.Caption = "瀹℃牳鐘舵��";
+            this.txt_isCheck.Properties.Caption = "鍒跺崟瀹℃牳鐘舵��";
             this.txt_isCheck.Size = new System.Drawing.Size(283, 24);
             this.txt_isCheck.StyleController = this.layoutMx1;
             this.txt_isCheck.TabIndex = 330;
@@ -673,18 +620,18 @@
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(657, 12);
+            this.txt_createBy.Location = new System.Drawing.Point(385, 12);
             this.txt_createBy.Name = "txt_createBy";
-            this.txt_createBy.Size = new System.Drawing.Size(211, 24);
+            this.txt_createBy.Size = new System.Drawing.Size(196, 24);
             this.txt_createBy.StyleController = this.layoutMx1;
             this.txt_createBy.TabIndex = 331;
             this.txt_createBy.Tag = "readonly";
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(657, 40);
+            this.txt_createDate.Location = new System.Drawing.Point(385, 40);
             this.txt_createDate.Name = "txt_createDate";
-            this.txt_createDate.Size = new System.Drawing.Size(211, 24);
+            this.txt_createDate.Size = new System.Drawing.Size(196, 24);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 332;
             this.txt_createDate.Tag = "readonly";
@@ -700,13 +647,41 @@
             // 
             // txt_isFinish
             // 
-            this.txt_isFinish.Location = new System.Drawing.Point(585, 68);
+            this.txt_isFinish.Location = new System.Drawing.Point(585, 96);
             this.txt_isFinish.Name = "txt_isFinish";
             this.txt_isFinish.Properties.Caption = "瀹岀粨鐘舵��";
             this.txt_isFinish.Size = new System.Drawing.Size(283, 24);
             this.txt_isFinish.StyleController = this.layoutMx1;
             this.txt_isFinish.TabIndex = 335;
             this.txt_isFinish.Tag = "readonly";
+            // 
+            // txt_qt034
+            // 
+            this.txt_qt034.Location = new System.Drawing.Point(959, 12);
+            this.txt_qt034.Name = "txt_qt034";
+            this.txt_qt034.Size = new System.Drawing.Size(196, 24);
+            this.txt_qt034.StyleController = this.layoutMx1;
+            this.txt_qt034.TabIndex = 336;
+            this.txt_qt034.Tag = "readonly";
+            // 
+            // txt_qt033
+            // 
+            this.txt_qt033.Location = new System.Drawing.Point(959, 40);
+            this.txt_qt033.Name = "txt_qt033";
+            this.txt_qt033.Size = new System.Drawing.Size(196, 24);
+            this.txt_qt033.StyleController = this.layoutMx1;
+            this.txt_qt033.TabIndex = 337;
+            this.txt_qt033.Tag = "readonly";
+            // 
+            // txt_qt032
+            // 
+            this.txt_qt032.Location = new System.Drawing.Point(872, 68);
+            this.txt_qt032.Name = "txt_qt032";
+            this.txt_qt032.Properties.Caption = "閲囪喘瀹℃牳鐘舵��";
+            this.txt_qt032.Size = new System.Drawing.Size(283, 24);
+            this.txt_qt032.StyleController = this.layoutMx1;
+            this.txt_qt032.TabIndex = 338;
+            this.txt_qt032.Tag = "readonly";
             // 
             // layoutControlItem2
             // 
@@ -737,15 +712,18 @@
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem1,
             this.layoutControlItem4,
+            this.layoutControlItem13,
+            this.layoutControlItem8,
+            this.layoutControlItem6,
+            this.layoutControlItem14,
+            this.layoutControlItem15,
             this.layoutControlItem9,
             this.layoutControlItem10,
             this.layoutControlItem11,
-            this.layoutControlItem14,
-            this.layoutControlItem15,
-            this.layoutControlItem8,
-            this.layoutControlItem3,
-            this.layoutControlItem6,
-            this.layoutControlItem13});
+            this.layoutControlItem5,
+            this.layoutControlItem7,
+            this.layoutControlItem16,
+            this.layoutControlItem3});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -767,11 +745,14 @@
             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;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition1,
             rowDefinition2,
-            rowDefinition3});
-            this.Root.Size = new System.Drawing.Size(1167, 104);
+            rowDefinition3,
+            rowDefinition4});
+            this.Root.Size = new System.Drawing.Size(1167, 134);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -781,7 +762,7 @@
             this.layoutControlItem1.Name = "layoutControlItem1";
             this.layoutControlItem1.Size = new System.Drawing.Size(286, 28);
             this.layoutControlItem1.Text = "鐢宠鍗曞彿";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem4
             // 
@@ -791,107 +772,127 @@
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem4.Size = new System.Drawing.Size(286, 28);
             this.layoutControlItem4.Text = "搴撳瓨缁勭粐";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_remark;
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 84);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem13.Size = new System.Drawing.Size(573, 30);
+            this.layoutControlItem13.Text = "鐢宠鍘熷洜";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_fStockId;
+            this.layoutControlItem8.CustomizationFormText = "浠g浠撳簱";
+            this.layoutControlItem8.Location = new System.Drawing.Point(0, 56);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem8.Size = new System.Drawing.Size(286, 28);
+            this.layoutControlItem8.Text = "浠g浠撳簱";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_fCustId;
+            this.layoutControlItem6.Location = new System.Drawing.Point(286, 56);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem6.Size = new System.Drawing.Size(287, 28);
+            this.layoutControlItem6.Text = "閫夋嫨瀹㈡埛";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_createBy;
+            this.layoutControlItem14.CustomizationFormText = "鐢宠浜�";
+            this.layoutControlItem14.Location = new System.Drawing.Point(286, 0);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem14.Size = new System.Drawing.Size(287, 28);
+            this.layoutControlItem14.Text = "鐢宠浜哄憳";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_createDate;
+            this.layoutControlItem15.Location = new System.Drawing.Point(286, 28);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem15.Size = new System.Drawing.Size(287, 28);
+            this.layoutControlItem15.Text = "鐢宠鏃堕棿";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_checkBy;
-            this.layoutControlItem9.Location = new System.Drawing.Point(860, 0);
+            this.layoutControlItem9.Location = new System.Drawing.Point(573, 0);
             this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem9.Size = new System.Drawing.Size(287, 28);
-            this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem9.Text = "鍒跺崟瀹℃牳浜�";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_checkDate;
-            this.layoutControlItem10.Location = new System.Drawing.Point(860, 28);
+            this.layoutControlItem10.Location = new System.Drawing.Point(573, 28);
             this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem10.Size = new System.Drawing.Size(287, 28);
-            this.layoutControlItem10.Text = "瀹℃牳鏃ユ湡";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem10.Text = "鍒跺崟瀹℃牳鏈�";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_isCheck;
-            this.layoutControlItem11.Location = new System.Drawing.Point(860, 56);
+            this.layoutControlItem11.Location = new System.Drawing.Point(573, 56);
             this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem11.Size = new System.Drawing.Size(287, 28);
             this.layoutControlItem11.Text = "瀹℃牳鐘舵��";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
             // 
-            // layoutControlItem14
+            // layoutControlItem5
             // 
-            this.layoutControlItem14.Control = this.txt_createBy;
-            this.layoutControlItem14.CustomizationFormText = "鐢宠浜�";
-            this.layoutControlItem14.Location = new System.Drawing.Point(573, 0);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(287, 28);
-            this.layoutControlItem14.Text = "鐢宠浜哄憳";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem5.Control = this.txt_qt034;
+            this.layoutControlItem5.Location = new System.Drawing.Point(860, 0);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem5.Size = new System.Drawing.Size(287, 28);
+            this.layoutControlItem5.Text = "閲囪喘瀹℃牳浜�";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
             // 
-            // layoutControlItem15
+            // layoutControlItem7
             // 
-            this.layoutControlItem15.Control = this.txt_createDate;
-            this.layoutControlItem15.Location = new System.Drawing.Point(573, 28);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem15.Size = new System.Drawing.Size(287, 28);
-            this.layoutControlItem15.Text = "鐢宠鏃堕棿";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem7.Control = this.txt_qt033;
+            this.layoutControlItem7.Location = new System.Drawing.Point(860, 28);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem7.Size = new System.Drawing.Size(287, 28);
+            this.layoutControlItem7.Text = "閲囪喘瀹℃牳鏈�";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
             // 
-            // layoutControlItem8
+            // layoutControlItem16
             // 
-            this.layoutControlItem8.Control = this.txt_fStockId;
-            this.layoutControlItem8.CustomizationFormText = "浠g浠撳簱";
-            this.layoutControlItem8.Location = new System.Drawing.Point(286, 0);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(287, 28);
-            this.layoutControlItem8.Text = "浠g浠撳簱";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txt_isFinish;
-            this.layoutControlItem3.Location = new System.Drawing.Point(573, 56);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(287, 28);
-            this.layoutControlItem3.Text = "瀹岀粨鏍囪瘑";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem3.TextVisible = false;
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_fCustId;
-            this.layoutControlItem6.Location = new System.Drawing.Point(286, 28);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(287, 28);
-            this.layoutControlItem6.Text = "閫夋嫨瀹㈡埛";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.txt_remark;
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 56);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem13.Size = new System.Drawing.Size(573, 28);
-            this.layoutControlItem13.Text = "鐢宠鍘熷洜";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem16.Control = this.txt_qt032;
+            this.layoutControlItem16.Location = new System.Drawing.Point(860, 56);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem16.Size = new System.Drawing.Size(287, 28);
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem16.TextVisible = false;
             // 
             // tabMx
             // 
@@ -899,7 +900,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(1167, 454);
+            this.tabMx.Size = new System.Drawing.Size(1167, 424);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -909,7 +910,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.split99);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1165, 422);
+            this.tabMxPage1.Size = new System.Drawing.Size(1165, 392);
             this.tabMxPage1.Text = "鐗╂枡鏄庣粏";
             // 
             // split99
@@ -921,7 +922,6 @@
             // 
             // split99.Panel1
             // 
-            this.split99.Panel1.Controls.Add(this.layout99);
             this.split99.Panel1.Text = "Panel1";
             // 
             // split99.Panel2
@@ -929,376 +929,9 @@
             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.Size = new System.Drawing.Size(1165, 392);
+            this.split99.SplitterPosition = 0;
             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.allClickKey = null;
-            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(1030, 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.Properties.Padding = new System.Windows.Forms.Padding(0);
-            this.radOut.Size = new System.Drawing.Size(340, 32);
-            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.Name = "layoutControlItem24";
-            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem24.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlItem24.Size = new System.Drawing.Size(340, 32);
-            this.layoutControlItem24.Text = "璁$畻鏂瑰紡";
-            this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem24.TextVisible = false;
             // 
             // gcMx1
             // 
@@ -1309,7 +942,7 @@
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit1,
             this.repositoryItemSearchLookUpEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1165, 284);
+            this.gcMx1.Size = new System.Drawing.Size(1165, 380);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1603,7 +1236,7 @@
             // 
             this.xtraTabPage3.Controls.Add(this.gcMx2);
             this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1165, 422);
+            this.xtraTabPage3.Size = new System.Drawing.Size(1165, 392);
             this.xtraTabPage3.Text = "宸叉墦鍗版潯鐮佹槑缁�";
             // 
             // gcMx2
@@ -1612,7 +1245,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(1165, 422);
+            this.gcMx2.Size = new System.Drawing.Size(1165, 392);
             this.gcMx2.TabIndex = 2;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -1744,6 +1377,18 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_isFinish;
+            this.layoutControlItem3.Location = new System.Drawing.Point(573, 84);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem3.Size = new System.Drawing.Size(287, 30);
+            this.layoutControlItem3.Text = "瀹岀粨鏍囪瘑";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem3.TextVisible = false;
+            // 
             // Frm_MesShouTuo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1782,58 +1427,33 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit();
-            this.split99.Panel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit();
             this.split99.Panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.split99)).EndInit();
             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();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).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();
@@ -1843,6 +1463,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1876,10 +1497,7 @@
         private DevExpress.XtraLayout.LayoutControlGroup Root;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
         private DevExpress.XtraEditors.CheckEdit txt_isCheck;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraTab.XtraTabControl tabMx;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
         private DevExpress.XtraGrid.GridControl gcMx1;
@@ -1904,16 +1522,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
-        private UserControl.UcBtnPrint ucBtnPrint1;
-        private DevExpress.XtraEditors.LabelControl lbMxGuid;
-        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
-        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
-        private DevExpress.XtraEditors.TextEdit txt_kQty;
-        private DevExpress.XtraEditors.TextEdit txtYdy;
-        private DevExpress.XtraEditors.TextEdit txtQuantity;
-        private DevExpress.XtraEditors.TextEdit txtWlgg;
-        private DevExpress.XtraEditors.TextEdit txtWlmc;
-        private DevExpress.XtraEditors.TextEdit txtWlid;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
         private DevExpress.XtraGrid.GridControl gcMx2;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
@@ -1930,8 +1538,6 @@
         private DevExpress.XtraEditors.TextEdit txt_createDate;
         private UserControl.UcLookCustomer txt_fCustId;
         private DevExpress.XtraEditors.TextEdit txt_guid;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraGrid.Columns.GridColumn gv18;
@@ -1940,34 +1546,26 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
         private DevExpress.XtraEditors.CheckEdit txt_isFinish;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
         private DevExpress.Utils.ToolTipController tips;
-        private DevExpress.XtraEditors.RadioGroup radOut;
         private DevExpress.XtraEditors.SplitContainerControl split99;
-        private DevExpress.XtraLayout.LayoutControl layout99;
-        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private DevExpress.XtraEditors.TextEdit txt_qt034;
+        private DevExpress.XtraEditors.TextEdit txt_qt033;
+        private DevExpress.XtraEditors.CheckEdit txt_qt032;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
-        private DevExpress.XtraLayout.LayoutControl layoutControl1;
-        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
-        private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
index 92fda54..8d78699 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
@@ -77,92 +77,6 @@
                     MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
                 }
             };
-            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
-            this.ucBtnPrint1.btnPrintClick += (s, e) =>
-            {
-                ucBtnPrint1.guidKey = "";
-                string rowGuid = lbMxGuid.Text.Trim();
-                ucBtnPrint1.guidKey = rowGuid;
-                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�");
-                    txt_iCount_1.Focus();
-                    this.ucBtnPrint1.rptParameter = "return false";
-                    return;
-                }
-                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�");
-                    txt_psnQty_1.Focus();
-                    this.ucBtnPrint1.rptParameter = "return false";
-                    return;
-                }
-                if (lbMxGuid.Text.Trim().Length < 10)
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
-                    this.ucBtnPrint1.rptParameter = "return false";
-                    return;
-                }
-                this.ucBtnPrint1.rptParameter = "rpt_Strk{" + lbMxGuid.Text.Trim()
-                       + "," + ""
-                       + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
-                       + "," + txt_iCount_1.Text.Trim()
-                       + "," + txt_psnQty_1.Text.Trim()
-                       + "}";
-            };
-            this.ucBtnPrint1.btnAllClick += (s, e) =>
-            {
-                string rowGuid = lbMxGuid.Text.Trim();
-                if (rowGuid.Length < 10)
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
-                    this.ucBtnPrint1.rptParameter = "return false";
-                    return;
-                }
-                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, QcSeason.鍙楁墭鍏ュ簱.ToString());
-                string strCodeList = "";
-                string strAction = "";
-                frm.UpdateParent += (ss, ee) =>
-                {
-                    strCodeList = ee.StringSingle;
-                    strAction = ee.Data;
-                };
-                frm.ShowDialog();
-                if (string.IsNullOrEmpty(strCodeList))
-                    return;
-                if (strAction == "print")
-                {
-                    try
-                    {
-                        string rptParameter = "rpt_Strk{"
-                        + "100"
-                        + "," + ""
-                        + "," + ""
-                        + "," + ""
-                        + "," + ""
-                        + "," + strCodeList
-                        + "}";
-                        using (Form rpt = new RptPreview(rowGuid, rptParameter))
-                        {
-                            rpt.ShowDialog();
-                        }
-                        frm.Close();
-                    }
-                    catch (Exception ex)
-                    {
-                        MsgHelper.ShowError(ex.Message);
-                    }
-                }
-            };
-            //鑷姩璁$畻鎵撳嵃閲�
-            txt_psnQty_1.TextChanged += (s, e) =>
-            {
-                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
-            };
-            radOut.SelectedIndexChanged += (s, e) =>
-            {
-                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
-            };
         }
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
@@ -703,9 +617,11 @@
                     {
                         getModel(lbGuid.Text.Trim());
                     }
-                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+                    //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+                    getPageList(this.pageBar1.CurrentPage);
+                    int rowHandle = gridView1.LocateByValue("guid", rowGuid);
                     gridView1.FocusedRowHandle = rowHandle;
-                    UtilityHelper.SetCheckIco(gridView1, "isCheck", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
+                  
                 }
                 else
                     MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
@@ -713,34 +629,6 @@
             catch (Exception ex)
             {
                 MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
-            }
-        }
-        private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
-        {
-            if (e.FocusedRowHandle >= 0)
-            {
-                DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
-                lbMxGuid.Text = row["guid"].ToString();
-                ucBtnPrint1.guidKey = row["guid"].ToString();
-                txtWlid.Text = row["itemNo"].ToString();
-                txtWlgg.Text = row["itemModel"].ToString();
-                txtWlmc.Text = row["itemName"].ToString();
-                txtQuantity.Text = row["sqsl"].ToString();//鐢宠鎬婚噺
-                txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
-                txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
-            }
-            else
-            {
-                lbMxGuid.Text = "";
-                ucBtnPrint1.guidKey = "";
-                txtWlid.Text = "";
-                txtWlgg.Text = "";
-                txtWlmc.Text = "";
-                txtQuantity.Text = "";
-                txtYdy.Text = "";
-                txt_kQty.Text = "";
-                txt_psnQty_1.Text = "";
-                txt_iCount_1.Text = "";
             }
         }
     }

--
Gitblit v1.9.3