优化代码提交

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

@@ -89,8 +89,25 @@
             this.pi_title = new System.Windows.Forms.Label();
             this.label9 = new System.Windows.Forms.Label();
             this.ProcessCount = new System.Windows.Forms.Label();
+            this.CombindetailTwo = new System.Windows.Forms.CheckBox();
             this.DCCheck = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.GridPrcode = new UAS_LabelMachine.CustomControl.DataGridViewWithSerialNum();
+            this.pd_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_piid = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_inoutno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_whcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pjd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_custprodcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_pocode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CollectedNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.UnCollectedNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_outqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_unit = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_spec1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pjd_zxbzs_user = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.groupBoxWithBorder1 = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.label18 = new System.Windows.Forms.Label();
             this.MidBoxEnd = new UAS_LabelMachine.CustomControl.EnterTextBox();
@@ -102,26 +119,6 @@
             this.label7 = new System.Windows.Forms.Label();
             this.Input = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.LabelInf = new UAS_LabelMachine.CustomControl.DataGridViewWithSerialNum();
-            this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.pib_ifprint = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.pib_id1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_custprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pjd_orispeccode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_zxbzs = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_datecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DateCode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_custbarcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_custmidboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_custoutboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_pocode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_outboxcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_outboxcode2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pi_inoutno = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.SingleLabel = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.SingleLabelPrinter = new UAS_LabelMachine.CustomControl.PrinterCombox();
@@ -146,20 +143,27 @@
             this.OutboxCapacity = new System.Windows.Forms.NumericUpDown();
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
-            this.pd_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_piid = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_inoutno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_whcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pjd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_custprodcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.CollectedNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.UnCollectedNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_outqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_unit = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_spec1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pjd_zxbzs_user = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.pib_ifprint = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.pib_midifprint = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.pib_id1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_custprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pjd_orispeccode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_zxbzs = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_datecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DateCode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_custbarcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_custmidboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_custoutboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_pocode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_outboxcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_outboxcode2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridPrcode)).BeginInit();
@@ -195,7 +199,7 @@
             // LabelMainTain
             // 
             this.LabelMainTain.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LabelMainTain.Location = new System.Drawing.Point(388, 15);
+            this.LabelMainTain.Location = new System.Drawing.Point(388, 6);
             this.LabelMainTain.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.LabelMainTain.Name = "LabelMainTain";
             this.LabelMainTain.Size = new System.Drawing.Size(64, 26);
@@ -207,7 +211,7 @@
             // CleanDetail
             // 
             this.CleanDetail.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CleanDetail.Location = new System.Drawing.Point(296, 15);
+            this.CleanDetail.Location = new System.Drawing.Point(296, 6);
             this.CleanDetail.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.CleanDetail.Name = "CleanDetail";
             this.CleanDetail.Size = new System.Drawing.Size(64, 26);
@@ -472,7 +476,7 @@
             // AttachInfo
             // 
             this.AttachInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AttachInfo.Location = new System.Drawing.Point(388, 48);
+            this.AttachInfo.Location = new System.Drawing.Point(388, 39);
             this.AttachInfo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.AttachInfo.Name = "AttachInfo";
             this.AttachInfo.Size = new System.Drawing.Size(64, 26);
@@ -504,7 +508,7 @@
             // ExportData
             // 
             this.ExportData.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ExportData.Location = new System.Drawing.Point(296, 48);
+            this.ExportData.Location = new System.Drawing.Point(296, 39);
             this.ExportData.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ExportData.Name = "ExportData";
             this.ExportData.Size = new System.Drawing.Size(64, 26);
@@ -516,7 +520,7 @@
             // PrintFooter
             // 
             this.PrintFooter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintFooter.Location = new System.Drawing.Point(485, 15);
+            this.PrintFooter.Location = new System.Drawing.Point(485, 6);
             this.PrintFooter.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintFooter.Name = "PrintFooter";
             this.PrintFooter.Size = new System.Drawing.Size(64, 26);
@@ -530,7 +534,7 @@
             this.SetPrintStatus_label.AutoSize = true;
             this.SetPrintStatus_label.Font = new System.Drawing.Font("微软雅黑", 12F);
             this.SetPrintStatus_label.ForeColor = System.Drawing.Color.Green;
-            this.SetPrintStatus_label.Location = new System.Drawing.Point(475, 191);
+            this.SetPrintStatus_label.Location = new System.Drawing.Point(510, 191);
             this.SetPrintStatus_label.Name = "SetPrintStatus_label";
             this.SetPrintStatus_label.Size = new System.Drawing.Size(58, 21);
             this.SetPrintStatus_label.TabIndex = 76;
@@ -539,7 +543,7 @@
             // pictureBox1
             // 
             this.pictureBox1.Image = global::UAS_LabelMachine.Properties.Resources.Status;
-            this.pictureBox1.Location = new System.Drawing.Point(411, 120);
+            this.pictureBox1.Location = new System.Drawing.Point(446, 120);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(122, 64);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@@ -559,7 +563,7 @@
             // PackOutBox
             // 
             this.PackOutBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PackOutBox.Location = new System.Drawing.Point(485, 81);
+            this.PackOutBox.Location = new System.Drawing.Point(485, 72);
             this.PackOutBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PackOutBox.Name = "PackOutBox";
             this.PackOutBox.Size = new System.Drawing.Size(64, 26);
@@ -572,7 +576,7 @@
             // PrintStatus
             // 
             this.PrintStatus.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintStatus.Location = new System.Drawing.Point(485, 50);
+            this.PrintStatus.Location = new System.Drawing.Point(485, 41);
             this.PrintStatus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintStatus.Name = "PrintStatus";
             this.PrintStatus.Size = new System.Drawing.Size(64, 26);
@@ -622,7 +626,7 @@
             // PackMidBox
             // 
             this.PackMidBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PackMidBox.Location = new System.Drawing.Point(388, 80);
+            this.PackMidBox.Location = new System.Drawing.Point(388, 71);
             this.PackMidBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PackMidBox.Name = "PackMidBox";
             this.PackMidBox.Size = new System.Drawing.Size(64, 26);
@@ -636,7 +640,7 @@
             // 
             this.CustomerLabel.Enabled = false;
             this.CustomerLabel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CustomerLabel.Location = new System.Drawing.Point(296, 81);
+            this.CustomerLabel.Location = new System.Drawing.Point(296, 72);
             this.CustomerLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.CustomerLabel.Name = "CustomerLabel";
             this.CustomerLabel.Size = new System.Drawing.Size(84, 26);
@@ -648,13 +652,13 @@
             // Combindetail
             // 
             this.Combindetail.AutoSize = true;
-            this.Combindetail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Combindetail.Location = new System.Drawing.Point(296, 114);
+            this.Combindetail.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.Combindetail.Location = new System.Drawing.Point(296, 102);
             this.Combindetail.Margin = new System.Windows.Forms.Padding(2);
             this.Combindetail.Name = "Combindetail";
-            this.Combindetail.Size = new System.Drawing.Size(93, 25);
+            this.Combindetail.Size = new System.Drawing.Size(82, 21);
             this.Combindetail.TabIndex = 104;
-            this.Combindetail.Text = "合并明细";
+            this.Combindetail.Text = "合并明细1";
             this.Combindetail.UseVisualStyleBackColor = true;
             this.Combindetail.CheckedChanged += new System.EventHandler(this.Combindetail_CheckedChanged);
             // 
@@ -697,6 +701,19 @@
             this.ProcessCount.Size = new System.Drawing.Size(0, 20);
             this.ProcessCount.TabIndex = 108;
             // 
+            // CombindetailTwo
+            // 
+            this.CombindetailTwo.AutoSize = true;
+            this.CombindetailTwo.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.CombindetailTwo.Location = new System.Drawing.Point(296, 130);
+            this.CombindetailTwo.Margin = new System.Windows.Forms.Padding(2);
+            this.CombindetailTwo.Name = "CombindetailTwo";
+            this.CombindetailTwo.Size = new System.Drawing.Size(119, 21);
+            this.CombindetailTwo.TabIndex = 109;
+            this.CombindetailTwo.Text = "合并明细2(加PO)";
+            this.CombindetailTwo.UseVisualStyleBackColor = true;
+            this.CombindetailTwo.CheckedChanged += new System.EventHandler(this.CombindetailTwo_CheckedChanged);
+            // 
             // DCCheck
             // 
             this.DCCheck.ID = null;
@@ -718,10 +735,12 @@
             this.GridPrcode.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.pd_pdno,
             this.pd_piid,
+            this.Column1,
             this.pd_inoutno,
             this.pd_whcode,
             this.pjd_id,
             this.pd_custprodcode1,
+            this.pd_pocode1,
             this.pd_prodcode,
             this.CollectedNum,
             this.UnCollectedNum,
@@ -751,6 +770,139 @@
             this.GridPrcode.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.GridPrcode_CellPainting);
             this.GridPrcode.SelectionChanged += new System.EventHandler(this.GridPrcode_SelectionChanged);
             // 
+            // pd_pdno
+            // 
+            this.pd_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+            this.pd_pdno.DataPropertyName = "pd_pdno";
+            this.pd_pdno.HeaderText = "序号";
+            this.pd_pdno.Name = "pd_pdno";
+            this.pd_pdno.ReadOnly = true;
+            this.pd_pdno.Width = 54;
+            // 
+            // pd_piid
+            // 
+            this.pd_piid.DataPropertyName = "pd_piid";
+            this.pd_piid.HeaderText = "Column1";
+            this.pd_piid.Name = "pd_piid";
+            this.pd_piid.Visible = false;
+            // 
+            // Column1
+            // 
+            this.Column1.DataPropertyName = "combined";
+            this.Column1.HeaderText = "Column1";
+            this.Column1.Name = "Column1";
+            this.Column1.Visible = false;
+            // 
+            // pd_inoutno
+            // 
+            this.pd_inoutno.DataPropertyName = "pd_inoutno";
+            this.pd_inoutno.HeaderText = "Column1";
+            this.pd_inoutno.Name = "pd_inoutno";
+            this.pd_inoutno.Visible = false;
+            // 
+            // pd_whcode
+            // 
+            this.pd_whcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+            this.pd_whcode.DataPropertyName = "pd_whcode";
+            this.pd_whcode.HeaderText = "仓别";
+            this.pd_whcode.Name = "pd_whcode";
+            this.pd_whcode.Width = 54;
+            // 
+            // pjd_id
+            // 
+            this.pjd_id.DataPropertyName = "pjd_id";
+            this.pjd_id.HeaderText = "pjd_id";
+            this.pjd_id.Name = "pjd_id";
+            this.pjd_id.Visible = false;
+            // 
+            // pd_custprodcode1
+            // 
+            this.pd_custprodcode1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
+            this.pd_custprodcode1.DataPropertyName = "pd_custprodcode";
+            this.pd_custprodcode1.HeaderText = "客户料号";
+            this.pd_custprodcode1.Name = "pd_custprodcode1";
+            this.pd_custprodcode1.Width = 78;
+            // 
+            // pd_pocode1
+            // 
+            this.pd_pocode1.DataPropertyName = "pd_pocode";
+            this.pd_pocode1.HeaderText = "客户PO";
+            this.pd_pocode1.Name = "pd_pocode1";
+            // 
+            // pd_prodcode
+            // 
+            this.pd_prodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.pd_prodcode.DataPropertyName = "pd_prodcode";
+            this.pd_prodcode.HeaderText = "物料编号";
+            this.pd_prodcode.Name = "pd_prodcode";
+            this.pd_prodcode.ReadOnly = true;
+            this.pd_prodcode.Width = 78;
+            // 
+            // CollectedNum
+            // 
+            this.CollectedNum.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.CollectedNum.DataPropertyName = "CollectedNum";
+            this.CollectedNum.HeaderText = "已采数";
+            this.CollectedNum.Name = "CollectedNum";
+            this.CollectedNum.ReadOnly = true;
+            this.CollectedNum.Width = 66;
+            // 
+            // UnCollectedNum
+            // 
+            this.UnCollectedNum.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.UnCollectedNum.DataPropertyName = "UnCollectedNum";
+            this.UnCollectedNum.HeaderText = "未采集";
+            this.UnCollectedNum.Name = "UnCollectedNum";
+            this.UnCollectedNum.ReadOnly = true;
+            this.UnCollectedNum.Visible = false;
+            // 
+            // pd_outqty
+            // 
+            this.pd_outqty.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.pd_outqty.DataPropertyName = "pd_outqty";
+            this.pd_outqty.HeaderText = "出库数量";
+            this.pd_outqty.Name = "pd_outqty";
+            this.pd_outqty.ReadOnly = true;
+            this.pd_outqty.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.pd_outqty.Width = 59;
+            // 
+            // pr_unit
+            // 
+            this.pr_unit.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+            this.pr_unit.DataPropertyName = "pr_unit";
+            this.pr_unit.HeaderText = "单位";
+            this.pr_unit.Name = "pr_unit";
+            this.pr_unit.ReadOnly = true;
+            this.pr_unit.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.pr_unit.Width = 35;
+            // 
+            // pr_spec1
+            // 
+            this.pr_spec1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
+            this.pr_spec1.DataPropertyName = "pr_spec";
+            this.pr_spec1.HeaderText = "规格";
+            this.pr_spec1.MinimumWidth = 100;
+            this.pr_spec1.Name = "pr_spec1";
+            // 
+            // pd_brand
+            // 
+            this.pd_brand.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+            this.pd_brand.DataPropertyName = "pd_brand";
+            this.pd_brand.HeaderText = "品牌";
+            this.pd_brand.Name = "pd_brand";
+            this.pd_brand.ReadOnly = true;
+            this.pd_brand.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.pd_brand.Width = 35;
+            // 
+            // pjd_zxbzs_user
+            // 
+            this.pjd_zxbzs_user.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pjd_zxbzs_user.DataPropertyName = "pjd_zxbzs_user";
+            this.pjd_zxbzs_user.HeaderText = "最小包装";
+            this.pjd_zxbzs_user.MinimumWidth = 80;
+            this.pjd_zxbzs_user.Name = "pjd_zxbzs_user";
+            this.pjd_zxbzs_user.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
             // groupBoxWithBorder1
             // 
             this.groupBoxWithBorder1.Controls.Add(this.label18);
@@ -882,6 +1034,7 @@
             this.LabelInf.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Choose,
             this.pib_ifprint,
+            this.pib_midifprint,
             this.pib_id1,
             this.pib_pdno,
             this.pib_prodcode,
@@ -910,216 +1063,45 @@
             this.LabelInf.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.LabelInf_DataError);
             this.LabelInf.SelectionChanged += new System.EventHandler(this.LabelInf_SelectionChanged);
             // 
-            // Choose
-            // 
-            this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.Choose.HeaderText = "勾选";
-            this.Choose.Name = "Choose";
-            this.Choose.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.Choose.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.Choose.Width = 55;
-            // 
-            // pib_ifprint
+            // pi_inoutno
             // 
-            this.pib_ifprint.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_ifprint.DataPropertyName = "pib_ifprint";
-            this.pib_ifprint.HeaderText = "已打印";
-            this.pib_ifprint.Name = "pib_ifprint";
-            this.pib_ifprint.Width = 60;
+            this.pi_inoutno.ID = null;
+            this.pi_inoutno.Location = new System.Drawing.Point(86, 10);
+            this.pi_inoutno.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.pi_inoutno.Name = "pi_inoutno";
+            this.pi_inoutno.Size = new System.Drawing.Size(150, 21);
+            this.pi_inoutno.Str = null;
+            this.pi_inoutno.Str1 = null;
+            this.pi_inoutno.Str2 = null;
+            this.pi_inoutno.TabIndex = 2;
+            this.pi_inoutno.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pi_inoutno_KeyDown);
             // 
-            // pib_id1
+            // SingleLabel
             // 
-            this.pib_id1.DataPropertyName = "pib_id";
-            this.pib_id1.HeaderText = "pib_id";
-            this.pib_id1.Name = "pib_id1";
-            this.pib_id1.Visible = false;
-            this.pib_id1.Width = 66;
+            this.SingleLabel.Controls.Add(this.SingleLabelPrinter);
+            this.SingleLabel.Controls.Add(this.SingleLabelPrint);
+            this.SingleLabel.Controls.Add(this.SingleLabelAutoPrint);
+            this.SingleLabel.Controls.Add(this.SingleLabelCombox);
+            this.SingleLabel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SingleLabel.Location = new System.Drawing.Point(726, 6);
+            this.SingleLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.SingleLabel.Name = "SingleLabel";
+            this.SingleLabel.Padding = new System.Windows.Forms.Padding(2);
+            this.SingleLabel.Size = new System.Drawing.Size(170, 211);
+            this.SingleLabel.TabIndex = 77;
+            this.SingleLabel.TabStop = false;
+            this.SingleLabel.Text = "单盘标签";
             // 
-            // pib_pdno
+            // SingleLabelPrinter
             // 
-            this.pib_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_pdno.DataPropertyName = "pib_pdno";
-            this.pib_pdno.HeaderText = "序号";
-            this.pib_pdno.Name = "pib_pdno";
-            this.pib_pdno.ReadOnly = true;
-            this.pib_pdno.Width = 55;
+            this.SingleLabelPrinter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SingleLabelPrinter.Location = new System.Drawing.Point(7, 63);
+            this.SingleLabelPrinter.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+            this.SingleLabelPrinter.Name = "SingleLabelPrinter";
+            this.SingleLabelPrinter.Size = new System.Drawing.Size(159, 25);
+            this.SingleLabelPrinter.TabIndex = 40;
             // 
-            // pib_prodcode
-            // 
-            this.pib_prodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_prodcode.DataPropertyName = "pib_prodcode";
-            this.pib_prodcode.HeaderText = "物料编号";
-            this.pib_prodcode.MinimumWidth = 120;
-            this.pib_prodcode.Name = "pib_prodcode";
-            this.pib_prodcode.ReadOnly = true;
-            this.pib_prodcode.Width = 120;
-            // 
-            // pd_custprodcode
-            // 
-            this.pd_custprodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pd_custprodcode.DataPropertyName = "pd_custprodcode";
-            this.pd_custprodcode.HeaderText = "CPN";
-            this.pd_custprodcode.MinimumWidth = 120;
-            this.pd_custprodcode.Name = "pd_custprodcode";
-            this.pd_custprodcode.Width = 120;
-            // 
-            // pjd_orispeccode
-            // 
-            this.pjd_orispeccode.DataPropertyName = "pjd_orispeccode";
-            this.pjd_orispeccode.HeaderText = "MPN";
-            this.pjd_orispeccode.Name = "pjd_orispeccode";
-            this.pjd_orispeccode.ReadOnly = true;
-            this.pjd_orispeccode.Visible = false;
-            this.pjd_orispeccode.Width = 48;
-            // 
-            // pib_brand
-            // 
-            this.pib_brand.DataPropertyName = "pib_brand";
-            this.pib_brand.HeaderText = "品牌";
-            this.pib_brand.Name = "pib_brand";
-            this.pib_brand.ReadOnly = true;
-            this.pib_brand.Width = 54;
-            // 
-            // pr_zxbzs
-            // 
-            this.pr_zxbzs.DataPropertyName = "pr_zxbzs";
-            this.pr_zxbzs.HeaderText = "最小包装数";
-            this.pr_zxbzs.Name = "pr_zxbzs";
-            this.pr_zxbzs.ReadOnly = true;
-            this.pr_zxbzs.Visible = false;
-            this.pr_zxbzs.Width = 90;
-            // 
-            // pib_lotno
-            // 
-            this.pib_lotno.DataPropertyName = "pib_lotno";
-            this.pib_lotno.HeaderText = "LotNo";
-            this.pib_lotno.Name = "pib_lotno";
-            this.pib_lotno.ReadOnly = true;
-            this.pib_lotno.Width = 60;
-            // 
-            // pib_datecode
-            // 
-            this.pib_datecode.DataPropertyName = "pib_datecode";
-            this.pib_datecode.HeaderText = "DateCode";
-            this.pib_datecode.Name = "pib_datecode";
-            this.pib_datecode.ReadOnly = true;
-            this.pib_datecode.Width = 78;
-            // 
-            // DateCode1
-            // 
-            this.DateCode1.DataPropertyName = "DateCode1";
-            this.DateCode1.HeaderText = "DateCode1";
-            this.DateCode1.Name = "DateCode1";
-            this.DateCode1.Visible = false;
-            this.DateCode1.Width = 84;
-            // 
-            // pib_qty
-            // 
-            this.pib_qty.DataPropertyName = "pib_qty";
-            this.pib_qty.HeaderText = "数量";
-            this.pib_qty.Name = "pib_qty";
-            this.pib_qty.ReadOnly = true;
-            this.pib_qty.Width = 54;
-            // 
-            // pib_custbarcode
-            // 
-            this.pib_custbarcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_custbarcode.DataPropertyName = "pib_custbarcode";
-            this.pib_custbarcode.HeaderText = "料盘条码";
-            this.pib_custbarcode.MinimumWidth = 100;
-            this.pib_custbarcode.Name = "pib_custbarcode";
-            this.pib_custbarcode.ReadOnly = true;
-            // 
-            // pib_custmidboxcode
-            // 
-            this.pib_custmidboxcode.DataPropertyName = "pib_custmidboxcode";
-            this.pib_custmidboxcode.HeaderText = "中盒条码";
-            this.pib_custmidboxcode.Name = "pib_custmidboxcode";
-            this.pib_custmidboxcode.ReadOnly = true;
-            this.pib_custmidboxcode.Width = 78;
-            // 
-            // pib_custoutboxcode
-            // 
-            this.pib_custoutboxcode.DataPropertyName = "pib_custoutboxcode";
-            this.pib_custoutboxcode.HeaderText = "外箱条码";
-            this.pib_custoutboxcode.Name = "pib_custoutboxcode";
-            this.pib_custoutboxcode.ReadOnly = true;
-            this.pib_custoutboxcode.Width = 78;
-            // 
-            // pd_pocode
-            // 
-            this.pd_pocode.DataPropertyName = "pd_pocode";
-            this.pd_pocode.HeaderText = "客户PO";
-            this.pd_pocode.Name = "pd_pocode";
-            this.pd_pocode.ReadOnly = true;
-            this.pd_pocode.Width = 66;
-            // 
-            // pr_spec
-            // 
-            this.pr_spec.DataPropertyName = "pr_spec";
-            this.pr_spec.HeaderText = "规格";
-            this.pr_spec.Name = "pr_spec";
-            this.pr_spec.ReadOnly = true;
-            this.pr_spec.Visible = false;
-            this.pr_spec.Width = 54;
-            // 
-            // pib_outboxcode1
-            // 
-            this.pib_outboxcode1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_outboxcode1.DataPropertyName = "pib_outboxcode1";
-            this.pib_outboxcode1.HeaderText = "中盒号";
-            this.pib_outboxcode1.Name = "pib_outboxcode1";
-            this.pib_outboxcode1.ReadOnly = true;
-            this.pib_outboxcode1.Width = 90;
-            // 
-            // pib_outboxcode2
-            // 
-            this.pib_outboxcode2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_outboxcode2.DataPropertyName = "pib_outboxcode2";
-            this.pib_outboxcode2.HeaderText = "外箱号";
-            this.pib_outboxcode2.Name = "pib_outboxcode2";
-            this.pib_outboxcode2.ReadOnly = true;
-            this.pib_outboxcode2.Width = 90;
-            // 
-            // pi_inoutno
-            // 
-            this.pi_inoutno.ID = null;
-            this.pi_inoutno.Location = new System.Drawing.Point(86, 10);
-            this.pi_inoutno.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.pi_inoutno.Name = "pi_inoutno";
-            this.pi_inoutno.Size = new System.Drawing.Size(150, 21);
-            this.pi_inoutno.Str = null;
-            this.pi_inoutno.Str1 = null;
-            this.pi_inoutno.Str2 = null;
-            this.pi_inoutno.TabIndex = 2;
-            this.pi_inoutno.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pi_inoutno_KeyDown);
-            // 
-            // SingleLabel
-            // 
-            this.SingleLabel.Controls.Add(this.SingleLabelPrinter);
-            this.SingleLabel.Controls.Add(this.SingleLabelPrint);
-            this.SingleLabel.Controls.Add(this.SingleLabelAutoPrint);
-            this.SingleLabel.Controls.Add(this.SingleLabelCombox);
-            this.SingleLabel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabel.Location = new System.Drawing.Point(726, 6);
-            this.SingleLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.SingleLabel.Name = "SingleLabel";
-            this.SingleLabel.Padding = new System.Windows.Forms.Padding(2);
-            this.SingleLabel.Size = new System.Drawing.Size(170, 211);
-            this.SingleLabel.TabIndex = 77;
-            this.SingleLabel.TabStop = false;
-            this.SingleLabel.Text = "单盘标签";
-            // 
-            // SingleLabelPrinter
-            // 
-            this.SingleLabelPrinter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelPrinter.Location = new System.Drawing.Point(7, 63);
-            this.SingleLabelPrinter.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
-            this.SingleLabelPrinter.Name = "SingleLabelPrinter";
-            this.SingleLabelPrinter.Size = new System.Drawing.Size(159, 25);
-            this.SingleLabelPrinter.TabIndex = 40;
-            // 
-            // SingleLabelPrint
+            // SingleLabelPrint
             // 
             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)));
@@ -1355,6 +1337,11 @@
             this.OutboxCapacity.Name = "OutboxCapacity";
             this.OutboxCapacity.Size = new System.Drawing.Size(72, 23);
             this.OutboxCapacity.TabIndex = 84;
+            this.OutboxCapacity.Value = new decimal(new int[] {
+            60,
+            0,
+            0,
+            0});
             this.OutboxCapacity.Leave += new System.EventHandler(this.MidBoxCapacity_Leave);
             // 
             // OutBoxLabelPrint
@@ -1381,126 +1368,186 @@
             this.OutBoxCombox.TabIndex = 78;
             this.OutBoxCombox.SelectedIndexChanged += new System.EventHandler(this.OutBoxCombox_SelectedIndexChanged);
             // 
-            // pd_pdno
+            // Choose
             // 
-            this.pd_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
-            this.pd_pdno.DataPropertyName = "pd_pdno";
-            this.pd_pdno.HeaderText = "序号";
-            this.pd_pdno.Name = "pd_pdno";
-            this.pd_pdno.ReadOnly = true;
-            this.pd_pdno.Width = 54;
+            this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.Choose.HeaderText = "勾选";
+            this.Choose.Name = "Choose";
+            this.Choose.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.Choose.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.Choose.Width = 55;
             // 
-            // pd_piid
+            // pib_ifprint
             // 
-            this.pd_piid.DataPropertyName = "pd_piid";
-            this.pd_piid.HeaderText = "Column1";
-            this.pd_piid.Name = "pd_piid";
-            this.pd_piid.Visible = false;
+            this.pib_ifprint.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_ifprint.DataPropertyName = "pib_ifprint";
+            this.pib_ifprint.HeaderText = "已打印";
+            this.pib_ifprint.Name = "pib_ifprint";
+            this.pib_ifprint.Width = 60;
             // 
-            // pd_inoutno
+            // pib_midifprint
             // 
-            this.pd_inoutno.DataPropertyName = "pd_inoutno";
-            this.pd_inoutno.HeaderText = "Column1";
-            this.pd_inoutno.Name = "pd_inoutno";
-            this.pd_inoutno.Visible = false;
+            this.pib_midifprint.DataPropertyName = "pib_midifprint";
+            this.pib_midifprint.HeaderText = "中盒已打印";
+            this.pib_midifprint.Name = "pib_midifprint";
+            this.pib_midifprint.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.pib_midifprint.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.pib_midifprint.Visible = false;
+            this.pib_midifprint.Width = 90;
             // 
-            // pd_whcode
+            // pib_id1
             // 
-            this.pd_whcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
-            this.pd_whcode.DataPropertyName = "pd_whcode";
-            this.pd_whcode.HeaderText = "仓别";
-            this.pd_whcode.Name = "pd_whcode";
-            this.pd_whcode.Width = 54;
+            this.pib_id1.DataPropertyName = "pib_id";
+            this.pib_id1.HeaderText = "pib_id";
+            this.pib_id1.Name = "pib_id1";
+            this.pib_id1.Visible = false;
+            this.pib_id1.Width = 66;
             // 
-            // pjd_id
+            // pib_pdno
             // 
-            this.pjd_id.DataPropertyName = "pjd_id";
-            this.pjd_id.HeaderText = "pjd_id";
-            this.pjd_id.Name = "pjd_id";
-            this.pjd_id.Visible = false;
+            this.pib_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_pdno.DataPropertyName = "pib_pdno";
+            this.pib_pdno.HeaderText = "序号";
+            this.pib_pdno.Name = "pib_pdno";
+            this.pib_pdno.ReadOnly = true;
+            this.pib_pdno.Width = 55;
             // 
-            // pd_custprodcode1
+            // pib_prodcode
             // 
-            this.pd_custprodcode1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
-            this.pd_custprodcode1.DataPropertyName = "pd_custprodcode";
-            this.pd_custprodcode1.HeaderText = "客户料号";
-            this.pd_custprodcode1.Name = "pd_custprodcode1";
-            this.pd_custprodcode1.Width = 78;
+            this.pib_prodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_prodcode.DataPropertyName = "pib_prodcode";
+            this.pib_prodcode.HeaderText = "物料编号";
+            this.pib_prodcode.MinimumWidth = 120;
+            this.pib_prodcode.Name = "pib_prodcode";
+            this.pib_prodcode.ReadOnly = true;
+            this.pib_prodcode.Width = 120;
             // 
-            // pd_prodcode
+            // pd_custprodcode
             // 
-            this.pd_prodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.pd_prodcode.DataPropertyName = "pd_prodcode";
-            this.pd_prodcode.HeaderText = "物料编号";
-            this.pd_prodcode.Name = "pd_prodcode";
-            this.pd_prodcode.ReadOnly = true;
-            this.pd_prodcode.Width = 78;
+            this.pd_custprodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pd_custprodcode.DataPropertyName = "pd_custprodcode";
+            this.pd_custprodcode.HeaderText = "CPN";
+            this.pd_custprodcode.MinimumWidth = 120;
+            this.pd_custprodcode.Name = "pd_custprodcode";
+            this.pd_custprodcode.Width = 120;
             // 
-            // CollectedNum
+            // pjd_orispeccode
             // 
-            this.CollectedNum.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.CollectedNum.DataPropertyName = "CollectedNum";
-            this.CollectedNum.HeaderText = "已采数";
-            this.CollectedNum.Name = "CollectedNum";
-            this.CollectedNum.ReadOnly = true;
-            this.CollectedNum.Width = 66;
+            this.pjd_orispeccode.DataPropertyName = "pjd_orispeccode";
+            this.pjd_orispeccode.HeaderText = "MPN";
+            this.pjd_orispeccode.Name = "pjd_orispeccode";
+            this.pjd_orispeccode.ReadOnly = true;
+            this.pjd_orispeccode.Visible = false;
+            this.pjd_orispeccode.Width = 48;
             // 
-            // UnCollectedNum
+            // pib_brand
             // 
-            this.UnCollectedNum.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.UnCollectedNum.DataPropertyName = "UnCollectedNum";
-            this.UnCollectedNum.HeaderText = "未采集";
-            this.UnCollectedNum.Name = "UnCollectedNum";
-            this.UnCollectedNum.ReadOnly = true;
-            this.UnCollectedNum.Visible = false;
-            this.UnCollectedNum.Width = 66;
+            this.pib_brand.DataPropertyName = "pib_brand";
+            this.pib_brand.HeaderText = "品牌";
+            this.pib_brand.Name = "pib_brand";
+            this.pib_brand.ReadOnly = true;
+            this.pib_brand.Width = 54;
             // 
-            // pd_outqty
+            // pr_zxbzs
             // 
-            this.pd_outqty.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.pd_outqty.DataPropertyName = "pd_outqty";
-            this.pd_outqty.HeaderText = "出库数量";
-            this.pd_outqty.Name = "pd_outqty";
-            this.pd_outqty.ReadOnly = true;
-            this.pd_outqty.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.pd_outqty.Width = 59;
+            this.pr_zxbzs.DataPropertyName = "pr_zxbzs";
+            this.pr_zxbzs.HeaderText = "最小包装数";
+            this.pr_zxbzs.Name = "pr_zxbzs";
+            this.pr_zxbzs.ReadOnly = true;
+            this.pr_zxbzs.Visible = false;
+            this.pr_zxbzs.Width = 90;
             // 
-            // pr_unit
+            // pib_lotno
             // 
-            this.pr_unit.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
-            this.pr_unit.DataPropertyName = "pr_unit";
-            this.pr_unit.HeaderText = "单位";
-            this.pr_unit.Name = "pr_unit";
-            this.pr_unit.ReadOnly = true;
-            this.pr_unit.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.pr_unit.Width = 35;
+            this.pib_lotno.DataPropertyName = "pib_lotno";
+            this.pib_lotno.HeaderText = "LotNo";
+            this.pib_lotno.Name = "pib_lotno";
+            this.pib_lotno.ReadOnly = true;
+            this.pib_lotno.Width = 60;
             // 
-            // pr_spec1
+            // pib_datecode
             // 
-            this.pr_spec1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
-            this.pr_spec1.DataPropertyName = "pr_spec";
-            this.pr_spec1.HeaderText = "规格";
-            this.pr_spec1.MinimumWidth = 100;
-            this.pr_spec1.Name = "pr_spec1";
+            this.pib_datecode.DataPropertyName = "pib_datecode";
+            this.pib_datecode.HeaderText = "DateCode";
+            this.pib_datecode.Name = "pib_datecode";
+            this.pib_datecode.ReadOnly = true;
+            this.pib_datecode.Width = 78;
             // 
-            // pd_brand
+            // DateCode1
             // 
-            this.pd_brand.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
-            this.pd_brand.DataPropertyName = "pd_brand";
-            this.pd_brand.HeaderText = "品牌";
-            this.pd_brand.Name = "pd_brand";
-            this.pd_brand.ReadOnly = true;
-            this.pd_brand.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.pd_brand.Width = 35;
+            this.DateCode1.DataPropertyName = "DateCode1";
+            this.DateCode1.HeaderText = "DateCode1";
+            this.DateCode1.Name = "DateCode1";
+            this.DateCode1.Visible = false;
+            this.DateCode1.Width = 84;
             // 
-            // pjd_zxbzs_user
+            // pib_qty
             // 
-            this.pjd_zxbzs_user.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pjd_zxbzs_user.DataPropertyName = "pjd_zxbzs_user";
-            this.pjd_zxbzs_user.HeaderText = "最小包装";
-            this.pjd_zxbzs_user.MinimumWidth = 80;
-            this.pjd_zxbzs_user.Name = "pjd_zxbzs_user";
-            this.pjd_zxbzs_user.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.pib_qty.DataPropertyName = "pib_qty";
+            this.pib_qty.HeaderText = "数量";
+            this.pib_qty.Name = "pib_qty";
+            this.pib_qty.ReadOnly = true;
+            this.pib_qty.Width = 54;
+            // 
+            // pib_custbarcode
+            // 
+            this.pib_custbarcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_custbarcode.DataPropertyName = "pib_custbarcode";
+            this.pib_custbarcode.HeaderText = "料盘条码";
+            this.pib_custbarcode.MinimumWidth = 100;
+            this.pib_custbarcode.Name = "pib_custbarcode";
+            this.pib_custbarcode.ReadOnly = true;
+            // 
+            // pib_custmidboxcode
+            // 
+            this.pib_custmidboxcode.DataPropertyName = "pib_custmidboxcode";
+            this.pib_custmidboxcode.HeaderText = "中盒条码";
+            this.pib_custmidboxcode.Name = "pib_custmidboxcode";
+            this.pib_custmidboxcode.ReadOnly = true;
+            this.pib_custmidboxcode.Width = 78;
+            // 
+            // pib_custoutboxcode
+            // 
+            this.pib_custoutboxcode.DataPropertyName = "pib_custoutboxcode";
+            this.pib_custoutboxcode.HeaderText = "外箱条码";
+            this.pib_custoutboxcode.Name = "pib_custoutboxcode";
+            this.pib_custoutboxcode.ReadOnly = true;
+            this.pib_custoutboxcode.Width = 78;
+            // 
+            // pd_pocode
+            // 
+            this.pd_pocode.DataPropertyName = "pd_pocode";
+            this.pd_pocode.HeaderText = "客户PO";
+            this.pd_pocode.Name = "pd_pocode";
+            this.pd_pocode.ReadOnly = true;
+            this.pd_pocode.Width = 66;
+            // 
+            // pr_spec
+            // 
+            this.pr_spec.DataPropertyName = "pr_spec";
+            this.pr_spec.HeaderText = "规格";
+            this.pr_spec.Name = "pr_spec";
+            this.pr_spec.ReadOnly = true;
+            this.pr_spec.Visible = false;
+            this.pr_spec.Width = 54;
+            // 
+            // pib_outboxcode1
+            // 
+            this.pib_outboxcode1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_outboxcode1.DataPropertyName = "pib_outboxcode1";
+            this.pib_outboxcode1.HeaderText = "中盒号";
+            this.pib_outboxcode1.Name = "pib_outboxcode1";
+            this.pib_outboxcode1.ReadOnly = true;
+            this.pib_outboxcode1.Width = 90;
+            // 
+            // pib_outboxcode2
+            // 
+            this.pib_outboxcode2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_outboxcode2.DataPropertyName = "pib_outboxcode2";
+            this.pib_outboxcode2.HeaderText = "外箱号";
+            this.pib_outboxcode2.Name = "pib_outboxcode2";
+            this.pib_outboxcode2.ReadOnly = true;
+            this.pib_outboxcode2.Width = 90;
             // 
             // UAS_出货标签打印
             // 
@@ -1508,6 +1555,7 @@
             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(1259, 729);
+            this.Controls.Add(this.CombindetailTwo);
             this.Controls.Add(this.ProcessCount);
             this.Controls.Add(this.label9);
             this.Controls.Add(this.label8);
@@ -1670,8 +1718,26 @@
         private System.Windows.Forms.Label pi_title;
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.Label ProcessCount;
+        private System.Windows.Forms.CheckBox CombindetailTwo;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_pdno;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_piid;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_inoutno;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_whcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pjd_id;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_custprodcode1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_pocode1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_prodcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CollectedNum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn UnCollectedNum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_outqty;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_unit;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_brand;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pjd_zxbzs_user;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Choose;
         private System.Windows.Forms.DataGridViewCheckBoxColumn pib_ifprint;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn pib_midifprint;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_id1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_pdno;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_prodcode;
@@ -1690,19 +1756,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_pdno;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_piid;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_inoutno;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_whcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pjd_id;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_custprodcode1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_prodcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn CollectedNum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn UnCollectedNum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_outqty;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pr_unit;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_brand;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pjd_zxbzs_user;
     }
 }

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

@@ -134,7 +134,7 @@ namespace UAS_LabelMachine
             Left = 0;
             Width = ScreenArea.Width;
             Height = ScreenArea.Height;
-            OutboxCapacity.Value = Properties.Settings.Default.OutboxCapacity;
+            //OutboxCapacity.Value = Properties.Settings.Default.OutboxCapacity;
             MidboxCapacity.Value = Properties.Settings.Default.MidBoxCapacity;
             if (MidboxCapacity.Value == 0)
             {
@@ -240,7 +240,12 @@ namespace UAS_LabelMachine
             //校验DateCode是否过期
             if (!CheckDateCode(Data["DATECODE"]))
             {
-                MessageBox.Show("物料" + Data["PRCODE"] + "【DateCode】超出校验日期");
+                string close = MessageBox.Show(this.ParentForm, "物料" + Data["PRCODE"] + "【DateCode】超出校验日期,是否继续", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                if (close != "Yes")
+                {
+                    Input.SelectAll();
+                    return;
+                }
             }
             if (Data["PRCODE"] != CurrentPrCode)
             {
@@ -317,6 +322,17 @@ namespace UAS_LabelMachine
                 MessageBox.Show("请选择指定箱号或者新增");
                 return;
             }
+            //加载完数据之后进行容量的判断
+            int BoxNum = LabelInfDataTable.Select("pib_outboxcode2='" + OutBoxNum.Text + "'").Length;
+            if (BoxNum + CodeCount > OutboxCapacity.Value)
+            {
+                string close = MessageBox.Show(this.ParentForm, "箱号【" + OutBoxNum.Text + "】后超数量为" + (BoxNum + CodeCount) + ",超出容量" + OutboxCapacity.Value + "，是否继续？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                if (close != "Yes")
+                {
+                    Input.SelectAll();
+                    return;
+                }
+            }
             //计算当前采集数量
             string collectqty = dh.getFieldDataByCondition("prodiobarcode", "sum(pib_qty)", "pib_inoutno='" + pi_inoutno.Text + "' and pib_prodcode='" + CurrentPrCode + "' and pib_pdno='" + CurrentPDNO + "'").ToString();
             double CollectQty = (collectqty == "" ? 0 : double.Parse(collectqty));
@@ -365,12 +381,6 @@ namespace UAS_LabelMachine
             {
                 LabelInf.Rows[LabelInf.Rows.Count - 1].Selected = true;
             }
-            //加载完数据之后进行容量的判断
-            int BoxNum = LabelInfDataTable.Select("pib_outboxcode2='" + OutBoxNum.Text + "'").Length;
-            if (BoxNum > OutboxCapacity.Value)
-            {
-                MessageBox.Show("箱号【" + OutBoxNum.Text + "】超出容量,当前已采集" + BoxNum, "提示");
-            }
             if (SingleLabelAutoPrint.Checked)
             {
                 thread = new Thread(AutoPrintSingleLabel);
@@ -381,14 +391,22 @@ namespace UAS_LabelMachine
             //采集后重新计数，自动跳到下一行
             collectqty = (SumQty.Compute("sum(pib_qty)", "pib_prodcode='" + CurrentPrCode + "' and pib_pdno='" + CurrentPDNO + "'").ToString());
             CollectQty = (collectqty == "" ? 0 : double.Parse(collectqty));
-            dh.UpdateByCondition("CS$InoutPrcode", "Collectednum='" + collectqty + "'", "pd_inoutno='" + pi_inoutno.Text + "' and pd_pdno='" + CurrentPDNO + "' and combined=" + (Combindetail.Checked ? -1 : 0));
+            int combined = 0;
+            if (Combindetail.Checked)
+                combined = 1;
+            if (CombindetailTwo.Checked)
+                combined = 2;
+            dh.UpdateByCondition("CS$InoutPrcode", "Collectednum='" + collectqty + "'", "pd_inoutno='" + pi_inoutno.Text + "' and pd_pdno='" + CurrentPDNO + "' and combined=" + combined);
             CollectNum = 0;
             double OutNum = 0;
             if (GridPrcode.SelectedRows.Count > 0)
             {
                 GridPrcode.Rows[GridPrcode.SelectedRows[0].Index].Cells["CollectedNum"].Value = collectqty;
-                CollectNum = int.Parse(CSPrcode.Compute("sum(CollectedNum)", "1=1").ToString());
-                OutNum = int.Parse(CSPrcode.Compute("sum(pd_outqty)", "1=1").ToString());
+                for (int i = 0; i < GridPrcode.Rows.Count; i++)
+                {
+                    CollectNum += int.Parse(GridPrcode.Rows[i].Cells["CollectedNum"].Value.ToString());
+                    OutNum += int.Parse(GridPrcode.Rows[i].Cells["pd_outqty"].Value.ToString());
+                }
             }
             ProcessCount.Text = CollectNum + "/" + OutNum;
             if (CollectNum == OutNum)
@@ -541,6 +559,7 @@ namespace UAS_LabelMachine
             if (e.KeyCode == Keys.Enter)
             {
                 Combindetail.Checked = false;
+                CombindetailTwo.Checked = false;
                 Input.Clear();
                 sql.Clear();
                 sql.Append("select pi_id,pi_cardcode,pi_title,to_char(pi_date,'yyyymmdd')pi_date from prodinout where pi_inoutno='" + pi_inoutno.Text + "' and pi_invostatuscode='AUDITED'");
@@ -796,9 +815,9 @@ namespace UAS_LabelMachine
                     SelectProdcode = LabelInf.Rows[SelectRowIndex].Cells["pib_prodcode"].Value.ToString();
                     for (int i = SelectRowIndex; i >= 0; i--)
                     {
-                        if ((LabelInf.Rows[i].Cells["pib_prodcode"].Value.ToString() == SelectProdcode && LabelInf.Rows[i].Cells["pib_ifprint"].FormattedValue.ToString().ToLower() != "true") || i == SelectRowIndex)
+                        if ((LabelInf.Rows[i].Cells["pib_prodcode"].Value.ToString() == SelectProdcode && LabelInf.Rows[i].Cells["pib_midifprint"].FormattedValue.ToString().ToLower() != "true") || i == SelectRowIndex)
                         {
-                            LabelInf.Rows[i].Cells["pib_ifprint"].Value = true;
+                            LabelInf.Rows[i].Cells["pib_midifprint"].Value = true;
                             if (!MidOutBoxCode.Contains(int.Parse(LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString())))
                             {
                                 MidOutBoxCode.Add(int.Parse(LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString()));
@@ -812,9 +831,9 @@ namespace UAS_LabelMachine
                     }
                     for (int i = SelectRowIndex; i < LabelInf.Rows.Count - 1; i++)
                     {
-                        if ((LabelInf.Rows[i].Cells["pib_prodcode"].Value.ToString() == SelectProdcode && LabelInf.Rows[i].Cells["pib_ifprint"].FormattedValue.ToString().ToLower() != "true") || i == SelectRowIndex)
+                        if ((LabelInf.Rows[i].Cells["pib_prodcode"].Value.ToString() == SelectProdcode && LabelInf.Rows[i].Cells["pib_midifprint"].FormattedValue.ToString().ToLower() != "true") || i == SelectRowIndex)
                         {
-                            LabelInf.Rows[i].Cells["pib_ifprint"].Value = true;
+                            LabelInf.Rows[i].Cells["pib_midifprint"].Value = true;
                             if (!MidOutBoxCode.Contains(int.Parse(LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString())))
                             {
                                 MidOutBoxCode.Add(int.Parse(LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString()));
@@ -876,6 +895,7 @@ namespace UAS_LabelMachine
             }
             else
                 MessageBox.Show("未维护中盒标签", "提示");
+            Input.Focus();
         }
 
         private void OutBoxPrint()
@@ -982,7 +1002,7 @@ namespace UAS_LabelMachine
                     MidReport.PrintSettings.ShowDialog = false;
                     MidReport.PrintSettings.Printer = MidLabelPrinter.Text;
                     MidReport.Print();
-                    dh.UpdateByCondition("prodiobarcode", "pib_ifprint=1", "pib_inoutno='" + pi_inoutno.Text + "' and pib_outboxcode1 in (" + pib_outboxcode1 + ")");
+                    dh.UpdateByCondition("prodiobarcode", "pib_midifprint=-1", "pib_inoutno='" + pi_inoutno.Text + "' and pib_outboxcode1 in (" + pib_outboxcode1 + ")");
                     SelectRowIndex = -1;
                 }
                 Properties.Settings.Default.MPrinter = MidLabelPrinter.Text;
@@ -1069,6 +1089,7 @@ namespace UAS_LabelMachine
             }
             else
                 MessageBox.Show("未维护外箱标签", "提示");
+            Input.Focus();
         }
 
         /// <summary>
@@ -1080,7 +1101,7 @@ namespace UAS_LabelMachine
         {
             AllChecked = false;
             sql.Clear();
-            sql.Append("select pd_custprodcode,pd_custprodspec,pib_custmidboxcode,pd_pocode,pjd_orispeccode,pib_madein,pib_custbarcode,pib_custoutboxcode,pib_id,pib_datecode1,pib_pdid,pib_piid,");
+            sql.Append("select pd_custprodcode,pd_custprodspec,nvl(pib_midifprint,0)pib_midifprint,pib_custmidboxcode,pd_pocode,pjd_orispeccode,pib_madein,pib_custbarcode,pib_custoutboxcode,pib_id,pib_datecode1,pib_pdid,pib_piid,");
             sql.Append("pib_pdno,pib_prodcode,pib_brand,pr_vendprodcode,pib_lotno,pib_datecode,week_to_date(pib_datecode) datecode1,pib_qty,pr_spec,");
             sql.Append("pr_zxbzs,pr_unit,pib_barcode,pib_outboxcode1,pib_outboxcode2,nvl(pib_ifprint,0)pib_ifprint from prodiobarcode left join ");
             sql.Append("prodiodetail on pib_piid=pd_piid and pd_pdno=pib_pdno and pd_prodcode=pib_prodcode left join product on pr_code=pib_prodcode  ");
@@ -1281,14 +1302,19 @@ namespace UAS_LabelMachine
         DataTable CSPrcode;
         private void LoadPrcodeData()
         {
-            DataTable Prcode = (DataTable)dh.ExecuteSql("select '' pd_piid,pd_inoutno,pd_pdno,pd_custprodcode,pd_whcode,pd_prodcode,'0' CollectedNum,'0' UnCollectedNum,pd_outqty,pr_unit,pr_spec,pd_brand,pjd_zxbzs_user,pjd_id from prodiodetail left join prodinout on pi_id=pd_piid left join PRODJOINVENDDETAIL on pjd_brand =pd_brand and pjd_prodcode=pd_prodcode left join product on pd_prodcode=pr_code where pi_id='" + PI_ID + "' order by pd_pdno", "select");
+            DataTable Prcode = (DataTable)dh.ExecuteSql("select '' pd_piid,pd_inoutno,pd_custprodcode,pd_pocode,pd_whcode,pd_prodcode,'0' CollectedNum,'0' UnCollectedNum,pd_outqty,pr_unit,pr_spec,pd_brand,pjd_zxbzs_user,pjd_id,pd_pdno from prodiodetail left join prodinout on pi_id=pd_piid left join PRODJOINVENDDETAIL on pjd_brand =pd_brand and pjd_prodcode=pd_prodcode left join product on pd_prodcode=pr_code where pi_id='" + PI_ID + "' order by pd_pdno", "select");
             GridPrcode.DataSource = Prcode;
             List<int> RemoveIndex = new List<int>();
             double CollectNum = 0;
             double OutNum = 0;
+            int combined = 0;
             if (Combindetail.Checked)
+                combined = 1;
+            if (CombindetailTwo.Checked)
+                combined = 2;
+            if (Combindetail.Checked || CombindetailTwo.Checked)
             {
-                CSPrcode = (DataTable)dh.ExecuteSql("select * from CS$InoutPrcode where pd_inoutno='" + pi_inoutno.Text + "' and combined=-1 order by  pd_pdno", "select");
+                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 from CS$InoutPrcode where pd_inoutno='" + pi_inoutno.Text + "' and combined=" + combined + " order by  pd_pdno", "select");
                 if (CSPrcode.Rows.Count == 0)
                 {
                     int CurrentIndex = 0;
@@ -1311,12 +1337,14 @@ namespace UAS_LabelMachine
                             string BWhCode = GridPrcode.Rows[i].Cells["pd_whcode"].Value.ToString();
                             string BPrUnit = GridPrcode.Rows[i].Cells["pr_unit"].Value.ToString();
                             string BPrBrand = GridPrcode.Rows[i].Cells["pd_brand"].Value.ToString();
+                            string BPoCode = GridPrcode.Rows[i].Cells["pd_pocode1"].Value.ToString();
                             string FProdCode = GridPrcode.Rows[i + 1].Cells["pd_prodcode"].Value.ToString();
                             string FCustProdCode = GridPrcode.Rows[i + 1].Cells["pd_custprodcode1"].Value.ToString();
                             string FPrUnit = GridPrcode.Rows[i + 1].Cells["pr_unit"].Value.ToString();
                             string FrBrand = GridPrcode.Rows[i + 1].Cells["pd_brand"].Value.ToString();
                             string FWhCode = GridPrcode.Rows[i + 1].Cells["pd_whcode"].Value.ToString();
-                            if (BProdCode == FProdCode && BPrBrand == FrBrand && BCustProdCode == FCustProdCode)
+                            string FPoCode = GridPrcode.Rows[i + 1].Cells["pd_pocode1"].Value.ToString();
+                            if (BProdCode == FProdCode && BPrBrand == FrBrand && BCustProdCode == FCustProdCode && (CombindetailTwo.Checked && FPoCode == BPoCode || Combindetail.Checked))
                             {
                                 GridPrcode.Rows[CurrentIndex].Cells["pd_outqty"].Value = double.Parse(GridPrcode.Rows[CurrentIndex].Cells["pd_outqty"].Value.ToString()) + double.Parse(GridPrcode.Rows[i + 1].Cells["pd_outqty"].Value.ToString());
                                 GridPrcode.Rows[CurrentIndex].Cells["CollectedNum"].Value = double.Parse(GridPrcode.Rows[CurrentIndex].Cells["CollectedNum"].Value.ToString()) + double.Parse(GridPrcode.Rows[i + 1].Cells["CollectedNum"].Value.ToString());
@@ -1326,7 +1354,6 @@ namespace UAS_LabelMachine
                             {
                                 CurrentIndex = i + 1;
                             }
-
                         }
                     }
                     foreach (int item in RemoveIndex.OrderByDescending(x => x))
@@ -1338,7 +1365,7 @@ namespace UAS_LabelMachine
             }
             else
             {
-                CSPrcode = (DataTable)dh.ExecuteSql("select * from CS$InoutPrcode where pd_inoutno='" + pi_inoutno.Text + "' and combined=0 order by pd_pdno", "select");
+                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 from CS$InoutPrcode where pd_inoutno='" + pi_inoutno.Text + "' and combined=" + combined + " order by pd_pdno", "select");
                 if (CSPrcode.Rows.Count == 0)
                 {
                     for (int i = 0; i < GridPrcode.Rows.Count; i++)
@@ -1358,8 +1385,8 @@ namespace UAS_LabelMachine
             {
                 sql.Clear();
                 sql.Append("insert into CS$InoutPrcode (pd_piid,pd_pdno,pd_custprodcode,pd_whcode,pd_prodcode,");
-                sql.Append("CollectedNum,UnCollectedNum,pd_outqty,pr_unit,pr_spec,pd_brand,pjd_zxbzs_user,pjd_id,pd_inoutno,combined)");
-                sql.Append("values ('',: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,'" + (Combindetail.Checked ? -1 : 0) + "')");
+                sql.Append("CollectedNum,UnCollectedNum,pd_outqty,pr_unit,pr_spec,pd_brand,pjd_zxbzs_user,pjd_id,pd_inoutno,combined,pd_pocode)");
+                sql.Append("values ('',: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,'" + combined + "',:pd_pocode)");
                 dh.SaveDataTable((GridPrcode.DataSource as DataTable), "CS$InoutPrcode", "pd_piid", sql.ToString());
             }
             else
@@ -1494,6 +1521,7 @@ namespace UAS_LabelMachine
             string Value = GridPrcode.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString();
             string ID = GridPrcode.Rows[e.RowIndex].Cells["pjd_id"].Value.ToString();
             dh.UpdateByCondition("PRODJOINVENDDETAIL", "pjd_zxbzs_user='" + Value + "'", "pjd_id='" + ID + "'");
+            dh.UpdateByCondition("CS$INOUTPRCODE", "pjd_zxbzs_user='" + Value + "'", "pjd_id='" + ID + "' and pd_inoutno='" + pi_inoutno.Text + "'");
             //删除对应物料的明细
             CurrentPrCode = GridPrcode.Rows[e.RowIndex].Cells["pd_prodcode"].Value.ToString();
             CurrentZXBZ = GridPrcode.Rows[e.RowIndex].Cells["pjd_zxbzs_user"].Value.ToString();
@@ -1753,6 +1781,18 @@ namespace UAS_LabelMachine
 
         private void Combindetail_CheckedChanged(object sender, EventArgs e)
         {
+            if (Combindetail.Checked)
+            {
+                CombindetailTwo.Checked = false;
+            }
+            LoadPrcodeData();
+        }
+        private void CombindetailTwo_CheckedChanged(object sender, EventArgs e)
+        {
+            if (CombindetailTwo.Checked)
+            {
+                Combindetail.Checked = false;
+            }
             LoadPrcodeData();
         }
         string SelectProdcode = "";
@@ -1768,10 +1808,7 @@ namespace UAS_LabelMachine
 
         private void OutBoxNum_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if (!ComBoxClickChangeLabelDoc)
-            {
-                OutBoxNum1 = OutBoxNum.Text;
-            }
+            OutBoxNum1 = OutBoxNum.Text;
             LoadGridData(sender, e);
         }
 

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

@@ -129,6 +129,9 @@
   <metadata name="pd_pdno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="pd_whcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -138,6 +141,9 @@
   <metadata name="pd_custprodcode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pd_pocode1.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>
@@ -162,6 +168,9 @@
   <metadata name="pjd_zxbzs_user.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pib_midifprint.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="pd_custprodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>