合并状态，新增箱号

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

@@ -564,10 +564,21 @@ namespace UAS_LabelMachine
                 LoadCheck = true;
                 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'");
+                sql.Append("select pi_id,pi_cardcode,pi_title,to_char(pi_date,'yyyymmdd')pi_date,nvl(pi_combine_user,0)pi_combine_user from prodinout where pi_inoutno='" + pi_inoutno.Text + "' and pi_invostatuscode='AUDITED'");
                 dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                 if (dt.Rows.Count > 0)
                 {
+                    switch (dt.Rows[0]["pi_combine_user"].ToString())
+                    {
+                        case "1":
+                            Combindetail.Checked = true;
+                            break;
+                        case "2":
+                            CombindetailTwo.Checked = true;
+                            break;
+                        default:
+                            break;
+                    }
                     pi_cardcode.Text = dt.Rows[0]["pi_cardcode"].ToString();
                     pi_title.Text = dt.Rows[0]["pi_title"].ToString();
                     if (pi_cardcode.Text != "ZGCC")
@@ -1103,7 +1114,7 @@ namespace UAS_LabelMachine
         {
             AllChecked = false;
             sql.Clear();
-            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("select pd_custprodcode,pib_combine_user,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  ");
@@ -1316,6 +1327,7 @@ namespace UAS_LabelMachine
                 combined = 2;
             if (Combindetail.Checked || CombindetailTwo.Checked)
             {
+                dh.UpdateByCondition("prodinout", "pib_combine_user=" + combined, "pi_inoutno='" + pi_inoutno.Text + "'");
                 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)
                 {
@@ -1482,6 +1494,7 @@ namespace UAS_LabelMachine
                         }
                         else
                         {
+                            SQL = SQL.Replace("{pd_pdno}", CurrentPDNO);
                             //替换参数后重新执行SQL
                             foreach (Match mch in match.Matches(SQL))
                             {
@@ -1846,5 +1859,10 @@ namespace UAS_LabelMachine
                 pi_inoutno_KeyDown(sender, new KeyEventArgs(Keys.Enter));
             }
         }
+
+        private void AddNewOutBox_Click(object sender, EventArgs e)
+        {
+            OutBoxNum.Text = "新增";
+        }
     }
 }