通过PO和行号获取IMEI

src/main/java/com/uas/eis/entity/HelperType.java

@@ -9,6 +9,7 @@ public enum HelperType {
     CheckUserAndResourcePassed("CheckUserAndResourcePassed","验证序列号执行工序") , //验证序列号执行工序
     GetAddressRangeByMO("GetAddressRangeByMO","分配MAC和BT信息") ,//分配MAC和BT信息
     GetMEIOrNetCodeRange("GetMEIOrNetCodeRange","分配IMEI和NetCode信息") ,//分配IMEI和NetCode信息
+    GetMEIOrNetCodeRangeByPo("GetMEIOrNetCodeRangeByPo","分配IMEI和NetCode信息") ,//分配IMEI和NetCode信息
     GetRcardMOInfo("GetRcardMOInfo","获取序列号对应工单信息") ,//获取序列号对应工单信息
     GetMobileAllInfo("GetMobileAllInfo","查询已分配的信息") ,//查询已分配的信息
     SetAddressInfo("SetAddressInfo","写入SN的Wifi,BT信息") ,//写入SN的Wifi,BT信息

src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -73,6 +73,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 			case GetMEIOrNetCodeRange:
 				remap = GetMEIOrNetCodeRange(json,AE_MASTER);
 				break;
+			case GetMEIOrNetCodeRangeByPo:
+				remap = GetMEIOrNetCodeRangeByPo(json,AE_MASTER);
+				break;
 			case GetRcardMOInfo:
 				remap = GetRcardMOInfo(json,AE_MASTER);
 				break;
@@ -652,6 +655,62 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+	private Map<Object,Object> GetMEIOrNetCodeRangeByPo(JSONObject map,String Master){
+		//实际业务数据
+		Map<Object, Object> rmap = new HashMap<>();
+		String iSN="";
+		String oErrMessage = null;
+		String oIMEI1 = "";
+		String oIMEI2 = "";
+		String oMEID = "";
+		String oNetCode = "";
+		String oPSN = "";
+		String oID1 = "";
+		String oID2 = "";
+		String oID3 = "";
+		if(map.get("iSN")==null){
+			oErrMessage = "SN不能为空";
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		if(map.get("iIMEI1")!=null){
+			oIMEI1=map.get("iIMEI1").toString();
+		}
+		if(map.get("iNetCode")!=null){
+			oNetCode=map.get("iNetCode").toString();
+		}
+		iSN=map.get("iSN").toString();
+		List<String> list = new ArrayList<String>();
+		list = baseDao.callProcedureWithOut(Master+".CS_GETIMEIORNETCODERANGEBYPO", new Object[]{
+				String.valueOf(iSN),
+				String.valueOf(""),
+				String.valueOf(oIMEI1),
+				String.valueOf(oNetCode),
+		}, new Integer[]{1,2,3,4}, new Integer[]{5,6,7,8,9,10,11,12,13,14});
+		oIMEI1 = list.get(0);
+		oIMEI2 =  list.get(1);
+		oMEID =  list.get(3);
+		oNetCode = list.get(4);
+		oPSN = list.get(5);
+		oID1 =  list.get(6);
+		oID2 =  list.get(7);
+		oID3 =  list.get(8);
+		oErrMessage= list.get(9);
+		if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null"){
+			rmap.put("oIMEI1",oIMEI1);
+			rmap.put("oIMEI2",oIMEI2);
+			rmap.put("oMEID",oMEID);
+			rmap.put("oNetCode",oNetCode);
+			rmap.put("oPSN",oPSN);
+			rmap.put("oID1",oID1);
+			rmap.put("oID2",oID2);
+			rmap.put("oID3",oID3);
+		}
+		else
+			rmap.put("oErrMessage",oErrMessage);
+		return rmap;
+	}
+
 	private Map<Object,Object> GetRcardMOInfo(JSONObject map,String Master){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();