|
|
@@ -94,22 +94,26 @@ namespace UAS_MES.Make
|
|
|
//核对工序
|
|
|
if (LogicHandler.CheckStepSNAndMacode(makecode, User.UserSourceCode, code.Text, User.UserCode, out oMakecode, out oMsid, out errorMessage))
|
|
|
{
|
|
|
- //按照out出的工单号查出工单相关信息，并赋值到相关控件
|
|
|
- sql.Clear();
|
|
|
- sql.Append("select ma_code as ms_macode,mcd_okqty,ma_qty,ma_qty-mcd_inqty as remain_qty,pr_detail,pr_code as ma_prodcode ");
|
|
|
- sql.Append("from makeserial left join make on ms_makecode=ma_code left join product on ");
|
|
|
- sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_id=:msid and mcd_stepcode='" + User.CurrentStepCode + "'");
|
|
|
- dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", oMsid);
|
|
|
- if (dt.Rows.Count > 0)
|
|
|
+ //如果用户没有选择工单号
|
|
|
+ if (ms_macode.Text == "" || ms_macode.Text != makecode)
|
|
|
{
|
|
|
- //记录数量
|
|
|
- ma_qty = int.Parse(dt.Rows[0]["ma_qty"].ToString());
|
|
|
- BaseUtil.SetFormValue(this.Controls, dt);
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- OperateResult.AppendText(">>序列号" + code.Text + "不存在\n", Color.Red,code);
|
|
|
- return;
|
|
|
+ //按照out出的工单号查出工单相关信息，并赋值到相关控件
|
|
|
+ sql.Clear();
|
|
|
+ sql.Append("select ma_code as ms_macode,mcd_okqty,ma_qty,ma_qty-mcd_inqty as remain_qty,pr_detail,pr_code as ma_prodcode ");
|
|
|
+ sql.Append("from makeserial left join make on ms_makecode=ma_code left join product on ");
|
|
|
+ sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_id=:msid and mcd_stepcode='" + User.CurrentStepCode + "'");
|
|
|
+ dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", oMsid);
|
|
|
+ if (dt.Rows.Count > 0)
|
|
|
+ {
|
|
|
+ //记录数量
|
|
|
+ ma_qty = int.Parse(dt.Rows[0]["ma_qty"].ToString());
|
|
|
+ BaseUtil.SetFormValue(this.Controls, dt);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ OperateResult.AppendText(">>序列号" + code.Text + "不存在\n", Color.Red, code);
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
//获取需要关联采集的信息，以及校验规则
|
|
|
ListA = (DataTable)dh.ExecuteSql("select * from productsnrelation where psr_prodcode='" + ma_prodcode.Text + "' order by psr_detno", "select");
|
shim