合并序号3调整

UAS-出货标签管理(泽天)/UAS_出货标签管理.Designer.cs

@@ -242,6 +242,7 @@
             this.OutboxCapacity = new System.Windows.Forms.NumericUpDown();
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
+            this.CombindetailThree = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.ShowMenu_Total.SuspendLayout();
@@ -759,7 +760,7 @@
             // 
             this.MixPrCode.AutoSize = true;
             this.MixPrCode.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.MixPrCode.Location = new System.Drawing.Point(592, 268);
+            this.MixPrCode.Location = new System.Drawing.Point(784, 161);
             this.MixPrCode.Margin = new System.Windows.Forms.Padding(4);
             this.MixPrCode.Name = "MixPrCode";
             this.MixPrCode.Size = new System.Drawing.Size(142, 35);
@@ -1188,7 +1189,7 @@
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(23, 30);
+            this.label15.Location = new System.Drawing.Point(26, 33);
             this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(62, 31);
@@ -1258,7 +1259,7 @@
             this.Weight.AutoSize = true;
             this.Weight.Font = new System.Drawing.Font("微软雅黑", 25F);
             this.Weight.ForeColor = System.Drawing.Color.Red;
-            this.Weight.Location = new System.Drawing.Point(43, 96);
+            this.Weight.Location = new System.Drawing.Point(46, 99);
             this.Weight.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Weight.Name = "Weight";
             this.Weight.Size = new System.Drawing.Size(0, 88);
@@ -1502,7 +1503,7 @@
             // 
             this.label18.AutoSize = true;
             this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label18.Location = new System.Drawing.Point(143, 259);
+            this.label18.Location = new System.Drawing.Point(146, 262);
             this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(24, 31);
@@ -1512,7 +1513,7 @@
             // MidBoxEnd
             // 
             this.MidBoxEnd.ID = null;
-            this.MidBoxEnd.Location = new System.Drawing.Point(166, 242);
+            this.MidBoxEnd.Location = new System.Drawing.Point(174, 258);
             this.MidBoxEnd.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.MidBoxEnd.Name = "MidBoxEnd";
             this.MidBoxEnd.Size = new System.Drawing.Size(96, 35);
@@ -1524,7 +1525,7 @@
             // MidBoxBegin
             // 
             this.MidBoxBegin.ID = null;
-            this.MidBoxBegin.Location = new System.Drawing.Point(16, 242);
+            this.MidBoxBegin.Location = new System.Drawing.Point(37, 255);
             this.MidBoxBegin.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.MidBoxBegin.Name = "MidBoxBegin";
             this.MidBoxBegin.Size = new System.Drawing.Size(96, 35);
@@ -1537,7 +1538,7 @@
             // 
             this.label16.AutoSize = true;
             this.label16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label16.Location = new System.Drawing.Point(140, 132);
+            this.label16.Location = new System.Drawing.Point(143, 135);
             this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(24, 31);
@@ -1547,7 +1548,7 @@
             // SingleBoxEnd
             // 
             this.SingleBoxEnd.ID = null;
-            this.SingleBoxEnd.Location = new System.Drawing.Point(164, 118);
+            this.SingleBoxEnd.Location = new System.Drawing.Point(174, 136);
             this.SingleBoxEnd.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.SingleBoxEnd.Name = "SingleBoxEnd";
             this.SingleBoxEnd.Size = new System.Drawing.Size(96, 35);
@@ -1559,7 +1560,7 @@
             // SingleBoxBegin
             // 
             this.SingleBoxBegin.ID = null;
-            this.SingleBoxBegin.Location = new System.Drawing.Point(14, 116);
+            this.SingleBoxBegin.Location = new System.Drawing.Point(29, 131);
             this.SingleBoxBegin.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.SingleBoxBegin.Name = "SingleBoxBegin";
             this.SingleBoxBegin.Size = new System.Drawing.Size(96, 35);
@@ -1572,7 +1573,7 @@
             // 
             this.label12.AutoSize = true;
             this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label12.Location = new System.Drawing.Point(43, 207);
+            this.label12.Location = new System.Drawing.Point(23, 201);
             this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(110, 31);
@@ -1583,7 +1584,7 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(39, 83);
+            this.label7.Location = new System.Drawing.Point(23, 74);
             this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(110, 31);
@@ -1984,7 +1985,7 @@
             // 
             this.label14.AutoSize = true;
             this.label14.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label14.Location = new System.Drawing.Point(43, 303);
+            this.label14.Location = new System.Drawing.Point(46, 289);
             this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(155, 36);
@@ -1993,7 +1994,7 @@
             // 
             // CurrentOutBoxNum
             // 
-            this.CurrentOutBoxNum.Location = new System.Drawing.Point(196, 284);
+            this.CurrentOutBoxNum.Location = new System.Drawing.Point(213, 289);
             this.CurrentOutBoxNum.Margin = new System.Windows.Forms.Padding(6);
             this.CurrentOutBoxNum.Name = "CurrentOutBoxNum";
             this.CurrentOutBoxNum.Size = new System.Drawing.Size(104, 50);
@@ -2004,7 +2005,7 @@
             // 
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label13.Location = new System.Drawing.Point(43, 247);
+            this.label13.Location = new System.Drawing.Point(46, 239);
             this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(155, 36);
@@ -2013,7 +2014,7 @@
             // 
             // CurrentBoxNum
             // 
-            this.CurrentBoxNum.Location = new System.Drawing.Point(196, 228);
+            this.CurrentBoxNum.Location = new System.Drawing.Point(213, 233);
             this.CurrentBoxNum.Margin = new System.Windows.Forms.Padding(6);
             this.CurrentBoxNum.Name = "CurrentBoxNum";
             this.CurrentBoxNum.Size = new System.Drawing.Size(104, 50);
@@ -2034,7 +2035,7 @@
             // 
             this.SingleLabelPrint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.SingleLabelPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelPrint.Location = new System.Drawing.Point(60, 354);
+            this.SingleLabelPrint.Location = new System.Drawing.Point(52, 356);
             this.SingleLabelPrint.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.SingleLabelPrint.Name = "SingleLabelPrint";
             this.SingleLabelPrint.Size = new System.Drawing.Size(136, 52);
@@ -2047,7 +2048,7 @@
             // 
             this.SingleLabelAutoPrint.AutoSize = true;
             this.SingleLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(27, 193);
+            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(30, 196);
             this.SingleLabelAutoPrint.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.SingleLabelAutoPrint.Name = "SingleLabelAutoPrint";
             this.SingleLabelAutoPrint.Size = new System.Drawing.Size(142, 35);
@@ -2093,7 +2094,7 @@
             // 
             this.AutoPrintMidBox.AutoSize = true;
             this.AutoPrintMidBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AutoPrintMidBox.Location = new System.Drawing.Point(28, 380);
+            this.AutoPrintMidBox.Location = new System.Drawing.Point(14, 370);
             this.AutoPrintMidBox.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.AutoPrintMidBox.Name = "AutoPrintMidBox";
             this.AutoPrintMidBox.Size = new System.Drawing.Size(166, 35);
@@ -2105,7 +2106,7 @@
             // 
             this.CurrentRowOnly.AutoSize = true;
             this.CurrentRowOnly.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CurrentRowOnly.Location = new System.Drawing.Point(181, 203);
+            this.CurrentRowOnly.Location = new System.Drawing.Point(162, 185);
             this.CurrentRowOnly.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.CurrentRowOnly.Name = "CurrentRowOnly";
             this.CurrentRowOnly.Size = new System.Drawing.Size(166, 35);
@@ -2131,7 +2132,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(36, 259);
+            this.label2.Location = new System.Drawing.Point(22, 244);
             this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(62, 31);
@@ -2155,7 +2156,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(36, 323);
+            this.label5.Location = new System.Drawing.Point(22, 309);
             this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(62, 31);
@@ -2187,7 +2188,7 @@
             // 
             this.MidLabelAutoPrint.AutoSize = true;
             this.MidLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.MidLabelAutoPrint.Location = new System.Drawing.Point(27, 201);
+            this.MidLabelAutoPrint.Location = new System.Drawing.Point(10, 185);
             this.MidLabelAutoPrint.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.MidLabelAutoPrint.Name = "MidLabelAutoPrint";
             this.MidLabelAutoPrint.Size = new System.Drawing.Size(142, 35);
@@ -2241,7 +2242,7 @@
             // 
             this.AutoPrintOutBox.AutoSize = true;
             this.AutoPrintOutBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AutoPrintOutBox.Location = new System.Drawing.Point(162, 182);
+            this.AutoPrintOutBox.Location = new System.Drawing.Point(157, 185);
             this.AutoPrintOutBox.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.AutoPrintOutBox.Name = "AutoPrintOutBox";
             this.AutoPrintOutBox.Size = new System.Drawing.Size(118, 35);
@@ -2253,7 +2254,7 @@
             // 
             this.AutoSetOutBox.AutoSize = true;
             this.AutoSetOutBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AutoSetOutBox.Location = new System.Drawing.Point(19, 222);
+            this.AutoSetOutBox.Location = new System.Drawing.Point(14, 225);
             this.AutoSetOutBox.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.AutoSetOutBox.Name = "AutoSetOutBox";
             this.AutoSetOutBox.Size = new System.Drawing.Size(142, 35);
@@ -2265,7 +2266,7 @@
             // 
             this.DiffDetno.AutoSize = true;
             this.DiffDetno.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.DiffDetno.Location = new System.Drawing.Point(279, 390);
+            this.DiffDetno.Location = new System.Drawing.Point(276, 383);
             this.DiffDetno.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.DiffDetno.Name = "DiffDetno";
             this.DiffDetno.Size = new System.Drawing.Size(133, 34);
@@ -2277,7 +2278,7 @@
             // 
             this.DiffCPN.AutoSize = true;
             this.DiffCPN.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.DiffCPN.Location = new System.Drawing.Point(279, 346);
+            this.DiffCPN.Location = new System.Drawing.Point(276, 339);
             this.DiffCPN.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.DiffCPN.Name = "DiffCPN";
             this.DiffCPN.Size = new System.Drawing.Size(135, 34);
@@ -2289,7 +2290,7 @@
             // 
             this.BoxCount.AutoSize = true;
             this.BoxCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BoxCount.Location = new System.Drawing.Point(291, 403);
+            this.BoxCount.Location = new System.Drawing.Point(294, 406);
             this.BoxCount.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.BoxCount.Name = "BoxCount";
             this.BoxCount.Size = new System.Drawing.Size(0, 31);
@@ -2299,7 +2300,7 @@
             // 
             this.DiffLotNo.AutoSize = true;
             this.DiffLotNo.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.DiffLotNo.Location = new System.Drawing.Point(279, 298);
+            this.DiffLotNo.Location = new System.Drawing.Point(276, 291);
             this.DiffLotNo.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.DiffLotNo.Name = "DiffLotNo";
             this.DiffLotNo.Size = new System.Drawing.Size(118, 34);
@@ -2311,7 +2312,7 @@
             // 
             this.DiffDC.AutoSize = true;
             this.DiffDC.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.DiffDC.Location = new System.Drawing.Point(279, 246);
+            this.DiffDC.Location = new System.Drawing.Point(276, 239);
             this.DiffDC.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.DiffDC.Name = "DiffDC";
             this.DiffDC.Size = new System.Drawing.Size(121, 34);
@@ -2323,7 +2324,7 @@
             // 
             this.OnlyOneRow.AutoSize = true;
             this.OnlyOneRow.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.OnlyOneRow.Location = new System.Drawing.Point(279, 198);
+            this.OnlyOneRow.Location = new System.Drawing.Point(276, 191);
             this.OnlyOneRow.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.OnlyOneRow.Name = "OnlyOneRow";
             this.OnlyOneRow.Size = new System.Drawing.Size(111, 34);
@@ -2335,7 +2336,7 @@
             // 
             this.AllLabel.AutoSize = true;
             this.AllLabel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AllLabel.Location = new System.Drawing.Point(19, 180);
+            this.AllLabel.Location = new System.Drawing.Point(14, 183);
             this.AllLabel.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.AllLabel.Name = "AllLabel";
             this.AllLabel.Size = new System.Drawing.Size(142, 35);
@@ -2346,7 +2347,7 @@
             // AddNewOutBox
             // 
             this.AddNewOutBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AddNewOutBox.Location = new System.Drawing.Point(18, 360);
+            this.AddNewOutBox.Location = new System.Drawing.Point(15, 361);
             this.AddNewOutBox.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.AddNewOutBox.Name = "AddNewOutBox";
             this.AddNewOutBox.Size = new System.Drawing.Size(102, 52);
@@ -2358,7 +2359,7 @@
             // LogingOut
             // 
             this.LogingOut.AutoSize = true;
-            this.LogingOut.Location = new System.Drawing.Point(255, 43);
+            this.LogingOut.Location = new System.Drawing.Point(258, 17);
             this.LogingOut.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.LogingOut.Name = "LogingOut";
             this.LogingOut.Size = new System.Drawing.Size(82, 41);
@@ -2386,7 +2387,7 @@
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(51, 333);
+            this.label10.Location = new System.Drawing.Point(48, 322);
             this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(62, 31);
@@ -2397,7 +2398,7 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(51, 284);
+            this.label6.Location = new System.Drawing.Point(48, 275);
             this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(62, 31);
@@ -2431,7 +2432,7 @@
             // OutBoxLabelPrint
             // 
             this.OutBoxLabelPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OutBoxLabelPrint.Location = new System.Drawing.Point(114, 362);
+            this.OutBoxLabelPrint.Location = new System.Drawing.Point(115, 362);
             this.OutBoxLabelPrint.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.OutBoxLabelPrint.Name = "OutBoxLabelPrint";
             this.OutBoxLabelPrint.Size = new System.Drawing.Size(134, 52);
@@ -2452,12 +2453,26 @@
             this.OutBoxCombox.TabIndex = 78;
             this.OutBoxCombox.SelectedIndexChanged += new System.EventHandler(this.OutBoxCombox_SelectedIndexChanged);
             // 
+            // CombindetailThree
+            // 
+            this.CombindetailThree.AutoSize = true;
+            this.CombindetailThree.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.CombindetailThree.Location = new System.Drawing.Point(592, 268);
+            this.CombindetailThree.Margin = new System.Windows.Forms.Padding(4);
+            this.CombindetailThree.Name = "CombindetailThree";
+            this.CombindetailThree.Size = new System.Drawing.Size(234, 35);
+            this.CombindetailThree.TabIndex = 121;
+            this.CombindetailThree.Text = "合并明细3(备注1)";
+            this.CombindetailThree.UseVisualStyleBackColor = true;
+            this.CombindetailThree.CheckedChanged += new System.EventHandler(this.CombindetailThree_CheckedChanged);
+            // 
             // UAS_出货标签打印
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(229)))), ((int)(((byte)(233)))), ((int)(((byte)(206)))));
             this.ClientSize = new System.Drawing.Size(2529, 1062);
+            this.Controls.Add(this.CombindetailThree);
             this.Controls.Add(this.MixPrCode);
             this.Controls.Add(this.richTextAutoBottom1);
             this.Controls.Add(this.Connect);
@@ -2751,5 +2766,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_remark2;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode2;
+        private System.Windows.Forms.CheckBox CombindetailThree;
     }
 }

UAS-出货标签管理(泽天)/UAS_出货标签管理.cs

@@ -669,6 +669,8 @@ namespace UAS_LabelMachine
                 combined = 1;
             if (CombindetailTwo.Checked)
                 combined = 2;
+            if (CombindetailThree.Checked)
+                combined = 3;
             dh.UpdateByCondition("CS$InoutPrcode", "Collectednum='" + CollectQty + "'", "pd_inoutno='" + pi_inoutno.Text + "' and pd_pdno='" + CurrentPDNO + "' and combined=" + combined);
             CollectNum = 0;
             double OutNum = 0;
@@ -858,6 +860,7 @@ namespace UAS_LabelMachine
                 LoadCheck = false;
                 Combindetail.Checked = false;
                 CombindetailTwo.Checked = false;
+                CombindetailThree.Checked = false;
                 LoadCheck = true;
                 Input.Clear();
                 sql.Clear();
@@ -877,6 +880,9 @@ namespace UAS_LabelMachine
                         case "2":
                             CombindetailTwo.Checked = true;
                             break;
+                        case "3":
+                            CombindetailThree.Checked = true;
+                            break;
                         default:
                             break;
                     }
@@ -1753,7 +1759,9 @@ namespace UAS_LabelMachine
                 combined = 1;
             if (CombindetailTwo.Checked)
                 combined = 2;
-            if (Combindetail.Checked || CombindetailTwo.Checked)
+            if (CombindetailThree.Checked)
+                combined = 3;
+            if (Combindetail.Checked || CombindetailTwo.Checked|| CombindetailThree.Checked)
             {
                 CSPrcode = (DataTable)dh.ExecuteSql("select pd_piid,pd_pdno,pd_custprodcode,pd_whcode,pd_prodcode,CollectedNum,UnCollectedNum,pd_outqty,pr_unit,pr_spec,pd_brand,pjd_zxbzs_user,pjd_id,pd_inoutno,pd_pocode,nvl(checknum,0)checknum from CS$InoutPrcode where pd_inoutno='" + pi_inoutno.Text + "' and combined=" + combined + " order by  pd_pdno", "select");
                 if (CSPrcode.Rows.Count == 0)
@@ -2399,6 +2407,7 @@ namespace UAS_LabelMachine
             if (Combindetail.Checked)
             {
                 CombindetailTwo.Checked = false;
+                CombindetailThree.Checked = false;
             }
             if (LoadCheck)
             {
@@ -2414,6 +2423,7 @@ namespace UAS_LabelMachine
             if (CombindetailTwo.Checked)
             {
                 Combindetail.Checked = false;
+                CombindetailThree.Checked = false;
             }
             if (LoadCheck)
             {
@@ -2424,6 +2434,22 @@ namespace UAS_LabelMachine
             }
         }
 
+        private void CombindetailThree_CheckedChanged(object sender, EventArgs e)
+        {
+            if (CombindetailThree.Checked)
+            {
+                Combindetail.Checked = false;
+                CombindetailTwo.Checked = false;
+            }
+            if (LoadCheck)
+            {
+                LoadPrcodeData();
+                string response = "";
+                string[] param = new string[] { PI_ID, "3", response };
+                dh.CallProcedure("USER_PRODOUT_GROUPQTY_TEST", param);
+            }
+        }
+
         string SelectProdcode = "";
         int SelectRowIndex = -1;
         private void LabelInf_CellClick(object sender, DataGridViewCellEventArgs e)
@@ -3233,5 +3259,7 @@ namespace UAS_LabelMachine
                 MessageBox.Show("请先连接电子秤!");
             }
         }
+
+       
     }
 }