Browse Source

添加获取PSN接口

callm 1 year ago
parent
commit
5a78af1bb1

+ 1 - 0
src/main/java/com/uas/eis/entity/HelperType.java

@@ -21,6 +21,7 @@ public enum HelperType {
     GetInfoByMaterial("GetInfoByMaterial","根据上料信息获取到SN相关信息"),
     GetInfoByMaterial("GetInfoByMaterial","根据上料信息获取到SN相关信息"),
     GetMakeInfoBySN("GetMakeInfoBySN","根据SN获取工单相关信息"),
     GetMakeInfoBySN("GetMakeInfoBySN","根据SN获取工单相关信息"),
     GetMakeInfoByProd("GetMakeInfoByProd","根据物料获取相关信息"),
     GetMakeInfoByProd("GetMakeInfoByProd","根据物料获取相关信息"),
+    GetPSN("GetPSN","获取转号后的SN"),
     GetProdInfo("GetProdInfo","根据物料获取相关信息");
     GetProdInfo("GetProdInfo","根据物料获取相关信息");
 
 
     private String code;
     private String code;

+ 28 - 0
src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -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;