|
|
@@ -581,6 +581,15 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return rmap;
|
|
|
}
|
|
|
lotSN=map.get("lotSN").toString();
|
|
|
+ SqlRowList rs=baseDao.queryForRowSet("select ms_sncode from makeserial where ms_imei1='"+lotSN+"' or ms_imei2='"+lotSN+"'");
|
|
|
+ if(rs.next()){
|
|
|
+ lotSN=rs.getString("ms_sncode");
|
|
|
+ }else{
|
|
|
+ rs=baseDao.queryForRowSet("select mil_sncode from makeimeilist where mil_imei1='"+lotSN+"' or mil_imei2='"+lotSN+"'");
|
|
|
+ if(rs.next()){
|
|
|
+ lotSN=rs.getString("mil_sncode");
|
|
|
+ }
|
|
|
+ }
|
|
|
specificationName=map.get("specificationName").toString();
|
|
|
weight=map.get("weight").toString().replaceAll("KG","");
|
|
|
oErrMessage=CheckRoutePassed(lotSN,specificationName);
|
|
|
@@ -599,7 +608,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
//不在设置的重量范围内
|
|
|
if(Double.parseDouble(weight)<Double.parseDouble(obj[0].toString())||Double.parseDouble(weight)>Double.parseDouble(obj[1].toString())){
|
|
|
rmap.put("code",-1);
|
|
|
- rmap.put("message","SN重量为"+weight+",不符合重量范围"+obj[0]+"-"+obj[1]);
|
|
|
+ rmap.put("message","SN["+lotSN+"]重量为"+weight+",不符合重量范围"+obj[0]+"-"+obj[1]);
|
|
|
Map<String, String> rmap1 = new HashMap<String, String>();
|
|
|
rmap1.put("minWeight",obj[0].toString());
|
|
|
rmap1.put("maxWeight",obj[1].toString());
|
|
|
@@ -610,7 +619,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
Object oErr=SetPcbaData(lotSN,specificationName,specificationName,"OK");
|
|
|
if(oErr==null){
|
|
|
rmap.put("code",0);
|
|
|
- rmap.put("message","SN重量为"+weight+",符合重量范围"+obj[0]+"-"+obj[1]+",称重通过");
|
|
|
+ rmap.put("message","SN["+lotSN+"]重量为"+weight+",符合重量范围"+obj[0]+"-"+obj[1]+",称重通过");
|
|
|
Object ms_id=baseDao.getFieldDataByCondition("makeserial","max(ms_id)","ms_sncode='"+lotSN+"'");
|
|
|
baseDao.execute("update makeserial set ms_grossw ='"+weight+"' where ms_id="+ms_id);
|
|
|
}else{
|
