添加IMEI字段

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

@@ -1122,6 +1122,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String oErrMessage = null;
 		String oIMEI1 = "";
 		String oIMEI2 = "";
+		String oIMEI3 = "";
+		String oIMEI4 = "";
 		String oMEID = "";
 		String oNetCode = "";
 		String oPSN = "";
@@ -1142,34 +1144,40 @@ public class MESHelperServiceImpl implements MESHelperService {
 			oNetCode=map.get("iNetCode").toString();
 		}
 		iSN=map.get("iSN").toString();
+		Object MAC_IMEI=baseDao.getFieldDataByCondition("makeaddresslist", "mal_imei", "mal_sncode='" + iSN + "'");
+		if(MAC_IMEI!=null){
+			oIMEI1=MAC_IMEI.toString();
+		}
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_GETIMEIORNETCODERANGE", new Object[]{
+		list = baseDao.callProcedureWithOut("CS_GETIMEIORNETCODERANGE_FIMEI", 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});
+		}, new Integer[]{1,2,3,4}, new Integer[]{5,6,7,8,9,10,11,12,13,14,15});
 		oIMEI1 = list.get(0);
 		oIMEI2 =  list.get(1);
-		oMEID =  list.get(2);
-		oNetCode = list.get(3);
-		oID1 =  list.get(4);
-		oID2 =  list.get(5);
-		oID3 =  list.get(6);
-		oID4 =  list.get(7);
-		oID5 =  list.get(8);
-		oErrMessage= list.get(9);
+		oIMEI3 =  list.get(2);
+		oIMEI4 =  list.get(3);
+		oMEID =  list.get(4);
+		oNetCode = list.get(5);
+		oPSN =  list.get(6);
+		oID1 =  list.get(7);
+		oID2 =  list.get(8);
+		oID3 =  list.get(9);
+		oErrMessage= list.get(10);
 		if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null"){
 			rmap.put("oIMEI1",oIMEI1);
 			rmap.put("oIMEI2",oIMEI2);
+			rmap.put("oIMEI3",oIMEI3);
+			rmap.put("oIMEI4",oIMEI4);
 			rmap.put("oMEID",oMEID);
 			rmap.put("oNetCode",oNetCode);
 			rmap.put("oPSN",oPSN);
 			rmap.put("oID1",oID1);
 			rmap.put("oID2",oID2);
 			rmap.put("oID3",oID3);
-			rmap.put("oID4",oID4);
-			rmap.put("oID5",oID5);
+			rmap.put("oErrMessage",oErrMessage);
 		}
 		else
 			rmap.put("oErrMessage",oErrMessage);