|
|
@@ -2000,6 +2000,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return rmap;
|
|
|
}
|
|
|
String macode = map.get("moid") == null ? "" : String.valueOf(map.get("moid"));
|
|
|
+ String machineid = map.get("machineld") == null ? "" : String.valueOf(map.get("machineld"));
|
|
|
if("".equals(macode)){
|
|
|
rmap.put("code",-1);
|
|
|
rmap.put("message","工单不能为空");
|
|
|
@@ -2033,7 +2034,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
snmap.put("serialNo",rs.getGeneralString("msl_sncode"));
|
|
|
mainbarcode=rs.getGeneralString("msl_sncode");
|
|
|
maps.add(snmap);
|
|
|
- sqls.add("update MAKESNLIST_RADIUM set msl_makecode='"+macode+"',msl_signtime=sysdate,msl_status=-1 where msl_id="+rs.getGeneralInt("msl_id"));
|
|
|
+ sqls.add("update MAKESNLIST_RADIUM set msl_makecode='"+macode+"',msl_signtime=sysdate,msl_status=-1,msl_machine='"+machineid+"' where msl_id="+rs.getGeneralInt("msl_id"));
|
|
|
msl_id+=rs.getGeneralInt("msl_id")+",";
|
|
|
}
|
|
|
msl_id+="0";
|