|
|
@@ -378,6 +378,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
oErrMessage=list.get(2);
|
|
|
if(oErrMessage!=null){
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
|
+ rmap.put("oMaster",AE_MASTER);
|
|
|
return rmap;
|
|
|
}
|
|
|
SqlRowList rs = baseDao.queryForRowSet("select ms_status,ms_stepcode,ms_nextstepcode from "+Master+".makeserial where ms_id=( select max(ms_id) from "+Master+".makeserial where ms_sncode in ( select '" + iSN + "' from dual union select sn from "+Master+".makesnrelation where beforesn='" + iSN + "' and sn<>' ' union select beforesn from "+Master+".makesnrelation where sn='" + iSN + "' and beforesn<>' '))");
|
|
|
@@ -395,6 +396,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
oErrMessage = "当前序列号下一工序" + ms_nextstepcode;
|
|
|
}
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
|
+ rmap.put("oMaster",AE_MASTER);
|
|
|
return rmap;
|
|
|
}
|
|
|
|