|
|
@@ -191,15 +191,27 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
//验证makeserial或者ms_firstsn表序列号是否存在
|
|
|
sql.Clear();
|
|
|
- sql.Append("select max(ms_id) ms_id,ms_makecode,ms_prodcode,ms_sncode,pr_detail,ms_stepcode,ms_craftcode,ms_checkno,ms_ifrework,ms_reworkcheckno ");
|
|
|
+ sql.Append("select max(ms_id) ms_id,ms_makecode,ms_firstsn,ms_prodcode,ms_sncode,pr_detail,ms_stepcode,ms_craftcode,ms_checkno,ms_ifrework,ms_reworkcheckno ");
|
|
|
sql.Append("from makeserial left join product on pr_code=ms_prodcode where ms_makecode ='" + macode + "' and(ms_sncode");
|
|
|
sql.Append("='" + GetSNCode.Text + "' or ms_firstsn in (select firstsn from makesnrelation where ");
|
|
|
- sql.Append("sn='" + GetSNCode.Text + "')) group by ms_makecode,ms_prodcode,ms_sncode,pr_detail,ms_stepcode,ms_craftcode,ms_checkno,ms_ifrework,ms_reworkcheckno");
|
|
|
+ sql.Append("sn='" + GetSNCode.Text + "')) group by ms_makecode,ms_prodcode,ms_sncode,pr_detail,ms_firstsn,ms_stepcode,ms_craftcode,ms_checkno,ms_ifrework,ms_reworkcheckno");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
msid = dt.Rows[0]["ms_id"].ToString();
|
|
|
BaseUtil.SetFormValue(this.Controls, dt);
|
|
|
+ //判断是否存在上料记录
|
|
|
+ string firstsn = dt.Rows[0]["ms_firstsn"].ToString();
|
|
|
+ sql.Clear();
|
|
|
+ sql.Append("select cm_sncode,cm_status,cm_maprodcode,cm_stepcode,cm_soncode,min(cm_indate)cm_indate,sum(case ");
|
|
|
+ sql.Append("when cm_status=-1 then 0 else 1 end)qty from craftmaterial left join product on pr_code=cm_soncode ");
|
|
|
+ sql.Append("where(cm_sncode in (select sn from makesnrelation where firstsn='" + firstsn + "') or cm_sncode='" + firstsn + "')");
|
|
|
+ sql.Append("group by cm_sncode,cm_status,cm_maprodcode,cm_stepcode,cm_soncode having sum(case when cm_status=-1 then 0 else 1 end)=0 order by cm_indate");
|
|
|
+ dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
+ if (dt.Rows.Count > 0)
|
|
|
+ {
|
|
|
+ cd_stepcode.Text = dt.Rows[0]["cm_stepcode"].ToString();
|
|
|
+ }
|
|
|
LoadBadInfTree(sender, e);
|
|
|
}
|
|
|
else OperatResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
|
|
|
@@ -688,6 +700,8 @@ namespace UAS_MES.Make
|
|
|
else
|
|
|
cr_code.Condition = "";
|
|
|
bd_soncode.Condition = "bd_mothercode='" + ms_prodcode.Text + "' and NVL(bd_usestatus,' ')<>'DISABLE'";
|
|
|
+ //设置工序的条件
|
|
|
+ cd_stepcode.Condition = "ST_STATUSCODE='AUDITED' and cr_code='" + cr_code.Text + "' and cr_prodcode='" + ms_prodcode.Text + "'";
|
|
|
}
|
|
|
}
|
|
|
}
|
