卡通箱和大箱拆箱之后可以直接打印,标签补打添加大箱打印

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -497,6 +497,7 @@ namespace UAS_MES.Make
                             SQLS.Add("delete from packagedetail where pd_outboxcode='" + pa_outboxcode.Text + "'");
                             SQLS.Add("update package set pa_packageqty=0,pa_totalqty=0,pa_currentqty=0,pa_status=0 where pa_outboxcode='" + pa_outboxcode.Text + "'");
                             SQLS.Add("update package set pa_mothercode='' where pa_mothercode='" + pa_outboxcode.Text + "'");
+                            SQLS.Add("delete labelprintlog where lpl_value='" + pa_outboxcode.Text + "'");
                             dh.ExecuteSQLTran(SQLS.ToArray());
                         }
                         //将子箱的母箱编号置成空

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -879,6 +879,7 @@ namespace UAS_MES.Make
                                     dh.ExecuteSql("update package set pa_checkno='',pa_prodcode='',pa_packtype='',pa_salecode='',pa_packageqty=0,pa_totalqty=0,pa_currentqty=0,pa_status=0 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
                                 pa_status.Text = "0";
                                 //删除箱的明细
+                                dh.ExecuteSql("delete from labelprintlog where lpl_value='" + pa_outboxcode.Text + "'", "delete");
                                 dh.ExecuteSql("delete from packagedetail where pd_outboxcode='" + pa_outboxcode.Text + "'", "delete");
                                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "卡通箱拆解", "成功", pa_outboxcode.Text, ob_checkno.Text);
                                 OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "成功拆解!\n", Color.Green);

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -869,6 +869,7 @@ namespace UAS_MES.Make
                                     dh.ExecuteSql("update package set pa_checkno='',pa_prodcode='',pa_packtype='',pa_salecode='',pa_packageqty=0,pa_totalqty=0,pa_currentqty=0,pa_status=0 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
                                 pa_status.Text = "0";
                                 //删除箱的明细
+                                dh.ExecuteSql("delete from labelprintlog where lpl_value='" + pa_outboxcode.Text + "'", "delete");
                                 dh.ExecuteSql("delete from packagedetail where pd_outboxcode='" + pa_outboxcode.Text + "'","delete");
                                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "卡通箱拆解", "成功", pa_outboxcode.Text, ob_checkno.Text);
                                 OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "成功拆解!\n", Color.Green);

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

@@ -28,6 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_RePrintLabel));
             this.giftBox = new System.Windows.Forms.RadioButton();
             this.CartonBox = new System.Windows.Forms.RadioButton();
@@ -36,7 +37,7 @@
             this.label3 = new System.Windows.Forms.Label();
             this.label111 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
-            this.PrintLabel = new UAS_MES.CustomControl.ComBoxWithFocus.ComboxWithTip();
+            this.PrintLabel = new UAS_MES.CustomControl.ComBoxWithFocus.ComboxWithTip(this.components);
             this.label6 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
             this.label8 = new System.Windows.Forms.Label();
@@ -53,6 +54,7 @@
             this.inputText = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.Printer = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
             this.groupBoxWithBorder1 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.BigBox = new System.Windows.Forms.RadioButton();
             this.groupBoxWithBorder1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -61,10 +63,10 @@
             this.giftBox.AutoSize = true;
             this.giftBox.Checked = true;
             this.giftBox.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.giftBox.Location = new System.Drawing.Point(83, 52);
-            this.giftBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.giftBox.Location = new System.Drawing.Point(111, 71);
+            this.giftBox.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.giftBox.Name = "giftBox";
-            this.giftBox.Size = new System.Drawing.Size(135, 35);
+            this.giftBox.Size = new System.Drawing.Size(177, 45);
             this.giftBox.TabIndex = 1;
             this.giftBox.TabStop = true;
             this.giftBox.Text = "彩标打印";
@@ -75,10 +77,10 @@
             // 
             this.CartonBox.AutoSize = true;
             this.CartonBox.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.CartonBox.Location = new System.Drawing.Point(431, 52);
-            this.CartonBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.CartonBox.Location = new System.Drawing.Point(480, 71);
+            this.CartonBox.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.CartonBox.Name = "CartonBox";
-            this.CartonBox.Size = new System.Drawing.Size(164, 35);
+            this.CartonBox.Size = new System.Drawing.Size(216, 45);
             this.CartonBox.TabIndex = 2;
             this.CartonBox.Text = "Carton打印";
             this.CartonBox.UseVisualStyleBackColor = true;
@@ -88,10 +90,10 @@
             // 
             this.fuselagel.AutoSize = true;
             this.fuselagel.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.fuselagel.Location = new System.Drawing.Point(845, 52);
-            this.fuselagel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.fuselagel.Location = new System.Drawing.Point(868, 71);
+            this.fuselagel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.fuselagel.Name = "fuselagel";
-            this.fuselagel.Size = new System.Drawing.Size(159, 35);
+            this.fuselagel.Size = new System.Drawing.Size(209, 45);
             this.fuselagel.TabIndex = 3;
             this.fuselagel.Text = "机身标打印";
             this.fuselagel.UseVisualStyleBackColor = true;
@@ -101,9 +103,10 @@
             // 
             this.label.AutoSize = true;
             this.label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label.Location = new System.Drawing.Point(38, 133);
+            this.label.Location = new System.Drawing.Point(51, 177);
+            this.label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label.Name = "label";
-            this.label.Size = new System.Drawing.Size(86, 31);
+            this.label.Size = new System.Drawing.Size(114, 41);
             this.label.TabIndex = 4;
             this.label.Text = "输入值";
             // 
@@ -111,9 +114,10 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label3.Location = new System.Drawing.Point(546, 133);
+            this.label3.Location = new System.Drawing.Point(728, 177);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(110, 31);
+            this.label3.Size = new System.Drawing.Size(146, 41);
             this.label3.TabIndex = 5;
             this.label3.Text = "工单代码";
             // 
@@ -121,9 +125,10 @@
             // 
             this.label111.AutoSize = true;
             this.label111.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label111.Location = new System.Drawing.Point(38, 173);
+            this.label111.Location = new System.Drawing.Point(51, 231);
+            this.label111.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label111.Name = "label111";
-            this.label111.Size = new System.Drawing.Size(110, 31);
+            this.label111.Size = new System.Drawing.Size(146, 41);
             this.label111.TabIndex = 6;
             this.label111.Text = "产品编号";
             // 
@@ -131,9 +136,10 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label5.Location = new System.Drawing.Point(546, 173);
+            this.label5.Location = new System.Drawing.Point(728, 231);
+            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(62, 31);
+            this.label5.Size = new System.Drawing.Size(82, 41);
             this.label5.TabIndex = 7;
             this.label5.Text = "名称";
             // 
@@ -141,20 +147,20 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(188, 269);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.PrintLabel.Location = new System.Drawing.Point(251, 359);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(222, 26);
+            this.PrintLabel.Size = new System.Drawing.Size(295, 32);
             this.PrintLabel.TabIndex = 189;
             // 
             // label6
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(38, 218);
-            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label6.Location = new System.Drawing.Point(51, 291);
+            this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(134, 31);
+            this.label6.Size = new System.Drawing.Size(178, 41);
             this.label6.TabIndex = 188;
             this.label6.Text = "打印机列表";
             // 
@@ -162,10 +168,10 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(38, 264);
-            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label7.Location = new System.Drawing.Point(51, 352);
+            this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(110, 31);
+            this.label7.Size = new System.Drawing.Size(146, 41);
             this.label7.TabIndex = 187;
             this.label7.Text = "标签模板";
             // 
@@ -173,9 +179,10 @@
             // 
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label8.Location = new System.Drawing.Point(544, 222);
+            this.label8.Location = new System.Drawing.Point(725, 296);
+            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(86, 31);
+            this.label8.Size = new System.Drawing.Size(114, 41);
             this.label8.TabIndex = 190;
             this.label8.Text = "输入框";
             // 
@@ -183,9 +190,10 @@
             // 
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label9.Location = new System.Drawing.Point(546, 269);
+            this.label9.Location = new System.Drawing.Point(728, 359);
+            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(62, 31);
+            this.label9.Size = new System.Drawing.Size(82, 41);
             this.label9.TabIndex = 192;
             this.label9.Text = "份数";
             // 
@@ -193,9 +201,10 @@
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label10.Location = new System.Drawing.Point(49, 576);
+            this.label10.Location = new System.Drawing.Point(65, 768);
+            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(110, 31);
+            this.label10.Size = new System.Drawing.Size(146, 41);
             this.label10.TabIndex = 196;
             this.label10.Text = "补打核对";
             // 
@@ -203,18 +212,20 @@
             // 
             this.inputValue.AutoSize = true;
             this.inputValue.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.inputValue.Location = new System.Drawing.Point(182, 133);
+            this.inputValue.Location = new System.Drawing.Point(243, 177);
+            this.inputValue.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.inputValue.Name = "inputValue";
-            this.inputValue.Size = new System.Drawing.Size(0, 31);
+            this.inputValue.Size = new System.Drawing.Size(0, 41);
             this.inputValue.TabIndex = 199;
             // 
             // pr_code
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_code.Location = new System.Drawing.Point(182, 173);
+            this.pr_code.Location = new System.Drawing.Point(243, 231);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(0, 31);
+            this.pr_code.Size = new System.Drawing.Size(0, 41);
             this.pr_code.TabIndex = 200;
             this.pr_code.TextChanged += new System.EventHandler(this.PrintLabel_TextChanged);
             // 
@@ -222,18 +233,20 @@
             // 
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ms_makecode.Location = new System.Drawing.Point(656, 133);
+            this.ms_makecode.Location = new System.Drawing.Point(875, 177);
+            this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode.Name = "ms_makecode";
-            this.ms_makecode.Size = new System.Drawing.Size(0, 31);
+            this.ms_makecode.Size = new System.Drawing.Size(0, 41);
             this.ms_makecode.TabIndex = 201;
             // 
             // pr_detail
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_detail.Location = new System.Drawing.Point(656, 173);
+            this.pr_detail.Location = new System.Drawing.Point(875, 231);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 31);
+            this.pr_detail.Size = new System.Drawing.Size(0, 41);
             this.pr_detail.TabIndex = 202;
             // 
             // rePrintCheck
@@ -241,11 +254,11 @@
             this.rePrintCheck.AllPower = null;
             this.rePrintCheck.BackColor = System.Drawing.Color.White;
             this.rePrintCheck.ID = null;
-            this.rePrintCheck.Location = new System.Drawing.Point(223, 576);
-            this.rePrintCheck.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.rePrintCheck.Location = new System.Drawing.Point(297, 768);
+            this.rePrintCheck.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.rePrintCheck.Name = "rePrintCheck";
             this.rePrintCheck.Power = null;
-            this.rePrintCheck.Size = new System.Drawing.Size(242, 28);
+            this.rePrintCheck.Size = new System.Drawing.Size(321, 35);
             this.rePrintCheck.Str = null;
             this.rePrintCheck.Str1 = null;
             this.rePrintCheck.Str2 = null;
@@ -255,10 +268,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(44, 316);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.OperateResult.Location = new System.Drawing.Point(59, 421);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(5, 7, 5, 7);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1134, 246);
+            this.OperateResult.Size = new System.Drawing.Size(1511, 327);
             this.OperateResult.TabIndex = 195;
             this.OperateResult.Text = "";
             // 
@@ -269,13 +282,13 @@
             this.printBtn.DownImage = ((System.Drawing.Image)(resources.GetObject("printBtn.DownImage")));
             this.printBtn.Image = null;
             this.printBtn.IsShowBorder = true;
-            this.printBtn.Location = new System.Drawing.Point(923, 267);
-            this.printBtn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.printBtn.Location = new System.Drawing.Point(1231, 356);
+            this.printBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.printBtn.MoveImage = ((System.Drawing.Image)(resources.GetObject("printBtn.MoveImage")));
             this.printBtn.Name = "printBtn";
             this.printBtn.NormalImage = ((System.Drawing.Image)(resources.GetObject("printBtn.NormalImage")));
             this.printBtn.Power = null;
-            this.printBtn.Size = new System.Drawing.Size(75, 36);
+            this.printBtn.Size = new System.Drawing.Size(100, 48);
             this.printBtn.TabIndex = 194;
             this.printBtn.Text = "打印";
             this.printBtn.UseVisualStyleBackColor = false;
@@ -286,12 +299,12 @@
             this.printNum.AllPower = null;
             this.printNum.BackColor = System.Drawing.Color.White;
             this.printNum.ID = null;
-            this.printNum.Location = new System.Drawing.Point(663, 273);
-            this.printNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.printNum.Location = new System.Drawing.Point(884, 364);
+            this.printNum.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.printNum.Name = "printNum";
             this.printNum.Negative = false;
             this.printNum.Power = null;
-            this.printNum.Size = new System.Drawing.Size(222, 28);
+            this.printNum.Size = new System.Drawing.Size(295, 35);
             this.printNum.Str = null;
             this.printNum.Str1 = null;
             this.printNum.Str2 = null;
@@ -303,11 +316,11 @@
             this.inputText.AllPower = null;
             this.inputText.BackColor = System.Drawing.Color.White;
             this.inputText.ID = null;
-            this.inputText.Location = new System.Drawing.Point(662, 224);
-            this.inputText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.inputText.Location = new System.Drawing.Point(883, 299);
+            this.inputText.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.inputText.Name = "inputText";
             this.inputText.Power = null;
-            this.inputText.Size = new System.Drawing.Size(222, 28);
+            this.inputText.Size = new System.Drawing.Size(295, 35);
             this.inputText.Str = null;
             this.inputText.Str1 = null;
             this.inputText.Str2 = null;
@@ -316,34 +329,48 @@
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(188, 218);
-            this.Printer.Margin = new System.Windows.Forms.Padding(6);
+            this.Printer.Location = new System.Drawing.Point(251, 291);
+            this.Printer.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(222, 37);
+            this.Printer.Size = new System.Drawing.Size(296, 49);
             this.Printer.TabIndex = 186;
             // 
             // groupBoxWithBorder1
             // 
             this.groupBoxWithBorder1.BorderColor = System.Drawing.Color.Black;
+            this.groupBoxWithBorder1.Controls.Add(this.BigBox);
             this.groupBoxWithBorder1.Controls.Add(this.CartonBox);
             this.groupBoxWithBorder1.Controls.Add(this.fuselagel);
             this.groupBoxWithBorder1.Controls.Add(this.giftBox);
             this.groupBoxWithBorder1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder1.Location = new System.Drawing.Point(44, 14);
-            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.groupBoxWithBorder1.Location = new System.Drawing.Point(59, 19);
+            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
-            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.groupBoxWithBorder1.Size = new System.Drawing.Size(1134, 108);
+            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.groupBoxWithBorder1.Size = new System.Drawing.Size(1512, 144);
             this.groupBoxWithBorder1.TabIndex = 204;
             this.groupBoxWithBorder1.TabStop = false;
             this.groupBoxWithBorder1.Text = "打印类型";
             this.groupBoxWithBorder1.TextColor = System.Drawing.Color.Black;
             // 
+            // BigBox
+            // 
+            this.BigBox.AutoSize = true;
+            this.BigBox.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.BigBox.Location = new System.Drawing.Point(1172, 71);
+            this.BigBox.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.BigBox.Name = "BigBox";
+            this.BigBox.Size = new System.Drawing.Size(209, 45);
+            this.BigBox.TabIndex = 4;
+            this.BigBox.Text = "大箱标打印";
+            this.BigBox.UseVisualStyleBackColor = true;
+            this.BigBox.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChange);
+            // 
             // Make_RePrintLabel
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1227, 625);
+            this.ClientSize = new System.Drawing.Size(1636, 833);
             this.Controls.Add(this.groupBoxWithBorder1);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.ms_makecode);
@@ -366,7 +393,7 @@
             this.Controls.Add(this.label3);
             this.Controls.Add(this.label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Name = "Make_RePrintLabel";
             this.Tag = "Make!RePrintLabel";
             this.Text = "Make_RePrintLabel";
@@ -405,5 +432,6 @@
         private System.Windows.Forms.Label ms_makecode;
         private System.Windows.Forms.Label pr_detail;
         private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder groupBoxWithBorder1;
+        private System.Windows.Forms.RadioButton BigBox;
     }
 }

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -103,7 +103,7 @@ namespace UAS_MES.Make
                 OperateResult.AppendText(">>请输入SN\n", Color.Black);
                 clearAll();
             }
-            else if (btn.Name == "CartonBox" && btn.Checked)
+            else if ((btn.Name == "CartonBox"||btn.Name== "BigBox") && btn.Checked)
             {
                 OperateResult.AppendText(">>请输入卡通箱号\n", Color.Black);
                 clearAll();
@@ -146,7 +146,7 @@ namespace UAS_MES.Make
                     inputText.Text = "";
                 }
                 //打印类型为卡通箱
-                else if (CartonBox.Checked)
+                else if (CartonBox.Checked||BigBox.Checked)
                 {
                     //查询箱号是否存在
                     dt = (DataTable)dh.ExecuteSql("select pa_id,pa_prodcode pr_code,pa_makecode ms_makecode,pr_detail from package left join product on pr_code=pa_prodcode where pa_outboxcode='" + inputText.Text + "' and pa_type=1", "select");
@@ -243,7 +243,7 @@ namespace UAS_MES.Make
                 }
             }
             //打印类型为卡通箱标签
-            else if (CartonBox.Checked)
+            else if (CartonBox.Checked||BigBox.Checked)
             {
                 //select pa_downstatus from package where pa_outboxcode=? 输入值code
                 mapB = (DataTable)dh.ExecuteSql("select pa_downstatus from package where pa_outboxcode='" + inputValue.Text + "'", "select");
@@ -307,7 +307,7 @@ namespace UAS_MES.Make
             LogicHandler.GetSerialNumByCaller("MakeDown", out md_code);
             sql.Clear();
             sql.Append("INSERT INTO MAKEDOWN (MD_ID,MD_LINECODE,MD_SCCODE,MD_STEPCODE,");
-            sql.Append((CartonBox.Checked ? "MD_OUTBOXCODE" : "MD_SNCODE") + ",MD_PRODCODE,MD_MACODE, MD_DOWNREASON, MD_CODE,");
+            sql.Append(((CartonBox.Checked||BigBox.Checked) ? "MD_OUTBOXCODE" : "MD_SNCODE") + ",MD_PRODCODE,MD_MACODE, MD_DOWNREASON, MD_CODE,");
             sql.Append("MD_DOWNDATE,MD_DOWNMAN,MD_STATUS) values (MAKEDOWN_seq.nextval,'" + User.UserLineCode + "','" + User.UserSourceCode + "',");
             sql.Append("'" + User.CurrentStepCode + "','" + inputValue.Text + "','" + pr_code.Text + "','" + ms_makecode.Text + "','补打标签','" + md_code + "',sysdate,'" + User.UserCode + "','-1')");
             dh.ExecuteSql(sql.GetString(), "insert");
@@ -377,7 +377,7 @@ namespace UAS_MES.Make
                     }
                 }
                 //勾选的是卡通箱
-                else if (CartonBox.Checked)
+                else if (CartonBox.Checked||BigBox.Checked)
                 {
                     //第一次输入
                     if (TSN == "")