修改外箱号核对，栈板必须连号

UAS_MES_HYSX/FunctionCode/Make/Make_OutBoxSnCheck.Designer.cs

@@ -31,6 +31,8 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_OutBoxSnCheck));
             this.label10 = new System.Windows.Forms.Label();
             this.CheckSnDGV = new System.Windows.Forms.DataGridView();
+            this.pd_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_checksn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.label1 = new System.Windows.Forms.Label();
             this.pa_makecode_label = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
@@ -39,11 +41,13 @@
             this.CheckNum = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             this.pa_makecode = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             this.pa_outboxcode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
-            this.pd_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_checksn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cancel = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.pa_outboxcode2 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.pa_outboxcode1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             ((System.ComponentModel.ISupportInitialize)(this.CheckSnDGV)).BeginInit();
             this.SuspendLayout();
             // 
@@ -72,22 +76,40 @@
             this.CheckSnDGV.Size = new System.Drawing.Size(1117, 624);
             this.CheckSnDGV.TabIndex = 18;
             // 
+            // pd_barcode
+            // 
+            this.pd_barcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.pd_barcode.DataPropertyName = "pd_barcode";
+            this.pd_barcode.HeaderText = "箱内序列号";
+            this.pd_barcode.MinimumWidth = 10;
+            this.pd_barcode.Name = "pd_barcode";
+            this.pd_barcode.Width = 175;
+            // 
+            // pd_checksn
+            // 
+            this.pd_checksn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.pd_checksn.DataPropertyName = "pd_checksn";
+            this.pd_checksn.HeaderText = "扫描SN号";
+            this.pd_checksn.MinimumWidth = 10;
+            this.pd_checksn.Name = "pd_checksn";
+            this.pd_checksn.Width = 151;
+            // 
             // label1
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(66, 46);
+            this.label1.Location = new System.Drawing.Point(11, 49);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(283, 64);
+            this.label1.Size = new System.Drawing.Size(155, 64);
             this.label1.TabIndex = 19;
-            this.label1.Text = "卡通箱号";
+            this.label1.Text = "箱号";
             // 
             // pa_makecode_label
             // 
             this.pa_makecode_label.AutoSize = true;
             this.pa_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode_label.Location = new System.Drawing.Point(1156, 68);
+            this.pa_makecode_label.Location = new System.Drawing.Point(898, 790);
             this.pa_makecode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_makecode_label.Name = "pa_makecode_label";
             this.pa_makecode_label.Size = new System.Drawing.Size(146, 41);
@@ -112,7 +134,7 @@
             this.dataGridViewTextBoxColumn1.HeaderText = "箱内序列号";
             this.dataGridViewTextBoxColumn1.MinimumWidth = 10;
             this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.Width = 175;
+            this.dataGridViewTextBoxColumn1.Width = 200;
             // 
             // dataGridViewTextBoxColumn2
             // 
@@ -121,7 +143,7 @@
             this.dataGridViewTextBoxColumn2.HeaderText = "扫描SN号";
             this.dataGridViewTextBoxColumn2.MinimumWidth = 10;
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.Width = 151;
+            this.dataGridViewTextBoxColumn2.Width = 200;
             // 
             // CheckNum
             // 
@@ -141,7 +163,7 @@
             this.pa_makecode.AutoSize = true;
             this.pa_makecode.CutLength = null;
             this.pa_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode.Location = new System.Drawing.Point(1324, 68);
+            this.pa_makecode.Location = new System.Drawing.Point(1066, 790);
             this.pa_makecode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_makecode.MaximumSize = new System.Drawing.Size(300, 0);
             this.pa_makecode.Name = "pa_makecode";
@@ -155,35 +177,17 @@
             this.pa_outboxcode.BackColor = System.Drawing.Color.White;
             this.pa_outboxcode.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pa_outboxcode.ID = null;
-            this.pa_outboxcode.Location = new System.Drawing.Point(358, 43);
+            this.pa_outboxcode.Location = new System.Drawing.Point(184, 43);
             this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4);
             this.pa_outboxcode.Name = "pa_outboxcode";
             this.pa_outboxcode.Power = null;
-            this.pa_outboxcode.Size = new System.Drawing.Size(773, 80);
+            this.pa_outboxcode.Size = new System.Drawing.Size(363, 80);
             this.pa_outboxcode.Str = null;
             this.pa_outboxcode.Str1 = null;
             this.pa_outboxcode.Str2 = null;
             this.pa_outboxcode.TabIndex = 20;
             this.pa_outboxcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pa_outboxcode_KeyDown);
             // 
-            // pd_barcode
-            // 
-            this.pd_barcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.pd_barcode.DataPropertyName = "pd_barcode";
-            this.pd_barcode.HeaderText = "箱内序列号";
-            this.pd_barcode.MinimumWidth = 10;
-            this.pd_barcode.Name = "pd_barcode";
-            this.pd_barcode.Width = 175;
-            // 
-            // pd_checksn
-            // 
-            this.pd_checksn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.pd_checksn.DataPropertyName = "pd_checksn";
-            this.pd_checksn.HeaderText = "扫描SN号";
-            this.pd_checksn.MinimumWidth = 10;
-            this.pd_checksn.Name = "pd_checksn";
-            this.pd_checksn.Width = 151;
-            // 
             // cancel
             // 
             this.cancel.AllPower = null;
@@ -230,11 +234,71 @@
             this.OperateResult.TabIndex = 10;
             this.OperateResult.Text = "";
             // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label3.Location = new System.Drawing.Point(569, 50);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(155, 64);
+            this.label3.TabIndex = 114;
+            this.label3.Text = "箱号";
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label4.Location = new System.Drawing.Point(1163, 50);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(155, 64);
+            this.label4.TabIndex = 116;
+            this.label4.Text = "箱号";
+            // 
+            // pa_outboxcode2
+            // 
+            this.pa_outboxcode2.AllPower = null;
+            this.pa_outboxcode2.BackColor = System.Drawing.Color.White;
+            this.pa_outboxcode2.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_outboxcode2.ID = null;
+            this.pa_outboxcode2.Location = new System.Drawing.Point(1326, 47);
+            this.pa_outboxcode2.Margin = new System.Windows.Forms.Padding(4);
+            this.pa_outboxcode2.Name = "pa_outboxcode2";
+            this.pa_outboxcode2.Power = null;
+            this.pa_outboxcode2.Size = new System.Drawing.Size(363, 80);
+            this.pa_outboxcode2.Str = null;
+            this.pa_outboxcode2.Str1 = null;
+            this.pa_outboxcode2.Str2 = null;
+            this.pa_outboxcode2.TabIndex = 118;
+            this.pa_outboxcode2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pa_outboxcode_KeyDown);
+            // 
+            // pa_outboxcode1
+            // 
+            this.pa_outboxcode1.AllPower = null;
+            this.pa_outboxcode1.BackColor = System.Drawing.Color.White;
+            this.pa_outboxcode1.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_outboxcode1.ID = null;
+            this.pa_outboxcode1.Location = new System.Drawing.Point(756, 43);
+            this.pa_outboxcode1.Margin = new System.Windows.Forms.Padding(4);
+            this.pa_outboxcode1.Name = "pa_outboxcode1";
+            this.pa_outboxcode1.Power = null;
+            this.pa_outboxcode1.Size = new System.Drawing.Size(363, 80);
+            this.pa_outboxcode1.Str = null;
+            this.pa_outboxcode1.Str1 = null;
+            this.pa_outboxcode1.Str2 = null;
+            this.pa_outboxcode1.TabIndex = 119;
+            this.pa_outboxcode1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pa_outboxcode_KeyDown);
+            // 
             // Make_OutBoxSnCheck
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1772, 866);
+            this.Controls.Add(this.pa_outboxcode1);
+            this.Controls.Add(this.pa_outboxcode2);
+            this.Controls.Add(this.label4);
+            this.Controls.Add(this.label3);
             this.Controls.Add(this.CheckNum);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.pa_makecode);
@@ -254,7 +318,7 @@
             this.Load += new System.EventHandler(this.Make_LabelCheck_Load);
             this.SizeChanged += new System.EventHandler(this.Make_LabelCheck_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.CheckSnDGV)).EndInit();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }
@@ -275,5 +339,9 @@
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label4;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox pa_outboxcode2;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox pa_outboxcode1;
     }
 }

UAS_MES_HYSX/FunctionCode/Make/Make_OutBoxSnCheck.cs

@@ -147,23 +147,35 @@ namespace UAS_MES_NEW.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
-                dt = (DataTable)dh.ExecuteSql("select pd_barcode,pd_makecode pa_makecode,pa_nextstep from packagedetail left join package on pa_id=pd_paid where pd_outboxcode='" + pa_outboxcode.Text + "' or pa_zxcode='" + pa_outboxcode.Text + "'", "select");
-                if (dt.Rows.Count > 0)
+                if ((sender as TextBox).Name == "pa_outboxcode")
                 {
-                    //CheckNum.Text = CheckRow + "/" + CheckSnDGV.Rows.Count;
-                    pa_nextstep = dt.Rows[0]["pa_nextstep"].ToString();
-                    //if (pa_nextstep != User.CurrentStepCode && pa_nextstep != "")
-                    //{
-                    //    OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "的下一工序" + pa_nextstep + "不是当前岗位资源对应工序\n", Color.Red);
-                    //    return;
-                    //}
-                    BaseUtil.FillDgvWithDataTable(CheckSnDGV, dt);
-                    BaseUtil.SetFormValue(this.Controls, dt);
-                    sncode.Focus();
+                    pa_outboxcode1.Focus();
                 }
-                else
+                if ((sender as TextBox).Name == "pa_outboxcode1")
+                {
+                    pa_outboxcode2.Focus();
+                }
+                if ((sender as TextBox).Name == "pa_outboxcode2")
                 {
-                    OperateResult.AppendText("<<箱号" + pa_outboxcode.Text + "不存在\n", Color.Red);
+                    if (pa_outboxcode.Text == pa_outboxcode1.Text && pa_outboxcode1.Text == pa_outboxcode2.Text)
+                    {
+                        dt = (DataTable)dh.ExecuteSql("select pd_barcode,pd_makecode pa_makecode,pa_nextstep from packagedetail left join package on pa_id=pd_paid where pd_outboxcode='" + pa_outboxcode.Text + "' or pa_zxcode='" + pa_outboxcode.Text + "'", "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            pa_nextstep = dt.Rows[0]["pa_nextstep"].ToString();
+                            BaseUtil.FillDgvWithDataTable(CheckSnDGV, dt);
+                            BaseUtil.SetFormValue(this.Controls, dt);
+                            sncode.Focus();
+                        }
+                        else
+                        {
+                            OperateResult.AppendText("<<箱号" + pa_outboxcode.Text + "不存在\n", Color.Red);
+                        }
+                    }
+                    else
+                    {
+                        OperateResult.AppendText("<<箱号核对不一致\n", Color.Red);
+                    }
                 }
             }
         }

UAS_MES_HYSX/FunctionCode/Make/Make_OutBoxSnCheck.resx

@@ -123,43 +123,49 @@
   <metadata name="pd_checksn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pd_barcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pd_checksn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="cancel.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=
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFfSURBVFhH5dhNTsJgFIXhM2WiCxL2oAEHrJKhQSYM
+        JIgzjSLIX0sRKPSPtl+Lo2uOgVbWcJu8CzhP8nVwISIAUAFwA+AWQFNh3M39lZMHrgDUu91uyxjji8KP
+        u7mfDgCuiVLt958fkjSTie3I62iqLu7m/sHgpQ2gRpSG6/nmc2bL23imtuHMkp0f5ADuidIMoljev+bq
+        o8PpH4NmcIjlY7JQHx0KlPCQyHBqqY8OJUqcyGhuq48OBUoUJzJeLNVHhwLlkKQysRz10eECZbpcqe8C
+        JU6NzJ1v9dGhQElSI9Zqoz46lCgmE3u9VR8dCpTUZOJsXPXRoUTJclltd+qjQ4FislzW7l59dChR8lw2
+        e099dDijNA5xYnZBKFvPVxv3x0lanA5qT71eOzsexQsjcf1AXdzN/XQ4H5l4fqs/djqtIIzC/Pgj2uJu
+        7i/Okf8O11UAd6c3pS3u5v6/w/UvTaFspAxAMh4AAAAASUVORK5CYII=
 </value>
   </data>
   <data name="cancel.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==
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAF3SURBVFhH5djbSgJRFMbxHsP7wBfYT7jvu46QDIoI
+        C4QNQRAIgVBRSdpxpgZN83wYx5nZOjNqrvgEd73DGvhfzdX3g32ztohoS0iVElLtCakehVQdhmE39qfg
+        AZBtIdX70Y0TjsJ4SQw/7MZ+OAip0kDJnD3UdJAsyXIjKvWm7MJu7M+X6lpIlQWK3ZhEq8pgRvfdKdvK
+        /Rk1/XglpHKA0ulPF3Tb0eyDAzzWKL3pgq7bmn1wMChdPadiK2QfHAxKW8/pqhmwDw4GpRXOqdAI2AcH
+        g9IME7qs++yDg0H5DhK6qE3YBweD0vATOq967IODQfnyE1KOxz44GJTaJKb855h9cDAoVS+mU9tlHxwM
+        iuPFdGK57IPDH8o4ouO3EfvgYFA+xhEdvg7ZB4cNil3uhquc5dLBy5Bt2P/U0+Z0kN0tOhqHlpzt0v7z
+        gF3Yjf1w2ByZ0jjD7RSs8K7l/+Ant7Ab+8058t/hOiOkquBNMQy7sX99uP4F5D4U8hdr4uMAAAAASUVO
+        RK5CYII=
 </value>
   </data>
   <data name="cancel.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=
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGpSURBVFhH5dg/ayJBGMfxB4YFXTARBAvBQhAsBEEQ
+        ZLnNzFu4I6aYV5kyF9tgbad1jrsYY9T4Z3fcnV2f45e38Sx8q6l+n2IWhpiZjDFVY8wPY8xPY4wVGHZj
+        fxUepLW+0Vrfz+fzR+fclgV+2I39cNBa31Icx/FisXi6XpnL8io27F8ul89xHN9RFEWTPM+ToihZet57
+        F0XRA43HYwsp7wvxwQEeNBqNbFmWnOW5+OAADxoOh7YoS3ZZJj44wIMGg4H1RcGpu4gPDvCgfr9vvfd8
+        TlPxwQEe1Ov1bO49H8+J+OAAD+p2uxaXzNfpJD44wIM6nY69ZDnvDkfxwQEe1G637SXLeLs/iA8O8KBW
+        q2XdJePNbi8+OMCDms2mxe9o/bkTHxzgQY1GwybO8WrzKT44wIPq9bpNUsdv64344AAPqtVq9pw6/vv+
+        IT44wIPCMJzsvg7Jv/UH/1m9iw3794ejC8PwgSqVyt3LbPZ8SpLvg9e3lbiwG/vhAA8KguA2CIL739Pp
+        42a73eNQWtiN/XCAB+GhVilVVUrFSqlfSikrMOzG/u+H6/+yQ4jdXN8e9AAAAABJRU5ErkJggg==
 </value>
   </data>
 </root>

UAS_MES_HYSX/FunctionCode/Packing/Packing_PalletCollectionZX.Designer.cs

@@ -771,6 +771,7 @@
             this.CheckBox.AutoSize = true;
             this.CheckBox.Checked = true;
             this.CheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.CheckBox.Enabled = false;
             this.CheckBox.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.CheckBox.ForeColor = System.Drawing.Color.Red;
             this.CheckBox.Location = new System.Drawing.Point(1624, 367);