|
|
@@ -134,12 +134,14 @@ namespace UAS_MES.Make
|
|
|
return;
|
|
|
}
|
|
|
sql.Clear();
|
|
|
- sql.Append("select ms_status,ms_outboxcode,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework from makeserial left join make ");
|
|
|
+ sql.Append("select ms_status,ms_outboxcode,ms_paststep,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework from makeserial left join make ");
|
|
|
sql.Append("on ms_makecode=ma_code where ms_sncode = '" + GetSNCode.Text + "' order by ms_id desc");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
+ string ms_paststep = "";
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
string ms_status = dt.Rows[0]["ms_status"].ToString();
|
|
|
+ ms_paststep = dt.Rows[0]["ms_paststep"].ToString();
|
|
|
ifrework = dt.Rows[0]["ms_ifrework"].ToString();
|
|
|
reworkstatus = dt.Rows[0]["ms_reworkstatus"].ToString();
|
|
|
if (dt.Rows[0]["ms_outboxcode"].ToString() != "")
|
|
|
@@ -228,7 +230,17 @@ namespace UAS_MES.Make
|
|
|
if (dh.getFieldDataByCondition("craft left join craftdetail on cr_id=cd_crid", "nvl(cd_ifburnin,0)", "cr_code='" + cr_code.Text + "' and cr_prodcode='" + ms_prodcode.Text + "' and cd_stepcode='" + dt.Rows[0]["cm_stepcode"].ToString() + "'").ToString() != "0")
|
|
|
cdstepcode = dt.Rows[0]["cm_stepcode"].ToString();
|
|
|
else
|
|
|
- cdstepcode = LogicHandler.GetNextStep(dt.Rows[0]["cm_craftcode"].ToString(), dt.Rows[0]["cm_stepcode"].ToString(), ms_prodcode.Text);
|
|
|
+ {
|
|
|
+ string nextstep = LogicHandler.GetNextStep(dt.Rows[0]["cm_craftcode"].ToString(), dt.Rows[0]["cm_stepcode"].ToString(), ms_prodcode.Text);
|
|
|
+ if (ms_paststep.Contains(nextstep))
|
|
|
+ {
|
|
|
+ cdstepcode = nextstep;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ cdstepcode = dt.Rows[0]["cm_stepcode"].ToString();
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
else
|
|
|
{
|
章政