添加行号绑定

UAS_MES_YDCY/FunctionCode/Warehouse/Warehouse_FinishedProductOutSumNEW.Designer.cs

@@ -34,6 +34,8 @@
             this.pi_titile_label = new System.Windows.Forms.Label();
             this.pi_title = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.Baurate = new System.Windows.Forms.Label();
+            this.ComList = new System.Windows.Forms.Label();
             this.sumpalletweight = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.weight = new System.Windows.Forms.Label();
@@ -57,13 +59,6 @@
             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.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();
@@ -87,8 +82,22 @@
             this.pa_packageqty_label = new System.Windows.Forms.Label();
             this.StartWeight = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.RefreshWeigh = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.ComList = new System.Windows.Forms.Label();
-            this.Baurate = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.PrinterList1 = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.PrinterCombox();
+            this.PrintNum1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            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.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Prodiodetail)).BeginInit();
@@ -144,12 +153,34 @@
             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(1182, 132);
+            this.panel1.Location = new System.Drawing.Point(1212, 132);
             this.panel1.Margin = new System.Windows.Forms.Padding(4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(553, 388);
+            this.panel1.Size = new System.Drawing.Size(523, 388);
             this.panel1.TabIndex = 217;
             // 
+            // Baurate
+            // 
+            this.Baurate.AutoSize = true;
+            this.Baurate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Baurate.Location = new System.Drawing.Point(283, 181);
+            this.Baurate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.Baurate.Name = "Baurate";
+            this.Baurate.Size = new System.Drawing.Size(0, 41);
+            this.Baurate.TabIndex = 252;
+            this.Baurate.Visible = false;
+            // 
+            // ComList
+            // 
+            this.ComList.AutoSize = true;
+            this.ComList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ComList.Location = new System.Drawing.Point(275, 173);
+            this.ComList.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ComList.Name = "ComList";
+            this.ComList.Size = new System.Drawing.Size(0, 41);
+            this.ComList.TabIndex = 251;
+            this.ComList.Visible = false;
+            // 
             // sumpalletweight
             // 
             this.sumpalletweight.AutoSize = true;
@@ -338,7 +369,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, 209);
+            this.PrintLabel_label.Location = new System.Drawing.Point(851, 180);
             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);
@@ -349,7 +380,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, 297);
+            this.pa_restqty_label.Location = new System.Drawing.Point(851, 221);
             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);
@@ -361,7 +392,7 @@
             this.PrintNum.AllPower = null;
             this.PrintNum.BackColor = System.Drawing.Color.White;
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(958, 303);
+            this.PrintNum.Location = new System.Drawing.Point(983, 227);
             this.PrintNum.Margin = new System.Windows.Forms.Padding(6);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Power = null;
@@ -376,7 +407,7 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(958, 209);
+            this.PrintLabel.Location = new System.Drawing.Point(981, 180);
             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);
@@ -389,7 +420,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(998, 407);
+            this.Printlab.Location = new System.Drawing.Point(1004, 474);
             this.Printlab.Margin = new System.Windows.Forms.Padding(6);
             this.Printlab.MoveImage = ((System.Drawing.Image)(resources.GetObject("Printlab.MoveImage")));
             this.Printlab.Name = "Printlab";
@@ -410,6 +441,8 @@
             this.pd_cartons,
             this.pd_id,
             this.pd_prodcode,
+            this.pd_custpo,
+            this.pd_custpodetno,
             this.dataGridViewTextBoxColumn2,
             this.pr_detail1,
             this.pr_spec1});
@@ -423,73 +456,6 @@
             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;
-            // 
-            // 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)));
@@ -675,7 +641,7 @@
             // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(958, 137);
+            this.PrinterList.Location = new System.Drawing.Point(983, 134);
             this.PrinterList.Margin = new System.Windows.Forms.Padding(8);
             this.PrinterList.Name = "PrinterList";
             this.PrinterList.Size = new System.Drawing.Size(219, 40);
@@ -798,33 +764,180 @@
             this.RefreshWeigh.Text = "刷新重量";
             this.RefreshWeigh.UseVisualStyleBackColor = true;
             // 
-            // ComList
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.Location = new System.Drawing.Point(851, 319);
+            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);
+            this.label2.TabIndex = 261;
+            this.label2.Text = "打印机";
+            // 
+            // PrinterList1
+            // 
+            this.PrinterList1.Location = new System.Drawing.Point(981, 323);
+            this.PrinterList1.Margin = new System.Windows.Forms.Padding(8);
+            this.PrinterList1.Name = "PrinterList1";
+            this.PrinterList1.Size = new System.Drawing.Size(219, 40);
+            this.PrinterList1.TabIndex = 260;
+            // 
+            // PrintNum1
+            // 
+            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.Margin = new System.Windows.Forms.Padding(6);
+            this.PrintNum1.Name = "PrintNum1";
+            this.PrintNum1.Power = null;
+            this.PrintNum1.Size = new System.Drawing.Size(219, 35);
+            this.PrintNum1.Str = null;
+            this.PrintNum1.Str1 = null;
+            this.PrintNum1.Str2 = null;
+            this.PrintNum1.TabIndex = 259;
+            this.PrintNum1.Text = "1";
+            // 
+            // label3
+            // 
+            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.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(82, 41);
+            this.label3.TabIndex = 258;
+            this.label3.Text = "标签";
+            // 
+            // PrintLabel1
+            // 
+            this.PrintLabel1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.PrintLabel1.FormattingEnabled = true;
+            this.PrintLabel1.Location = new System.Drawing.Point(981, 366);
+            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);
+            this.PrintLabel1.TabIndex = 257;
+            // 
+            // label7
+            // 
+            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.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(82, 41);
+            this.label7.TabIndex = 256;
+            this.label7.Text = "张数";
+            // 
+            // PrintSecond
+            // 
+            this.PrintSecond.AutoSize = true;
+            this.PrintSecond.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.PrintSecond.Location = new System.Drawing.Point(858, 274);
+            this.PrintSecond.Margin = new System.Windows.Forms.Padding(6);
+            this.PrintSecond.Name = "PrintSecond";
+            this.PrintSecond.Size = new System.Drawing.Size(182, 39);
+            this.PrintSecond.TabIndex = 262;
+            this.PrintSecond.Text = "打印副标签";
+            this.PrintSecond.UseVisualStyleBackColor = true;
             // 
-            this.ComList.AutoSize = true;
-            this.ComList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ComList.Location = new System.Drawing.Point(275, 173);
-            this.ComList.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(0, 41);
-            this.ComList.TabIndex = 251;
-            this.ComList.Visible = false;
+            // pd_pdno
             // 
-            // Baurate
+            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;
             // 
-            this.Baurate.AutoSize = true;
-            this.Baurate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Baurate.Location = new System.Drawing.Point(283, 181);
-            this.Baurate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.Baurate.Name = "Baurate";
-            this.Baurate.Size = new System.Drawing.Size(0, 41);
-            this.Baurate.TabIndex = 252;
-            this.Baurate.Visible = false;
+            // 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;
             // 
             // 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.PrintSecond);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.PrinterList1);
+            this.Controls.Add(this.PrintNum1);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.PrintLabel1);
+            this.Controls.Add(this.label7);
             this.Controls.Add(this.RefreshWeigh);
             this.Controls.Add(this.StartWeight);
             this.Controls.Add(this.pa_standardqty);
@@ -925,14 +1038,23 @@
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label weight;
         private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label ComList;
+        private System.Windows.Forms.Label Baurate;
+        private System.Windows.Forms.Label label2;
+        private CustomControl.ComBoxWithFocus.PrinterCombox PrinterList1;
+        private CustomControl.TextBoxWithIcon.EnterTextBox PrintNum1;
+        private System.Windows.Forms.Label label3;
+        private CustomControl.ComBoxWithFocus.ComboxWithTip PrintLabel1;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.CheckBox PrintSecond;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_pdno;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_cartons;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_id;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_prodcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_custpo;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_custpodetno;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec1;
-        private System.Windows.Forms.Label ComList;
-        private System.Windows.Forms.Label Baurate;
     }
 }

UAS_MES_YDCY/FunctionCode/Warehouse/Warehouse_FinishedProductOutSumNEW.cs

@@ -270,15 +270,15 @@ namespace UAS_MES_NEW.Warehouse
             if (Combine.Checked)
             {
                 sql.Clear();
-                sql.Append("select max(pd_pdno)pd_pdno,max(pd_id)pd_id,pd_prodcode,sum(nvl(pd_cartons,0))pd_cartons,sum(pd_outqty)pd_outqty,max(pr_detail)pr_detail,max(pr_spec)pr_spec from prodiodetail left join prodinout ");
-                sql.Append("on pd_piid=pi_id left join product on pd_prodcode=pr_code where pi_inoutno='" + pi_inoutno.Text + "' group by pd_prodcode");
+                sql.Append("select min(pd_custpo)pd_custpo,pd_custpodetno,max(pd_pdno)pd_pdno,max(pd_id)pd_id,pd_prodcode,sum(nvl(pd_cartons,0))pd_cartons,sum(pd_outqty)pd_outqty,max(pr_detail)pr_detail,max(pr_spec)pr_spec from prodiodetail left join prodinout ");
+                sql.Append("on pd_piid=pi_id left join product on pd_prodcode=pr_code where pi_inoutno='" + pi_inoutno.Text + "' group by pd_prodcode,pd_custpo,pd_custpodetno");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 BaseUtil.FillDgvWithDataTable(Prodiodetail, dt);
             }
             else
             {
                 sql.Clear();
-                sql.Append("select pd_pdno,pd_prodcode,pd_id,pd_outqty,nvl(pd_cartons,0)pd_cartons,pr_detail,pr_spec from prodiodetail left join prodinout ");
+                sql.Append("select pd_custpo,pd_custpodetno,pd_pdno,pd_prodcode,pd_id,pd_outqty,nvl(pd_cartons,0)pd_cartons,pr_detail,pr_spec from prodiodetail left join prodinout ");
                 sql.Append("on pd_piid=pi_id left join product on pd_prodcode=pr_code where pi_inoutno='" + pi_inoutno.Text + "'");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 BaseUtil.FillDgvWithDataTable(Prodiodetail, dt);
@@ -352,8 +352,8 @@ namespace UAS_MES_NEW.Warehouse
                             }
                             dtms = (DataTable)dh.ExecuteSql("select ma_prodcode from mes_package_view left join make on ma_code=v_makecode where v_outboxcode='" + input.Text + "'", "select");
                             sql.Clear();
-                            sql.Append("select cn,outqty,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_prodcode='" + dtms.Rows[0]["ma_prodcode"].ToString() + "'),0)ungetqty from");
-                            sql.Append("(select nvl(sum(pd_outqty),0) outqty  ,count(1)cn from prodiodetail where pd_piid=" + pi_id.Text + " and pd_prodcode='" + dtms.Rows[0]["ma_prodcode"].ToString() + "')");
+                            sql.Append("select cn,outqty,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_pdid='" + PDID + "'),0)ungetqty from");
+                            sql.Append("(select nvl(sum(pd_outqty),0) outqty  ,count(1)cn from prodiodetail where pd_piid=" + pi_id.Text + " and pd_id='" + PDID + "')");
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows[0]["cn"].ToString() == "0")
                             {
@@ -440,7 +440,7 @@ namespace UAS_MES_NEW.Warehouse
                                 dh.ExecuteSql(sql.GetString(), "insert");
                                 dh.ExecuteSql("update package set pa_packageqty=pa_packageqty+1,pa_totalqty=pa_totalqty+(select pa_totalqty from package where pa_outboxcode='" + input.Text + "'),pa_currentqty=pa_currentqty+1,pa_status=1 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
                                 if (pa_mothercode != "")
-                                {   
+                                {
                                     //从之前的栈板号里面移除出来
                                     dh.ExecuteSql("delete from packagedetail where pd_outboxcode='" + pa_mothercode + "' and pd_innerboxcode='" + input.Text + "'", "delete");
                                     //减少箱内容量
@@ -474,7 +474,7 @@ namespace UAS_MES_NEW.Warehouse
                                     dh.ExecuteSql("update package set pa_mothercode='" + pa_outboxcode.Text + "' where pa_outboxcode='" + input.Text + "'", "update");
                                 }
                                 RefreshWeight(pa_prodcode, input.Text);
-                                if (!checkinsertprodiomac("箱号",input.Text))
+                                if (!checkinsertprodiomac("箱号", input.Text))
                                     return;
                                 //更新箱号对应的出货单号
                                 dh.UpdateByCondition("package", "pa_outno = '" + pi_inoutno.Text + "'", "pa_outboxcode = '" + input.Text + "'");
@@ -652,29 +652,6 @@ namespace UAS_MES_NEW.Warehouse
             }
         }
 
-        private void updatesn(string ms_id)
-        {
-            //更新操作
-            sql.Clear();
-            sql.Append("insert into prodiomac(pim_id,pim_inoutno,pim_piid,pim_prodcode,pim_mac,pim_indate,pim_inman,pim_type,pim_inorout,pim_class)");
-            sql.Append("values(prodiomac_seq.nextval,'" + pi_inoutno.Text + "','" + pi_id.Text + "','" + dtms.Rows[0]["ms_prodcode"].ToString() + "','" + input.Text + "',sysdate,'" + User.UserCode + "',' ','OUT','出货')");
-            dh.ExecuteSql(sql.GetString(), "insert");
-            dh.UpdateByCondition("makeserial", "ms_outno='" + pi_inoutno.Text + "'", " ms_id='" + ms_id + "'");
-
-            dt = (DataTable)dh.ExecuteSql("select ms_prodcode1 from makeserial where ms_id=" + ms_id, "select");
-            string ms_prodcode = dt.Rows[0]["ms_prodcode1"].ToString();
-            //如果产品不存在,则插入到明细表中
-            if (!dh.CheckExist("prodiodetail", "pd_piid='" + pi_id.Text + "' and pd_prodcode='" + ms_prodcode + "'"))
-            {
-                string pd_pdno = dh.getFieldDataByCondition("prodiodetail", "nvl(max(pd_pdno),0)+1", "pd_piid=" + pi_id.Text).ToString();
-                dh.ExecuteSql("insert into prodiodetail(pd_id,pd_piid,pd_inoutno,pd_pdno,pd_prodcode,pd_outqty)values(prodiodetail_seq.nextval,'" + pi_id.Text + "','" + pi_inoutno.Text + "','" + pd_pdno + "','" + ms_prodcode + "',1)", "insert");
-            }
-            else
-            {
-                dh.ExecuteSql("update prodiodetail set pd_outqty=pd_outqty+1 where pd_piid='" + pi_id.Text + "' and pd_prodcode='" + ms_prodcode + "'", "update");
-            }
-        }
-
         //插入prodiomac表
         private void insertprodiomac(string type, string iBox)
         {
@@ -688,13 +665,12 @@ namespace UAS_MES_NEW.Warehouse
                 pib_type = "BOX";
             }
             sql.Clear();
-            sql.Append("insert into prodiomac(pim_id,pim_inoutno,pim_piid,pim_prodcode,pim_mac,pim_indate,pim_inman,pim_type,pim_outboxcode,pim_inorout,pim_class)");
-            sql.Append("select prodiomac_seq.nextval,'" + pi_inoutno.Text + "','" + pi_id.Text + "',v_prodcode,ms_sncode,sysdate,'" + User.UserCode + "','" + pib_type + "','" + iBox + "','OUT','出货'" +
+            sql.Append("insert into prodiomac(pim_id,pim_inoutno,pim_piid,pim_prodcode,pim_mac,pim_indate,pim_inman,pim_type,pim_outboxcode,pim_inorout,pim_class,pim_custpo,pim_custdetno,pim_pdid)");
+            sql.Append("select prodiomac_seq.nextval,'" + pi_inoutno.Text + "','" + pi_id.Text + "',v_prodcode,ms_sncode,sysdate,'" + User.UserCode + "','" + pib_type + "','" + iBox + "','OUT','出货','" + custpo + "','" + custpodetno + "','" + PDID + "'" +
                 " from mes_package_view left join makeserial on ms_sncode=v_barcode and ms_makecode=v_makecode where v_outboxcode='" + iBox + "' and ms_outno is null");
             dh.ExecuteSql(sql.GetString(), "insert");
         }
 
-
         private Boolean checkinsertprodiomac(string type, string iBox)
         {
             sql.Clear();
@@ -839,8 +815,10 @@ namespace UAS_MES_NEW.Warehouse
 
         }
         string PrintPrcode = "";
+        string custpo = "";
+        string custpodetno = "";
         string PdPDNO = "";
-        string PDID = "";
+        string PDID = "0";
         private void Prodiodetail_CellClick(object sender, DataGridViewCellEventArgs e)
         {
             if (e.RowIndex >= 0)
@@ -848,6 +826,8 @@ namespace UAS_MES_NEW.Warehouse
                 string pd_prodcode = Prodiodetail.Rows[e.RowIndex].Cells["pd_prodcode"].Value.ToString();
                 string pd_pdno = Prodiodetail.Rows[e.RowIndex].Cells["pd_pdno"].Value.ToString();
                 string pd_id = Prodiodetail.Rows[e.RowIndex].Cells["pd_id"].Value.ToString();
+                custpo = Prodiodetail.Rows[e.RowIndex].Cells["pd_custpo"].Value.ToString();
+                custpodetno = Prodiodetail.Rows[e.RowIndex].Cells["pd_custpodetno"].Value.ToString();
                 PrintPrcode = pd_prodcode;
                 PdPDNO = pd_pdno;
                 PDID = pd_id;
@@ -861,6 +841,10 @@ namespace UAS_MES_NEW.Warehouse
             PrintLabel.DataSource = _dt;
             PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";
+
+            PrintLabel1.DataSource = _dt.Copy();
+            PrintLabel1.DisplayMember = "la_url";
+            PrintLabel1.ValueMember = "la_id";
         }
         Engine engine;
         private void Printlab_Click(object sender, EventArgs e)
@@ -885,6 +869,17 @@ namespace UAS_MES_NEW.Warehouse
             {
                 OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
             }
+            if (PrintSecond.Checked)
+            {
+                if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel1.Text, PrintLabel1.SelectedValue.ToString(), PrinterList1.Text, PDID, PrintPrcode, int.Parse(PrintNum1.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)

UAS_MES_YDCY/FunctionCode/Warehouse/Warehouse_FinishedProductOutSumNEW.resx

@@ -264,25 +264,10 @@
   <metadata name="pd_prodcode.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>
-  <metadata name="pd_pdno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <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_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">
+  <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">
@@ -350,24 +335,6 @@
   <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