添加NetCard字段获取

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

@@ -530,6 +530,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String oErrMessage = null;
 		String oWIFI = "";
 		String oBT = "";
+		String oNetCard = "";
 		String oCode1 = "";
 		String oCode2 = "";
 		String oCode3 = "";
@@ -549,19 +550,21 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return rmap;
 		}
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut(Master+".CS_GETADDRESSBYMAKECODE", new Object[]{
+		list = baseDao.callProcedureWithOut(Master+".CS_GETADDRESSBYMAKECODE_TOOL", new Object[]{
 				String.valueOf(iSN),
 				String.valueOf(map2.get("oMoCode").toString()),
-		}, new Integer[]{1,2}, new Integer[]{3,4,5,6,7,8});
+		}, new Integer[]{1,2}, new Integer[]{3,4,5,6,7,8,9});
 		oWIFI = list.get(0);
 		oBT =  list.get(1);
-		oCode1 =  list.get(2);
-		oCode2 = list.get(3);
-		oCode3 =  list.get(4);
-		oErrMessage= list.get(5);
+		oNetCard =  list.get(2);
+		oCode1 =  list.get(3);
+		oCode2 = list.get(4);
+		oCode3 =  list.get(5);
+		oErrMessage= list.get(6);
 		if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null"){
 			rmap.put("oWIFI",oWIFI);
 			rmap.put("oBT",oBT);
+			rmap.put("oNetCard",oNetCard);
 			rmap.put("oCode1",oCode1);
 			rmap.put("oCode2",oCode2);
 			rmap.put("oCode3",oCode3);
@@ -760,6 +763,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String iWIFI = null;
 		String iBT = null;
 		String iNetCard=null;
+		String iNetCard2=null;
 		String iCode1 = null;
 		String iCode2 = null;
 		String iCode3 = null;
@@ -775,6 +779,9 @@ public class MESHelperServiceImpl implements MESHelperService {
 		if(map.get("iNetCard")!=null){
 			iNetCard=map.get("iNetCard").toString();
 		}
+		if(map.get("iNetCard2")!=null){
+			iNetCard2=map.get("iNetCard2").toString();
+		}
 		if(map.get("iCode1")!=null){
 			iCode1=map.get("iCode1").toString();
 		}
@@ -785,15 +792,16 @@ public class MESHelperServiceImpl implements MESHelperService {
 			iCode3=map.get("iCode3").toString();
 		}
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut(Master+".CS_SETADDRESSINFO_TOOL", new Object[]{
+		list = baseDao.callProcedureWithOut(Master+".CS_SETADDRESSINFO_TOOL_NEW", new Object[]{
 				String.valueOf(iSN),
 				String.valueOf(iWIFI),
 				String.valueOf(iBT),
 				String.valueOf(iNetCard),
+				String.valueOf(iNetCard2),
 				String.valueOf(iCode1),
 				String.valueOf(iCode2),
 				String.valueOf(iCode3)
-		}, new Integer[]{1, 2, 3, 4, 5, 6,7}, new Integer[]{8});
+		}, new Integer[]{1, 2, 3, 4, 5, 6,7,8}, new Integer[]{9});
 		oErrMessage = list.get(0);
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;