|
@@ -43,7 +43,7 @@ namespace UAS_MES.Special
|
|
|
sql.Append("select cd_stepcode from craft left join craftdetail on cr_id=cd_crid where ");
|
|
sql.Append("select cd_stepcode from craft left join craftdetail on cr_id=cd_crid where ");
|
|
|
sql.Append("cr_prodcode='" + pr_code + "' and cr_code='" + cr_code + "' order by cd_detno ");
|
|
sql.Append("cr_prodcode='" + pr_code + "' and cr_code='" + cr_code + "' order by cd_detno ");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
- if (ms_stepcode == dt.Rows[0]["cd_stepcode"].ToString() || (ms_stepcode == "" && ms_nextstepcode == User.CurrentStepCode))
|
|
|
|
|
|
|
+ if (ms_stepcode == dt.Rows[0]["cd_stepcode"].ToString() || (ms_nextstepcode == dt.Rows[0]["cd_stepcode"].ToString()))
|
|
|
{
|
|
{
|
|
|
List<string> sqls = new List<string>();
|
|
List<string> sqls = new List<string>();
|
|
|
//存在不良删除不良记录
|
|
//存在不良删除不良记录
|
|
@@ -101,7 +101,7 @@ namespace UAS_MES.Special
|
|
|
{
|
|
{
|
|
|
////初始化号段状态
|
|
////初始化号段状态
|
|
|
sqls.Add("delete MAKESNRULEDETAIL where msd_sncode='" + sn_code.Text + "' and msd_makecode='" + ms_makecode + "' and msd_type='before'");
|
|
sqls.Add("delete MAKESNRULEDETAIL where msd_sncode='" + sn_code.Text + "' and msd_makecode='" + ms_makecode + "' and msd_type='before'");
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
//解除前一工单板的使用
|
|
//解除前一工单板的使用
|
|
|
sqls.Add("update makeserial set ms_nextmacode='' where ms_sncode='" + sn_code.Text + "' and ms_nextmacode='" + ms_makecode + "'");
|
|
sqls.Add("update makeserial set ms_nextmacode='' where ms_sncode='" + sn_code.Text + "' and ms_nextmacode='" + ms_makecode + "'");
|
|
|
//清除操作日志
|
|
//清除操作日志
|
callm