修改MAC，IMEI获取字段，和返回字段显示

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

@@ -1263,6 +1263,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String oErrMessage = null;
 		String oWIFI = "";
 		String oBT = "";
+		String oNetCard = "";
 		String oCode1 = "";
 		String oCode2 = "";
 		String oCode3 = "";
@@ -1282,22 +1283,25 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return rmap;
 		}
 		List<String> list = new ArrayList<String>();
-		list = baseDao.callProcedureWithOut("CS_GETADDRESSBYMAKECODE", new Object[]{
+		list = baseDao.callProcedureWithOut("CS_GETADDRESSBYMAKECODE_FIMEI", 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);
+			rmap.put("oErrMessage",oErrMessage);
 		}
 		else
 			rmap.put("oErrMessage",oErrMessage);
@@ -1333,6 +1337,10 @@ 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_FIMEI", new Object[]{
 				String.valueOf(iSN),
@@ -1417,8 +1425,11 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String oErrMessage = null;
 		String oIMEI1 = "";
 		String oIMEI2 = "";
+		String oIMEI3 = "";
+		String oIMEI4 = "";
 		String oMEID = "";
 		String oNetCode = "";
+		String oNetCard = "";
 		String oPSN = "";
 		String oID1 = "";
 		String oID2 = "";
@@ -1439,21 +1450,25 @@ public class MESHelperServiceImpl implements MESHelperService {
 		Object ms_id =baseDao.getFieldDataByCondition("makeserial", "max(ms_id)", "ms_sncode='" + iSN + "'");
 		if(ms_id!=null)
 		{
-			SqlRowList rs=baseDao.queryForRowSet("select ms_id, ms_mac, ms_bt, ms_meid, ms_netcode, nvl(ms_psn,ms_sncode)ms_psn, ms_imei1, ms_imei2, ms_imei3, ms_othcode1, ms_othcode2, ms_othcode3, ms_othid1, ms_othid2, ms_othid3 from MakeSerial where ms_id="+ms_id.toString());
+			SqlRowList rs=baseDao.queryForRowSet("select ms_imei4,ms_id, ms_mac, ms_bt, ms_meid, ms_netcode, ms_psn, ms_imei1, ms_imei2, ms_imei3, ms_othcode1, ms_othcode2, ms_othcode3, ms_othid1, ms_othid2, ms_othid3,ms_netcard from MakeSerial where ms_id="+ms_id.toString());
 			if(rs.next()){
 				oWIFI = rs.getString("ms_mac");
 				oBT = rs.getString("ms_bt");
 				oPSN = rs.getString("ms_psn");
 				oNetCode = rs.getString("ms_netcode");
+				oNetCard = rs.getString("ms_netcard");
 				oMEID = rs.getString("ms_meid");
 				oIMEI1 = rs.getString("ms_imei1");
 				oIMEI2 = rs.getString("ms_imei2");
+				oIMEI3 = rs.getString("ms_imei3");
+				oIMEI4 = rs.getString("ms_imei4");
 				oCode1 = rs.getString("ms_othcode1");
 				oCode2 = rs.getString("ms_othcode2");
 				oCode3 = rs.getString("ms_othcode3");
-				oID1 = rs.getString("ms_othid3");
-				oID2 = rs.getString("ms_othid3");
+				oID1 = rs.getString("ms_othid1");
+				oID2 = rs.getString("ms_othid2");
 				oID3 = rs.getString("ms_othid3");
+
 			}
 		}else
 		{
@@ -1464,8 +1479,11 @@ 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("oIMEI4",oIMEI4);
 			rmap.put("oMEID",oMEID);
 			rmap.put("oNetCode",oNetCode);
+			rmap.put("oNetCard",oNetCard);
 			rmap.put("oPSN",oPSN);
 			rmap.put("oID1",oID1);
 			rmap.put("oID2",oID2);
@@ -1477,6 +1495,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			rmap.put("oCode1",oCode1);
 			rmap.put("oCode2",oCode2);
 			rmap.put("oCode3",oCode3);
+			rmap.put("oErrMessage","");
 		}
 		else
 			rmap.put("oErrMessage",oErrMessage);