|
|
@@ -84,7 +84,7 @@ namespace UAS_MES.Make
|
|
|
if (e.KeyCode == Keys.Enter)
|
|
|
{
|
|
|
sql.Clear();
|
|
|
- sql.Append("select pa_makecode,pa_status,pa_packageqty,pa_currentqty,pa_prodcode,pa_outboxcode,pa_totalqty,pa_custcode,pa_salecode ");
|
|
|
+ sql.Append("select pa_makecode,pa_standardqty,pa_status,pa_packageqty,pa_currentqty,pa_prodcode,pa_outboxcode,pa_totalqty,pa_custcode,pa_salecode ");
|
|
|
sql.Append("from package where pa_outboxcode='" + pa_outboxcode.Text + "' and pa_type =3");
|
|
|
DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
@@ -188,8 +188,8 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
pa_id = dh.GetSEQ("package_seq");
|
|
|
sql.Clear();
|
|
|
- sql.Append("insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode,pa_level,PA_STATUS,pa_sccode,pa_currentstep)values");
|
|
|
- sql.Append("(" + pa_id + ",'" + pa_outboxcode.Text + "','" + pa_makecode.Text + "',sysdate,'0',3,'" + pa_prodcode.Text + "',0,0,'" + User.UserSourceCode + "','" + User.CurrentStepCode + "')");
|
|
|
+ sql.Append("insert into package (pa_id,pa_outboxcode,PA_STANDARDQTY,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode,pa_level,PA_STATUS,pa_sccode,pa_currentstep)values");
|
|
|
+ sql.Append("(" + pa_id + ",'" + pa_outboxcode.Text + "','" + pa_standardqty.Text + "','" + pa_makecode.Text + "',sysdate,'0',3,'" + pa_prodcode.Text + "',0,0,'" + User.UserSourceCode + "','" + User.CurrentStepCode + "')");
|
|
|
dh.ExecuteSql(sql.GetString(), "insert");
|
|
|
}
|
|
|
else
|
|
|
@@ -309,9 +309,15 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
if (PrintLabel.Items.Count != 0)
|
|
|
{
|
|
|
- OperateResult.AppendText(">>打印箱号" + pa_outboxcode.Text + "\n", Color.Black);
|
|
|
- doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
|
|
|
- Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text));
|
|
|
+ if (dh.getFieldDataByCondition("package", "pa_status", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString() == "1")
|
|
|
+ {
|
|
|
+ OperateResult.AppendText(">>打印箱号" + pa_outboxcode.Text + "\n", Color.Black);
|
|
|
+ doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
|
|
|
+ Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text));
|
|
|
+ pa_outboxcode.Focus();
|
|
|
+ pa_outboxcode.SelectAll();
|
|
|
+ }
|
|
|
+ else OperateResult.AppendText(">>必须封栈板才能进行打印\n", Color.Red);
|
|
|
}
|
|
|
else OperateResult.AppendText(">>产品" + pa_prodcode.Text + "未维护打印标签\n", Color.Red);
|
|
|
}
|