|
|
@@ -148,8 +148,13 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return rmap;
|
|
|
}
|
|
|
iSN=map.get("iSN").toString();
|
|
|
- String makecode=baseDao.getFieldDataByCondition("makeserial","ms_makecode","ms_id=(select max(ms_id) from makeserial where ms_sncode='"+iSN+"')").toString();
|
|
|
- SqlRowList rs=baseDao.queryForRowSet("select mid_item,mid_value from makeitem left join makeitemdetail on mi_id=mid_miid " +
|
|
|
+ Object makecode=baseDao.getFieldDataByCondition(Master+".makeserial","ms_makecode","ms_id=(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')");
|
|
|
+ if(makecode==null){
|
|
|
+ oErrMessage = "SN不存在";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ SqlRowList rs=baseDao.queryForRowSet("select mid_item,mid_value from "+Master+".makeitem left join "+Master+".makeitemdetail on mi_id=mid_miid " +
|
|
|
"where mi_makecode='"+makecode+"' and mid_item is not null");
|
|
|
while(rs.next()){
|
|
|
rmap.put(rs.getString("mid_item"),rs.getString("mid_value"));
|