|
@@ -318,7 +318,9 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
"where mi_makecode='"+iMakeCode+"' and mid_item is not null");
|
|
"where mi_makecode='"+iMakeCode+"' and mid_item is not null");
|
|
|
while(rs.next()){
|
|
while(rs.next()){
|
|
|
rmap.put(rs.getString("mid_item"),rs.getString("mid_value"));
|
|
rmap.put(rs.getString("mid_item"),rs.getString("mid_value"));
|
|
|
- rmap.put(rs.getString("sid_item"),rs.getString("sid_value"));
|
|
|
|
|
|
|
+ if(rs.getString("sid_item")!=null){
|
|
|
|
|
+ rmap.put(rs.getString("sid_item"),rs.getString("sid_value"));
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}else {
|
|
}else {
|
|
|
iSN=map.get("iSN").toString();
|
|
iSN=map.get("iSN").toString();
|
|
@@ -333,7 +335,9 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
"where mi_makecode='"+makecode+"' and mid_item is not null");
|
|
"where mi_makecode='"+makecode+"' and mid_item is not null");
|
|
|
while(rs.next()){
|
|
while(rs.next()){
|
|
|
rmap.put(rs.getString("mid_item"),rs.getString("mid_value"));
|
|
rmap.put(rs.getString("mid_item"),rs.getString("mid_value"));
|
|
|
- rmap.put(rs.getString("sid_item"),rs.getString("sid_value"));
|
|
|
|
|
|
|
+ if(rs.getString("sid_item")!=null){
|
|
|
|
|
+ rmap.put(rs.getString("sid_item"),rs.getString("sid_value"));
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
return rmap;
|
|
return rmap;
|