|
|
@@ -90,8 +90,18 @@ namespace UAS_MES.Special
|
|
|
sqls.Add("delete from AGINGRECORD where ar_sncode='" + sn_code.Text + "' and ar_macode='" + ms_makecode + "'");
|
|
|
//初始化导入数据状态
|
|
|
sqls.Add("update makesnlist set msl_status=0 where msl_sncode='" + sn_code.Text + "' and msl_makecode='" + ms_makecode + "' and msl_type='before'");
|
|
|
- ////初始化号段状态
|
|
|
- sqls.Add("update MAKESNRULEDETAIL set msd_status=0 where msd_sncode='" + sn_code.Text + "' and msd_makecode='" + ms_makecode + "' and msd_type='before'");
|
|
|
+ //判断此时SN是否仍处于此工单SN导入范围
|
|
|
+ if (dh.CheckExist("MAKESNRULE", "MSR_MAKECODE = '" + ms_makecode + "' and '" + sn_code.Text + "' BETWEEN MSR_STARTNO AND MSR_ENDNO AND MSR_TYPE = 'before'"))
|
|
|
+ {
|
|
|
+ ////初始化号段状态
|
|
|
+ sqls.Add("update MAKESNRULEDETAIL set msd_status=0 where msd_sncode='" + sn_code.Text + "' and msd_makecode='" + ms_makecode + "' and msd_type='before'");
|
|
|
+ }
|
|
|
+ //不符合即删除
|
|
|
+ else
|
|
|
+ {
|
|
|
+ ////初始化号段状态
|
|
|
+ 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 + "'");
|
|
|
//清除操作日志
|
章政