添加卡板号记录

UAS_MES_YDCY/FunctionCode/Packing/Packing_PackageCollectionPallet.Designer.cs

@@ -46,9 +46,6 @@
             this.mcd_inqty_label = new System.Windows.Forms.Label();
             this.mcd_inqty = new System.Windows.Forms.Label();
             this.pa_remark_label = new System.Windows.Forms.Label();
-            this.CollecRemark = new System.Windows.Forms.CheckBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.Remark_PreFix = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.pa_remark = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.groupBoxWithBorder2 = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.PrintNum = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
@@ -127,6 +124,8 @@
             this.label10 = new System.Windows.Forms.Label();
             this.PrintList2 = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.PrinterCombox();
             this.label11 = new System.Windows.Forms.Label();
+            this.PalletCode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.label2 = new System.Windows.Forms.Label();
             this.groupBoxWithBorder2.SuspendLayout();
             this.groupBoxWithBorder1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).BeginInit();
@@ -309,56 +308,17 @@
             this.pa_remark_label.TabIndex = 198;
             this.pa_remark_label.Text = "备注";
             // 
-            // CollecRemark
-            // 
-            this.CollecRemark.AutoSize = true;
-            this.CollecRemark.Location = new System.Drawing.Point(958, 1115);
-            this.CollecRemark.Margin = new System.Windows.Forms.Padding(6);
-            this.CollecRemark.Name = "CollecRemark";
-            this.CollecRemark.Size = new System.Drawing.Size(186, 28);
-            this.CollecRemark.TabIndex = 201;
-            this.CollecRemark.Text = "采集备注信息";
-            this.CollecRemark.UseVisualStyleBackColor = true;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(874, 1056);
-            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(71, 36);
-            this.label2.TabIndex = 210;
-            this.label2.Text = "前缀";
-            // 
-            // Remark_PreFix
-            // 
-            this.Remark_PreFix.AllPower = null;
-            this.Remark_PreFix.BackColor = System.Drawing.Color.White;
-            this.Remark_PreFix.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.Remark_PreFix.ID = null;
-            this.Remark_PreFix.Location = new System.Drawing.Point(958, 1052);
-            this.Remark_PreFix.Margin = new System.Windows.Forms.Padding(12, 14, 12, 14);
-            this.Remark_PreFix.Name = "Remark_PreFix";
-            this.Remark_PreFix.Power = null;
-            this.Remark_PreFix.Size = new System.Drawing.Size(72, 39);
-            this.Remark_PreFix.Str = null;
-            this.Remark_PreFix.Str1 = null;
-            this.Remark_PreFix.Str2 = null;
-            this.Remark_PreFix.TabIndex = 209;
-            this.Remark_PreFix.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Remark_PreFix_KeyDown);
-            // 
             // pa_remark
             // 
             this.pa_remark.AllPower = null;
             this.pa_remark.BackColor = System.Drawing.Color.White;
             this.pa_remark.ID = null;
-            this.pa_remark.Location = new System.Drawing.Point(1048, 1002);
+            this.pa_remark.Location = new System.Drawing.Point(966, 1002);
             this.pa_remark.Margin = new System.Windows.Forms.Padding(4);
             this.pa_remark.Multiline = true;
             this.pa_remark.Name = "pa_remark";
             this.pa_remark.Power = null;
-            this.pa_remark.Size = new System.Drawing.Size(242, 90);
+            this.pa_remark.Size = new System.Drawing.Size(324, 41);
             this.pa_remark.Str = null;
             this.pa_remark.Str1 = null;
             this.pa_remark.Str2 = null;
@@ -418,7 +378,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(527, 29);
+            this.label1.Location = new System.Drawing.Point(528, 30);
             this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(146, 41);
@@ -441,7 +401,7 @@
             this.checkweightlabel.AutoSize = true;
             this.checkweightlabel.CutLength = null;
             this.checkweightlabel.ForeColor = System.Drawing.Color.Red;
-            this.checkweightlabel.Location = new System.Drawing.Point(53, 45);
+            this.checkweightlabel.Location = new System.Drawing.Point(54, 46);
             this.checkweightlabel.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.checkweightlabel.MaximumSize = new System.Drawing.Size(400, 0);
             this.checkweightlabel.Name = "checkweightlabel";
@@ -452,7 +412,7 @@
             // 
             this.ob_nowcheckqty.AutoSize = true;
             this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(689, 173);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(690, 174);
             this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 41);
@@ -462,7 +422,7 @@
             // 
             this.ob_batchqty.AutoSize = true;
             this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty.Location = new System.Drawing.Point(689, 97);
+            this.ob_batchqty.Location = new System.Drawing.Point(690, 98);
             this.ob_batchqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_batchqty.Name = "ob_batchqty";
             this.ob_batchqty.Size = new System.Drawing.Size(0, 41);
@@ -472,7 +432,7 @@
             // 
             this.ob_nowcheckqty_label.AutoSize = true;
             this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(527, 173);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(528, 174);
             this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
             this.ob_nowcheckqty_label.Size = new System.Drawing.Size(146, 41);
@@ -483,7 +443,7 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(527, 101);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(528, 102);
             this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
             this.ob_batchqty_label.Size = new System.Drawing.Size(146, 41);
@@ -494,7 +454,7 @@
             // 
             this.ob_checkno.AutoSize = true;
             this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno.Location = new System.Drawing.Point(689, 29);
+            this.ob_checkno.Location = new System.Drawing.Point(690, 30);
             this.ob_checkno.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Size = new System.Drawing.Size(0, 41);
@@ -559,7 +519,7 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(13, 175);
+            this.label3.Location = new System.Drawing.Point(14, 176);
             this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(146, 41);
@@ -609,7 +569,7 @@
             // 
             this.PrintList_label.AutoSize = true;
             this.PrintList_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintList_label.Location = new System.Drawing.Point(13, 95);
+            this.PrintList_label.Location = new System.Drawing.Point(14, 96);
             this.PrintList_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.PrintList_label.Name = "PrintList_label";
             this.PrintList_label.Size = new System.Drawing.Size(178, 41);
@@ -620,7 +580,7 @@
             // 
             this.PrintNum_label.AutoSize = true;
             this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintNum_label.Location = new System.Drawing.Point(413, 257);
+            this.PrintNum_label.Location = new System.Drawing.Point(414, 258);
             this.PrintNum_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.PrintNum_label.Name = "PrintNum_label";
             this.PrintNum_label.Size = new System.Drawing.Size(82, 41);
@@ -667,7 +627,7 @@
             this.locksalecode.AutoSize = true;
             this.locksalecode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.locksalecode.ForeColor = System.Drawing.Color.Red;
-            this.locksalecode.Location = new System.Drawing.Point(581, 31);
+            this.locksalecode.Location = new System.Drawing.Point(582, 32);
             this.locksalecode.Margin = new System.Windows.Forms.Padding(6);
             this.locksalecode.Name = "locksalecode";
             this.locksalecode.Size = new System.Drawing.Size(186, 28);
@@ -679,7 +639,7 @@
             // 
             this.PreFix_label.AutoSize = true;
             this.PreFix_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PreFix_label.Location = new System.Drawing.Point(355, 27);
+            this.PreFix_label.Location = new System.Drawing.Point(356, 28);
             this.PreFix_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.PreFix_label.Name = "PreFix_label";
             this.PreFix_label.Size = new System.Drawing.Size(71, 36);
@@ -707,7 +667,7 @@
             // 
             this.pa_salecode_label.AutoSize = true;
             this.pa_salecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_salecode_label.Location = new System.Drawing.Point(417, 271);
+            this.pa_salecode_label.Location = new System.Drawing.Point(418, 272);
             this.pa_salecode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_salecode_label.Name = "pa_salecode_label";
             this.pa_salecode_label.Size = new System.Drawing.Size(146, 41);
@@ -718,7 +678,7 @@
             // 
             this.ma_code_label.AutoSize = true;
             this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code_label.Location = new System.Drawing.Point(9, 271);
+            this.ma_code_label.Location = new System.Drawing.Point(10, 272);
             this.ma_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ma_code_label.Name = "ma_code_label";
             this.ma_code_label.Size = new System.Drawing.Size(114, 41);
@@ -729,7 +689,7 @@
             // 
             this.ms_salecode.AutoSize = true;
             this.ms_salecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_salecode.Location = new System.Drawing.Point(579, 271);
+            this.ms_salecode.Location = new System.Drawing.Point(580, 272);
             this.ms_salecode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_salecode.Name = "ms_salecode";
             this.ms_salecode.Size = new System.Drawing.Size(0, 41);
@@ -739,7 +699,7 @@
             // 
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(181, 271);
+            this.ms_makecode.Location = new System.Drawing.Point(182, 272);
             this.ms_makecode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_makecode.MaximumSize = new System.Drawing.Size(300, 0);
             this.ms_makecode.Name = "ms_makecode";
@@ -750,7 +710,7 @@
             // 
             this.OutBoxLength_label.AutoSize = true;
             this.OutBoxLength_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OutBoxLength_label.Location = new System.Drawing.Point(159, 27);
+            this.OutBoxLength_label.Location = new System.Drawing.Point(160, 28);
             this.OutBoxLength_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.OutBoxLength_label.Name = "OutBoxLength_label";
             this.OutBoxLength_label.Size = new System.Drawing.Size(71, 36);
@@ -816,7 +776,7 @@
             this.AutoGenBoxCode.AutoSize = true;
             this.AutoGenBoxCode.Checked = true;
             this.AutoGenBoxCode.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.AutoGenBoxCode.Location = new System.Drawing.Point(493, 87);
+            this.AutoGenBoxCode.Location = new System.Drawing.Point(494, 88);
             this.AutoGenBoxCode.Margin = new System.Windows.Forms.Padding(4);
             this.AutoGenBoxCode.Name = "AutoGenBoxCode";
             this.AutoGenBoxCode.Size = new System.Drawing.Size(178, 45);
@@ -829,7 +789,7 @@
             // 
             this.pa_currentqty_label.AutoSize = true;
             this.pa_currentqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty_label.Location = new System.Drawing.Point(421, 151);
+            this.pa_currentqty_label.Location = new System.Drawing.Point(422, 152);
             this.pa_currentqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_currentqty_label.Name = "pa_currentqty_label";
             this.pa_currentqty_label.Size = new System.Drawing.Size(146, 41);
@@ -840,7 +800,7 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(417, 207);
+            this.pr_detail_label.Location = new System.Drawing.Point(418, 208);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(146, 41);
@@ -869,7 +829,7 @@
             // 
             this.pa_currentqty.AutoSize = true;
             this.pa_currentqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty.Location = new System.Drawing.Point(577, 147);
+            this.pa_currentqty.Location = new System.Drawing.Point(578, 148);
             this.pa_currentqty.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_currentqty.Name = "pa_currentqty";
             this.pa_currentqty.Size = new System.Drawing.Size(0, 41);
@@ -879,7 +839,7 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(9, 207);
+            this.pr_code_label.Location = new System.Drawing.Point(10, 208);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_code_label.Name = "pr_code_label";
             this.pr_code_label.Size = new System.Drawing.Size(146, 41);
@@ -890,7 +850,7 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(579, 207);
+            this.pr_detail.Location = new System.Drawing.Point(580, 208);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 41);
@@ -900,7 +860,7 @@
             // 
             this.pr_outboxinnerqty_label.AutoSize = true;
             this.pr_outboxinnerqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(9, 145);
+            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(10, 146);
             this.pr_outboxinnerqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_outboxinnerqty_label.Name = "pr_outboxinnerqty_label";
             this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(146, 41);
@@ -911,7 +871,7 @@
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(181, 207);
+            this.pr_code.Location = new System.Drawing.Point(182, 208);
             this.pr_code.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_code.MaximumSize = new System.Drawing.Size(300, 0);
             this.pr_code.Name = "pr_code";
@@ -923,7 +883,7 @@
             // 
             this.pa_code_label.AutoSize = true;
             this.pa_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_code_label.Location = new System.Drawing.Point(9, 85);
+            this.pa_code_label.Location = new System.Drawing.Point(10, 86);
             this.pa_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_code_label.Name = "pa_code_label";
             this.pa_code_label.Size = new System.Drawing.Size(82, 41);
@@ -1156,7 +1116,7 @@
             // 
             this.pr_cartonboxgw.AutoSize = true;
             this.pr_cartonboxgw.Font = new System.Drawing.Font("微软雅黑", 25F);
-            this.pr_cartonboxgw.Location = new System.Drawing.Point(23, 317);
+            this.pr_cartonboxgw.Location = new System.Drawing.Point(24, 318);
             this.pr_cartonboxgw.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_cartonboxgw.Name = "pr_cartonboxgw";
             this.pr_cartonboxgw.Size = new System.Drawing.Size(0, 88);
@@ -1166,7 +1126,7 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(7, 243);
+            this.label4.Location = new System.Drawing.Point(8, 244);
             this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(210, 41);
@@ -1178,7 +1138,7 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 35F);
             this.weight.ForeColor = System.Drawing.Color.DarkGreen;
-            this.weight.Location = new System.Drawing.Point(19, 105);
+            this.weight.Location = new System.Drawing.Point(20, 106);
             this.weight.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.weight.Name = "weight";
             this.weight.Size = new System.Drawing.Size(0, 121);
@@ -1188,7 +1148,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(7, 37);
+            this.label5.Location = new System.Drawing.Point(8, 38);
             this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(146, 41);
@@ -1314,9 +1274,9 @@
             this.PrintThird.Location = new System.Drawing.Point(1321, 999);
             this.PrintThird.Margin = new System.Windows.Forms.Padding(6);
             this.PrintThird.Name = "PrintThird";
-            this.PrintThird.Size = new System.Drawing.Size(162, 28);
+            this.PrintThird.Size = new System.Drawing.Size(174, 28);
             this.PrintThird.TabIndex = 239;
-            this.PrintThird.Text = "打印副标签";
+            this.PrintThird.Text = "打印副标签2";
             this.PrintThird.UseVisualStyleBackColor = true;
             // 
             // PrintLabel2
@@ -1339,7 +1299,7 @@
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(101, 41);
             this.label10.TabIndex = 238;
-            this.label10.Text = "标签1";
+            this.label10.Text = "标签2";
             // 
             // PrintList2
             // 
@@ -1359,7 +1319,35 @@
             this.label11.Name = "label11";
             this.label11.Size = new System.Drawing.Size(133, 41);
             this.label11.TabIndex = 235;
-            this.label11.Text = "打印机1";
+            this.label11.Text = "打印机2";
+            // 
+            // PalletCode
+            // 
+            this.PalletCode.AllPower = null;
+            this.PalletCode.BackColor = System.Drawing.Color.White;
+            this.PalletCode.ID = null;
+            this.PalletCode.Location = new System.Drawing.Point(966, 1070);
+            this.PalletCode.Margin = new System.Windows.Forms.Padding(4);
+            this.PalletCode.Multiline = true;
+            this.PalletCode.Name = "PalletCode";
+            this.PalletCode.Power = null;
+            this.PalletCode.Size = new System.Drawing.Size(324, 41);
+            this.PalletCode.Str = null;
+            this.PalletCode.Str1 = null;
+            this.PalletCode.Str2 = null;
+            this.PalletCode.TabIndex = 243;
+            this.PalletCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.PalletCode_KeyDown);
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.Location = new System.Drawing.Point(874, 1070);
+            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(82, 41);
+            this.label2.TabIndex = 242;
+            this.label2.Text = "卡板";
             // 
             // Packing_PackageCollectionPallet
             // 
@@ -1367,6 +1355,8 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.ClientSize = new System.Drawing.Size(1758, 1168);
+            this.Controls.Add(this.PalletCode);
+            this.Controls.Add(this.label2);
             this.Controls.Add(this.PrintNum2);
             this.Controls.Add(this.label9);
             this.Controls.Add(this.PrintThird);
@@ -1382,9 +1372,6 @@
             this.Controls.Add(this.PrintList1);
             this.Controls.Add(this.label8);
             this.Controls.Add(this.groupBoxWithBorder3);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.Remark_PreFix);
-            this.Controls.Add(this.CollecRemark);
             this.Controls.Add(this.pa_remark);
             this.Controls.Add(this.pa_remark_label);
             this.Controls.Add(this.mcd_remainqty_label);
@@ -1417,14 +1404,14 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.PackCollection_FormClosing);
             this.Load += new System.EventHandler(this.PackCollection_Load);
             this.SizeChanged += new System.EventHandler(this.PackCollection_SizeChanged);
-            this.groupBoxWithBorder2.ResumeLayout(true);
+            this.groupBoxWithBorder2.ResumeLayout(false);
             this.groupBoxWithBorder2.PerformLayout();
-            this.groupBoxWithBorder1.ResumeLayout(true);
+            this.groupBoxWithBorder1.ResumeLayout(false);
             this.groupBoxWithBorder1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).EndInit();
-            this.groupBoxWithBorder3.ResumeLayout(true);
+            this.groupBoxWithBorder3.ResumeLayout(false);
             this.groupBoxWithBorder3.PerformLayout();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }
@@ -1490,7 +1477,6 @@
         private CustomControl.TextBoxWithIcon.EnterTextBox pa_remark;
         private System.Windows.Forms.Label PreFix_label;
         private CustomControl.TextBoxWithIcon.SnCollectionBox PreFix;
-        private System.Windows.Forms.CheckBox CollecRemark;
         private System.Windows.Forms.CheckBox locksalecode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_barcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pa_outboxcode1;
@@ -1500,8 +1486,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_id;
         public CustomControl.TextBoxWithIcon.SnCollectionBox pa_outboxcode;
         public System.Windows.Forms.Label ob_checkno;
-        private System.Windows.Forms.Label label2;
-        private CustomControl.TextBoxWithIcon.SnCollectionBox Remark_PreFix;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
@@ -1528,5 +1512,7 @@
         private System.Windows.Forms.Label label10;
         private CustomControl.ComBoxWithFocus.PrinterCombox PrintList2;
         private System.Windows.Forms.Label label11;
+        private CustomControl.TextBoxWithIcon.EnterTextBox PalletCode;
+        private System.Windows.Forms.Label label2;
     }
 }

UAS_MES_YDCY/FunctionCode/Packing/Packing_PackageCollectionPallet.cs

@@ -79,7 +79,6 @@ namespace UAS_MES_NEW.Packing
             {
                 OutBoxLength.Text = BaseUtil.GetCacheData("OutBoxLength").ToString();
                 PreFix.Text = BaseUtil.GetCacheData("PreFix").ToString();
-                Remark_PreFix.Text = BaseUtil.GetCacheData("Remark_PreFix").ToString();
             }
             catch (Exception) { }
             if (!LogicHandler.CheckPower(User.UserCode, Tag.ToString()))
@@ -296,7 +295,7 @@ namespace UAS_MES_NEW.Packing
                         PR_CHECKCARTONW = dh.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid left join makeserial on ms_craftcode =cr_code and cr_prodcode = ms_prodcode", "nvl(cd_ifweigh,'0') cd_ifweigh", "ms_sncode='" + sn_code.Text + "' and ms_makecode='" + oMakeCode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
                         //获取序列号信息
                         sql.Clear();
-                        sql.Append("select nvl(ms_iostatus,0) ms_iostatus,pa_salecode,ms_salecode,ms_outno,ms_makecode,ms_prodcode,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,");
+                        sql.Append("select pr_Singlelevelqty,nvl(ms_iostatus,0) ms_iostatus,pa_salecode,ms_salecode,ms_outno,ms_makecode,ms_prodcode,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,");
                         sql.Append("nvl(pr_outboxinnerqty,0)pr_outboxinnerqty,nvl(pr_sendchecktype,'LineCode')pr_sendchecktype from makeserial left join product on ms_prodcode=pr_code left join packagedetail ");
                         sql.Append("on pd_barcode=ms_sncode left join package on pa_id =pd_paid where ms_id='" + oMsID + "'");
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -305,6 +304,7 @@ namespace UAS_MES_NEW.Packing
                         string ms_iostatus = "";
                         string ms_outno = "";
                         string ms_salecode_text = "";
+                        string pr_Singlelevelqty = "";
                         if (dt.Rows.Count > 0)
                         {
                             StandardQTY = decimal.Parse(dt.Rows[0]["pr_outboxinnerqty"].ToString());
@@ -508,24 +508,8 @@ namespace UAS_MES_NEW.Packing
                                         pa_standardqty.Text = "";
                                         if (AutoPrint.Checked)
                                             Print_Click(new object(), new EventArgs());
-                                        if (!CollecRemark.Checked)
-                                        {
-                                            if (!AutoGenBoxCode.Checked)
-                                            {
-                                                pa_outboxcode.SelectAll();
-                                                pa_outboxcode.Focus();
-                                            }
-                                            else
-                                            {
-                                                sn_code.Focus();
-                                                sn_code.SelectAll();
-                                            }
-                                        }
-                                        else
-                                        {
-                                            pa_remark.SelectAll();
-                                            pa_remark.Focus();
-                                        }
+                                        pa_remark.SelectAll();
+                                        pa_remark.Focus();
                                         if (LogicHandler.OutBoxStepPass(pa_outboxcode.Text, ms_makecode, User.UserSourceCode, User.UserCode, "卡通箱:" + pa_outboxcode.Text + "整箱过站", "卡通箱整箱过站", out ErrorMessage))
                                         {
                                             dh.UpdateByCondition("package", "pa_nextstep='" + dh.getFieldDataByCondition("packagedetail left join makeserial on ms_sncode=pd_barcode and ms_makecode=pd_makecode", "max(ms_nextstepcode)", "pd_outboxcode='" + pa_outboxcode.Text + "'").ToString() + "', PA_CURRENTSTEP = '' ", "pa_outboxcode='" + pa_outboxcode.Text + "'");
@@ -645,24 +629,8 @@ namespace UAS_MES_NEW.Packing
                     pa_status.Text = "1";
                     pa_standardqty.Text = "";
                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "装箱采集", "卡通箱" + pa_outboxcode.Text + "封箱成功", pa_outboxcode.Text, "");
-                    if (!CollecRemark.Checked)
-                    {
-                        if (!AutoGenBoxCode.Checked)
-                        {
-                            pa_outboxcode.SelectAll();
-                            pa_outboxcode.Focus();
-                        }
-                        else
-                        {
-                            sn_code.Focus();
-                            sn_code.SelectAll();
-                        }
-                    }
-                    else
-                    {
-                        pa_remark.SelectAll();
-                        pa_remark.Focus();
-                    }
+                    pa_remark.SelectAll();
+                    pa_remark.Focus();
                     if (PR_CHECKCARTONW != "0")
                     {
                         OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "处于称重工序，请在卡通箱称重界面进行操作\n", Color.Black, sn_code);
@@ -1008,22 +976,6 @@ namespace UAS_MES_NEW.Packing
             {
                 if (dh.CheckExist("package", "pa_outboxcode='" + pa_outboxcode.Text + "'"))
                 {
-                    if (Remark_PreFix.Text != "")
-                    {
-                        try
-                        {
-                            if (pa_remark.Text.Substring(0, Remark_PreFix.Text.Length) != Remark_PreFix.Text)
-                            {
-                                OperateResult.AppendText(">>备注前缀不匹配，请重新输入备注信息\n", Color.Red);
-                                return;
-                            }
-                        }
-                        catch (Exception)
-                        {
-                            OperateResult.AppendText(">>备注前缀不匹配，请重新输入备注信息\n", Color.Red);
-                            return;
-                        }
-                    }
                     dh.UpdateByCondition("package", "pa_remark='" + pa_remark.Text.ToUpper() + "'", "pa_outboxcode='" + pa_outboxcode.Text + "'");
                     OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "关联信息" + pa_remark.Text + "采集成功\n", Color.Green);
                     pa_remark.Text = "";
@@ -1064,12 +1016,7 @@ namespace UAS_MES_NEW.Packing
         {
             if (e.KeyCode == Keys.Enter)
             {
-                BaseUtil.SetCacheData("Remark_PreFix", Remark_PreFix.Text);
-                if (CollecRemark.Checked)
-                {
-                    pa_remark.SelectAll();
-                    pa_remark.Focus();
-                }
+
             }
         }
 
@@ -1121,5 +1068,24 @@ namespace UAS_MES_NEW.Packing
                 pa_outboxcode.Enabled = true;
             }
         }
+
+        private void PalletCode_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                DataTable dt = (DataTable)dh.ExecuteSql("select pl_code from pallet where pl_code='" + PalletCode.Text + "'", "select");
+                if (dt.Rows.Count == 0)
+                {
+                    OperateResult.AppendText(">>卡板号" + pr_code.Text + "不存在\n", Color.Red);
+                    return;
+                }
+                string boxcode = dh.getFieldDataByCondition("package", "pa_outboxcode", "PA_PALLETNO='" + PalletCode.Text + "'").ToString();
+                if (boxcode != "")
+                {
+                    OperateResult.AppendText(">>卡板号" + pr_code.Text + "已绑定栈板" + boxcode + "\n", Color.Red);
+                    return;
+                }
+            }
+        }
     }
 }