|
|
@@ -175,7 +175,7 @@ namespace UAS_MES.Make
|
|
|
sql.Clear();
|
|
|
sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode as pr_code ,pr_detail,");
|
|
|
sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
|
|
|
- sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + oMakeCode + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
|
|
|
+ sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + (oMakeCode=="null"?ma_code.Text: oMakeCode) + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
@@ -231,7 +231,7 @@ namespace UAS_MES.Make
|
|
|
return;
|
|
|
}
|
|
|
//更新至下一步工序
|
|
|
- if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, sncode.Text, "彩盒打印", "彩盒打印成功", User.UserCode, out ErrorMessage2))
|
|
|
+ if (LogicHandler.SetStepResult((oMakeCode == "null" ? ma_code.Text : oMakeCode), User.UserSourceCode, sncode.Text, "彩盒打印", "彩盒打印成功", User.UserCode, out ErrorMessage2))
|
|
|
{
|
|
|
Print.CodeSoft(Tag.ToString(), lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
|
|
|
//提示用户打印成功
|
