|
|
@@ -1875,6 +1875,20 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return rmap;
|
|
|
}
|
|
|
String iSN=map.get("iSN").toString();
|
|
|
+ //SN在makeserial表最新一条记录ms_status为2的不允许更新
|
|
|
+ SqlRowList rsMs = baseDao.queryForRowSet("select ms_status from "+Master+".makeserial where ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode=?)", iSN);
|
|
|
+ if(rsMs.next() && "2".equals(rsMs.getString("ms_status"))){
|
|
|
+ oErrMessage = "SN:" + iSN + " 已完工,不允许更新";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ //prodiomac表中已有该SN出货记录的不允许更新
|
|
|
+ SqlRowList rsPim = baseDao.queryForRowSet("select count(1)cn from "+Master+".prodiomac where pim_mac=?", iSN);
|
|
|
+ if(rsPim.next() && rsPim.getInt(1) > 0){
|
|
|
+ oErrMessage = "SN:" + iSN + " 已存在出货记录,不允许更新";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
String iTestResult= "";
|
|
|
String iResCode= "";
|
|
|
String iClassName="";
|
callm