|
|
@@ -329,7 +329,14 @@ namespace UAS_LabelMachine
|
|
|
|
|
|
Data.Add("DATECODE", SplitData2[4].Substring(2, SplitData2[4].Length - 2));
|
|
|
|
|
|
- Data.Add("BRAND","NEX");
|
|
|
+ if (checkBox1.Checked)
|
|
|
+ {
|
|
|
+ Data.Add("BRAND", "P");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ Data.Add("BRAND", "NEX");
|
|
|
+ }
|
|
|
|
|
|
Data.Add("LOTNO", SplitData2[5].Substring(2, SplitData2[5].Length - 2));
|
|
|
|
|
|
@@ -973,7 +980,7 @@ namespace UAS_LabelMachine
|
|
|
}
|
|
|
|
|
|
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,nvl(cu_controlinout,0)cu_controlinout from prodinout left join customer on pi_cardcode=cu_code 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,nvl(cu_controlinout,0)cu_controlinout,nvl(cu_zxyq_user,' ')cu_zxyq_user from prodinout left join customer on pi_cardcode=cu_code where pi_inoutno='" + pi_inoutno.Text + "' and pi_invostatuscode='AUDITED'");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
@@ -982,6 +989,7 @@ namespace UAS_LabelMachine
|
|
|
pi_date.Text = dt.Rows[0]["pi_date"].ToString();
|
|
|
PI_ID = dt.Rows[0]["pi_id"].ToString();
|
|
|
cu_controlinout.Text = dt.Rows[0]["cu_controlinout"].ToString();
|
|
|
+ cu_zxyq_user.Text = dt.Rows[0]["cu_zxyq_user"].ToString();
|
|
|
switch (dt.Rows[0]["pi_combine_user"].ToString())
|
|
|
{
|
|
|
case "1":
|