Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS-MES/CustomControl/TextBoxWithIcon/SourceStepCount.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 using UAS_MES.DataOperate;
+using UAS_MES.Entity;
 
 namespace UAS_MES.CustomControl.TextBoxWithIcon
 {
@@ -86,7 +87,7 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
         public void Start()
         {
             string SQL = "select count(distinct mp_sncode) from makeprocess where trunc(sysdate)=trunc(mp_indate) and ";
-            SQL += "mp_sourcecode='" + Source1 + "' and mp_linecode='" + LineCode1 + "' and mp_stepcode='" + StepCode1 + "' ";
+            SQL += "mp_sourcecode='" + Source1 + "' and mp_linecode='" + LineCode1 + "' and mp_stepcode='" + StepCode1 + "' and mp_inman='"+User.UserCode+"' ";
             DataTable dt = (DataTable)Dh.ExecuteSql(SQL, "select");
             Count.Text = "计数:" + dt.Rows[0][0].ToString();
             CountRefresh.Start();
@@ -100,7 +101,7 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
         private void CountRefresh_Tick(object sender, EventArgs e)
         {
             string SQL = "select count(distinct mp_sncode) from makeprocess where trunc(sysdate)=trunc(mp_indate) and ";
-            SQL += "mp_sourcecode='" + Source1 + "' and mp_linecode='" + LineCode1 + "' and mp_stepcode='" + StepCode1 + "' ";
+            SQL += "mp_sourcecode='" + Source1 + "' and mp_linecode='" + LineCode1 + "' and mp_stepcode='" + StepCode1 + "'and mp_inman='" + User.UserCode + "' ";
             DataTable dt = (DataTable)Dh.ExecuteSql(SQL, "select");
             Count.Text = "计数:" + dt.Rows[0][0].ToString();
         }

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.Designer.cs

@@ -33,6 +33,7 @@
             this.panel6 = new System.Windows.Forms.Panel();
             this.label3 = new System.Windows.Forms.Label();
             this.ob_checkno = new System.Windows.Forms.Label();
+            this.SendCheck = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ob_nowcheckqty = new System.Windows.Forms.Label();
             this.ob_batchqty = new System.Windows.Forms.Label();
             this.ob_nowcheckqty_label = new System.Windows.Forms.Label();
@@ -75,10 +76,9 @@
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.normalButton1 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
-            this.SendCheck = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.fileSystemWatcher1 = new System.IO.FileSystemWatcher();
-            this.sourceStepCount1 = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
+            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.panel6.SuspendLayout();
             this.panel4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.fileSystemWatcher1)).BeginInit();
@@ -133,6 +133,28 @@
             this.ob_checkno.TabIndex = 184;
             this.ob_checkno.TextChanged += new System.EventHandler(this.ob_checkno_TextChanged);
             // 
+            // SendCheck
+            // 
+            this.SendCheck.AllPower = "ifall";
+            this.SendCheck.BackColor = System.Drawing.Color.Transparent;
+            this.SendCheck.DownImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.DownImage")));
+            this.SendCheck.Enabled = false;
+            this.SendCheck.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.SendCheck.Image = null;
+            this.SendCheck.IsShowBorder = true;
+            this.SendCheck.Location = new System.Drawing.Point(465, 132);
+            this.SendCheck.Margin = new System.Windows.Forms.Padding(4);
+            this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
+            this.SendCheck.Name = "SendCheck";
+            this.SendCheck.NormalImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.NormalImage")));
+            this.SendCheck.Power = null;
+            this.SendCheck.Size = new System.Drawing.Size(84, 36);
+            this.SendCheck.TabIndex = 183;
+            this.SendCheck.Tag = "ifread";
+            this.SendCheck.Text = "送检";
+            this.SendCheck.UseVisualStyleBackColor = true;
+            this.SendCheck.Click += new System.EventHandler(this.SendCheck_Click);
+            // 
             // ob_nowcheckqty
             // 
             this.ob_nowcheckqty.AutoSize = true;
@@ -648,28 +670,6 @@
             this.outboxcode.TabIndex = 86;
             this.outboxcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sncode_KeyDown);
             // 
-            // SendCheck
-            // 
-            this.SendCheck.AllPower = "ifall";
-            this.SendCheck.BackColor = System.Drawing.Color.Transparent;
-            this.SendCheck.DownImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.DownImage")));
-            this.SendCheck.Enabled = false;
-            this.SendCheck.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.SendCheck.Image = null;
-            this.SendCheck.IsShowBorder = true;
-            this.SendCheck.Location = new System.Drawing.Point(465, 132);
-            this.SendCheck.Margin = new System.Windows.Forms.Padding(4);
-            this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
-            this.SendCheck.Name = "SendCheck";
-            this.SendCheck.NormalImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.NormalImage")));
-            this.SendCheck.Power = null;
-            this.SendCheck.Size = new System.Drawing.Size(84, 36);
-            this.SendCheck.TabIndex = 183;
-            this.SendCheck.Tag = "ifread";
-            this.SendCheck.Text = "送检";
-            this.SendCheck.UseVisualStyleBackColor = true;
-            this.SendCheck.Click += new System.EventHandler(this.SendCheck_Click);
-            // 
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -685,23 +685,23 @@
             this.fileSystemWatcher1.EnableRaisingEvents = true;
             this.fileSystemWatcher1.SynchronizingObject = this;
             // 
-            // sourceStepCount1
+            // StepCount
             // 
-            this.sourceStepCount1.LineCode = null;
-            this.sourceStepCount1.Location = new System.Drawing.Point(1257, 266);
-            this.sourceStepCount1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.sourceStepCount1.Name = "sourceStepCount1";
-            this.sourceStepCount1.Size = new System.Drawing.Size(119, 34);
-            this.sourceStepCount1.Source = null;
-            this.sourceStepCount1.StepCode = null;
-            this.sourceStepCount1.TabIndex = 188;
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(1257, 266);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(119, 34);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 188;
             // 
             // Make_CartonBoxWeigh
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1454, 840);
-            this.Controls.Add(this.sourceStepCount1);
+            this.Controls.Add(this.StepCount);
             this.Controls.Add(this.pr_sendchecktype);
             this.Controls.Add(this.RefreshWeigh);
             this.Controls.Add(this.PrintNum);
@@ -805,6 +805,6 @@
         private CustomControl.ButtonUtil.NormalButton RefreshWeigh;
         private System.Windows.Forms.Label pr_sendchecktype;
         private System.IO.FileSystemWatcher fileSystemWatcher1;
-        private CustomControl.TextBoxWithIcon.SourceStepCount sourceStepCount1;
+        private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
     }
 }

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.cs

@@ -76,6 +76,11 @@ namespace UAS_MES.Make
             stw.ShowDialog();
             StartWeight.PerformClick();
             dh = new DataHelper();
+            StepCount.StepCode = User.CurrentStepCode;
+            StepCount.Source = User.UserSourceCode;
+            StepCount.LineCode = User.UserLineCode;
+            StepCount.Dh = dh;
+            StepCount.Start();
         }
 
         private void InPrint()

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.resx

@@ -118,6 +118,44 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="SendCheck.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="SendCheck.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="SendCheck.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
   <data name="RefreshWeigh.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -902,44 +940,6 @@
         2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
         zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="SendCheck.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="SendCheck.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="SendCheck.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="fileSystemWatcher1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.Designer.cs

@@ -36,6 +36,7 @@
             this.mcd_okqty_label = new System.Windows.Forms.Label();
             this.pr_code_label = new System.Windows.Forms.Label();
             this.ms_makecode_label = new System.Windows.Forms.Label();
+            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.DeleteButton = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ms_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.mcd_remainqty = new UAS_MES.CustomControl.ValueLabel.ValueNumLabel(this.components);
@@ -44,7 +45,6 @@
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.sourceStepCount1 = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.SuspendLayout();
             // 
             // pr_detail_label
@@ -115,6 +115,17 @@
             this.ms_makecode_label.TabIndex = 199;
             this.ms_makecode_label.Text = "工单编号";
             // 
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(694, 84);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(119, 34);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 214;
+            // 
             // DeleteButton
             // 
             this.DeleteButton.AllPower = null;
@@ -123,7 +134,7 @@
             this.DeleteButton.Image = null;
             this.DeleteButton.IsShowBorder = true;
             this.DeleteButton.Location = new System.Drawing.Point(447, 621);
-            this.DeleteButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.DeleteButton.Margin = new System.Windows.Forms.Padding(4);
             this.DeleteButton.MoveImage = ((System.Drawing.Image)(resources.GetObject("DeleteButton.MoveImage")));
             this.DeleteButton.Name = "DeleteButton";
             this.DeleteButton.NormalImage = ((System.Drawing.Image)(resources.GetObject("DeleteButton.NormalImage")));
@@ -199,7 +210,7 @@
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
             this.sncode.Location = new System.Drawing.Point(132, 624);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
             this.sncode.Size = new System.Drawing.Size(292, 28);
@@ -214,29 +225,18 @@
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.OperateResult.Location = new System.Drawing.Point(18, 146);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(1057, 456);
             this.OperateResult.TabIndex = 203;
             this.OperateResult.Text = "";
             // 
-            // sourceStepCount1
-            // 
-            this.sourceStepCount1.LineCode = null;
-            this.sourceStepCount1.Location = new System.Drawing.Point(694, 84);
-            this.sourceStepCount1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.sourceStepCount1.Name = "sourceStepCount1";
-            this.sourceStepCount1.Size = new System.Drawing.Size(119, 34);
-            this.sourceStepCount1.Source = null;
-            this.sourceStepCount1.StepCode = null;
-            this.sourceStepCount1.TabIndex = 214;
-            // 
             // Make_CollectBTMAC
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1110, 672);
-            this.Controls.Add(this.sourceStepCount1);
+            this.Controls.Add(this.StepCount);
             this.Controls.Add(this.DeleteButton);
             this.Controls.Add(this.ms_makecode);
             this.Controls.Add(this.mcd_remainqty);
@@ -279,6 +279,6 @@
         private System.Windows.Forms.Label pr_code_label;
         private System.Windows.Forms.Label ms_makecode_label;
         private CustomControl.ButtonUtil.NormalButton DeleteButton;
-        private CustomControl.TextBoxWithIcon.SourceStepCount sourceStepCount1;
+        private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
     }
 }

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -50,6 +50,11 @@ namespace UAS_MES.Make
             printcount = 0;
             sncode.Focus();
             dh = new DataHelper();
+            StepCount.StepCode = User.CurrentStepCode;
+            StepCount.Source = User.UserSourceCode;
+            StepCount.LineCode = User.UserLineCode;
+            StepCount.Dh = dh;
+            StepCount.Start();
         }
 
         private void Make_CollectBTMAC_Activated(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_CollectNetCode.Designer.cs

@@ -36,6 +36,8 @@
             this.mcd_okqty_label = new System.Windows.Forms.Label();
             this.pr_code_label = new System.Windows.Forms.Label();
             this.ms_makecode_label = new System.Windows.Forms.Label();
+            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
+            this.Delete = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ms_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.mcd_remainqty = new UAS_MES.CustomControl.ValueLabel.ValueNumLabel(this.components);
             this.mcd_okqty = new UAS_MES.CustomControl.ValueLabel.ValueNumLabel(this.components);
@@ -43,8 +45,6 @@
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.Delete = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.sourceStepCount1 = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.SuspendLayout();
             // 
             // pr_detail_label
@@ -115,6 +115,36 @@
             this.ms_makecode_label.TabIndex = 184;
             this.ms_makecode_label.Text = "工单编号";
             // 
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(684, 106);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(119, 34);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 200;
+            // 
+            // Delete
+            // 
+            this.Delete.AllPower = null;
+            this.Delete.BackColor = System.Drawing.Color.Transparent;
+            this.Delete.DownImage = ((System.Drawing.Image)(resources.GetObject("Delete.DownImage")));
+            this.Delete.Image = null;
+            this.Delete.IsShowBorder = true;
+            this.Delete.Location = new System.Drawing.Point(574, 633);
+            this.Delete.Margin = new System.Windows.Forms.Padding(4);
+            this.Delete.MoveImage = ((System.Drawing.Image)(resources.GetObject("Delete.MoveImage")));
+            this.Delete.Name = "Delete";
+            this.Delete.NormalImage = ((System.Drawing.Image)(resources.GetObject("Delete.NormalImage")));
+            this.Delete.Power = null;
+            this.Delete.Size = new System.Drawing.Size(112, 42);
+            this.Delete.TabIndex = 199;
+            this.Delete.Text = "取消";
+            this.Delete.UseVisualStyleBackColor = false;
+            this.Delete.Click += new System.EventHandler(this.deleteButton1_Click);
+            // 
             // ms_makecode
             // 
             this.ms_makecode.AutoSize = true;
@@ -180,7 +210,7 @@
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
             this.sncode.Location = new System.Drawing.Point(146, 636);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
             this.sncode.Size = new System.Drawing.Size(292, 28);
@@ -195,48 +225,18 @@
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.OperateResult.Location = new System.Drawing.Point(15, 159);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(1057, 456);
             this.OperateResult.TabIndex = 188;
             this.OperateResult.Text = "";
             // 
-            // Delete
-            // 
-            this.Delete.AllPower = null;
-            this.Delete.BackColor = System.Drawing.Color.Transparent;
-            this.Delete.DownImage = ((System.Drawing.Image)(resources.GetObject("Delete.DownImage")));
-            this.Delete.Image = null;
-            this.Delete.IsShowBorder = true;
-            this.Delete.Location = new System.Drawing.Point(574, 633);
-            this.Delete.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.Delete.MoveImage = ((System.Drawing.Image)(resources.GetObject("Delete.MoveImage")));
-            this.Delete.Name = "Delete";
-            this.Delete.NormalImage = ((System.Drawing.Image)(resources.GetObject("Delete.NormalImage")));
-            this.Delete.Power = null;
-            this.Delete.Size = new System.Drawing.Size(112, 42);
-            this.Delete.TabIndex = 199;
-            this.Delete.Text = "取消";
-            this.Delete.UseVisualStyleBackColor = false;
-            this.Delete.Click += new System.EventHandler(this.deleteButton1_Click);
-            // 
-            // sourceStepCount1
-            // 
-            this.sourceStepCount1.LineCode = null;
-            this.sourceStepCount1.Location = new System.Drawing.Point(684, 106);
-            this.sourceStepCount1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.sourceStepCount1.Name = "sourceStepCount1";
-            this.sourceStepCount1.Size = new System.Drawing.Size(119, 34);
-            this.sourceStepCount1.Source = null;
-            this.sourceStepCount1.StepCode = null;
-            this.sourceStepCount1.TabIndex = 200;
-            // 
             // Make_CollectNetCode
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1112, 680);
-            this.Controls.Add(this.sourceStepCount1);
+            this.Controls.Add(this.StepCount);
             this.Controls.Add(this.Delete);
             this.Controls.Add(this.ms_makecode);
             this.Controls.Add(this.mcd_remainqty);
@@ -278,6 +278,6 @@
         private System.Windows.Forms.Label ms_makecode_label;
         private CustomControl.ValueLabel.ValueLabel ms_makecode;
         private CustomControl.ButtonUtil.NormalButton Delete;
-        private CustomControl.TextBoxWithIcon.SourceStepCount sourceStepCount1;
+        private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
     }
 }

UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs

@@ -42,6 +42,11 @@ namespace UAS_MES.Make
             asc.controllInitializeSize(this);
             sncode.Focus();
             dh = new DataHelper();
+            StepCount.StepCode = User.CurrentStepCode;
+            StepCount.Source = User.UserSourceCode;
+            StepCount.LineCode = User.UserLineCode;
+            StepCount.Dh = dh;
+            StepCount.Start();
         }
 
         private void sncode_KeyDown(object sender, KeyEventArgs e)

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.Designer.cs

@@ -39,6 +39,8 @@
             this.mcd_okqty_label = new System.Windows.Forms.Label();
             this.pr_code_label = new System.Windows.Forms.Label();
             this.ms_makecode_label = new System.Windows.Forms.Label();
+            this.CheckTSN = new System.Windows.Forms.CheckBox();
+            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.LockMakeCode = new UAS_MES.CustomControl.CustomCheckBox.LockCheckBox();
             this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.Printer = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
@@ -49,8 +51,6 @@
             this.PrintNum = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.CheckTSN = new System.Windows.Forms.CheckBox();
-            this.sourceStepCount1 = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.SuspendLayout();
             // 
             // PrintLabel
@@ -165,6 +165,32 @@
             this.ms_makecode_label.TabIndex = 163;
             this.ms_makecode_label.Text = "归属工单";
             // 
+            // CheckTSN
+            // 
+            this.CheckTSN.AutoSize = true;
+            this.CheckTSN.Checked = true;
+            this.CheckTSN.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.CheckTSN.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.CheckTSN.Location = new System.Drawing.Point(48, 667);
+            this.CheckTSN.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.CheckTSN.Name = "CheckTSN";
+            this.CheckTSN.Size = new System.Drawing.Size(184, 35);
+            this.CheckTSN.TabIndex = 186;
+            this.CheckTSN.Text = "是否检查TSN";
+            this.CheckTSN.UseVisualStyleBackColor = true;
+            this.CheckTSN.CheckedChanged += new System.EventHandler(this.CheckTSN_CheckedChanged);
+            // 
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(1094, 368);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(119, 34);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 189;
+            // 
             // LockMakeCode
             // 
             this.LockMakeCode.AutoSize = true;
@@ -201,7 +227,7 @@
             // Printer
             // 
             this.Printer.Location = new System.Drawing.Point(1184, 216);
-            this.Printer.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.Printer.Margin = new System.Windows.Forms.Padding(6);
             this.Printer.Name = "Printer";
             this.Printer.Size = new System.Drawing.Size(201, 37);
             this.Printer.TabIndex = 178;
@@ -300,38 +326,12 @@
             this.OperateResult.TabIndex = 168;
             this.OperateResult.Text = "";
             // 
-            // CheckTSN
-            // 
-            this.CheckTSN.AutoSize = true;
-            this.CheckTSN.Checked = true;
-            this.CheckTSN.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.CheckTSN.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CheckTSN.Location = new System.Drawing.Point(48, 667);
-            this.CheckTSN.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.CheckTSN.Name = "CheckTSN";
-            this.CheckTSN.Size = new System.Drawing.Size(184, 35);
-            this.CheckTSN.TabIndex = 186;
-            this.CheckTSN.Text = "是否检查TSN";
-            this.CheckTSN.UseVisualStyleBackColor = true;
-            this.CheckTSN.CheckedChanged += new System.EventHandler(this.CheckTSN_CheckedChanged);
-            // 
-            // sourceStepCount1
-            // 
-            this.sourceStepCount1.LineCode = null;
-            this.sourceStepCount1.Location = new System.Drawing.Point(1094, 368);
-            this.sourceStepCount1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.sourceStepCount1.Name = "sourceStepCount1";
-            this.sourceStepCount1.Size = new System.Drawing.Size(119, 34);
-            this.sourceStepCount1.Source = null;
-            this.sourceStepCount1.StepCode = null;
-            this.sourceStepCount1.TabIndex = 189;
-            // 
             // Make_ColorBoxLabelPrint
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1407, 720);
-            this.Controls.Add(this.sourceStepCount1);
+            this.Controls.Add(this.StepCount);
             this.Controls.Add(this.CheckTSN);
             this.Controls.Add(this.LockMakeCode);
             this.Controls.Add(this.ma_code);
@@ -390,6 +390,6 @@
         private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
         private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
         private System.Windows.Forms.CheckBox CheckTSN;
-        private CustomControl.TextBoxWithIcon.SourceStepCount sourceStepCount1;
+        private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
     }
 }

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -73,6 +73,11 @@ namespace UAS_MES.Make
             ma_code.DbChange += Ma_code_DbChange;
             OperateResult.AppendText(">>请输入TSN\n", Color.Black);
             dh = new DataHelper();
+            StepCount.StepCode = User.CurrentStepCode;
+            StepCount.Source = User.UserSourceCode;
+            StepCount.LineCode = User.UserLineCode;
+            StepCount.Dh = dh;
+            StepCount.Start();
         }
 
         private void Ma_code_DbChange(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.Designer.cs

@@ -45,6 +45,8 @@
             this.code_label = new System.Windows.Forms.Label();
             this.ms_craftcode = new System.Windows.Forms.Label();
             this.ClearSn_code = new System.Windows.Forms.PictureBox();
+            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
+            this.PrintNum = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.Lock = new UAS_MES.CustomControl.CustomCheckBox.LockCheckBox();
             this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.ma_bomversion = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
@@ -55,8 +57,6 @@
             this.pr_code = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.PrintNum = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.sourceStepCount1 = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).BeginInit();
             this.SuspendLayout();
             // 
@@ -242,6 +242,33 @@
             this.ClearSn_code.TabStop = false;
             this.ClearSn_code.Click += new System.EventHandler(this.ClearSn_code_Click);
             // 
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(1101, 250);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(119, 34);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 189;
+            // 
+            // PrintNum
+            // 
+            this.PrintNum.AllPower = null;
+            this.PrintNum.BackColor = System.Drawing.Color.White;
+            this.PrintNum.Enabled = false;
+            this.PrintNum.ID = null;
+            this.PrintNum.Location = new System.Drawing.Point(1212, 168);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.PrintNum.Name = "PrintNum";
+            this.PrintNum.Power = null;
+            this.PrintNum.Size = new System.Drawing.Size(196, 28);
+            this.PrintNum.Str = null;
+            this.PrintNum.Str1 = null;
+            this.PrintNum.Str2 = null;
+            this.PrintNum.TabIndex = 174;
+            // 
             // Lock
             // 
             this.Lock.AutoSize = true;
@@ -306,7 +333,7 @@
             // Printer
             // 
             this.Printer.Location = new System.Drawing.Point(1212, 22);
-            this.Printer.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.Printer.Margin = new System.Windows.Forms.Padding(6);
             this.Printer.Name = "Printer";
             this.Printer.Size = new System.Drawing.Size(197, 37);
             this.Printer.TabIndex = 159;
@@ -368,39 +395,12 @@
             this.OperateResult.TabIndex = 143;
             this.OperateResult.Text = "";
             // 
-            // PrintNum
-            // 
-            this.PrintNum.AllPower = null;
-            this.PrintNum.BackColor = System.Drawing.Color.White;
-            this.PrintNum.Enabled = false;
-            this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(1212, 168);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.PrintNum.Name = "PrintNum";
-            this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(196, 28);
-            this.PrintNum.Str = null;
-            this.PrintNum.Str1 = null;
-            this.PrintNum.Str2 = null;
-            this.PrintNum.TabIndex = 174;
-            // 
-            // sourceStepCount1
-            // 
-            this.sourceStepCount1.LineCode = null;
-            this.sourceStepCount1.Location = new System.Drawing.Point(1101, 250);
-            this.sourceStepCount1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.sourceStepCount1.Name = "sourceStepCount1";
-            this.sourceStepCount1.Size = new System.Drawing.Size(119, 34);
-            this.sourceStepCount1.Source = null;
-            this.sourceStepCount1.StepCode = null;
-            this.sourceStepCount1.TabIndex = 189;
-            // 
             // Make_ColorBoxLoadPrint
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1454, 678);
-            this.Controls.Add(this.sourceStepCount1);
+            this.Controls.Add(this.StepCount);
             this.Controls.Add(this.PrintNum);
             this.Controls.Add(this.ClearSn_code);
             this.Controls.Add(this.Lock);
@@ -470,6 +470,6 @@
         private CustomControl.CustomCheckBox.LockCheckBox Lock;
         private System.Windows.Forms.PictureBox ClearSn_code;
         private CustomControl.TextBoxWithIcon.EnterTextBox PrintNum;
-        private CustomControl.TextBoxWithIcon.SourceStepCount sourceStepCount1;
+        private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
     }
 }

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -73,6 +73,11 @@ namespace UAS_MES.Make
             ma_code.SetLockCheckBox(Lock);
             code.Focus();
             dh = new DataHelper();
+            StepCount.StepCode = User.CurrentStepCode;
+            StepCount.Source = User.UserSourceCode;
+            StepCount.LineCode = User.UserLineCode;
+            StepCount.Dh = dh;
+            StepCount.Start();
         }
 
         private void Ms_makecode_DbChange(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.Designer.cs

@@ -35,7 +35,6 @@
             this.weight_label = new System.Windows.Forms.Label();
             this.weight = new System.Windows.Forms.Label();
             this.panel4 = new System.Windows.Forms.Panel();
-            this.RefreshWeigh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.label15 = new System.Windows.Forms.Label();
             this.pr_detail_label = new System.Windows.Forms.Label();
             this.ma_qty_label = new System.Windows.Forms.Label();
@@ -52,6 +51,10 @@
             this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.pr_sendchecktype = new System.Windows.Forms.Label();
+            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
+            this.RefreshWeigh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.PrintNum = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.groupBoxWithBorder2 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.ob_checkno_label = new System.Windows.Forms.Label();
             this.ob_checkno = new System.Windows.Forms.Label();
@@ -75,9 +78,10 @@
             this.normalButton1 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.PrintNum = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.pr_sendchecktype = new System.Windows.Forms.Label();
-            this.sourceStepCount1 = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
+            this.mcd_inqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.mcd_inqty_label = new System.Windows.Forms.Label();
+            this.mcd_remainqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.mcd_remainqty_label = new System.Windows.Forms.Label();
             this.panel4.SuspendLayout();
             this.groupBoxWithBorder2.SuspendLayout();
             this.SuspendLayout();
@@ -86,10 +90,10 @@
             // 
             this.pr_colorboxgw_label.AutoSize = true;
             this.pr_colorboxgw_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_colorboxgw_label.Location = new System.Drawing.Point(24, 356);
+            this.pr_colorboxgw_label.Location = new System.Drawing.Point(21, 271);
             this.pr_colorboxgw_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_colorboxgw_label.Name = "pr_colorboxgw_label";
-            this.pr_colorboxgw_label.Size = new System.Drawing.Size(137, 39);
+            this.pr_colorboxgw_label.Size = new System.Drawing.Size(115, 32);
             this.pr_colorboxgw_label.TabIndex = 42;
             this.pr_colorboxgw_label.Text = "标准重量";
             // 
@@ -97,10 +101,10 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(24, 504);
+            this.pr_code_label.Location = new System.Drawing.Point(21, 384);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(137, 39);
+            this.pr_code_label.Size = new System.Drawing.Size(115, 32);
             this.pr_code_label.TabIndex = 40;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -110,10 +114,10 @@
             this.pr_colorboxunit.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.pr_colorboxunit.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pr_colorboxunit.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.pr_colorboxunit.Location = new System.Drawing.Point(24, 146);
+            this.pr_colorboxunit.Location = new System.Drawing.Point(21, 122);
             this.pr_colorboxunit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_colorboxunit.Name = "pr_colorboxunit";
-            this.pr_colorboxunit.Size = new System.Drawing.Size(46, 38);
+            this.pr_colorboxunit.Size = new System.Drawing.Size(38, 31);
             this.pr_colorboxunit.TabIndex = 42;
             this.pr_colorboxunit.Text = "克";
             this.pr_colorboxunit.Visible = false;
@@ -124,10 +128,10 @@
             this.weight_label.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.weight_label.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.weight_label.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.weight_label.Location = new System.Drawing.Point(24, 78);
+            this.weight_label.Location = new System.Drawing.Point(21, 65);
             this.weight_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.weight_label.Name = "weight_label";
-            this.weight_label.Size = new System.Drawing.Size(75, 38);
+            this.weight_label.Size = new System.Drawing.Size(62, 31);
             this.weight_label.TabIndex = 20;
             this.weight_label.Text = "重量";
             // 
@@ -136,10 +140,10 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 35F);
             this.weight.ForeColor = System.Drawing.Color.Green;
-            this.weight.Location = new System.Drawing.Point(129, 46);
+            this.weight.Location = new System.Drawing.Point(115, 38);
             this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 90);
+            this.weight.Size = new System.Drawing.Size(0, 78);
             this.weight.TabIndex = 41;
             // 
             // panel4
@@ -148,39 +152,20 @@
             this.panel4.Controls.Add(this.pr_colorboxunit);
             this.panel4.Controls.Add(this.weight_label);
             this.panel4.Controls.Add(this.weight);
-            this.panel4.Location = new System.Drawing.Point(24, 117);
-            this.panel4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.panel4.Location = new System.Drawing.Point(21, 97);
+            this.panel4.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(518, 185);
+            this.panel4.Size = new System.Drawing.Size(461, 154);
             this.panel4.TabIndex = 63;
             // 
-            // RefreshWeigh
-            // 
-            this.RefreshWeigh.AllPower = null;
-            this.RefreshWeigh.BackColor = System.Drawing.Color.Transparent;
-            this.RefreshWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.DownImage")));
-            this.RefreshWeigh.Image = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.Image")));
-            this.RefreshWeigh.IsShowBorder = true;
-            this.RefreshWeigh.Location = new System.Drawing.Point(458, 356);
-            this.RefreshWeigh.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.RefreshWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.MoveImage")));
-            this.RefreshWeigh.Name = "RefreshWeigh";
-            this.RefreshWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.NormalImage")));
-            this.RefreshWeigh.Power = null;
-            this.RefreshWeigh.Size = new System.Drawing.Size(81, 36);
-            this.RefreshWeigh.TabIndex = 177;
-            this.RefreshWeigh.Text = "刷新重量";
-            this.RefreshWeigh.UseVisualStyleBackColor = true;
-            this.RefreshWeigh.Click += new System.EventHandler(this.RefreshWeigh_Click);
-            // 
             // label15
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 20F);
-            this.label15.Location = new System.Drawing.Point(12, 27);
+            this.label15.Location = new System.Drawing.Point(11, 22);
             this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(143, 52);
+            this.label15.Size = new System.Drawing.Size(122, 45);
             this.label15.TabIndex = 56;
             this.label15.Text = "条码号";
             // 
@@ -188,10 +173,10 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(24, 663);
+            this.pr_detail_label.Location = new System.Drawing.Point(21, 502);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(137, 39);
+            this.pr_detail_label.Size = new System.Drawing.Size(115, 32);
             this.pr_detail_label.TabIndex = 53;
             this.pr_detail_label.Text = "产品型号";
             // 
@@ -199,10 +184,10 @@
             // 
             this.ma_qty_label.AutoSize = true;
             this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty_label.Location = new System.Drawing.Point(24, 736);
+            this.ma_qty_label.Location = new System.Drawing.Point(21, 559);
             this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(137, 39);
+            this.ma_qty_label.Size = new System.Drawing.Size(115, 32);
             this.ma_qty_label.TabIndex = 55;
             this.ma_qty_label.Text = "工单数量";
             // 
@@ -210,10 +195,10 @@
             // 
             this.ma_salecode_label.AutoSize = true;
             this.ma_salecode_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_salecode_label.Location = new System.Drawing.Point(24, 582);
+            this.ma_salecode_label.Location = new System.Drawing.Point(21, 444);
             this.ma_salecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_salecode_label.Name = "ma_salecode_label";
-            this.ma_salecode_label.Size = new System.Drawing.Size(137, 39);
+            this.ma_salecode_label.Size = new System.Drawing.Size(115, 32);
             this.ma_salecode_label.TabIndex = 54;
             this.ma_salecode_label.Text = "订单编号";
             // 
@@ -221,10 +206,10 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(24, 429);
+            this.ms_makecode_label.Location = new System.Drawing.Point(21, 326);
             this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(137, 39);
+            this.ms_makecode_label.Size = new System.Drawing.Size(115, 32);
             this.ms_makecode_label.TabIndex = 72;
             this.ms_makecode_label.Text = "制造单号";
             // 
@@ -232,10 +217,10 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1317, 177);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.PrintLabel.Location = new System.Drawing.Point(1171, 147);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(178, 26);
+            this.PrintLabel.Size = new System.Drawing.Size(159, 23);
             this.PrintLabel.TabIndex = 159;
             this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
@@ -243,10 +228,10 @@
             // 
             this.Printer_label.AutoSize = true;
             this.Printer_label.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Printer_label.Location = new System.Drawing.Point(1155, 129);
+            this.Printer_label.Location = new System.Drawing.Point(1027, 107);
             this.Printer_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Printer_label.Name = "Printer_label";
-            this.Printer_label.Size = new System.Drawing.Size(123, 30);
+            this.Printer_label.Size = new System.Drawing.Size(107, 25);
             this.Printer_label.TabIndex = 162;
             this.Printer_label.Text = "打印机列表";
             // 
@@ -254,10 +239,10 @@
             // 
             this.PrintLabel_label.AutoSize = true;
             this.PrintLabel_label.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintLabel_label.Location = new System.Drawing.Point(1155, 177);
+            this.PrintLabel_label.Location = new System.Drawing.Point(1027, 147);
             this.PrintLabel_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintLabel_label.Name = "PrintLabel_label";
-            this.PrintLabel_label.Size = new System.Drawing.Size(101, 30);
+            this.PrintLabel_label.Size = new System.Drawing.Size(88, 25);
             this.PrintLabel_label.TabIndex = 163;
             this.PrintLabel_label.Text = "打印标签";
             // 
@@ -265,10 +250,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(1155, 87);
+            this.label1.Location = new System.Drawing.Point(1027, 72);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(101, 30);
+            this.label1.Size = new System.Drawing.Size(88, 25);
             this.label1.TabIndex = 170;
             this.label1.Text = "打印张数";
             // 
@@ -276,10 +261,10 @@
             // 
             this.BaudRate.AutoSize = true;
             this.BaudRate.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BaudRate.Location = new System.Drawing.Point(1326, 48);
+            this.BaudRate.Location = new System.Drawing.Point(1179, 40);
             this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.BaudRate.Name = "BaudRate";
-            this.BaudRate.Size = new System.Drawing.Size(113, 30);
+            this.BaudRate.Size = new System.Drawing.Size(100, 25);
             this.BaudRate.TabIndex = 171;
             this.BaudRate.Text = "BaudRate";
             this.BaudRate.Visible = false;
@@ -288,10 +273,10 @@
             // 
             this.ComList.AutoSize = true;
             this.ComList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ComList.Location = new System.Drawing.Point(1326, 9);
+            this.ComList.Location = new System.Drawing.Point(1179, 7);
             this.ComList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(98, 30);
+            this.ComList.Size = new System.Drawing.Size(86, 25);
             this.ComList.TabIndex = 172;
             this.ComList.Text = "ComList";
             this.ComList.Visible = false;
@@ -304,10 +289,10 @@
             this.columnHeader3,
             this.columnHeader4});
             this.WeighRecord.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.WeighRecord.Location = new System.Drawing.Point(566, 327);
-            this.WeighRecord.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.WeighRecord.Location = new System.Drawing.Point(503, 272);
+            this.WeighRecord.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.WeighRecord.Name = "WeighRecord";
-            this.WeighRecord.Size = new System.Drawing.Size(570, 499);
+            this.WeighRecord.Size = new System.Drawing.Size(507, 416);
             this.WeighRecord.TabIndex = 173;
             this.WeighRecord.UseCompatibleStateImageBehavior = false;
             this.WeighRecord.View = System.Windows.Forms.View.Details;
@@ -332,6 +317,61 @@
             this.columnHeader4.Text = "时间";
             this.columnHeader4.Width = 130;
             // 
+            // pr_sendchecktype
+            // 
+            this.pr_sendchecktype.AutoSize = true;
+            this.pr_sendchecktype.Location = new System.Drawing.Point(675, 702);
+            this.pr_sendchecktype.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_sendchecktype.Name = "pr_sendchecktype";
+            this.pr_sendchecktype.Size = new System.Drawing.Size(0, 15);
+            this.pr_sendchecktype.TabIndex = 188;
+            this.pr_sendchecktype.Visible = false;
+            // 
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(1031, 183);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(106, 28);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 189;
+            // 
+            // RefreshWeigh
+            // 
+            this.RefreshWeigh.AllPower = null;
+            this.RefreshWeigh.BackColor = System.Drawing.Color.Transparent;
+            this.RefreshWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.DownImage")));
+            this.RefreshWeigh.Image = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.Image")));
+            this.RefreshWeigh.IsShowBorder = true;
+            this.RefreshWeigh.Location = new System.Drawing.Point(410, 276);
+            this.RefreshWeigh.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.RefreshWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.MoveImage")));
+            this.RefreshWeigh.Name = "RefreshWeigh";
+            this.RefreshWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.NormalImage")));
+            this.RefreshWeigh.Power = null;
+            this.RefreshWeigh.Size = new System.Drawing.Size(72, 30);
+            this.RefreshWeigh.TabIndex = 177;
+            this.RefreshWeigh.Text = "刷新重量";
+            this.RefreshWeigh.UseVisualStyleBackColor = true;
+            this.RefreshWeigh.Click += new System.EventHandler(this.RefreshWeigh_Click);
+            // 
+            // PrintNum
+            // 
+            this.PrintNum.AllPower = null;
+            this.PrintNum.BackColor = System.Drawing.Color.White;
+            this.PrintNum.Enabled = false;
+            this.PrintNum.ID = null;
+            this.PrintNum.Location = new System.Drawing.Point(1171, 72);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.PrintNum.Name = "PrintNum";
+            this.PrintNum.Power = null;
+            this.PrintNum.Size = new System.Drawing.Size(102, 25);
+            this.PrintNum.Str = null;
+            this.PrintNum.Str1 = null;
+            this.PrintNum.Str2 = null;
+            this.PrintNum.TabIndex = 176;
+            // 
             // groupBoxWithBorder2
             // 
             this.groupBoxWithBorder2.BorderColor = System.Drawing.Color.Black;
@@ -343,9 +383,11 @@
             this.groupBoxWithBorder2.Controls.Add(this.ob_batchqty_label);
             this.groupBoxWithBorder2.Controls.Add(this.SendCheck);
             this.groupBoxWithBorder2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder2.Location = new System.Drawing.Point(566, 117);
+            this.groupBoxWithBorder2.Location = new System.Drawing.Point(503, 97);
+            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBoxWithBorder2.Name = "groupBoxWithBorder2";
-            this.groupBoxWithBorder2.Size = new System.Drawing.Size(570, 184);
+            this.groupBoxWithBorder2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBoxWithBorder2.Size = new System.Drawing.Size(507, 153);
             this.groupBoxWithBorder2.TabIndex = 175;
             this.groupBoxWithBorder2.TabStop = false;
             this.groupBoxWithBorder2.Text = "送检信息";
@@ -355,10 +397,10 @@
             // 
             this.ob_checkno_label.AutoSize = true;
             this.ob_checkno_label.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_checkno_label.Location = new System.Drawing.Point(33, 120);
+            this.ob_checkno_label.Location = new System.Drawing.Point(29, 99);
             this.ob_checkno_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno_label.Name = "ob_checkno_label";
-            this.ob_checkno_label.Size = new System.Drawing.Size(119, 35);
+            this.ob_checkno_label.Size = new System.Drawing.Size(101, 30);
             this.ob_checkno_label.TabIndex = 180;
             this.ob_checkno_label.Text = "当前批号";
             // 
@@ -366,10 +408,10 @@
             // 
             this.ob_checkno.AutoSize = true;
             this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_checkno.Location = new System.Drawing.Point(174, 120);
+            this.ob_checkno.Location = new System.Drawing.Point(155, 99);
             this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno.Name = "ob_checkno";
-            this.ob_checkno.Size = new System.Drawing.Size(0, 35);
+            this.ob_checkno.Size = new System.Drawing.Size(0, 30);
             this.ob_checkno.TabIndex = 179;
             this.ob_checkno.TextChanged += new System.EventHandler(this.ob_checkno_TextChanged);
             // 
@@ -377,30 +419,30 @@
             // 
             this.ob_nowcheckqty.AutoSize = true;
             this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(436, 50);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(388, 41);
             this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
-            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 35);
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 30);
             this.ob_nowcheckqty.TabIndex = 178;
             // 
             // ob_batchqty
             // 
             this.ob_batchqty.AutoSize = true;
             this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_batchqty.Location = new System.Drawing.Point(174, 50);
+            this.ob_batchqty.Location = new System.Drawing.Point(155, 41);
             this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty.Name = "ob_batchqty";
-            this.ob_batchqty.Size = new System.Drawing.Size(0, 35);
+            this.ob_batchqty.Size = new System.Drawing.Size(0, 30);
             this.ob_batchqty.TabIndex = 177;
             // 
             // ob_nowcheckqty_label
             // 
             this.ob_nowcheckqty_label.AutoSize = true;
             this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(296, 50);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(263, 41);
             this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
-            this.ob_nowcheckqty_label.Size = new System.Drawing.Size(119, 35);
+            this.ob_nowcheckqty_label.Size = new System.Drawing.Size(101, 30);
             this.ob_nowcheckqty_label.TabIndex = 176;
             this.ob_nowcheckqty_label.Text = "当前批数";
             // 
@@ -408,10 +450,10 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_batchqty_label.Location = new System.Drawing.Point(33, 50);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(29, 41);
             this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
-            this.ob_batchqty_label.Size = new System.Drawing.Size(119, 35);
+            this.ob_batchqty_label.Size = new System.Drawing.Size(101, 30);
             this.ob_batchqty_label.TabIndex = 175;
             this.ob_batchqty_label.Text = "标准批数";
             // 
@@ -424,13 +466,13 @@
             this.SendCheck.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.SendCheck.Image = null;
             this.SendCheck.IsShowBorder = true;
-            this.SendCheck.Location = new System.Drawing.Point(435, 129);
-            this.SendCheck.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SendCheck.Location = new System.Drawing.Point(387, 107);
+            this.SendCheck.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
             this.SendCheck.Name = "SendCheck";
             this.SendCheck.NormalImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.NormalImage")));
             this.SendCheck.Power = null;
-            this.SendCheck.Size = new System.Drawing.Size(68, 36);
+            this.SendCheck.Size = new System.Drawing.Size(60, 30);
             this.SendCheck.TabIndex = 174;
             this.SendCheck.Tag = "ifread";
             this.SendCheck.Text = "送检";
@@ -442,21 +484,20 @@
             this.pr_colorboxgw.AutoSize = true;
             this.pr_colorboxgw.CutLength = null;
             this.pr_colorboxgw.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_colorboxgw.Location = new System.Drawing.Point(194, 356);
+            this.pr_colorboxgw.Location = new System.Drawing.Point(172, 271);
             this.pr_colorboxgw.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_colorboxgw.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pr_colorboxgw.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_colorboxgw.Name = "pr_colorboxgw";
-            this.pr_colorboxgw.Size = new System.Drawing.Size(0, 39);
+            this.pr_colorboxgw.Size = new System.Drawing.Size(0, 32);
             this.pr_colorboxgw.TabIndex = 80;
             this.pr_colorboxgw.Tag = "1";
             // 
             // AutoPrint
             // 
             this.AutoPrint.Checked = false;
-            this.AutoPrint.Location = new System.Drawing.Point(1161, 33);
-            this.AutoPrint.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.AutoPrint.Location = new System.Drawing.Point(1032, 27);
             this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(158, 33);
+            this.AutoPrint.Size = new System.Drawing.Size(140, 27);
             this.AutoPrint.TabIndex = 174;
             // 
             // pr_code
@@ -464,21 +505,21 @@
             this.pr_code.AutoSize = true;
             this.pr_code.CutLength = null;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(192, 504);
+            this.pr_code.Location = new System.Drawing.Point(171, 384);
             this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_code.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pr_code.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(0, 39);
+            this.pr_code.Size = new System.Drawing.Size(0, 32);
             this.pr_code.TabIndex = 79;
             this.pr_code.Tag = "1";
             this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
             // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(1317, 129);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.PrinterList.Location = new System.Drawing.Point(1171, 107);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(5);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(177, 30);
+            this.PrinterList.Size = new System.Drawing.Size(157, 25);
             this.PrinterList.TabIndex = 160;
             // 
             // StopWeight
@@ -488,13 +529,13 @@
             this.StopWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.DownImage")));
             this.StopWeight.Image = ((System.Drawing.Image)(resources.GetObject("StopWeight.Image")));
             this.StopWeight.IsShowBorder = true;
-            this.StopWeight.Location = new System.Drawing.Point(1022, 36);
-            this.StopWeight.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.StopWeight.Location = new System.Drawing.Point(908, 30);
+            this.StopWeight.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.StopWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.MoveImage")));
             this.StopWeight.Name = "StopWeight";
             this.StopWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.NormalImage")));
             this.StopWeight.Power = null;
-            this.StopWeight.Size = new System.Drawing.Size(81, 36);
+            this.StopWeight.Size = new System.Drawing.Size(72, 30);
             this.StopWeight.TabIndex = 158;
             this.StopWeight.Text = "停止称量";
             this.StopWeight.UseVisualStyleBackColor = true;
@@ -507,13 +548,13 @@
             this.StartWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.DownImage")));
             this.StartWeight.Image = ((System.Drawing.Image)(resources.GetObject("StartWeight.Image")));
             this.StartWeight.IsShowBorder = true;
-            this.StartWeight.Location = new System.Drawing.Point(903, 36);
-            this.StartWeight.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.StartWeight.Location = new System.Drawing.Point(803, 30);
+            this.StartWeight.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.StartWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.MoveImage")));
             this.StartWeight.Name = "StartWeight";
             this.StartWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.NormalImage")));
             this.StartWeight.Power = null;
-            this.StartWeight.Size = new System.Drawing.Size(81, 36);
+            this.StartWeight.Size = new System.Drawing.Size(72, 30);
             this.StartWeight.TabIndex = 157;
             this.StartWeight.Text = "开始称量";
             this.StartWeight.UseVisualStyleBackColor = true;
@@ -526,13 +567,13 @@
             this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
             this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
             this.Confirm.IsShowBorder = true;
-            this.Confirm.Location = new System.Drawing.Point(1317, 218);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.Confirm.Location = new System.Drawing.Point(1171, 182);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
             this.Confirm.Name = "Confirm";
             this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
             this.Confirm.Power = null;
-            this.Confirm.Size = new System.Drawing.Size(74, 36);
+            this.Confirm.Size = new System.Drawing.Size(66, 30);
             this.Confirm.TabIndex = 152;
             this.Confirm.Text = "打印";
             this.Confirm.UseVisualStyleBackColor = true;
@@ -543,11 +584,11 @@
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.CutLength = null;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(194, 429);
+            this.ms_makecode.Location = new System.Drawing.Point(172, 326);
             this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ms_makecode.MaximumSize = new System.Drawing.Size(225, 0);
+            this.ms_makecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ms_makecode.Name = "ms_makecode";
-            this.ms_makecode.Size = new System.Drawing.Size(0, 39);
+            this.ms_makecode.Size = new System.Drawing.Size(0, 32);
             this.ms_makecode.TabIndex = 77;
             this.ms_makecode.Tag = "1";
             // 
@@ -556,11 +597,11 @@
             this.ma_qty.AutoSize = true;
             this.ma_qty.CutLength = null;
             this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty.Location = new System.Drawing.Point(192, 736);
+            this.ma_qty.Location = new System.Drawing.Point(171, 559);
             this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_qty.MaximumSize = new System.Drawing.Size(225, 0);
+            this.ma_qty.MaximumSize = new System.Drawing.Size(200, 0);
             this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(0, 39);
+            this.ma_qty.Size = new System.Drawing.Size(0, 32);
             this.ma_qty.TabIndex = 76;
             // 
             // pr_detail
@@ -568,11 +609,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(192, 663);
+            this.pr_detail.Location = new System.Drawing.Point(171, 502);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 39);
+            this.pr_detail.Size = new System.Drawing.Size(0, 32);
             this.pr_detail.TabIndex = 75;
             // 
             // ma_salecode
@@ -580,11 +621,11 @@
             this.ma_salecode.AutoSize = true;
             this.ma_salecode.CutLength = null;
             this.ma_salecode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_salecode.Location = new System.Drawing.Point(192, 582);
+            this.ma_salecode.Location = new System.Drawing.Point(171, 444);
             this.ma_salecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_salecode.MaximumSize = new System.Drawing.Size(225, 0);
+            this.ma_salecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ma_salecode.Name = "ma_salecode";
-            this.ma_salecode.Size = new System.Drawing.Size(0, 39);
+            this.ma_salecode.Size = new System.Drawing.Size(0, 32);
             this.ma_salecode.TabIndex = 73;
             // 
             // Clean
@@ -594,13 +635,13 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1287, 837);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.Clean.Location = new System.Drawing.Point(1144, 697);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(90, 36);
+            this.Clean.Size = new System.Drawing.Size(80, 30);
             this.Clean.TabIndex = 60;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -613,8 +654,8 @@
             this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
             this.normalButton1.Image = ((System.Drawing.Image)(resources.GetObject("normalButton1.Image")));
             this.normalButton1.IsShowBorder = true;
-            this.normalButton1.Location = new System.Drawing.Point(32, 81);
-            this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.normalButton1.Location = new System.Drawing.Point(28, 67);
+            this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
             this.normalButton1.Name = "normalButton1";
             this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
@@ -630,11 +671,11 @@
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(165, 27);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.sncode.Location = new System.Drawing.Point(147, 22);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.sncode.Name = "sncode";
             this.sncode.Power = "";
-            this.sncode.Size = new System.Drawing.Size(702, 55);
+            this.sncode.Size = new System.Drawing.Size(624, 47);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -644,56 +685,69 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(1152, 280);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.OperateResult.Location = new System.Drawing.Point(1024, 233);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(358, 544);
+            this.OperateResult.Size = new System.Drawing.Size(319, 454);
             this.OperateResult.TabIndex = 58;
             this.OperateResult.Text = "";
             // 
-            // PrintNum
-            // 
-            this.PrintNum.AllPower = null;
-            this.PrintNum.BackColor = System.Drawing.Color.White;
-            this.PrintNum.Enabled = false;
-            this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(1317, 87);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.PrintNum.Name = "PrintNum";
-            this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(114, 28);
-            this.PrintNum.Str = null;
-            this.PrintNum.Str1 = null;
-            this.PrintNum.Str2 = null;
-            this.PrintNum.TabIndex = 176;
-            // 
-            // pr_sendchecktype
-            // 
-            this.pr_sendchecktype.AutoSize = true;
-            this.pr_sendchecktype.Location = new System.Drawing.Point(759, 843);
-            this.pr_sendchecktype.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_sendchecktype.Name = "pr_sendchecktype";
-            this.pr_sendchecktype.Size = new System.Drawing.Size(0, 18);
-            this.pr_sendchecktype.TabIndex = 188;
-            this.pr_sendchecktype.Visible = false;
-            // 
-            // sourceStepCount1
-            // 
-            this.sourceStepCount1.LineCode = null;
-            this.sourceStepCount1.Location = new System.Drawing.Point(1160, 220);
-            this.sourceStepCount1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.sourceStepCount1.Name = "sourceStepCount1";
-            this.sourceStepCount1.Size = new System.Drawing.Size(119, 34);
-            this.sourceStepCount1.Source = null;
-            this.sourceStepCount1.StepCode = null;
-            this.sourceStepCount1.TabIndex = 189;
+            // mcd_inqty
+            // 
+            this.mcd_inqty.AutoSize = true;
+            this.mcd_inqty.CutLength = null;
+            this.mcd_inqty.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_inqty.Location = new System.Drawing.Point(172, 616);
+            this.mcd_inqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_inqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.mcd_inqty.Name = "mcd_inqty";
+            this.mcd_inqty.Size = new System.Drawing.Size(0, 32);
+            this.mcd_inqty.TabIndex = 191;
+            // 
+            // mcd_inqty_label
+            // 
+            this.mcd_inqty_label.AutoSize = true;
+            this.mcd_inqty_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_inqty_label.Location = new System.Drawing.Point(22, 616);
+            this.mcd_inqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_inqty_label.Name = "mcd_inqty_label";
+            this.mcd_inqty_label.Size = new System.Drawing.Size(115, 32);
+            this.mcd_inqty_label.TabIndex = 190;
+            this.mcd_inqty_label.Text = "已采集数";
+            // 
+            // mcd_remainqty
+            // 
+            this.mcd_remainqty.AutoSize = true;
+            this.mcd_remainqty.CutLength = null;
+            this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_remainqty.Location = new System.Drawing.Point(172, 670);
+            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.mcd_remainqty.Name = "mcd_remainqty";
+            this.mcd_remainqty.Size = new System.Drawing.Size(0, 32);
+            this.mcd_remainqty.TabIndex = 193;
+            // 
+            // mcd_remainqty_label
+            // 
+            this.mcd_remainqty_label.AutoSize = true;
+            this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_remainqty_label.Location = new System.Drawing.Point(22, 670);
+            this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty_label.Name = "mcd_remainqty_label";
+            this.mcd_remainqty_label.Size = new System.Drawing.Size(115, 32);
+            this.mcd_remainqty_label.TabIndex = 192;
+            this.mcd_remainqty_label.Text = "待采集数";
             // 
             // Make_ColorBoxWeigh
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1520, 876);
-            this.Controls.Add(this.sourceStepCount1);
+            this.ClientSize = new System.Drawing.Size(1351, 730);
+            this.Controls.Add(this.mcd_remainqty);
+            this.Controls.Add(this.mcd_remainqty_label);
+            this.Controls.Add(this.mcd_inqty);
+            this.Controls.Add(this.mcd_inqty_label);
+            this.Controls.Add(this.StepCount);
             this.Controls.Add(this.pr_sendchecktype);
             this.Controls.Add(this.RefreshWeigh);
             this.Controls.Add(this.PrintNum);
@@ -729,7 +783,7 @@
             this.Controls.Add(this.ma_salecode_label);
             this.Controls.Add(this.OperateResult);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.Name = "Make_ColorBoxWeigh";
             this.Tag = "Make!ColorBoxWeigh";
             this.Text = "彩盒称重";
@@ -794,6 +848,10 @@
         private System.Windows.Forms.Label ob_checkno_label;
         private CustomControl.ButtonUtil.NormalButton RefreshWeigh;
         private System.Windows.Forms.Label pr_sendchecktype;
-        private CustomControl.TextBoxWithIcon.SourceStepCount sourceStepCount1;
+        private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
+        private CustomControl.ValueLabel.ValueLabel mcd_inqty;
+        private System.Windows.Forms.Label mcd_inqty_label;
+        private CustomControl.ValueLabel.ValueLabel mcd_remainqty;
+        private System.Windows.Forms.Label mcd_remainqty_label;
     }
 }

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -62,6 +62,11 @@ namespace UAS_MES.Make
             stw.ShowDialog();
             StartWeight.PerformClick();
             dh = new DataHelper();
+            StepCount.StepCode = User.CurrentStepCode;
+            StepCount.Source = User.UserSourceCode;
+            StepCount.LineCode = User.UserLineCode;
+            StepCount.Dh = dh;
+            StepCount.Start();
         }
 
         private void InPrint()
@@ -160,6 +165,7 @@ namespace UAS_MES.Make
                             else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                             //称量是否通过都记录重量
                             dh.ExecuteSql("update makeserial set ms_grossw='" + ActualWeight + "' where ms_id='" + oMsID + "'", "update");
+                            LoadCollectedNum();
                             sncode.Clear();
                         }
                         else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, sncode);
@@ -426,5 +432,11 @@ namespace UAS_MES.Make
                     pr_colorboxgw.Text = MinWeight + "-" + MaxWeight + dt.Rows[0]["pr_colorboxunit"].ToString();
             }
         }
+
+        private void LoadCollectedNum()
+        {
+            dt = (DataTable)dh.ExecuteSql("select mcd_inqty,ma_qty-mcd_inqty mcd_remainqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ms_makecode.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
+            BaseUtil.SetFormValue(Controls, dt);
+        }
     }
 }

UAS-MES/FunctionCode/Make/Make_FeedingCollection.Designer.cs

@@ -45,6 +45,13 @@
             this.ma_softversion_label = new System.Windows.Forms.CheckBox();
             this.ma_ecncode_label = new System.Windows.Forms.CheckBox();
             this.ClearSn_code = new System.Windows.Forms.PictureBox();
+            this.ms_craftcode = new System.Windows.Forms.Label();
+            this.ma_bomversion = new System.Windows.Forms.Label();
+            this.ma_bomversion_label = new System.Windows.Forms.Label();
+            this.ma_craftcode = new System.Windows.Forms.Label();
+            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
+            this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
+            this.LockMakeCode = new UAS_MES.CustomControl.CustomCheckBox.LockCheckBox();
             this.ma_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.mcd_remainqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
@@ -57,13 +64,6 @@
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.code = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.LockMakeCode = new UAS_MES.CustomControl.CustomCheckBox.LockCheckBox();
-            this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
-            this.ms_craftcode = new System.Windows.Forms.Label();
-            this.ma_bomversion = new System.Windows.Forms.Label();
-            this.ma_bomversion_label = new System.Windows.Forms.Label();
-            this.ma_craftcode = new System.Windows.Forms.Label();
-            this.sourceStepCount1 = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).BeginInit();
             this.SuspendLayout();
@@ -260,6 +260,94 @@
             this.ClearSn_code.TabStop = false;
             this.ClearSn_code.Click += new System.EventHandler(this.ClearSn_code_Click);
             // 
+            // ms_craftcode
+            // 
+            this.ms_craftcode.AutoSize = true;
+            this.ms_craftcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ms_craftcode.Location = new System.Drawing.Point(1152, 67);
+            this.ms_craftcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_craftcode.Name = "ms_craftcode";
+            this.ms_craftcode.Size = new System.Drawing.Size(0, 31);
+            this.ms_craftcode.TabIndex = 142;
+            this.ms_craftcode.Visible = false;
+            // 
+            // ma_bomversion
+            // 
+            this.ma_bomversion.AutoSize = true;
+            this.ma_bomversion.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_bomversion.Location = new System.Drawing.Point(1152, 208);
+            this.ma_bomversion.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_bomversion.Name = "ma_bomversion";
+            this.ma_bomversion.Size = new System.Drawing.Size(0, 31);
+            this.ma_bomversion.TabIndex = 143;
+            // 
+            // ma_bomversion_label
+            // 
+            this.ma_bomversion_label.AutoSize = true;
+            this.ma_bomversion_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_bomversion_label.Location = new System.Drawing.Point(1023, 208);
+            this.ma_bomversion_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_bomversion_label.Name = "ma_bomversion_label";
+            this.ma_bomversion_label.Size = new System.Drawing.Size(114, 31);
+            this.ma_bomversion_label.TabIndex = 144;
+            this.ma_bomversion_label.Text = "Bom版本";
+            // 
+            // ma_craftcode
+            // 
+            this.ma_craftcode.AutoSize = true;
+            this.ma_craftcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_craftcode.Location = new System.Drawing.Point(1132, 137);
+            this.ma_craftcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_craftcode.Name = "ma_craftcode";
+            this.ma_craftcode.Size = new System.Drawing.Size(0, 31);
+            this.ma_craftcode.TabIndex = 145;
+            this.ma_craftcode.Visible = false;
+            // 
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(1029, 407);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(119, 34);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 189;
+            // 
+            // ma_code
+            // 
+            this.ma_code.AllPower = null;
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = null;
+            this.ma_code.FormName = null;
+            this.ma_code.Location = new System.Drawing.Point(144, 65);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Power = null;
+            this.ma_code.ReturnData = null;
+            this.ma_code.SelectField = null;
+            this.ma_code.SetValueField = null;
+            this.ma_code.Size = new System.Drawing.Size(222, 31);
+            this.ma_code.TabIndex = 141;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
+            this.ma_code.UserControlTextChanged += new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox.OnTextChange(this.ma_code_UserControlTextChanged);
+            // 
+            // LockMakeCode
+            // 
+            this.LockMakeCode.AutoSize = true;
+            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.LockMakeCode.LeaveEvent = false;
+            this.LockMakeCode.Location = new System.Drawing.Point(372, 67);
+            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.LockMakeCode.Name = "LockMakeCode";
+            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
+            this.LockMakeCode.TabIndex = 140;
+            this.LockMakeCode.Text = "锁定";
+            this.LockMakeCode.UseVisualStyleBackColor = true;
+            // 
             // ma_prodcode
             // 
             this.ma_prodcode.AutoSize = true;
@@ -439,100 +527,12 @@
             this.sn_code.Str2 = null;
             this.sn_code.TabIndex = 65;
             // 
-            // LockMakeCode
-            // 
-            this.LockMakeCode.AutoSize = true;
-            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LockMakeCode.LeaveEvent = false;
-            this.LockMakeCode.Location = new System.Drawing.Point(372, 67);
-            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.LockMakeCode.Name = "LockMakeCode";
-            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
-            this.LockMakeCode.TabIndex = 140;
-            this.LockMakeCode.Text = "锁定";
-            this.LockMakeCode.UseVisualStyleBackColor = true;
-            // 
-            // ma_code
-            // 
-            this.ma_code.AllPower = null;
-            this.ma_code.Caller = null;
-            this.ma_code.Condition = null;
-            this.ma_code.DBTitle = null;
-            this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(144, 65);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.ma_code.Name = "ma_code";
-            this.ma_code.Power = null;
-            this.ma_code.ReturnData = null;
-            this.ma_code.SelectField = null;
-            this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(222, 31);
-            this.ma_code.TabIndex = 141;
-            this.ma_code.TableName = null;
-            this.ma_code.Tag = "ma_code";
-            this.ma_code.TextBoxEnable = true;
-            this.ma_code.UserControlTextChanged += new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox.OnTextChange(this.ma_code_UserControlTextChanged);
-            // 
-            // ms_craftcode
-            // 
-            this.ms_craftcode.AutoSize = true;
-            this.ms_craftcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_craftcode.Location = new System.Drawing.Point(1152, 67);
-            this.ms_craftcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ms_craftcode.Name = "ms_craftcode";
-            this.ms_craftcode.Size = new System.Drawing.Size(0, 31);
-            this.ms_craftcode.TabIndex = 142;
-            this.ms_craftcode.Visible = false;
-            // 
-            // ma_bomversion
-            // 
-            this.ma_bomversion.AutoSize = true;
-            this.ma_bomversion.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_bomversion.Location = new System.Drawing.Point(1152, 208);
-            this.ma_bomversion.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_bomversion.Name = "ma_bomversion";
-            this.ma_bomversion.Size = new System.Drawing.Size(0, 31);
-            this.ma_bomversion.TabIndex = 143;
-            // 
-            // ma_bomversion_label
-            // 
-            this.ma_bomversion_label.AutoSize = true;
-            this.ma_bomversion_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_bomversion_label.Location = new System.Drawing.Point(1023, 208);
-            this.ma_bomversion_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_bomversion_label.Name = "ma_bomversion_label";
-            this.ma_bomversion_label.Size = new System.Drawing.Size(114, 31);
-            this.ma_bomversion_label.TabIndex = 144;
-            this.ma_bomversion_label.Text = "Bom版本";
-            // 
-            // ma_craftcode
-            // 
-            this.ma_craftcode.AutoSize = true;
-            this.ma_craftcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_craftcode.Location = new System.Drawing.Point(1132, 137);
-            this.ma_craftcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_craftcode.Name = "ma_craftcode";
-            this.ma_craftcode.Size = new System.Drawing.Size(0, 31);
-            this.ma_craftcode.TabIndex = 145;
-            this.ma_craftcode.Visible = false;
-            // 
-            // sourceStepCount1
-            // 
-            this.sourceStepCount1.LineCode = null;
-            this.sourceStepCount1.Location = new System.Drawing.Point(1029, 407);
-            this.sourceStepCount1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.sourceStepCount1.Name = "sourceStepCount1";
-            this.sourceStepCount1.Size = new System.Drawing.Size(119, 34);
-            this.sourceStepCount1.Source = null;
-            this.sourceStepCount1.StepCode = null;
-            this.sourceStepCount1.TabIndex = 189;
-            // 
             // Make_FeedingCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1347, 816);
-            this.Controls.Add(this.sourceStepCount1);
+            this.Controls.Add(this.StepCount);
             this.Controls.Add(this.ma_craftcode);
             this.Controls.Add(this.ma_bomversion_label);
             this.Controls.Add(this.ma_bomversion);
@@ -617,6 +617,6 @@
         private System.Windows.Forms.Label ma_bomversion;
         private System.Windows.Forms.Label ma_bomversion_label;
         private System.Windows.Forms.Label ma_craftcode;
-        private CustomControl.TextBoxWithIcon.SourceStepCount sourceStepCount1;
+        private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
     }
 }

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -76,6 +76,11 @@ namespace UAS_MES.Make
             ma_code.DbChange += Ma_code_DBChange;
             code.Focus();
             dh = new DataHelper();
+            StepCount.StepCode = User.CurrentStepCode;
+            StepCount.Source = User.UserSourceCode;
+            StepCount.LineCode = User.UserLineCode;
+            StepCount.Dh = dh;
+            StepCount.Start();
         }
 
         private void Ma_code_DBChange(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_PackageCollection.Designer.cs

@@ -58,6 +58,7 @@
             this.PrintList_label = new System.Windows.Forms.Label();
             this.PrintNum_label = new System.Windows.Forms.Label();
             this.groupBoxWithBorder1 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.pa_salecode_label = new System.Windows.Forms.Label();
             this.ma_code_label = new System.Windows.Forms.Label();
             this.ms_salecode = new System.Windows.Forms.Label();
@@ -87,7 +88,10 @@
             this.pa_indate = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_sendchecktype = new System.Windows.Forms.Label();
-            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
+            this.mcd_remainqty_label = new System.Windows.Forms.Label();
+            this.mcd_remainqty = new System.Windows.Forms.Label();
+            this.mcd_inqty_label = new System.Windows.Forms.Label();
+            this.mcd_inqty = new System.Windows.Forms.Label();
             this.groupBoxWithBorder2.SuspendLayout();
             this.groupBoxWithBorder1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).BeginInit();
@@ -109,7 +113,7 @@
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label13.ForeColor = System.Drawing.Color.Black;
-            this.label13.Location = new System.Drawing.Point(11, 693);
+            this.label13.Location = new System.Drawing.Point(9, 693);
             this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(72, 27);
@@ -120,7 +124,7 @@
             // 
             this.Cancel.AutoSize = true;
             this.Cancel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Cancel.Location = new System.Drawing.Point(413, 693);
+            this.Cancel.Location = new System.Drawing.Point(372, 692);
             this.Cancel.Margin = new System.Windows.Forms.Padding(4);
             this.Cancel.Name = "Cancel";
             this.Cancel.Size = new System.Drawing.Size(114, 31);
@@ -257,7 +261,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(361, 16);
+            this.label1.Location = new System.Drawing.Point(361, 15);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(92, 27);
@@ -269,7 +273,7 @@
             this.checkweightlabel.AutoSize = true;
             this.checkweightlabel.CutLength = null;
             this.checkweightlabel.ForeColor = System.Drawing.Color.Red;
-            this.checkweightlabel.Location = new System.Drawing.Point(157, 13);
+            this.checkweightlabel.Location = new System.Drawing.Point(157, 12);
             this.checkweightlabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.checkweightlabel.MaximumSize = new System.Drawing.Size(267, 0);
             this.checkweightlabel.Name = "checkweightlabel";
@@ -280,7 +284,7 @@
             // 
             this.ob_nowcheckqty.AutoSize = true;
             this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(469, 109);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(469, 108);
             this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 27);
@@ -290,7 +294,7 @@
             // 
             this.ob_batchqty.AutoSize = true;
             this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty.Location = new System.Drawing.Point(469, 64);
+            this.ob_batchqty.Location = new System.Drawing.Point(469, 63);
             this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty.Name = "ob_batchqty";
             this.ob_batchqty.Size = new System.Drawing.Size(0, 27);
@@ -300,7 +304,7 @@
             // 
             this.ob_nowcheckqty_label.AutoSize = true;
             this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(361, 109);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(361, 108);
             this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
             this.ob_nowcheckqty_label.Size = new System.Drawing.Size(92, 27);
@@ -311,7 +315,7 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(361, 65);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(361, 64);
             this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
             this.ob_batchqty_label.Size = new System.Drawing.Size(92, 27);
@@ -322,7 +326,7 @@
             // 
             this.ob_checkno.AutoSize = true;
             this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno.Location = new System.Drawing.Point(469, 16);
+            this.ob_checkno.Location = new System.Drawing.Point(469, 15);
             this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Size = new System.Drawing.Size(0, 27);
@@ -387,7 +391,7 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(12, 108);
+            this.label3.Location = new System.Drawing.Point(12, 107);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(92, 27);
@@ -437,7 +441,7 @@
             // 
             this.PrintList_label.AutoSize = true;
             this.PrintList_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintList_label.Location = new System.Drawing.Point(12, 64);
+            this.PrintList_label.Location = new System.Drawing.Point(12, 63);
             this.PrintList_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintList_label.Name = "PrintList_label";
             this.PrintList_label.Size = new System.Drawing.Size(112, 27);
@@ -448,7 +452,7 @@
             // 
             this.PrintNum_label.AutoSize = true;
             this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintNum_label.Location = new System.Drawing.Point(280, 156);
+            this.PrintNum_label.Location = new System.Drawing.Point(280, 155);
             this.PrintNum_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintNum_label.Name = "PrintNum_label";
             this.PrintNum_label.Size = new System.Drawing.Size(52, 27);
@@ -488,11 +492,22 @@
             this.groupBoxWithBorder1.Text = "装箱信息";
             this.groupBoxWithBorder1.TextColor = System.Drawing.Color.Black;
             // 
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(336, 15);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(6, 9, 6, 9);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(86, 28);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 193;
+            // 
             // pa_salecode_label
             // 
             this.pa_salecode_label.AutoSize = true;
             this.pa_salecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_salecode_label.Location = new System.Drawing.Point(284, 170);
+            this.pa_salecode_label.Location = new System.Drawing.Point(284, 169);
             this.pa_salecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_salecode_label.Name = "pa_salecode_label";
             this.pa_salecode_label.Size = new System.Drawing.Size(92, 27);
@@ -503,7 +518,7 @@
             // 
             this.ma_code_label.AutoSize = true;
             this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code_label.Location = new System.Drawing.Point(12, 170);
+            this.ma_code_label.Location = new System.Drawing.Point(12, 169);
             this.ma_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_code_label.Name = "ma_code_label";
             this.ma_code_label.Size = new System.Drawing.Size(72, 27);
@@ -514,7 +529,7 @@
             // 
             this.ms_salecode.AutoSize = true;
             this.ms_salecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_salecode.Location = new System.Drawing.Point(393, 170);
+            this.ms_salecode.Location = new System.Drawing.Point(393, 169);
             this.ms_salecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_salecode.Name = "ms_salecode";
             this.ms_salecode.Size = new System.Drawing.Size(0, 27);
@@ -524,7 +539,7 @@
             // 
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(128, 170);
+            this.ms_makecode.Location = new System.Drawing.Point(128, 169);
             this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ms_makecode.Name = "ms_makecode";
@@ -535,7 +550,7 @@
             // 
             this.OutBoxLength_label.AutoSize = true;
             this.OutBoxLength_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OutBoxLength_label.Location = new System.Drawing.Point(129, 17);
+            this.OutBoxLength_label.Location = new System.Drawing.Point(129, 16);
             this.OutBoxLength_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.OutBoxLength_label.Name = "OutBoxLength_label";
             this.OutBoxLength_label.Size = new System.Drawing.Size(46, 24);
@@ -599,7 +614,7 @@
             // AutoGenBoxCode
             // 
             this.AutoGenBoxCode.AutoSize = true;
-            this.AutoGenBoxCode.Location = new System.Drawing.Point(336, 48);
+            this.AutoGenBoxCode.Location = new System.Drawing.Point(336, 47);
             this.AutoGenBoxCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.AutoGenBoxCode.Name = "AutoGenBoxCode";
             this.AutoGenBoxCode.Size = new System.Drawing.Size(114, 31);
@@ -611,7 +626,7 @@
             // 
             this.pa_currentqty_label.AutoSize = true;
             this.pa_currentqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty_label.Location = new System.Drawing.Point(284, 89);
+            this.pa_currentqty_label.Location = new System.Drawing.Point(284, 88);
             this.pa_currentqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_currentqty_label.Name = "pa_currentqty_label";
             this.pa_currentqty_label.Size = new System.Drawing.Size(92, 27);
@@ -622,7 +637,7 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(284, 130);
+            this.pr_detail_label.Location = new System.Drawing.Point(284, 129);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
@@ -650,7 +665,7 @@
             // 
             this.pa_currentqty.AutoSize = true;
             this.pa_currentqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty.Location = new System.Drawing.Point(393, 89);
+            this.pa_currentqty.Location = new System.Drawing.Point(393, 88);
             this.pa_currentqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_currentqty.Name = "pa_currentqty";
             this.pa_currentqty.Size = new System.Drawing.Size(0, 27);
@@ -660,7 +675,7 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(12, 130);
+            this.pr_code_label.Location = new System.Drawing.Point(12, 129);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
             this.pr_code_label.Size = new System.Drawing.Size(92, 27);
@@ -671,7 +686,7 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(393, 130);
+            this.pr_detail.Location = new System.Drawing.Point(393, 129);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 27);
@@ -681,7 +696,7 @@
             // 
             this.pr_outboxinnerqty_label.AutoSize = true;
             this.pr_outboxinnerqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(12, 89);
+            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(12, 88);
             this.pr_outboxinnerqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_outboxinnerqty_label.Name = "pr_outboxinnerqty_label";
             this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(92, 27);
@@ -692,7 +707,7 @@
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(128, 130);
+            this.pr_code.Location = new System.Drawing.Point(128, 129);
             this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_code.Name = "pr_code";
@@ -704,7 +719,7 @@
             // 
             this.pa_code_label.AutoSize = true;
             this.pa_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_code_label.Location = new System.Drawing.Point(12, 48);
+            this.pa_code_label.Location = new System.Drawing.Point(12, 47);
             this.pa_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_code_label.Name = "pa_code_label";
             this.pa_code_label.Size = new System.Drawing.Size(52, 27);
@@ -728,7 +743,7 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = null;
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(619, 653);
+            this.Clean.Location = new System.Drawing.Point(520, 690);
             this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
@@ -745,11 +760,11 @@
             this.sn_code.AllPower = "ifall";
             this.sn_code.BackColor = System.Drawing.Color.White;
             this.sn_code.ID = null;
-            this.sn_code.Location = new System.Drawing.Point(101, 693);
+            this.sn_code.Location = new System.Drawing.Point(99, 693);
             this.sn_code.Margin = new System.Windows.Forms.Padding(4);
             this.sn_code.Name = "sn_code";
             this.sn_code.Power = "ifread";
-            this.sn_code.Size = new System.Drawing.Size(260, 25);
+            this.sn_code.Size = new System.Drawing.Size(229, 25);
             this.sn_code.Str = null;
             this.sn_code.Str1 = null;
             this.sn_code.Str2 = null;
@@ -843,24 +858,59 @@
             this.pr_sendchecktype.TabIndex = 182;
             this.pr_sendchecktype.Visible = false;
             // 
-            // StepCount
-            // 
-            this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(336, 15);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(6, 9, 6, 9);
-            this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(86, 28);
-            this.StepCount.Source = null;
-            this.StepCount.StepCode = null;
-            this.StepCount.TabIndex = 193;
+            // mcd_remainqty_label
+            // 
+            this.mcd_remainqty_label.AutoSize = true;
+            this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_remainqty_label.Location = new System.Drawing.Point(630, 588);
+            this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty_label.Name = "mcd_remainqty_label";
+            this.mcd_remainqty_label.Size = new System.Drawing.Size(92, 27);
+            this.mcd_remainqty_label.TabIndex = 196;
+            this.mcd_remainqty_label.Text = "待采集数";
+            // 
+            // mcd_remainqty
+            // 
+            this.mcd_remainqty.AutoSize = true;
+            this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_remainqty.Location = new System.Drawing.Point(739, 588);
+            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty.Name = "mcd_remainqty";
+            this.mcd_remainqty.Size = new System.Drawing.Size(0, 27);
+            this.mcd_remainqty.TabIndex = 197;
+            // 
+            // mcd_inqty_label
+            // 
+            this.mcd_inqty_label.AutoSize = true;
+            this.mcd_inqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_inqty_label.Location = new System.Drawing.Point(630, 548);
+            this.mcd_inqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_inqty_label.Name = "mcd_inqty_label";
+            this.mcd_inqty_label.Size = new System.Drawing.Size(92, 27);
+            this.mcd_inqty_label.TabIndex = 194;
+            this.mcd_inqty_label.Text = "已采集数";
+            // 
+            // mcd_inqty
+            // 
+            this.mcd_inqty.AutoSize = true;
+            this.mcd_inqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_inqty.Location = new System.Drawing.Point(739, 548);
+            this.mcd_inqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_inqty.Name = "mcd_inqty";
+            this.mcd_inqty.Size = new System.Drawing.Size(0, 27);
+            this.mcd_inqty.TabIndex = 195;
             // 
             // Make_PackageCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1172, 730);
+            this.Controls.Add(this.mcd_remainqty_label);
+            this.Controls.Add(this.mcd_remainqty);
             this.Controls.Add(this.pr_sendchecktype);
+            this.Controls.Add(this.mcd_inqty_label);
             this.Controls.Add(this.pa_standardqty);
+            this.Controls.Add(this.mcd_inqty);
             this.Controls.Add(this.pa_downstatus);
             this.Controls.Add(this.pa_checkno);
             this.Controls.Add(this.pa_sccode);
@@ -956,5 +1006,9 @@
         private System.Windows.Forms.Label ms_salecode;
         private System.Windows.Forms.Label ms_makecode;
         private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
+        private System.Windows.Forms.Label mcd_remainqty_label;
+        private System.Windows.Forms.Label mcd_remainqty;
+        private System.Windows.Forms.Label mcd_inqty_label;
+        private System.Windows.Forms.Label mcd_inqty;
     }
 }

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -89,17 +89,16 @@ namespace UAS_MES.Make
         private void LoadData()
         {
             //加载表单数据
-            string Err = "";
             sql.Clear();
             sql.Append("select pr_code,nvl(pr_sendchecktype,'LineCode')pr_sendchecktype,pa_outboxcode,pa_prodcode,pa_salecode,pa_makecode,pa_sccode,nvl(pa_downstatus,0) pa_downstatus,pa_checkno,pa_status,pr_packrule,nvl(PR_CHECKCARTONW,'0') PR_CHECKCARTONW,pr_detail,pa_packageqty,nvl(pa_standardqty,0) pa_standardqty,nvl(pr_outboxinnerqty,0)pr_outboxinnerqty,pa_currentqty from package left join product on pa_prodcode=");
             sql.Append("pr_code where pa_outboxcode='" + pa_outboxcode.Text + "'");
-            Err = "箱号";
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             if (dt.Rows.Count > 0)
             {
                 //记录该数据保证在修改不被允许的前提下能偶回复之前的值
                 StandardQTY = decimal.Parse(dt.Rows[0]["pr_outboxinnerqty"].ToString());
                 ms_salecode.Text = dt.Rows[0]["pa_salecode"].ToString();
+                ms_makecode.Text = dt.Rows[0]["pa_makecode"].ToString();
                 BaseUtil.SetFormValue(this.Controls, dt);
                 if (pa_standardqty.Text != "0")
                 {
@@ -110,6 +109,7 @@ namespace UAS_MES.Make
             {
                 pa_makecode.Text = "";
             }
+            LoadCollectedNum();
             LoadCheckQTY();
         }
 
@@ -376,6 +376,7 @@ namespace UAS_MES.Make
                                         {
                                             OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                                         }
+                                        LoadCollectedNum();
                                         LoadCheckQTY();
                                     }
                                     sn_code.Clear();
@@ -750,5 +751,11 @@ namespace UAS_MES.Make
             }
             return true;
         }
+
+        private void LoadCollectedNum()
+        {
+            dt = (DataTable)dh.ExecuteSql("select mcd_inqty,ma_qty-mcd_inqty mcd_remainqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ms_makecode.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
+            BaseUtil.SetFormValue(Controls, dt);
+        }
     }
 }

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.Designer.cs

@@ -104,6 +104,10 @@
             this.BuildServer = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.CloseServer = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.pr_sendchecktype = new System.Windows.Forms.Label();
+            this.mcd_remainqty_label = new System.Windows.Forms.Label();
+            this.mcd_remainqty = new System.Windows.Forms.Label();
+            this.mcd_inqty_label = new System.Windows.Forms.Label();
+            this.mcd_inqty = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
             this.groupBoxWithBorder2.SuspendLayout();
@@ -137,7 +141,7 @@
             // 
             this.pa_code_label.AutoSize = true;
             this.pa_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_code_label.Location = new System.Drawing.Point(17, 51);
+            this.pa_code_label.Location = new System.Drawing.Point(17, 53);
             this.pa_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_code_label.Name = "pa_code_label";
             this.pa_code_label.Size = new System.Drawing.Size(52, 27);
@@ -148,7 +152,7 @@
             // 
             this.PrintList_label.AutoSize = true;
             this.PrintList_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintList_label.Location = new System.Drawing.Point(9, 56);
+            this.PrintList_label.Location = new System.Drawing.Point(9, 55);
             this.PrintList_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintList_label.Name = "PrintList_label";
             this.PrintList_label.Size = new System.Drawing.Size(112, 27);
@@ -159,7 +163,7 @@
             // 
             this.PrintNum_label.AutoSize = true;
             this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintNum_label.Location = new System.Drawing.Point(262, 153);
+            this.PrintNum_label.Location = new System.Drawing.Point(262, 152);
             this.PrintNum_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintNum_label.Name = "PrintNum_label";
             this.PrintNum_label.Size = new System.Drawing.Size(52, 27);
@@ -170,7 +174,7 @@
             // 
             this.Cancel.AutoSize = true;
             this.Cancel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Cancel.Location = new System.Drawing.Point(413, 692);
+            this.Cancel.Location = new System.Drawing.Point(375, 692);
             this.Cancel.Margin = new System.Windows.Forms.Padding(4);
             this.Cancel.Name = "Cancel";
             this.Cancel.Size = new System.Drawing.Size(114, 31);
@@ -194,7 +198,7 @@
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(147, 108);
+            this.PrintLabel.Location = new System.Drawing.Point(147, 103);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
             this.PrintLabel.Size = new System.Drawing.Size(199, 28);
@@ -205,7 +209,7 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(9, 103);
+            this.label3.Location = new System.Drawing.Point(9, 102);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(92, 27);
@@ -232,7 +236,7 @@
             // PrintList
             // 
             this.PrintList.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.PrintList.Location = new System.Drawing.Point(147, 61);
+            this.PrintList.Location = new System.Drawing.Point(147, 56);
             this.PrintList.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
             this.PrintList.Name = "PrintList";
             this.PrintList.Size = new System.Drawing.Size(199, 28);
@@ -276,7 +280,7 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = null;
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(619, 652);
+            this.Clean.Location = new System.Drawing.Point(520, 691);
             this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
@@ -297,7 +301,7 @@
             this.sn_code.Margin = new System.Windows.Forms.Padding(4);
             this.sn_code.Name = "sn_code";
             this.sn_code.Power = "ifread";
-            this.sn_code.Size = new System.Drawing.Size(260, 25);
+            this.sn_code.Size = new System.Drawing.Size(226, 25);
             this.sn_code.Str = null;
             this.sn_code.Str1 = null;
             this.sn_code.Str2 = null;
@@ -437,7 +441,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(292, 170);
+            this.label5.Location = new System.Drawing.Point(292, 169);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(92, 27);
@@ -448,7 +452,7 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(17, 170);
+            this.ms_makecode_label.Location = new System.Drawing.Point(17, 169);
             this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
             this.ms_makecode_label.Size = new System.Drawing.Size(72, 27);
@@ -459,7 +463,7 @@
             // 
             this.ms_salecode.AutoSize = true;
             this.ms_salecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_salecode.Location = new System.Drawing.Point(404, 170);
+            this.ms_salecode.Location = new System.Drawing.Point(404, 169);
             this.ms_salecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_salecode.Name = "ms_salecode";
             this.ms_salecode.Size = new System.Drawing.Size(0, 27);
@@ -469,7 +473,7 @@
             // 
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(126, 170);
+            this.ms_makecode.Location = new System.Drawing.Point(126, 169);
             this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ms_makecode.Name = "ms_makecode";
@@ -480,7 +484,7 @@
             // 
             this.OutBoxLength_label.AutoSize = true;
             this.OutBoxLength_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OutBoxLength_label.Location = new System.Drawing.Point(137, 16);
+            this.OutBoxLength_label.Location = new System.Drawing.Point(137, 15);
             this.OutBoxLength_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.OutBoxLength_label.Name = "OutBoxLength_label";
             this.OutBoxLength_label.Size = new System.Drawing.Size(46, 24);
@@ -493,7 +497,7 @@
             this.OutBoxLength.BackColor = System.Drawing.Color.White;
             this.OutBoxLength.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.OutBoxLength.ID = null;
-            this.OutBoxLength.Location = new System.Drawing.Point(213, 19);
+            this.OutBoxLength.Location = new System.Drawing.Point(213, 17);
             this.OutBoxLength.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
             this.OutBoxLength.Name = "OutBoxLength";
             this.OutBoxLength.Power = null;
@@ -529,7 +533,7 @@
             this.DeleteAll.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.DeleteAll.Image = null;
             this.DeleteAll.IsShowBorder = true;
-            this.DeleteAll.Location = new System.Drawing.Point(469, 58);
+            this.DeleteAll.Location = new System.Drawing.Point(469, 56);
             this.DeleteAll.Margin = new System.Windows.Forms.Padding(4);
             this.DeleteAll.MoveImage = ((System.Drawing.Image)(resources.GetObject("DeleteAll.MoveImage")));
             this.DeleteAll.Name = "DeleteAll";
@@ -545,7 +549,7 @@
             // 
             this.pa_currentqty_label.AutoSize = true;
             this.pa_currentqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty_label.Location = new System.Drawing.Point(292, 93);
+            this.pa_currentqty_label.Location = new System.Drawing.Point(292, 95);
             this.pa_currentqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_currentqty_label.Name = "pa_currentqty_label";
             this.pa_currentqty_label.Size = new System.Drawing.Size(92, 27);
@@ -556,7 +560,7 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(292, 132);
+            this.pr_detail_label.Location = new System.Drawing.Point(292, 131);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
@@ -567,7 +571,7 @@
             // 
             this.pa_currentqty.AutoSize = true;
             this.pa_currentqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty.Location = new System.Drawing.Point(404, 93);
+            this.pa_currentqty.Location = new System.Drawing.Point(404, 92);
             this.pa_currentqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_currentqty.Name = "pa_currentqty";
             this.pa_currentqty.Size = new System.Drawing.Size(0, 27);
@@ -577,7 +581,7 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(17, 132);
+            this.pr_code_label.Location = new System.Drawing.Point(17, 131);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
             this.pr_code_label.Size = new System.Drawing.Size(92, 27);
@@ -588,7 +592,7 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(404, 132);
+            this.pr_detail.Location = new System.Drawing.Point(404, 131);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 27);
@@ -598,7 +602,7 @@
             // 
             this.pr_outboxinnerqty_label.AutoSize = true;
             this.pr_outboxinnerqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(17, 91);
+            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(17, 94);
             this.pr_outboxinnerqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_outboxinnerqty_label.Name = "pr_outboxinnerqty_label";
             this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(92, 27);
@@ -609,7 +613,7 @@
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(126, 132);
+            this.pr_code.Location = new System.Drawing.Point(126, 131);
             this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_code.Name = "pr_code";
@@ -620,7 +624,7 @@
             // AutoGenBoxCode
             // 
             this.AutoGenBoxCode.AutoSize = true;
-            this.AutoGenBoxCode.Location = new System.Drawing.Point(330, 51);
+            this.AutoGenBoxCode.Location = new System.Drawing.Point(330, 53);
             this.AutoGenBoxCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.AutoGenBoxCode.Name = "AutoGenBoxCode";
             this.AutoGenBoxCode.Size = new System.Drawing.Size(114, 31);
@@ -680,7 +684,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(371, 14);
+            this.label1.Location = new System.Drawing.Point(371, 13);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(92, 27);
@@ -692,7 +696,7 @@
             this.checkweightlabel.AutoSize = true;
             this.checkweightlabel.CutLength = null;
             this.checkweightlabel.ForeColor = System.Drawing.Color.Black;
-            this.checkweightlabel.Location = new System.Drawing.Point(147, 17);
+            this.checkweightlabel.Location = new System.Drawing.Point(147, 16);
             this.checkweightlabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.checkweightlabel.MaximumSize = new System.Drawing.Size(267, 0);
             this.checkweightlabel.Name = "checkweightlabel";
@@ -703,7 +707,7 @@
             // 
             this.ob_nowcheckqty.AutoSize = true;
             this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(479, 103);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(479, 102);
             this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 27);
@@ -713,7 +717,7 @@
             // 
             this.ob_batchqty.AutoSize = true;
             this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty.Location = new System.Drawing.Point(479, 56);
+            this.ob_batchqty.Location = new System.Drawing.Point(479, 55);
             this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty.Name = "ob_batchqty";
             this.ob_batchqty.Size = new System.Drawing.Size(0, 27);
@@ -723,7 +727,7 @@
             // 
             this.ob_nowcheckqty_label.AutoSize = true;
             this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(371, 103);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(371, 102);
             this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
             this.ob_nowcheckqty_label.Size = new System.Drawing.Size(92, 27);
@@ -734,7 +738,7 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(371, 56);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(371, 55);
             this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
             this.ob_batchqty_label.Size = new System.Drawing.Size(92, 27);
@@ -786,7 +790,7 @@
             // 
             this.ob_checkno.AutoSize = true;
             this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno.Location = new System.Drawing.Point(479, 14);
+            this.ob_checkno.Location = new System.Drawing.Point(479, 13);
             this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Size = new System.Drawing.Size(0, 27);
@@ -861,7 +865,7 @@
             // 
             this.pr_cartonunit1.AutoSize = true;
             this.pr_cartonunit1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_cartonunit1.Location = new System.Drawing.Point(115, 155);
+            this.pr_cartonunit1.Location = new System.Drawing.Point(115, 154);
             this.pr_cartonunit1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_cartonunit1.Name = "pr_cartonunit1";
             this.pr_cartonunit1.Size = new System.Drawing.Size(25, 27);
@@ -874,7 +878,7 @@
             // 
             this.pr_cartonunit.AutoSize = true;
             this.pr_cartonunit.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_cartonunit.Location = new System.Drawing.Point(73, 28);
+            this.pr_cartonunit.Location = new System.Drawing.Point(73, 27);
             this.pr_cartonunit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_cartonunit.Name = "pr_cartonunit";
             this.pr_cartonunit.Size = new System.Drawing.Size(25, 27);
@@ -886,7 +890,7 @@
             // 
             this.pr_cartonboxgw.AutoSize = true;
             this.pr_cartonboxgw.Font = new System.Drawing.Font("微软雅黑", 25F);
-            this.pr_cartonboxgw.Location = new System.Drawing.Point(19, 194);
+            this.pr_cartonboxgw.Location = new System.Drawing.Point(19, 193);
             this.pr_cartonboxgw.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_cartonboxgw.Name = "pr_cartonboxgw";
             this.pr_cartonboxgw.Size = new System.Drawing.Size(0, 55);
@@ -896,7 +900,7 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(17, 155);
+            this.label4.Location = new System.Drawing.Point(17, 154);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(92, 27);
@@ -908,7 +912,7 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 35F);
             this.weight.ForeColor = System.Drawing.Color.DarkGreen;
-            this.weight.Location = new System.Drawing.Point(19, 62);
+            this.weight.Location = new System.Drawing.Point(19, 61);
             this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.weight.Name = "weight";
             this.weight.Size = new System.Drawing.Size(0, 78);
@@ -918,7 +922,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(17, 28);
+            this.label2.Location = new System.Drawing.Point(17, 27);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(52, 27);
@@ -1094,13 +1098,59 @@
             this.pr_sendchecktype.TabIndex = 195;
             this.pr_sendchecktype.Visible = false;
             // 
+            // mcd_remainqty_label
+            // 
+            this.mcd_remainqty_label.AutoSize = true;
+            this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_remainqty_label.Location = new System.Drawing.Point(615, 585);
+            this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty_label.Name = "mcd_remainqty_label";
+            this.mcd_remainqty_label.Size = new System.Drawing.Size(92, 27);
+            this.mcd_remainqty_label.TabIndex = 195;
+            this.mcd_remainqty_label.Text = "待采集数";
+            // 
+            // mcd_remainqty
+            // 
+            this.mcd_remainqty.AutoSize = true;
+            this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_remainqty.Location = new System.Drawing.Point(727, 585);
+            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty.Name = "mcd_remainqty";
+            this.mcd_remainqty.Size = new System.Drawing.Size(0, 27);
+            this.mcd_remainqty.TabIndex = 196;
+            // 
+            // mcd_inqty_label
+            // 
+            this.mcd_inqty_label.AutoSize = true;
+            this.mcd_inqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_inqty_label.Location = new System.Drawing.Point(615, 541);
+            this.mcd_inqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_inqty_label.Name = "mcd_inqty_label";
+            this.mcd_inqty_label.Size = new System.Drawing.Size(92, 27);
+            this.mcd_inqty_label.TabIndex = 193;
+            this.mcd_inqty_label.Text = "已采集数";
+            // 
+            // mcd_inqty
+            // 
+            this.mcd_inqty.AutoSize = true;
+            this.mcd_inqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_inqty.Location = new System.Drawing.Point(727, 541);
+            this.mcd_inqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_inqty.Name = "mcd_inqty";
+            this.mcd_inqty.Size = new System.Drawing.Size(0, 27);
+            this.mcd_inqty.TabIndex = 194;
+            // 
             // Make_PackageCollectionWeigh
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1172, 728);
+            this.Controls.Add(this.mcd_remainqty_label);
+            this.Controls.Add(this.mcd_remainqty);
             this.Controls.Add(this.pr_sendchecktype);
+            this.Controls.Add(this.mcd_inqty_label);
             this.Controls.Add(this.CloseServer);
+            this.Controls.Add(this.mcd_inqty);
             this.Controls.Add(this.BuildServer);
             this.Controls.Add(this.Port);
             this.Controls.Add(this.Port_label);
@@ -1223,5 +1273,9 @@
         private System.Windows.Forms.Label ms_salecode;
         private System.Windows.Forms.Label ms_makecode;
         private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
+        private System.Windows.Forms.Label mcd_remainqty_label;
+        private System.Windows.Forms.Label mcd_remainqty;
+        private System.Windows.Forms.Label mcd_inqty_label;
+        private System.Windows.Forms.Label mcd_inqty;
     }
 }

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -172,6 +172,7 @@ namespace UAS_MES.Make
                 string _minweight = dt.Rows[0]["pr_cartonminw"].ToString();
                 PR_CHECKCARTONW = dt.Rows[0]["PR_CHECKCARTONW"].ToString();
                 ms_salecode.Text = dt.Rows[0]["pa_salecode"].ToString();
+                ms_makecode.Text = dt.Rows[0]["pa_makecode"].ToString();
                 if (PR_CHECKCARTONW != "0")
                     checkweightlabel.Text = "需要检测重量";
                 else
@@ -192,6 +193,7 @@ namespace UAS_MES.Make
             }
             else sn_code.Focus();
             LoadCheckQTY();
+            LoadCollectedNum();
         }
 
         private void LoadGridData()
@@ -410,6 +412,7 @@ namespace UAS_MES.Make
                                     if (ErrorMessage.Contains("AFTERSUCCESS"))
                                         OperateResult.AppendText(">>" + ErrorMessage + "\n");
                                     LoadCheckQTY();
+                                    LoadCollectedNum();
                                     OperateResult.AppendText(">>序列号" + sn_code.Text + "采集成功！\n", Color.Green);
                                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "卡通箱采集", "卡通箱" + pa_outboxcode.Text + "采集成功", sn_code.Text, "");
                                     LastSncode = sn_code.Text;
@@ -467,6 +470,7 @@ namespace UAS_MES.Make
                                             md.SendOrder("M501_ON");
                                         }
                                         LoadCheckQTY();
+                                        LoadCollectedNum();
                                         OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "称量完成\n", Color.Green);
                                         if (AutoPrint.Checked)
                                             Print_Click(new object(), new EventArgs());
@@ -864,5 +868,11 @@ namespace UAS_MES.Make
             else
                 OperateResult.AppendText(">>服务尚未开启\n");
         }
+
+        private void LoadCollectedNum()
+        {
+            dt = (DataTable)dh.ExecuteSql("select mcd_inqty,ma_qty-mcd_inqty mcd_remainqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ms_makecode.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
+            BaseUtil.SetFormValue(Controls, dt);
+        }
     }
 }