添加IMEI3,NETCARD2

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

@@ -1138,6 +1138,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String oWIFI = "";
 		String oBT = "";
 		String oNetCard = "";
+		String oNetCard2 = "";
 		String oCode1 = "";
 		String oCode2 = "";
 		String oCode3 = "";
@@ -1157,21 +1158,23 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return rmap;
 		}
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut(Master+".CS_GETADDRESSBYMAKECODE_TOOL", new Object[]{
+		list = baseDao.callProcedureWithOut(Master+".CS_GETADDRESSBYMAKECODE_TOOL_NEW", new Object[]{
 				String.valueOf(iSN),
 				String.valueOf(map2.get("oMoCode").toString()),
-		}, new Integer[]{1,2}, new Integer[]{3,4,5,6,7,8,9});
+		}, new Integer[]{1,2}, new Integer[]{3,4,5,6,7,8,9,10});
 		oWIFI = list.get(0);
 		oBT =  list.get(1);
 		oNetCard =  list.get(2);
-		oCode1 =  list.get(3);
-		oCode2 = list.get(4);
-		oCode3 =  list.get(5);
-		oErrMessage= list.get(6);
+		oNetCard2 =  list.get(3);
+		oCode1 =  list.get(4);
+		oCode2 = list.get(5);
+		oCode3 =  list.get(6);
+		oErrMessage= list.get(7);
 		if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null"){
 			rmap.put("oWIFI",oWIFI);
 			rmap.put("oBT",oBT);
 			rmap.put("oNetCard",oNetCard);
+			rmap.put("oNetCard2",oNetCard2);
 			rmap.put("oCode1",oCode1);
 			rmap.put("oCode2",oCode2);
 			rmap.put("oCode3",oCode3);
@@ -1188,6 +1191,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String oErrMessage = null;
 		String oIMEI1 = "";
 		String oIMEI2 = "";
+		String oIMEI3 = "";
 		String oMEID = "";
 		String oNetCode = "";
 		String oPSN = "";
@@ -1217,6 +1221,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		}, new Integer[]{1,2,3,4}, new Integer[]{5,6,7,8,9,10,11,12,13,14,15,16});
 		oIMEI1 = list.get(0);
 		oIMEI2 =  list.get(1);
+		oIMEI3 =  list.get(2);
 		oMEID =  list.get(3);
 		oNetCode = list.get(4);
 		oPSN = list.get(5);
@@ -1229,6 +1234,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null"){
 			rmap.put("oIMEI1",oIMEI1);
 			rmap.put("oIMEI2",oIMEI2);
+			rmap.put("oIMEI3",oIMEI3);
 			rmap.put("oMEID",oMEID);
 			rmap.put("oNetCode",oNetCode);
 			rmap.put("oPSN",oPSN);