|
@@ -106,6 +106,9 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
case GetProdInfo:
|
|
case GetProdInfo:
|
|
|
remap = GetProdInfo(json);
|
|
remap = GetProdInfo(json);
|
|
|
break;
|
|
break;
|
|
|
|
|
+ case GetPSN:
|
|
|
|
|
+ remap = GetPSN(json);
|
|
|
|
|
+ break;
|
|
|
default:
|
|
default:
|
|
|
err = -1;
|
|
err = -1;
|
|
|
break;
|
|
break;
|
|
@@ -630,6 +633,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
|
return rmap;
|
|
return rmap;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
private Map<Object,Object> SetIMEIInfo(JSONObject map){
|
|
private Map<Object,Object> SetIMEIInfo(JSONObject map){
|
|
|
//实际业务数据
|
|
//实际业务数据
|
|
|
Map<Object, Object> rmap = new HashMap<>();
|
|
Map<Object, Object> rmap = new HashMap<>();
|
|
@@ -689,6 +693,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
|
return rmap;
|
|
return rmap;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
private Map<Object,Object> SetTestDetail(JSONObject map){
|
|
private Map<Object,Object> SetTestDetail(JSONObject map){
|
|
|
//实际业务数据
|
|
//实际业务数据
|
|
|
Map<Object, Object> rmap = new HashMap<>();
|
|
Map<Object, Object> rmap = new HashMap<>();
|
|
@@ -869,6 +874,29 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ private Map<Object,Object> GetPSN(JSONObject map){
|
|
|
|
|
+ String oErrMessage="";
|
|
|
|
|
+ Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
|
|
+ if(map.get("iMakeCode")==null){
|
|
|
|
|
+ oErrMessage = "工单号不能为空";
|
|
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
|
|
+ return rmap;
|
|
|
|
|
+ }
|
|
|
|
|
+ String iMakecode=map.get("iMakeCode").toString();
|
|
|
|
|
+ SqlRowList rs=baseDao.queryForRowSet("select msl_sncode,msl_id from makesnlist where msl_makecode='"+iMakecode+"' and msl_type='after' and nvl(msl_status,0)=0 order by msl_sncode");
|
|
|
|
|
+ if(rs.next()){
|
|
|
|
|
+ String msl_id=rs.getString("msl_id");
|
|
|
|
|
+ String msl_sncode=rs.getString("msl_sncode");
|
|
|
|
|
+ baseDao.execute("update makesnlist set msl_status=-1 where msl_id="+msl_id+" and nvl(msl_status,0)=0");
|
|
|
|
|
+ rmap.put("msl_sncode",msl_sncode);
|
|
|
|
|
+ return rmap;
|
|
|
|
|
+ }else{
|
|
|
|
|
+ oErrMessage = "工单号不能为空";
|
|
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
|
|
+ return rmap;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
private Map<Object,Object> GetProdInfo(JSONObject map){
|
|
private Map<Object,Object> GetProdInfo(JSONObject map){
|
|
|
Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
String iSN=null;
|
|
String iSN=null;
|