|
|
@@ -1433,7 +1433,12 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return rmap;
|
|
|
}
|
|
|
iSN=map.get("iSN").toString();
|
|
|
- String prcode=baseDao.getFieldDataByCondition(Master+".makeserial","ms_prodcode","ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')").toString();
|
|
|
+ Object prcode=baseDao.getFieldDataByCondition(Master+".makeserial","ms_prodcode","ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')");
|
|
|
+ if(prcode==null){
|
|
|
+ oErrMessage = "SN未关联产品编号";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
SqlRowList rs=baseDao.queryForRowSet("select pid_item,pid_value from "+Master+".productitem left join "+Master+".productitemdetail on pi_id=pid_piid " +
|
|
|
"where pi_prodcode='"+prcode+"' and pid_item is not null");
|
|
|
while(rs.next()){
|
callm