添加区分外箱DC和LOTNO

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

@@ -567,7 +567,7 @@ namespace UAS_LabelMachine
                 LoadCheck = true;
                 Input.Clear();
                 sql.Clear();
-                sql.Append("select pi_id,pi_cardcode,pi_combine_user,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'");
+                sql.Append("select pi_id,pi_cardcode,pi_combine_user,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)
                 {
@@ -1763,10 +1763,14 @@ namespace UAS_LabelMachine
                             string FPrcode = LabelInf.Rows[i].Cells["pib_prodcode"].Value.ToString();
                             string FPocode = LabelInf.Rows[i].Cells["pd_pocode"].Value.ToString();
                             string FWhcode = LabelInf.Rows[i].Cells["pib_brand"].Value.ToString();
+                            string FDC = LabelInf.Rows[i].Cells["pib_datecode"].Value.ToString();
+                            string FLOTNO = LabelInf.Rows[i].Cells["pib_lotno"].Value.ToString();
                             string BPrcode = LabelInf.Rows[i + 1].Cells["pib_prodcode"].Value.ToString();
                             string BPocode = LabelInf.Rows[i + 1].Cells["pd_pocode"].Value.ToString();
                             string BWhcode = LabelInf.Rows[i + 1].Cells["pib_brand"].Value.ToString();
-                            if (FPrcode != BPrcode || FPocode != BPocode || FWhcode != BWhcode)
+                            string BDC = LabelInf.Rows[i + 1].Cells["pib_datecode"].Value.ToString();
+                            string BLOTNO = LabelInf.Rows[i + 1].Cells["pib_lotno"].Value.ToString();
+                            if (FPrcode != BPrcode || FPocode != BPocode || FWhcode != BWhcode || (DiffDC.Checked && FDC != BDC) || (DiffLotNo.Checked && FLOTNO != BLOTNO))
                             {
                                 GetNumCount = GetNumCount + 1;
                             }
@@ -1791,10 +1795,14 @@ namespace UAS_LabelMachine
                             string FPrcode = LabelInf.Rows[i].Cells["pib_prodcode"].Value.ToString();
                             string FPocode = LabelInf.Rows[i].Cells["pd_pocode"].Value.ToString();
                             string FWhcode = LabelInf.Rows[i].Cells["pib_brand"].Value.ToString();
+                            string FDC = LabelInf.Rows[i].Cells["pib_datecode"].Value.ToString();
+                            string FLOTNO = LabelInf.Rows[i].Cells["pib_lotno"].Value.ToString();
                             string BPrcode = LabelInf.Rows[i + 1].Cells["pib_prodcode"].Value.ToString();
                             string BPocode = LabelInf.Rows[i + 1].Cells["pd_pocode"].Value.ToString();
                             string BWhcode = LabelInf.Rows[i + 1].Cells["pib_brand"].Value.ToString();
-                            if (FPrcode != BPrcode || FPocode != BPocode || FWhcode != BWhcode)
+                            string BDC = LabelInf.Rows[i + 1].Cells["pib_datecode"].Value.ToString();
+                            string BLOTNO = LabelInf.Rows[i + 1].Cells["pib_lotno"].Value.ToString();
+                            if (FPrcode != BPrcode || FPocode != BPocode || FWhcode != BWhcode || (DiffDC.Checked && FDC != BDC) || (DiffLotNo.Checked && FLOTNO != BLOTNO))
                             {
                                 MaxNum = MaxNum + 1;
                             }