|
|
@@ -66,21 +66,6 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap.put("message","SN号不能为空");
|
|
|
return rmap;
|
|
|
}
|
|
|
- if(map.get("MO")==null){
|
|
|
- rmap.put("code",-1);
|
|
|
- rmap.put("message","工单号不能为空");
|
|
|
- return rmap;
|
|
|
- }
|
|
|
- if(map.get("SpecificationName")==null){
|
|
|
- rmap.put("code",-1);
|
|
|
- rmap.put("message","工序不能为空");
|
|
|
- return rmap;
|
|
|
- }
|
|
|
- if(map.get("UserName")==null){
|
|
|
- rmap.put("code",-1);
|
|
|
- rmap.put("message","用户不能为空");
|
|
|
- return rmap;
|
|
|
- }
|
|
|
String specificationName=map.get("SpecificationName").toString();
|
|
|
String MO=map.get("MO").toString();
|
|
|
|
|
|
@@ -89,40 +74,12 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
Object key = entry.getKey();
|
|
|
Object value = entry.getValue();
|
|
|
SqlRowList rs=baseDao.queryForRowSet("select 1 from makesnlist where msl_sncode='"+value.toString().toUpperCase()+"'" +
|
|
|
- " and msl_makecode='"+MO+"' and msl_Radium=-1");
|
|
|
+ " and msl_Radium=-1");
|
|
|
if(rs.next()){
|
|
|
oErrMessage+="序列号"+value.toString().toUpperCase()+"已镭雕,";
|
|
|
|
|
|
}else {
|
|
|
- baseDao.execute("update makesnlist set msl_Radium=-1 where msl_sncode='"+value.toString().toUpperCase()+"' and " +
|
|
|
- "msl_makecode='"+MO+"'");
|
|
|
- }
|
|
|
- //启用过站
|
|
|
- if(baseDao.getFieldDataByCondition("configs","data","caller='MESSetting' and code='Radium'").toString().equals("1")){
|
|
|
- oErrMessage+=GoMo(value.toString().toUpperCase(),MO, specificationName);
|
|
|
- if(oErrMessage.equals("null")){
|
|
|
- oErrMessage="";
|
|
|
- }else{
|
|
|
- rmap.put("code",-1);
|
|
|
- rmap.put("message",oErrMessage);
|
|
|
- return rmap;
|
|
|
- }
|
|
|
- oErrMessage+=CheckRoutePassed(value.toString().toUpperCase(),specificationName);
|
|
|
- if(oErrMessage.equals("null")){
|
|
|
- oErrMessage="";
|
|
|
- }else{
|
|
|
- rmap.put("code",-1);
|
|
|
- rmap.put("message",oErrMessage);
|
|
|
- return rmap;
|
|
|
- }
|
|
|
- oErrMessage+=SetPcbaData(value.toString().toUpperCase(),specificationName,UserName,"OK");
|
|
|
- if(oErrMessage.equals("null")){
|
|
|
- oErrMessage="";
|
|
|
- }else{
|
|
|
- rmap.put("code",-1);
|
|
|
- rmap.put("message",oErrMessage);
|
|
|
- return rmap;
|
|
|
- }
|
|
|
+ baseDao.execute("update makesnlist set MSL_RADIUMTIME=sysdate,msl_Radium=-1 where msl_sncode='"+value.toString().toUpperCase()+"'");
|
|
|
}
|
|
|
}
|
|
|
if(oErrMessage.equals("")||oErrMessage==null){
|