添加IMEI字段

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

@@ -1406,11 +1406,16 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String iIMEI1=null;
 		String iIMEI2 = null;
 		String iIMEI3 = null;
+		String iIMEI4 = null;
 		String iMEID = null;
+		String iPSN = null;
 		String iNET = null;
 		String iID1 = null;
 		String iID2 = null;
 		String iID3 = null;
+		if(map.get("iPSN")!=null){
+			iPSN=map.get("iPSN").toString();
+		}
 		if(map.get("iIMEI1")!=null){
 			iIMEI1=map.get("iIMEI1").toString();
 		}
@@ -1420,6 +1425,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 		if(map.get("iIMEI3")!=null){
 			iIMEI3=map.get("iIMEI3").toString();
 		}
+		if(map.get("iIMEI4")!=null){
+			iIMEI4=map.get("iIMEI4").toString();
+		}
 		if(map.get("iMEID")!=null){
 			iMEID=map.get("iMEID").toString();
 		}
@@ -1436,18 +1444,19 @@ public class MESHelperServiceImpl implements MESHelperService {
 			iID3=map.get("iID3").toString();
 		}
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_SETIMEIINFO", new Object[]{
+		list = baseDao.callProcedureWithOut("CS_SETIMEIINFO_FIMEI", new Object[]{
 				String.valueOf(iSN),
 				String.valueOf(iIMEI1),
 				String.valueOf(iIMEI2),
 				String.valueOf(iIMEI3),
+				String.valueOf(iIMEI4),
 				String.valueOf(iMEID),
 				String.valueOf(iNET),
-				String.valueOf(""),
+				String.valueOf(iPSN),
 				String.valueOf(iID1),
 				String.valueOf(iID2),
 				String.valueOf(iID3),
-		}, new Integer[]{1, 2, 3, 4, 5, 6,7,8,9,10}, new Integer[]{11});
+		}, new Integer[]{1, 2, 3, 4, 5, 6,7,8,9,10,11}, new Integer[]{12});
 		oErrMessage = list.get(0);
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;