BUG优化

UAS_MES_YDCY/FunctionCode/Make/Make_TestCollectionOnlyBad.Designer.cs

@@ -731,7 +731,7 @@ namespace UAS_MES_NEW.Make
             this.Save.DownImage = ((System.Drawing.Image)(resources.GetObject("Save.DownImage")));
             this.Save.Image = null;
             this.Save.IsShowBorder = true;
-            this.Save.Location = new System.Drawing.Point(690, 986);
+            this.Save.Location = new System.Drawing.Point(609, 986);
             this.Save.Margin = new System.Windows.Forms.Padding(4);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
@@ -920,7 +920,7 @@ namespace UAS_MES_NEW.Make
             this.ms_sncode.Margin = new System.Windows.Forms.Padding(6);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
-            this.ms_sncode.Size = new System.Drawing.Size(358, 40);
+            this.ms_sncode.Size = new System.Drawing.Size(284, 40);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -1029,11 +1029,11 @@ namespace UAS_MES_NEW.Make
             this.SourceCode.BackColor = System.Drawing.Color.White;
             this.SourceCode.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.SourceCode.ID = null;
-            this.SourceCode.Location = new System.Drawing.Point(964, 993);
+            this.SourceCode.Location = new System.Drawing.Point(1035, 993);
             this.SourceCode.Margin = new System.Windows.Forms.Padding(6);
             this.SourceCode.Name = "SourceCode";
             this.SourceCode.Power = null;
-            this.SourceCode.Size = new System.Drawing.Size(289, 40);
+            this.SourceCode.Size = new System.Drawing.Size(218, 40);
             this.SourceCode.Str = null;
             this.SourceCode.Str1 = null;
             this.SourceCode.Str2 = null;
@@ -1045,13 +1045,12 @@ namespace UAS_MES_NEW.Make
             this.label11.AutoSize = true;
             this.label11.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label11.ForeColor = System.Drawing.Color.Black;
-            this.label11.Location = new System.Drawing.Point(872, 991);
+            this.label11.Location = new System.Drawing.Point(749, 992);
             this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(82, 41);
+            this.label11.Size = new System.Drawing.Size(274, 41);
             this.label11.TabIndex = 204;
-            this.label11.Text = "资源";
-            this.label11.Visible = false;
+            this.label11.Text = "不良工序岗位资源";
             // 
             // Make_TestCollectionOnlyBad
             // 

UAS_MES_YDCY/FunctionCode/Make/Make_TestCollectionOnlyBad.resx

@@ -259,7 +259,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAACdNJREFUeF7t3dtOW4cW
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAACdNJREFUeF7t3dtOW4cW
         heFe9VUibakv1/eoVGk/TFedps2hnCGAjTnYnAlgbGNzJpUqza2xgL2zmSlL4oqV8V98Fx2q190/YxwC
         30XEdwA8pQGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMNAHykAYCPNADwkQYAPtIAwEcaAPhIAwAfaQDg
         Iw0AfKQBgI80APCRBgA+0gDARxoA+EgDAB9pAOAjDQB8pAGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMN
@@ -426,7 +426,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAACdNJREFUeF7t3dtOW4cW
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAACdNJREFUeF7t3dtOW4cW
         heFe9VUibakv1/eoVGk/TFedps2hnCGAjTnYnAlgbGNzJpUqza2xgL2zmSlL4oqV8V98Fx2q190/YxwC
         30XEdwA8pQGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMNAHykAYCPNADwkQYAPtIAwEcaAPhIAwAfaQDg
         Iw0AfKQBgI80APCRBgA+0gDARxoA+EgDAB9pAOAjDQB8pAGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMN

UAS_MES_YDCY/FunctionCode/Packing/Packing_PackageCollectionPallet.cs

@@ -174,7 +174,7 @@ namespace UAS_MES_NEW.Packing
                     }
                     if (PrintSecond.Checked)
                     {
-                        if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel1.Text, PrintLabel1.SelectedValue.ToString(), PrintList1.Text, sn_code.Text, int.Parse(PrintNum1.Text), oMakeCode, pr_code.Text, "栈板标", "0", out ErrorMessage))
+                        if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel1.Text, PrintLabel1.SelectedValue.ToString(), PrintList1.Text, pa_outboxcode.Text, int.Parse(PrintNum1.Text), oMakeCode, pr_code.Text, "栈板标", "0", out ErrorMessage))
                         {
                             OperateResult.AppendText(">>序列号:" + sn_code.Text + "打印结束\n", Color.Green);
                         }
@@ -185,7 +185,7 @@ namespace UAS_MES_NEW.Packing
                     }
                     if (PrintThird.Checked)
                     {
-                        if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel2.Text, PrintLabel1.SelectedValue.ToString(), PrintList2.Text, sn_code.Text, int.Parse(PrintNum1.Text), oMakeCode, pr_code.Text, "栈板标", "0", out ErrorMessage))
+                        if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel2.Text, PrintLabel1.SelectedValue.ToString(), PrintList2.Text, pa_outboxcode.Text, int.Parse(PrintNum1.Text), oMakeCode, pr_code.Text, "栈板标", "0", out ErrorMessage))
                         {
                             OperateResult.AppendText(">>序列号:" + sn_code.Text + "打印结束\n", Color.Green);
                         }