添加返回Netcard字段

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

@@ -1620,6 +1620,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String oCode1 = "";
 		String oCode2 = "";
 		String oCode3 = "";
+		String oNetCard = "";
+		String oNetCard2 = "";
 		if(map.get("iSN")==null){
 			oErrMessage = "SN不能为空";
 			rmap.put("oErrMessage",oErrMessage);
@@ -1629,7 +1631,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 		Object ms_id =baseDao.getFieldDataByCondition(Master+".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, ms_psn, ms_imei1, ms_imei2, ms_imei3, ms_othcode1, ms_othcode2, ms_othcode3, ms_othid1, ms_othid2, ms_othid3 from "+Master+".MakeSerial where ms_id="+ms_id.toString());
+			SqlRowList rs=baseDao.queryForRowSet("select MS_NETCARD,MS_NETCARD2,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 from "+Master+".MakeSerial where ms_id="+ms_id.toString());
 			if(rs.next()){
 				oWIFI = rs.getString("ms_mac");
 				oBT = rs.getString("ms_bt");
@@ -1644,6 +1646,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 				oID1 = rs.getString("ms_othid3");
 				oID2 = rs.getString("ms_othid3");
 				oID3 = rs.getString("ms_othid3");
+				oNetCard = rs.getString("MS_NETCARD");
+				oNetCard2 = rs.getString("MS_NETCARD2");
 			}
 		}else
 		{
@@ -1667,6 +1671,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 			rmap.put("oCode1",oCode1);
 			rmap.put("oCode2",oCode2);
 			rmap.put("oCode3",oCode3);
+			rmap.put("oNetCard",oNetCard);
+			rmap.put("oNetCard2",oNetCard2);
 		}
 		else
 			rmap.put("oErrMessage",oErrMessage);