加计数

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,6 @@
             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.panel4.SuspendLayout();
             this.groupBoxWithBorder2.SuspendLayout();
             this.SuspendLayout();
@@ -154,25 +154,6 @@
             this.panel4.Size = new System.Drawing.Size(518, 185);
             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;
@@ -332,6 +313,62 @@
             this.columnHeader4.Text = "时间";
             this.columnHeader4.Width = 130;
             // 
+            // 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;
+            // 
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(1160, 220);
+            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;
+            // 
+            // 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);
+            // 
+            // 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);
+            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;
+            // 
             // groupBoxWithBorder2
             // 
             this.groupBoxWithBorder2.BorderColor = System.Drawing.Color.Black;
@@ -425,7 +462,7 @@
             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.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")));
@@ -476,7 +513,7 @@
             // PrinterList
             // 
             this.PrinterList.Location = new System.Drawing.Point(1317, 129);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(6);
             this.PrinterList.Name = "PrinterList";
             this.PrinterList.Size = new System.Drawing.Size(177, 30);
             this.PrinterList.TabIndex = 160;
@@ -651,49 +688,12 @@
             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;
-            // 
             // Make_ColorBoxWeigh
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1520, 876);
-            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);
@@ -794,6 +794,6 @@
         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;
     }
 }

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()

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)