|
|
@@ -194,6 +194,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
String iSN="";
|
|
|
String iSource="";
|
|
|
String weight="";
|
|
|
+ String iUserCode="";
|
|
|
if(map.get("iSN")==null){
|
|
|
oErrMessage = "SN不能为空";
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
|
@@ -204,6 +205,11 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
|
return rmap;
|
|
|
}
|
|
|
+ if(map.get("iUserCode")==null){
|
|
|
+ oErrMessage = "人员编号不能为空";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
if(map.get("weight")==null){
|
|
|
oErrMessage = "重量不能为空";
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
|
@@ -211,8 +217,9 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
}
|
|
|
iSN=map.get("iSN").toString();
|
|
|
iSource=map.get("iSource").toString();
|
|
|
+ iUserCode=map.get("iUserCode").toString();
|
|
|
weight=map.get("weight").toString().replaceAll("KG","");
|
|
|
- Object[] obj = baseDao.getFieldsDataByCondition(Master+".makeserial left join "+Master+".product on pr_code=ms_prodcode","pr_colorboxminw,pr_colorboxmaxw","ms_id =(select max(ms_id) from makeserial where ms_sncode='"+iSN+"')");
|
|
|
+ Object[] obj = baseDao.getFieldsDataByCondition(Master+".makeserial left join "+Master+".product on pr_code=ms_prodcode","pr_colorboxminw,pr_colorboxmaxw,ms_makecode","ms_id =(select max(ms_id) from "+Master+".makeserial where ms_sncode='"+iSN+"')");
|
|
|
if(obj[0]!=null&&obj[1]!=null){
|
|
|
//不在设置的重量范围内
|
|
|
if(Double.parseDouble(weight)<Double.parseDouble(obj[0].toString())||Double.parseDouble(weight)>Double.parseDouble(obj[1].toString())){
|
|
|
@@ -235,7 +242,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap1.put("maxWeight",obj[1].toString());
|
|
|
rmap1.put("machineModel","");
|
|
|
rmap.put("dataInfo",rmap1);
|
|
|
- return rmap;
|
|
|
+ return SetStepFinish(obj[2].toString(), iSource, iSN, "", "OK", iUserCode, "",Master);
|
|
|
}else{
|
|
|
oErrMessage = "未设置标准重量";
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
callm