添加栈板数量和散箱数量功能

UAS_MES_YDCY/FunctionCode/Warehouse/Warehouse_FinishedProductOutSumNEW.Designer.cs

@@ -59,6 +59,15 @@
             this.PrintLabel = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComboxWithTip(this.components);
             this.Printlab = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.Prodiodetail = new UAS_MES_NEW.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
+            this.pd_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_cartons = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_custpo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_custpodetno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_detail1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_spec1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.Clean = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.cancel = new UAS_MES_NEW.CustomControl.CustomCheckBox.CustomCheckBox();
@@ -89,15 +98,17 @@
             this.PrintLabel1 = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComboxWithTip(this.components);
             this.label7 = new System.Windows.Forms.Label();
             this.PrintSecond = new System.Windows.Forms.CheckBox();
-            this.pd_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_cartons = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_custpo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_custpodetno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_detail1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_spec1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PrintThird = new System.Windows.Forms.CheckBox();
+            this.label9 = new System.Windows.Forms.Label();
+            this.PrinterList2 = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.PrinterCombox();
+            this.PrintNum2 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.label11 = new System.Windows.Forms.Label();
+            this.PrintLabel2 = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComboxWithTip(this.components);
+            this.label12 = new System.Windows.Forms.Label();
+            this.pi_palletnum = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.label13 = new System.Windows.Forms.Label();
+            this.label14 = new System.Windows.Forms.Label();
+            this.pi_boxnum = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Prodiodetail)).BeginInit();
@@ -153,10 +164,10 @@
             this.panel1.Controls.Add(this.label8);
             this.panel1.Controls.Add(this.label6);
             this.panel1.Controls.Add(this.label4);
-            this.panel1.Location = new System.Drawing.Point(1212, 132);
+            this.panel1.Location = new System.Drawing.Point(1212, 143);
             this.panel1.Margin = new System.Windows.Forms.Padding(4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(523, 388);
+            this.panel1.Size = new System.Drawing.Size(523, 377);
             this.panel1.TabIndex = 217;
             // 
             // Baurate
@@ -369,7 +380,7 @@
             // 
             this.PrintLabel_label.AutoSize = true;
             this.PrintLabel_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintLabel_label.Location = new System.Drawing.Point(851, 180);
+            this.PrintLabel_label.Location = new System.Drawing.Point(1231, 53);
             this.PrintLabel_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.PrintLabel_label.Name = "PrintLabel_label";
             this.PrintLabel_label.Size = new System.Drawing.Size(82, 41);
@@ -380,7 +391,7 @@
             // 
             this.pa_restqty_label.AutoSize = true;
             this.pa_restqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_restqty_label.Location = new System.Drawing.Point(851, 221);
+            this.pa_restqty_label.Location = new System.Drawing.Point(1231, 94);
             this.pa_restqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pa_restqty_label.Name = "pa_restqty_label";
             this.pa_restqty_label.Size = new System.Drawing.Size(82, 41);
@@ -392,7 +403,7 @@
             this.PrintNum.AllPower = null;
             this.PrintNum.BackColor = System.Drawing.Color.White;
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(983, 227);
+            this.PrintNum.Location = new System.Drawing.Point(1363, 100);
             this.PrintNum.Margin = new System.Windows.Forms.Padding(6);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Power = null;
@@ -407,7 +418,7 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(981, 180);
+            this.PrintLabel.Location = new System.Drawing.Point(1361, 53);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.PrintLabel.Name = "PrintLabel";
             this.PrintLabel.Size = new System.Drawing.Size(219, 32);
@@ -420,7 +431,7 @@
             this.Printlab.DownImage = ((System.Drawing.Image)(resources.GetObject("Printlab.DownImage")));
             this.Printlab.Image = ((System.Drawing.Image)(resources.GetObject("Printlab.Image")));
             this.Printlab.IsShowBorder = true;
-            this.Printlab.Location = new System.Drawing.Point(1004, 474);
+            this.Printlab.Location = new System.Drawing.Point(1004, 477);
             this.Printlab.Margin = new System.Windows.Forms.Padding(6);
             this.Printlab.MoveImage = ((System.Drawing.Image)(resources.GetObject("Printlab.MoveImage")));
             this.Printlab.Name = "Printlab";
@@ -456,6 +467,89 @@
             this.Prodiodetail.TabIndex = 242;
             this.Prodiodetail.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.Prodiodetail_CellClick);
             // 
+            // pd_pdno
+            // 
+            this.pd_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pd_pdno.DataPropertyName = "pd_pdno";
+            this.pd_pdno.HeaderText = "序号";
+            this.pd_pdno.MinimumWidth = 10;
+            this.pd_pdno.Name = "pd_pdno";
+            this.pd_pdno.Width = 200;
+            // 
+            // pd_cartons
+            // 
+            this.pd_cartons.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pd_cartons.DataPropertyName = "pd_cartons";
+            this.pd_cartons.HeaderText = "栈板数量";
+            this.pd_cartons.MinimumWidth = 10;
+            this.pd_cartons.Name = "pd_cartons";
+            this.pd_cartons.Visible = false;
+            this.pd_cartons.Width = 160;
+            // 
+            // pd_id
+            // 
+            this.pd_id.DataPropertyName = "pd_id";
+            this.pd_id.HeaderText = "ID";
+            this.pd_id.MinimumWidth = 10;
+            this.pd_id.Name = "pd_id";
+            this.pd_id.Visible = false;
+            this.pd_id.Width = 10;
+            // 
+            // pd_prodcode
+            // 
+            this.pd_prodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
+            this.pd_prodcode.DataPropertyName = "pd_prodcode";
+            this.pd_prodcode.HeaderText = "物料编号";
+            this.pd_prodcode.MinimumWidth = 2;
+            this.pd_prodcode.Name = "pd_prodcode";
+            this.pd_prodcode.ReadOnly = true;
+            this.pd_prodcode.Width = 2;
+            // 
+            // pd_custpo
+            // 
+            this.pd_custpo.DataPropertyName = "pd_custpo";
+            this.pd_custpo.HeaderText = "客户订单号";
+            this.pd_custpo.MinimumWidth = 10;
+            this.pd_custpo.Name = "pd_custpo";
+            this.pd_custpo.Width = 200;
+            // 
+            // pd_custpodetno
+            // 
+            this.pd_custpodetno.DataPropertyName = "pd_custpodetno";
+            this.pd_custpodetno.HeaderText = "客户订单行号";
+            this.pd_custpodetno.MinimumWidth = 10;
+            this.pd_custpodetno.Name = "pd_custpodetno";
+            this.pd_custpodetno.Width = 200;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "pd_outqty";
+            this.dataGridViewTextBoxColumn2.HeaderText = "出货数量";
+            this.dataGridViewTextBoxColumn2.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            this.dataGridViewTextBoxColumn2.Width = 200;
+            // 
+            // pr_detail1
+            // 
+            this.pr_detail1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
+            this.pr_detail1.DataPropertyName = "pr_detail";
+            this.pr_detail1.HeaderText = "名称";
+            this.pr_detail1.MinimumWidth = 10;
+            this.pr_detail1.Name = "pr_detail1";
+            this.pr_detail1.ReadOnly = true;
+            this.pr_detail1.Width = 10;
+            // 
+            // pr_spec1
+            // 
+            this.pr_spec1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
+            this.pr_spec1.DataPropertyName = "pr_spec";
+            this.pr_spec1.HeaderText = "规格";
+            this.pr_spec1.MinimumWidth = 200;
+            this.pr_spec1.Name = "pr_spec1";
+            this.pr_spec1.ReadOnly = true;
+            this.pr_spec1.Width = 200;
+            // 
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -597,7 +691,7 @@
             this.ProdDetail.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.ProdDetail.Image = null;
             this.ProdDetail.IsShowBorder = true;
-            this.ProdDetail.Location = new System.Drawing.Point(1322, 9);
+            this.ProdDetail.Location = new System.Drawing.Point(821, 2);
             this.ProdDetail.Margin = new System.Windows.Forms.Padding(4);
             this.ProdDetail.MoveImage = ((System.Drawing.Image)(resources.GetObject("ProdDetail.MoveImage")));
             this.ProdDetail.Name = "ProdDetail";
@@ -632,7 +726,7 @@
             // 
             this.PrinterList_label.AutoSize = true;
             this.PrinterList_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrinterList_label.Location = new System.Drawing.Point(851, 133);
+            this.PrinterList_label.Location = new System.Drawing.Point(1231, 6);
             this.PrinterList_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.PrinterList_label.Name = "PrinterList_label";
             this.PrinterList_label.Size = new System.Drawing.Size(114, 41);
@@ -641,7 +735,7 @@
             // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(983, 134);
+            this.PrinterList.Location = new System.Drawing.Point(1363, 7);
             this.PrinterList.Margin = new System.Windows.Forms.Padding(8);
             this.PrinterList.Name = "PrinterList";
             this.PrinterList.Size = new System.Drawing.Size(219, 40);
@@ -650,7 +744,7 @@
             // Combine
             // 
             this.Combine.AutoSize = true;
-            this.Combine.Location = new System.Drawing.Point(1039, 26);
+            this.Combine.Location = new System.Drawing.Point(673, 17);
             this.Combine.Name = "Combine";
             this.Combine.Size = new System.Drawing.Size(138, 28);
             this.Combine.TabIndex = 250;
@@ -707,7 +801,7 @@
             this.pa_standardqty.Margin = new System.Windows.Forms.Padding(4);
             this.pa_standardqty.Name = "pa_standardqty";
             this.pa_standardqty.Power = null;
-            this.pa_standardqty.Size = new System.Drawing.Size(200, 35);
+            this.pa_standardqty.Size = new System.Drawing.Size(130, 35);
             this.pa_standardqty.Str = null;
             this.pa_standardqty.Str1 = null;
             this.pa_standardqty.Str2 = null;
@@ -732,13 +826,13 @@
             this.StartWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.DownImage")));
             this.StartWeight.Image = ((System.Drawing.Image)(resources.GetObject("StartWeight.Image")));
             this.StartWeight.IsShowBorder = true;
-            this.StartWeight.Location = new System.Drawing.Point(1409, 76);
+            this.StartWeight.Location = new System.Drawing.Point(1619, 21);
             this.StartWeight.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.StartWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.MoveImage")));
             this.StartWeight.Name = "StartWeight";
             this.StartWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.NormalImage")));
             this.StartWeight.Power = null;
-            this.StartWeight.Size = new System.Drawing.Size(141, 48);
+            this.StartWeight.Size = new System.Drawing.Size(116, 48);
             this.StartWeight.TabIndex = 252;
             this.StartWeight.Text = "开始称量";
             this.StartWeight.UseVisualStyleBackColor = true;
@@ -752,7 +846,7 @@
             this.RefreshWeigh.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.RefreshWeigh.Image = null;
             this.RefreshWeigh.IsShowBorder = true;
-            this.RefreshWeigh.Location = new System.Drawing.Point(1575, 76);
+            this.RefreshWeigh.Location = new System.Drawing.Point(1619, 76);
             this.RefreshWeigh.Margin = new System.Windows.Forms.Padding(6);
             this.RefreshWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.MoveImage")));
             this.RefreshWeigh.Name = "RefreshWeigh";
@@ -768,7 +862,7 @@
             // 
             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(851, 319);
+            this.label2.Location = new System.Drawing.Point(851, 341);
             this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(114, 41);
@@ -777,7 +871,7 @@
             // 
             // PrinterList1
             // 
-            this.PrinterList1.Location = new System.Drawing.Point(981, 323);
+            this.PrinterList1.Location = new System.Drawing.Point(981, 345);
             this.PrinterList1.Margin = new System.Windows.Forms.Padding(8);
             this.PrinterList1.Name = "PrinterList1";
             this.PrinterList1.Size = new System.Drawing.Size(219, 40);
@@ -788,7 +882,7 @@
             this.PrintNum1.AllPower = null;
             this.PrintNum1.BackColor = System.Drawing.Color.White;
             this.PrintNum1.ID = null;
-            this.PrintNum1.Location = new System.Drawing.Point(983, 413);
+            this.PrintNum1.Location = new System.Drawing.Point(983, 435);
             this.PrintNum1.Margin = new System.Windows.Forms.Padding(6);
             this.PrintNum1.Name = "PrintNum1";
             this.PrintNum1.Power = null;
@@ -803,7 +897,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(851, 366);
+            this.label3.Location = new System.Drawing.Point(851, 388);
             this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(82, 41);
@@ -814,7 +908,7 @@
             // 
             this.PrintLabel1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel1.FormattingEnabled = true;
-            this.PrintLabel1.Location = new System.Drawing.Point(981, 366);
+            this.PrintLabel1.Location = new System.Drawing.Point(981, 388);
             this.PrintLabel1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.PrintLabel1.Name = "PrintLabel1";
             this.PrintLabel1.Size = new System.Drawing.Size(219, 32);
@@ -824,7 +918,7 @@
             // 
             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(851, 407);
+            this.label7.Location = new System.Drawing.Point(851, 429);
             this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(82, 41);
@@ -835,7 +929,7 @@
             // 
             this.PrintSecond.AutoSize = true;
             this.PrintSecond.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.PrintSecond.Location = new System.Drawing.Point(858, 274);
+            this.PrintSecond.Location = new System.Drawing.Point(858, 296);
             this.PrintSecond.Margin = new System.Windows.Forms.Padding(6);
             this.PrintSecond.Name = "PrintSecond";
             this.PrintSecond.Size = new System.Drawing.Size(182, 39);
@@ -843,94 +937,155 @@
             this.PrintSecond.Text = "打印副标签";
             this.PrintSecond.UseVisualStyleBackColor = true;
             // 
-            // pd_pdno
-            // 
-            this.pd_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pd_pdno.DataPropertyName = "pd_pdno";
-            this.pd_pdno.HeaderText = "序号";
-            this.pd_pdno.MinimumWidth = 10;
-            this.pd_pdno.Name = "pd_pdno";
-            this.pd_pdno.Width = 200;
-            // 
-            // pd_cartons
-            // 
-            this.pd_cartons.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pd_cartons.DataPropertyName = "pd_cartons";
-            this.pd_cartons.HeaderText = "栈板数量";
-            this.pd_cartons.MinimumWidth = 10;
-            this.pd_cartons.Name = "pd_cartons";
-            this.pd_cartons.Visible = false;
-            this.pd_cartons.Width = 160;
-            // 
-            // pd_id
-            // 
-            this.pd_id.DataPropertyName = "pd_id";
-            this.pd_id.HeaderText = "ID";
-            this.pd_id.MinimumWidth = 10;
-            this.pd_id.Name = "pd_id";
-            this.pd_id.Visible = false;
-            this.pd_id.Width = 10;
-            // 
-            // pd_prodcode
-            // 
-            this.pd_prodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
-            this.pd_prodcode.DataPropertyName = "pd_prodcode";
-            this.pd_prodcode.HeaderText = "物料编号";
-            this.pd_prodcode.MinimumWidth = 2;
-            this.pd_prodcode.Name = "pd_prodcode";
-            this.pd_prodcode.ReadOnly = true;
-            this.pd_prodcode.Width = 2;
-            // 
-            // pd_custpo
-            // 
-            this.pd_custpo.DataPropertyName = "pd_custpo";
-            this.pd_custpo.HeaderText = "客户订单号";
-            this.pd_custpo.MinimumWidth = 10;
-            this.pd_custpo.Name = "pd_custpo";
-            this.pd_custpo.Width = 200;
-            // 
-            // pd_custpodetno
-            // 
-            this.pd_custpodetno.DataPropertyName = "pd_custpodetno";
-            this.pd_custpodetno.HeaderText = "客户订单行号";
-            this.pd_custpodetno.MinimumWidth = 10;
-            this.pd_custpodetno.Name = "pd_custpodetno";
-            this.pd_custpodetno.Width = 200;
-            // 
-            // dataGridViewTextBoxColumn2
-            // 
-            this.dataGridViewTextBoxColumn2.DataPropertyName = "pd_outqty";
-            this.dataGridViewTextBoxColumn2.HeaderText = "出货数量";
-            this.dataGridViewTextBoxColumn2.MinimumWidth = 10;
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.ReadOnly = true;
-            this.dataGridViewTextBoxColumn2.Width = 200;
-            // 
-            // pr_detail1
-            // 
-            this.pr_detail1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
-            this.pr_detail1.DataPropertyName = "pr_detail";
-            this.pr_detail1.HeaderText = "名称";
-            this.pr_detail1.MinimumWidth = 10;
-            this.pr_detail1.Name = "pr_detail1";
-            this.pr_detail1.ReadOnly = true;
-            this.pr_detail1.Width = 10;
-            // 
-            // pr_spec1
-            // 
-            this.pr_spec1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
-            this.pr_spec1.DataPropertyName = "pr_spec";
-            this.pr_spec1.HeaderText = "规格";
-            this.pr_spec1.MinimumWidth = 200;
-            this.pr_spec1.Name = "pr_spec1";
-            this.pr_spec1.ReadOnly = true;
-            this.pr_spec1.Width = 200;
+            // PrintThird
+            // 
+            this.PrintThird.AutoSize = true;
+            this.PrintThird.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.PrintThird.Location = new System.Drawing.Point(860, 112);
+            this.PrintThird.Margin = new System.Windows.Forms.Padding(6);
+            this.PrintThird.Name = "PrintThird";
+            this.PrintThird.Size = new System.Drawing.Size(182, 39);
+            this.PrintThird.TabIndex = 269;
+            this.PrintThird.Text = "打印副标签";
+            this.PrintThird.UseVisualStyleBackColor = true;
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label9.Location = new System.Drawing.Point(853, 157);
+            this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(114, 41);
+            this.label9.TabIndex = 268;
+            this.label9.Text = "打印机";
+            // 
+            // PrinterList2
+            // 
+            this.PrinterList2.Location = new System.Drawing.Point(983, 161);
+            this.PrinterList2.Margin = new System.Windows.Forms.Padding(8);
+            this.PrinterList2.Name = "PrinterList2";
+            this.PrinterList2.Size = new System.Drawing.Size(219, 40);
+            this.PrinterList2.TabIndex = 267;
+            // 
+            // PrintNum2
+            // 
+            this.PrintNum2.AllPower = null;
+            this.PrintNum2.BackColor = System.Drawing.Color.White;
+            this.PrintNum2.ID = null;
+            this.PrintNum2.Location = new System.Drawing.Point(985, 251);
+            this.PrintNum2.Margin = new System.Windows.Forms.Padding(6);
+            this.PrintNum2.Name = "PrintNum2";
+            this.PrintNum2.Power = null;
+            this.PrintNum2.Size = new System.Drawing.Size(219, 35);
+            this.PrintNum2.Str = null;
+            this.PrintNum2.Str1 = null;
+            this.PrintNum2.Str2 = null;
+            this.PrintNum2.TabIndex = 266;
+            this.PrintNum2.Text = "1";
+            // 
+            // label11
+            // 
+            this.label11.AutoSize = true;
+            this.label11.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label11.Location = new System.Drawing.Point(853, 204);
+            this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(82, 41);
+            this.label11.TabIndex = 265;
+            this.label11.Text = "标签";
+            // 
+            // PrintLabel2
+            // 
+            this.PrintLabel2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.PrintLabel2.FormattingEnabled = true;
+            this.PrintLabel2.Location = new System.Drawing.Point(983, 204);
+            this.PrintLabel2.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.PrintLabel2.Name = "PrintLabel2";
+            this.PrintLabel2.Size = new System.Drawing.Size(219, 32);
+            this.PrintLabel2.TabIndex = 264;
+            // 
+            // label12
+            // 
+            this.label12.AutoSize = true;
+            this.label12.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label12.Location = new System.Drawing.Point(853, 245);
+            this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label12.Name = "label12";
+            this.label12.Size = new System.Drawing.Size(82, 41);
+            this.label12.TabIndex = 263;
+            this.label12.Text = "张数";
+            // 
+            // pi_palletnum
+            // 
+            this.pi_palletnum.AllPower = null;
+            this.pi_palletnum.BackColor = System.Drawing.Color.White;
+            this.pi_palletnum.ID = null;
+            this.pi_palletnum.Location = new System.Drawing.Point(1104, 15);
+            this.pi_palletnum.Margin = new System.Windows.Forms.Padding(4);
+            this.pi_palletnum.Name = "pi_palletnum";
+            this.pi_palletnum.Power = null;
+            this.pi_palletnum.Size = new System.Drawing.Size(123, 35);
+            this.pi_palletnum.Str = null;
+            this.pi_palletnum.Str1 = null;
+            this.pi_palletnum.Str2 = null;
+            this.pi_palletnum.TabIndex = 271;
+            this.pi_palletnum.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pi_palletnum_KeyDown);
+            // 
+            // label13
+            // 
+            this.label13.AutoSize = true;
+            this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label13.Location = new System.Drawing.Point(980, 11);
+            this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label13.Name = "label13";
+            this.label13.Size = new System.Drawing.Size(114, 41);
+            this.label13.TabIndex = 270;
+            this.label13.Text = "栈板数";
+            // 
+            // label14
+            // 
+            this.label14.AutoSize = true;
+            this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label14.Location = new System.Drawing.Point(980, 60);
+            this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label14.Name = "label14";
+            this.label14.Size = new System.Drawing.Size(114, 41);
+            this.label14.TabIndex = 272;
+            this.label14.Text = "散箱数";
+            // 
+            // pi_boxnum
+            // 
+            this.pi_boxnum.AllPower = null;
+            this.pi_boxnum.BackColor = System.Drawing.Color.White;
+            this.pi_boxnum.ID = null;
+            this.pi_boxnum.Location = new System.Drawing.Point(1104, 66);
+            this.pi_boxnum.Margin = new System.Windows.Forms.Padding(4);
+            this.pi_boxnum.Name = "pi_boxnum";
+            this.pi_boxnum.Power = null;
+            this.pi_boxnum.Size = new System.Drawing.Size(123, 35);
+            this.pi_boxnum.Str = null;
+            this.pi_boxnum.Str1 = null;
+            this.pi_boxnum.Str2 = null;
+            this.pi_boxnum.TabIndex = 273;
+            this.pi_boxnum.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pi_boxnum_KeyDown);
             // 
             // Warehouse_FinishedProductOutSumNEW
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1750, 1036);
+            this.Controls.Add(this.pi_boxnum);
+            this.Controls.Add(this.label14);
+            this.Controls.Add(this.pi_palletnum);
+            this.Controls.Add(this.label13);
+            this.Controls.Add(this.PrintThird);
+            this.Controls.Add(this.label9);
+            this.Controls.Add(this.PrinterList2);
+            this.Controls.Add(this.PrintNum2);
+            this.Controls.Add(this.label11);
+            this.Controls.Add(this.PrintLabel2);
+            this.Controls.Add(this.label12);
             this.Controls.Add(this.PrintSecond);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.PrinterList1);
@@ -1056,5 +1211,16 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec1;
+        private System.Windows.Forms.CheckBox PrintThird;
+        private System.Windows.Forms.Label label9;
+        private CustomControl.ComBoxWithFocus.PrinterCombox PrinterList2;
+        private CustomControl.TextBoxWithIcon.EnterTextBox PrintNum2;
+        private System.Windows.Forms.Label label11;
+        private CustomControl.ComBoxWithFocus.ComboxWithTip PrintLabel2;
+        private System.Windows.Forms.Label label12;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pi_palletnum;
+        private System.Windows.Forms.Label label13;
+        private System.Windows.Forms.Label label14;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pi_boxnum;
     }
 }

UAS_MES_YDCY/FunctionCode/Warehouse/Warehouse_FinishedProductOutSumNEW.cs

@@ -63,8 +63,8 @@ namespace UAS_MES_NEW.Warehouse
             stw.ShowDialog();
             pi_inoutno.TableName = "prodinout";
             pi_inoutno.DBTitle = "出货单查询";
-            pi_inoutno.SelectField = "pi_id # ID,pi_title  # 客户名称,pi_inoutno # 出货单号,pi_type # 出货类型";
-            pi_inoutno.SetValueField = new string[] { "pi_title", "pi_inoutno", "pi_id", "pi_type" };
+            pi_inoutno.SelectField = "pi_id # ID,pi_title  # 客户名称,pi_inoutno # 出货单号,pi_type # 出货类型,pi_palletnum # 栈板数量 ,pi_boxnum # 散箱数量 ";
+            pi_inoutno.SetValueField = new string[] { "pi_title", "pi_inoutno", "pi_id", "pi_type", "pi_palletnum", "pi_boxnum" };
             pi_inoutno.FormName = Name;
             pi_inoutno.Condition = "nvl(pi_pdastatus,' ')<>'已出库' and pi_class='其它出库单' and pi_type='销售出货'";
             pi_inoutno.DbChange += Pi_inoutno_DbChange;
@@ -370,6 +370,12 @@ namespace UAS_MES_NEW.Warehouse
                                 OperateResult.AppendText("当前栈板数量" + PA_TOTALQTY + ",超出待采集数量\n", Color.Red, input);
                                 return;
                             }
+                            int palletnum = int.Parse(dh.getFieldDataByCondition("prodiomac", " count(distinct pim_outboxcode)", "pim_inoutno='" + pi_inoutno.Text + "' and PIM_TYPE='PALLET' ").ToString());
+                            if (palletnum >= int.Parse(pi_palletnum.Text))
+                            {
+                                OperateResult.AppendText("当前栈板数量" + palletnum + ",超出设置栈板数" + pi_palletnum.Text + "\n", Color.Red, input);
+                                return;
+                            }
                             RefreshWeight(pa_prodcode, input.Text);
                             if (!checkinsertprodiomac("栈板号", input.Text))
                                 return;
@@ -470,6 +476,12 @@ namespace UAS_MES_NEW.Warehouse
                             }
                             else
                             {
+                                int boxnum = int.Parse(dh.getFieldDataByCondition("prodiomac", " count(distinct pim_outboxcode)", "pim_inoutno='" + pi_inoutno.Text + "' and PIM_TYPE='BOX' ").ToString());
+                                if (boxnum >= int.Parse(pi_boxnum.Text))
+                                {
+                                    OperateResult.AppendText("当前散数量" + boxnum + ",超出设置散箱数" + pi_boxnum.Text + "\n", Color.Red, input);
+                                    return;
+                                }
                                 if (pa_mothercode != "")
                                 {
                                     //从之前的栈板号里面移除出来
@@ -850,6 +862,10 @@ namespace UAS_MES_NEW.Warehouse
             PrintLabel1.DataSource = _dt.Copy();
             PrintLabel1.DisplayMember = "la_url";
             PrintLabel1.ValueMember = "la_id";
+
+            PrintLabel2.DataSource = _dt.Copy();
+            PrintLabel2.DisplayMember = "la_url";
+            PrintLabel2.ValueMember = "la_id";
         }
         Engine engine;
         private void Printlab_Click(object sender, EventArgs e)
@@ -885,6 +901,17 @@ namespace UAS_MES_NEW.Warehouse
                     OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                 }
             }
+            if (PrintThird.Checked)
+            {
+                if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel2.Text, PrintLabel2.SelectedValue.ToString(), PrinterList2.Text, PDID, PrintPrcode, int.Parse(PrintNum2.Text), PdPDNO, PrintPrcode, "栈板标", "0", out ErrorMessage))
+                {
+                    OperateResult.AppendText(">>打印料号" + PrintPrcode + "\n", Color.Black);
+                }
+                else
+                {
+                    OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
+                }
+            }
         }
 
         private void pa_standardqty_KeyDown(object sender, KeyEventArgs e)
@@ -905,6 +932,8 @@ namespace UAS_MES_NEW.Warehouse
                     string total = dt.Rows[0]["pa_totalqty"].ToString();
                     if (int.Parse(pa_standardqty.Text) >= int.Parse(total))
                     {
+
+
                         dh.UpdateByCondition("package", "pa_standardqty='" + pa_standardqty.Text + "'", "pa_outboxcode='" + pa_outboxcode.Text + "'");
                         OperateResult.AppendText(">>栈板" + pa_outboxcode.Text + "修改容量成功,已修改为" + pa_standardqty.Text + "\n", Color.Green);
                         return;
@@ -918,5 +947,61 @@ namespace UAS_MES_NEW.Warehouse
         {
 
         }
+
+        private void pi_palletnum_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (dh.CheckExist("prodinout", "pi_inoutno='" + pi_inoutno.Text + "'"))
+                {
+                    int palletnum = 0;
+                    if (int.TryParse(pi_palletnum.Text, out palletnum))
+                    {
+                        int pallet_num = int.Parse(dh.getFieldDataByCondition("prodiomac", " count(distinct pim_outboxcode)", "pim_inoutno='" + pi_inoutno.Text + "' and PIM_TYPE='PALLET' ").ToString());
+                        if (palletnum < pallet_num)
+                        {
+                            pi_palletnum.Text = pallet_num.ToString();
+                            OperateResult.AppendText(">>单号" + pi_inoutno.Text + "已采集栈板数" + pallet_num + ",设置栈板数量不允许小于该数值\n", Color.Red);
+                            return;
+                        }
+                        dh.ExecuteSql("update prodinout set pi_palletnum='" + palletnum + "' where pi_inoutno='" + pi_inoutno.Text + "'", "update");
+                        OperateResult.AppendText(">>单号" + pi_inoutno.Text + "修改栈板数量" + palletnum + "成功\n", Color.Green);
+                    }
+                    else
+                    {
+                        OperateResult.AppendText(">>请输入正确的数字\n", Color.Red);
+                    }
+                }
+                else OperateResult.AppendText(">>单号" + pi_inoutno.Text + "不存在\n", Color.Red);
+            }
+        }
+
+        private void pi_boxnum_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (dh.CheckExist("prodinout", "pi_inoutno='" + pi_inoutno.Text + "'"))
+                {
+                    int boxnum = 0;
+                    if (int.TryParse(pi_boxnum.Text, out boxnum))
+                    {
+                        int box_num = int.Parse(dh.getFieldDataByCondition("prodiomac", " count(distinct pim_outboxcode)", "pim_inoutno='" + pi_inoutno.Text + "' and PIM_TYPE='PALLET' ").ToString());
+                        if (boxnum < box_num)
+                        {
+                            pi_boxnum.Text = box_num.ToString();
+                            OperateResult.AppendText(">>单号" + pi_inoutno.Text + "已采集散箱数" + box_num + ",设置散箱数量不允许小于该数值\n", Color.Red);
+                            return;
+                        }
+                        dh.ExecuteSql("update prodinout set pi_boxnum='" + boxnum + "' where pi_inoutno='" + pi_inoutno.Text + "'", "update");
+                        OperateResult.AppendText(">>单号" + pi_inoutno.Text + "修改散箱数量" + boxnum + "成功\n", Color.Green);
+                    }
+                    else
+                    {
+                        OperateResult.AppendText(">>请输入正确的数字\n", Color.Red);
+                    }
+                }
+                else OperateResult.AppendText(">>单号" + pi_inoutno.Text + "不存在\n", Color.Red);
+            }
+        }
     }
 }

UAS_MES_YDCY/FunctionCode/Warehouse/Warehouse_FinishedProductOutSumNEW.resx

@@ -279,6 +279,33 @@
   <metadata name="pr_spec1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pd_pdno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pd_cartons.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pd_prodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pd_custpo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pd_custpodetno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pr_detail1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pr_spec1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="Clean.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -335,6 +362,24 @@
   <metadata name="blank.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pa_mothercode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="PA_TOTALQTY.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pa_prodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pr_detail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="blank.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="ProdDetail.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m