优化栈板出货

UAS_MES_YDCY/FunctionCode/Warehouse/Warehouse_FinishedProductOutSumNEW.Designer.cs

@@ -63,6 +63,7 @@
             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_custprod = 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();
@@ -79,11 +80,10 @@
             this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.blank = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ProdDetail = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.pi_inoutno = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.PrinterList_label = new System.Windows.Forms.Label();
             this.PrinterList = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.PrinterCombox();
-            this.Combine = new System.Windows.Forms.CheckBox();
+            this.Combine = new System.Windows.Forms.RadioButton();
             this.AutoOutBoxCode = new System.Windows.Forms.CheckBox();
             this.pa_outboxcode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.pa_outboxcode_label = new System.Windows.Forms.Label();
@@ -109,6 +109,7 @@
             this.label13 = new System.Windows.Forms.Label();
             this.label14 = new System.Windows.Forms.Label();
             this.pi_boxnum = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.CombineCust = new System.Windows.Forms.RadioButton();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Prodiodetail)).BeginInit();
@@ -150,6 +151,7 @@
             // panel1
             // 
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel1.Controls.Add(this.CombineCust);
             this.panel1.Controls.Add(this.Baurate);
             this.panel1.Controls.Add(this.ComList);
             this.panel1.Controls.Add(this.sumpalletweight);
@@ -164,6 +166,7 @@
             this.panel1.Controls.Add(this.label8);
             this.panel1.Controls.Add(this.label6);
             this.panel1.Controls.Add(this.label4);
+            this.panel1.Controls.Add(this.Combine);
             this.panel1.Location = new System.Drawing.Point(1212, 143);
             this.panel1.Margin = new System.Windows.Forms.Padding(4);
             this.panel1.Name = "panel1";
@@ -452,6 +455,7 @@
             this.pd_cartons,
             this.pd_id,
             this.pd_prodcode,
+            this.pd_custprod,
             this.pd_custpo,
             this.pd_custpodetno,
             this.dataGridViewTextBoxColumn2,
@@ -505,6 +509,14 @@
             this.pd_prodcode.ReadOnly = true;
             this.pd_prodcode.Width = 2;
             // 
+            // pd_custprod
+            // 
+            this.pd_custprod.DataPropertyName = "pd_custprod";
+            this.pd_custprod.HeaderText = "客户料号";
+            this.pd_custprod.MinimumWidth = 10;
+            this.pd_custprod.Name = "pd_custprod";
+            this.pd_custprod.Width = 200;
+            // 
             // pd_custpo
             // 
             this.pd_custpo.DataPropertyName = "pd_custpo";
@@ -685,26 +697,6 @@
             this.blank.Name = "blank";
             this.blank.Width = 2;
             // 
-            // ProdDetail
-            // 
-            this.ProdDetail.AllPower = null;
-            this.ProdDetail.BackColor = System.Drawing.Color.Transparent;
-            this.ProdDetail.DownImage = ((System.Drawing.Image)(resources.GetObject("ProdDetail.DownImage")));
-            this.ProdDetail.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.ProdDetail.Image = null;
-            this.ProdDetail.IsShowBorder = true;
-            this.ProdDetail.Location = new System.Drawing.Point(821, 2);
-            this.ProdDetail.Margin = new System.Windows.Forms.Padding(4);
-            this.ProdDetail.MoveImage = ((System.Drawing.Image)(resources.GetObject("ProdDetail.MoveImage")));
-            this.ProdDetail.Name = "ProdDetail";
-            this.ProdDetail.NormalImage = ((System.Drawing.Image)(resources.GetObject("ProdDetail.NormalImage")));
-            this.ProdDetail.Power = null;
-            this.ProdDetail.Size = new System.Drawing.Size(130, 54);
-            this.ProdDetail.TabIndex = 214;
-            this.ProdDetail.Text = "产品明细";
-            this.ProdDetail.UseVisualStyleBackColor = false;
-            this.ProdDetail.Click += new System.EventHandler(this.ProdDetail_Click);
-            // 
             // pi_inoutno
             // 
             this.pi_inoutno.AllPower = null;
@@ -746,9 +738,9 @@
             // Combine
             // 
             this.Combine.AutoSize = true;
-            this.Combine.Location = new System.Drawing.Point(673, 17);
+            this.Combine.Location = new System.Drawing.Point(38, 321);
             this.Combine.Name = "Combine";
-            this.Combine.Size = new System.Drawing.Size(138, 28);
+            this.Combine.Size = new System.Drawing.Size(137, 28);
             this.Combine.TabIndex = 250;
             this.Combine.Text = "合并明细";
             this.Combine.UseVisualStyleBackColor = true;
@@ -1072,6 +1064,16 @@
             this.pi_boxnum.TabIndex = 273;
             this.pi_boxnum.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pi_boxnum_KeyDown);
             // 
+            // CombineCust
+            // 
+            this.CombineCust.AutoSize = true;
+            this.CombineCust.Location = new System.Drawing.Point(182, 321);
+            this.CombineCust.Name = "CombineCust";
+            this.CombineCust.Size = new System.Drawing.Size(185, 28);
+            this.CombineCust.TabIndex = 274;
+            this.CombineCust.Text = "合并客户料号";
+            this.CombineCust.UseVisualStyleBackColor = true;
+            // 
             // Warehouse_FinishedProductOutSumNEW
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
@@ -1102,7 +1104,6 @@
             this.Controls.Add(this.AutoOutBoxCode);
             this.Controls.Add(this.pa_outboxcode);
             this.Controls.Add(this.pa_outboxcode_label);
-            this.Controls.Add(this.Combine);
             this.Controls.Add(this.PrinterList_label);
             this.Controls.Add(this.PrinterList);
             this.Controls.Add(this.PrintNum);
@@ -1121,7 +1122,6 @@
             this.Controls.Add(this.palletBtn);
             this.Controls.Add(this.InOutDetailDGV);
             this.Controls.Add(this.panel1);
-            this.Controls.Add(this.ProdDetail);
             this.Controls.Add(this.pi_title);
             this.Controls.Add(this.pi_titile_label);
             this.Controls.Add(this.pi_inoutno_label);
@@ -1149,7 +1149,6 @@
         private System.Windows.Forms.Label pi_inoutno_label;
         private System.Windows.Forms.Label pi_titile_label;
         private System.Windows.Forms.Label pi_title;
-        private CustomControl.ButtonUtil.NormalButton ProdDetail;
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Label label10;
         private System.Windows.Forms.Label label8;
@@ -1177,7 +1176,7 @@
         private System.Windows.Forms.Label pa_restqty_label;
         private System.Windows.Forms.Label PrinterList_label;
         private CustomControl.ComBoxWithFocus.PrinterCombox PrinterList;
-        private System.Windows.Forms.CheckBox Combine;
+        private System.Windows.Forms.RadioButton Combine;
         private System.Windows.Forms.CheckBox AutoOutBoxCode;
         private CustomControl.TextBoxWithIcon.SnCollectionBox pa_outboxcode;
         private System.Windows.Forms.Label pa_outboxcode_label;
@@ -1204,15 +1203,6 @@
         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.CheckBox PrintThird;
         private System.Windows.Forms.Label label9;
         private CustomControl.ComBoxWithFocus.PrinterCombox PrinterList2;
@@ -1224,5 +1214,16 @@
         private System.Windows.Forms.Label label13;
         private System.Windows.Forms.Label label14;
         private CustomControl.TextBoxWithIcon.EnterTextBox pi_boxnum;
+        private System.Windows.Forms.RadioButton CombineCust;
+        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_custprod;
+        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;
     }
 }

UAS_MES_YDCY/FunctionCode/Warehouse/Warehouse_FinishedProductOutSumNEW.cs

@@ -260,15 +260,23 @@ namespace UAS_MES_NEW.Warehouse
             if (Combine.Checked)
             {
                 sql.Clear();
-                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("select min(pd_custprod)pd_custprod,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);
             }
+            if (CombineCust.Checked)
+            {
+                sql.Clear();
+                sql.Append("select pd_custprod,min(pd_custpo)pd_custpo,pd_custpodetno,max(pd_pdno)pd_pdno,max(pd_id)pd_id,wm_concat(pd_prodcode)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_custprod,pd_custpo,pd_custpodetno");
+                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                BaseUtil.FillDgvWithDataTable(Prodiodetail, dt);
+            }
             else
             {
                 sql.Clear();
-                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("select pd_custprod,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);
@@ -349,12 +357,12 @@ namespace UAS_MES_NEW.Warehouse
                                 OperateResult.AppendText("栈板号" + input.Text + "不存在,请重新输入\n", Color.Red, input);
                                 return;
                             }
-                            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");
-                            if (!Combine.Checked)
+                            dtms = (DataTable)dh.ExecuteSql("select ma_prodcode,ma_custprodcode from mes_package_view left join make on ma_code=v_makecode where v_outboxcode='" + input.Text + "'", "select");
+                            if (Combine.Checked)
                             {
                                 sql.Clear();
-                                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 + "')");
+                                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() + "')");
                                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                                 if (dt.Rows[0]["cn"].ToString() == "0")
                                 {
@@ -372,11 +380,33 @@ namespace UAS_MES_NEW.Warehouse
                                     return;
                                 }
                             }
+                            if (CombineCust.Checked)
+                            {
+                                sql.Clear();
+                                sql.Append("select cn,outqty,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_custprodcode='" + dtms.Rows[0]["ma_custprodcode"] + "'),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_custprod='" + dtms.Rows[0]["ma_custprodcode"] + "')");
+                                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                                if (dt.Rows[0]["cn"].ToString() == "0")
+                                {
+                                    OperateResult.AppendText("序列号" + input.Text + "所属产品客户料号:" + dtms.Rows[0]["ma_custprodcode"].ToString() + ",不在出货单" + pi_inoutno.Text + "中\n", Color.Red, input);
+                                    return;
+                                }
+                                else if (int.Parse(dt.Rows[0]["cn"].ToString()) > 0 && int.Parse(dt.Rows[0]["ungetqty"].ToString()) <= 0)
+                                {
+                                    OperateResult.AppendText("出货单产品,客户料号:" + dtms.Rows[0]["ma_custprodcode"].ToString() + "已经完成出货采集\n", Color.Red, input);
+                                    return;
+                                }
+                                if (int.Parse(dt.Rows[0]["ungetqty"].ToString()) < int.Parse(PA_TOTALQTY))
+                                {
+                                    OperateResult.AppendText("当前栈板数量" + PA_TOTALQTY + ",超出待采集数量\n", Color.Red, input);
+                                    return;
+                                }
+                            }
                             else
                             {
                                 sql.Clear();
-                                sql.Append("select cn,outqty,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_prodcode='" + pdprodcode + "'),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='" + pdprodcode + "')");
+                                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")
                                 {
@@ -427,18 +457,23 @@ namespace UAS_MES_NEW.Warehouse
                             string pr_packrule = "";
                             string pa_salecode = "";
                             string pa_mothercode = "";
+                            string PA_TOTALQTY = "";
                             if (outboxcode != "")
                             {
                                 input.Text = outboxcode;
                             }
                             sql.Clear();
-                            sql.Append("select pa_id,pr_palletqty,pr_packrule,pa_salecode,pa_outboxcode,pa_mothercode,pa_makecode,pa_status,nvl(pa_iostatus,0) pa_iostatus,nvl(pa_downstatus,0)pa_downstatus,pa_prodcode,pa_outno, pa_mothercode from package left join product on pr_code=pa_prodcode where pa_outboxcode='" + input.Text + "' and pa_type in(1,2,3)");
+                            sql.Append("select pa_id,pr_palletqty,PA_TOTALQTY,pr_packrule,pa_salecode,pa_outboxcode,pa_mothercode,pa_makecode,pa_status,nvl(pa_iostatus,0) pa_iostatus,nvl(pa_downstatus,0)pa_downstatus,pa_prodcode,pa_outno, pa_mothercode from package left join product on pr_code=pa_prodcode where pa_outboxcode='" + input.Text + "' and pa_type in(1,2,3)");
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count > 0)
                             {
                                 pa_makecode = dt.Rows[0]["pa_makecode"].ToString();
+                                PA_TOTALQTY = dt.Rows[0]["PA_TOTALQTY"].ToString();
                                 pa_prodcode = dt.Rows[0]["pa_prodcode"].ToString();
-                                pa_standardqty.Text = dt.Rows[0]["pr_palletqty"].ToString();
+                                if (dt.Rows[0]["pr_palletqty"].ToString() != "")
+                                {
+                                    pa_standardqty.Text = dt.Rows[0]["pr_palletqty"].ToString();
+                                }
                                 pr_packrule = dt.Rows[0]["pr_packrule"].ToString();
                                 pa_salecode = dt.Rows[0]["pa_salecode"].ToString();
                                 pa_mothercode = dt.Rows[0]["pa_mothercode"].ToString();
@@ -448,6 +483,78 @@ namespace UAS_MES_NEW.Warehouse
                                 OperateResult.AppendText("箱号" + input.Text + "不存在,请重新输入\n", Color.Red, input);
                                 return;
                             }
+                            if (pa_standardqty.Text == "")
+                            {
+                                OperateResult.AppendText("请输入栈板容量\n", Color.Red, input);
+                                return;
+                            }
+                            dtms = (DataTable)dh.ExecuteSql("select ma_prodcode,ma_custprodcode from mes_package_view left join make on ma_code=v_makecode where v_outboxcode='" + input.Text + "'", "select");
+                            if (Combine.Checked)
+                            {
+                                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() + "')");
+                                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                                if (dt.Rows[0]["cn"].ToString() == "0")
+                                {
+                                    OperateResult.AppendText("序列号" + input.Text + "所属产品:" + dtms.Rows[0]["ma_prodcode"].ToString() + ",不在出货单" + pi_inoutno.Text + "中\n", Color.Red, input);
+                                    return;
+                                }
+                                else if (int.Parse(dt.Rows[0]["cn"].ToString()) > 0 && int.Parse(dt.Rows[0]["ungetqty"].ToString()) <= 0)
+                                {
+                                    OperateResult.AppendText("出货单产品" + dtms.Rows[0]["ma_prodcode"].ToString() + "已经完成出货采集\n", Color.Red, input);
+                                    return;
+                                }
+                                if (int.Parse(dt.Rows[0]["ungetqty"].ToString()) < int.Parse(PA_TOTALQTY))
+                                {
+                                    OperateResult.AppendText("当前栈板数量" + PA_TOTALQTY + ",超出待采集数量\n", Color.Red, input);
+                                    return;
+                                }
+                            }
+                            if (CombineCust.Checked)
+                            {
+                                sql.Clear();
+                                sql.Append("select cn,outqty,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_custprodcode='" + dtms.Rows[0]["ma_custprodcode"].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_custprod='" + dtms.Rows[0]["ma_custprodcode"].ToString() + "')");
+                                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                                if (dt.Rows[0]["cn"].ToString() == "0")
+                                {
+                                    OperateResult.AppendText("序列号" + input.Text + "所属产品客户料号:" + dtms.Rows[0]["ma_custprodcode"].ToString() + ",不在出货单" + pi_inoutno.Text + "中\n", Color.Red, input);
+                                    return;
+                                }
+                                else if (int.Parse(dt.Rows[0]["cn"].ToString()) > 0 && int.Parse(dt.Rows[0]["ungetqty"].ToString()) <= 0)
+                                {
+                                    OperateResult.AppendText("出货单产品,客户料号:" + dtms.Rows[0]["ma_custprodcode"].ToString() + "已经完成出货采集\n", Color.Red, input);
+                                    return;
+                                }
+                                if (int.Parse(dt.Rows[0]["ungetqty"].ToString()) < int.Parse(PA_TOTALQTY))
+                                {
+                                    OperateResult.AppendText("当前栈板数量" + PA_TOTALQTY + ",超出待采集数量\n", Color.Red, input);
+                                    return;
+                                }
+                            }
+                            else
+                            {
+                                sql.Clear();
+                                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")
+                                {
+                                    OperateResult.AppendText("序列号" + input.Text + "所属产品:" + dtms.Rows[0]["ma_prodcode"].ToString() + ",不在出货单" + pi_inoutno.Text + "中\n", Color.Red, input);
+                                    return;
+                                }
+                                else if (int.Parse(dt.Rows[0]["cn"].ToString()) > 0 && int.Parse(dt.Rows[0]["ungetqty"].ToString()) <= 0)
+                                {
+                                    OperateResult.AppendText("出货单产品" + dtms.Rows[0]["ma_prodcode"].ToString() + "已经完成出货采集\n", Color.Red, input);
+                                    return;
+                                }
+                                if (int.Parse(dt.Rows[0]["ungetqty"].ToString()) < int.Parse(PA_TOTALQTY))
+                                {
+                                    OperateResult.AppendText("当前栈板数量" + PA_TOTALQTY + ",超出待采集数量\n", Color.Red, input);
+                                    return;
+                                }
+                            }
                             if (pa_outboxcode.Text == "" && !AutoOutBoxCode.Checked)
                             {
                                 pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PALLET", pa_makecode, pa_prodcode, User.UserCode);
@@ -462,7 +569,7 @@ namespace UAS_MES_NEW.Warehouse
                                     pa_id = dh.GetSEQ("package_seq");
                                     dh.ExecuteSql("insert into package(PA_ID, PA_OUTBOXCODE,PA_PRODCODE,PA_LEVEL,PA_PACKAGEQTY,PA_TOTALQTY,PA_MAKECODE,PA_STATUS,PA_INDATE,PA_SALECODE,PA_TYPE,PA_CURRENTQTY,PA_PACKTYPE,PA_STANDARDQTY,PA_SCCODE,PA_OUTNO)values" +
                                                 "(" + pa_id + ",'" + pa_outboxcode.Text + "',case when nvl('" + pr_packrule + "',' ')<>'MIX' then '" + pa_prodcode + "' ELSE''END,3,0,0,case when '" + pr_packrule + "'='MAKE' THEN '" + pa_makecode + "' ELSE '' END, 0,SYSDATE,case when '" + pr_packrule + "'='SALE' " +
-                                                 "then '" + pa_salecode + "' else ''end,3,0,'" + pr_packrule + "'," + pa_standardqty.Text + ",'" + User.UserSourceCode + "','" + pi_inoutno.Text + "')", "insert");
+                                                 "then '" + pa_salecode + "' else ''end,3,0,'" + pr_packrule + "','" + pa_standardqty.Text + "','" + User.UserSourceCode + "','" + pi_inoutno.Text + "')", "insert");
                                 }
                                 sql.Clear();
                                 sql.Append("insert into packagedetail(pd_id, pd_paid, pd_outboxcode,pd_makecode,pd_prodcode,pd_innerboxcode, pd_innerqty,pd_builddate)");
@@ -479,6 +586,10 @@ namespace UAS_MES_NEW.Warehouse
                                     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=0 where pa_outboxcode='" + pa_mothercode + "'", "update");
                                     dh.ExecuteSql("update package set pa_mothercode='" + pa_outboxcode.Text + "' where pa_outboxcode='" + input.Text + "'", "update");
                                 }
+                                else
+                                {
+                                    dh.ExecuteSql("update package set pa_mothercode='" + pa_outboxcode.Text + "' where pa_outboxcode='" + input.Text + "'", "update");
+                                }
                                 RefreshWeight(pa_prodcode, input.Text);
                                 if (!checkinsertprodiomac("栈板号", pa_outboxcode.Text))
                                     return;
@@ -503,6 +614,11 @@ namespace UAS_MES_NEW.Warehouse
                             else
                             {
                                 int boxnum = int.Parse(dh.getFieldDataByCondition("prodiomac", " count(distinct pim_outboxcode)", "pim_inoutno='" + pi_inoutno.Text + "' and PIM_TYPE='BOX' ").ToString());
+                                if (pi_boxnum.Text == "")
+                                {
+                                    OperateResult.AppendText("请设置散箱数量\n", Color.Red, input);
+                                    return;
+                                }
                                 if (boxnum >= int.Parse(pi_boxnum.Text))
                                 {
                                     OperateResult.AppendText("当前散数量" + boxnum + ",超出设置散箱数" + pi_boxnum.Text + "\n", Color.Red, input);
@@ -622,7 +738,7 @@ namespace UAS_MES_NEW.Warehouse
                             sql.Clear();
                             sql.Append("select pa_id,pa_outboxcode,pa_status,nvl(pa_downstatus,0)pa_downstatus, ");
                             sql.Append("pa_outno,nvl(pa_iostatus,0) pa_iostatus,pa_makecode,pa_mothercode  from package ");
-                            sql.Append("where pa_outboxcode='" + input.Text + "' and pa_type in (1,2)");
+                            sql.Append("where pa_outboxcode='" + input.Text + "' and pa_type in (1,2,3)");
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count > 0)
                             {
@@ -700,9 +816,9 @@ 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,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");
+            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,pim_custprodcode)");
+            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 + "',ma_custprodcode " +
+                " from mes_package_view left join makeserial on ms_sncode=v_barcode and ms_makecode=v_makecode left join make on ma_code=ms_makecode where v_outboxcode='" + iBox + "' and ms_outno is null");
             dh.ExecuteSql(sql.GetString(), "insert");
         }
 
@@ -819,12 +935,7 @@ namespace UAS_MES_NEW.Warehouse
         {
             if (((RadioButton)sender).Checked == true)
             {
-                if (((RadioButton)sender).Name == "serBtn")
-                {
-                    input.Focus();
-                    OperateResult.AppendText("请输入序列号进行采集\n", Color.Black, input);
-                }
-                else if (((RadioButton)sender).Name == "bigboxBtn")
+                if (((RadioButton)sender).Name == "bigboxBtn")
                 {
                     input.Focus();
                     OperateResult.AppendText("请输入箱号进行采集\n", Color.Black, input);
@@ -835,6 +946,7 @@ namespace UAS_MES_NEW.Warehouse
                     OperateResult.AppendText("请输入栈板进行采集\n", Color.Black, input);
                 }
             }
+            Console.WriteLine(CombineCust.Checked);
         }
 
         private void InOutDetailDGV_DataSourceChanged(object sender, EventArgs e)
@@ -847,11 +959,13 @@ namespace UAS_MES_NEW.Warehouse
         string PdPDNO = "";
         string PDID = "0";
         string pdprodcode = "";
+        string pdcustprodcode = "";
         private void Prodiodetail_CellClick(object sender, DataGridViewCellEventArgs e)
         {
             if (e.RowIndex >= 0)
             {
                 string pd_prodcode = Prodiodetail.Rows[e.RowIndex].Cells["pd_prodcode"].Value.ToString();
+                pdcustprodcode = Prodiodetail.Rows[e.RowIndex].Cells["pd_custprod"].Value.ToString();
                 pdprodcode = pd_prodcode;
                 string pd_pdno = Prodiodetail.Rows[e.RowIndex].Cells["pd_pdno"].Value.ToString();
                 string pd_id = Prodiodetail.Rows[e.RowIndex].Cells["pd_id"].Value.ToString();

UAS_MES_YDCY/FunctionCode/Warehouse/Warehouse_FinishedProductOutSumNEW.resx

@@ -335,44 +335,6 @@
   <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
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFfSURBVFhH5dhNTsJgFIXhM2WiCxL2oAEHrJKhQSYM
-        JIgzjSLIX0sRKPSPtl+Lo2uOgVbWcJu8CzhP8nVwISIAUAFwA+AWQFNh3M39lZMHrgDUu91uyxjji8KP
-        u7mfDgCuiVLt958fkjSTie3I62iqLu7m/sHgpQ2gRpSG6/nmc2bL23imtuHMkp0f5ADuidIMoljev+bq
-        o8PpH4NmcIjlY7JQHx0KlPCQyHBqqY8OJUqcyGhuq48OBUoUJzJeLNVHhwLlkKQysRz10eECZbpcqe8C
-        JU6NzJ1v9dGhQElSI9Zqoz46lCgmE3u9VR8dCpTUZOJsXPXRoUTJclltd+qjQ4FislzW7l59dChR8lw2
-        e099dDijNA5xYnZBKFvPVxv3x0lanA5qT71eOzsexQsjcf1AXdzN/XQ4H5l4fqs/djqtIIzC/Pgj2uJu
-        7i/Okf8O11UAd6c3pS3u5v6/w/UvTaFspAxAMh4AAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="ProdDetail.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAF3SURBVFhH5djbSgJRFMbxHsP7wBfYT7jvu46QDIoI
-        C4QNQRAIgVBRSdpxpgZN83wYx5nZOjNqrvgEd73DGvhfzdX3g32ztohoS0iVElLtCakehVQdhmE39qfg
-        AZBtIdX70Y0TjsJ4SQw/7MZ+OAip0kDJnD3UdJAsyXIjKvWm7MJu7M+X6lpIlQWK3ZhEq8pgRvfdKdvK
-        /Rk1/XglpHKA0ulPF3Tb0eyDAzzWKL3pgq7bmn1wMChdPadiK2QfHAxKW8/pqhmwDw4GpRXOqdAI2AcH
-        g9IME7qs++yDg0H5DhK6qE3YBweD0vATOq967IODQfnyE1KOxz44GJTaJKb855h9cDAoVS+mU9tlHxwM
-        iuPFdGK57IPDH8o4ouO3EfvgYFA+xhEdvg7ZB4cNil3uhquc5dLBy5Bt2P/U0+Z0kN0tOhqHlpzt0v7z
-        gF3Yjf1w2ByZ0jjD7RSs8K7l/+Ant7Ab+8058t/hOiOkquBNMQy7sX99uP4F5D4U8hdr4uMAAAAASUVO
-        RK5CYII=
-</value>
-  </data>
-  <data name="ProdDetail.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGpSURBVFhH5dg/ayJBGMfxB4YFXTARBAvBQhAsBEEQ
-        ZLnNzFu4I6aYV5kyF9tgbad1jrsYY9T4Z3fcnV2f45e38Sx8q6l+n2IWhpiZjDFVY8wPY8xPY4wVGHZj
-        fxUepLW+0Vrfz+fzR+fclgV+2I39cNBa31Icx/FisXi6XpnL8io27F8ul89xHN9RFEWTPM+ToihZet57
-        F0XRA43HYwsp7wvxwQEeNBqNbFmWnOW5+OAADxoOh7YoS3ZZJj44wIMGg4H1RcGpu4gPDvCgfr9vvfd8
-        TlPxwQEe1Ov1bO49H8+J+OAAD+p2uxaXzNfpJD44wIM6nY69ZDnvDkfxwQEe1G637SXLeLs/iA8O8KBW
-        q2XdJePNbi8+OMCDms2mxe9o/bkTHxzgQY1GwybO8WrzKT44wIPq9bpNUsdv64344AAPqtVq9pw6/vv+
-        IT44wIPCMJzsvg7Jv/UH/1m9iw3794ejC8PwgSqVyt3LbPZ8SpLvg9e3lbiwG/vhAA8KguA2CIL739Pp
-        42a73eNQWtiN/XCAB+GhVilVVUrFSqlfSikrMOzG/u+H6/+yQ4jdXN8e9AAAAABJRU5ErkJggg==
-</value>
-  </data>
   <data name="StartWeight.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m