|
|
@@ -206,9 +206,8 @@ namespace UAS_MES.Make
|
|
|
}
|
|
|
//获取工单的其他信息
|
|
|
sql.Clear();
|
|
|
- sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,nvl(ma_unlimitin,0)ma_unlimitin,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("select ma_code,nvl(ma_unlimitin,0)ma_unlimitin,pr_code,pr_detail,pr_spec from ");
|
|
|
+ sql.Append("make left join product on pr_code=ma_prodcode where ma_code='" + oMakeCode + "'");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
@@ -226,8 +225,7 @@ namespace UAS_MES.Make
|
|
|
OperateResult.AppendText(">>请重新选择标签模板\n", Color.Green);
|
|
|
return;
|
|
|
}
|
|
|
- else
|
|
|
- pr_change = false;
|
|
|
+ else pr_change = false;
|
|
|
}
|
|
|
}
|
|
|
else
|