添加接口參數返回

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

@@ -661,6 +661,16 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String oCode1 = "";
 		String oCode2 = "";
 		String oCode3 = "";
+		String UUID="";
+		String KEYID="";
+		String KEYPRODCODE="";
+		String ICCID="";
+		String IMSI="";
+		String SIM="";
+		String CARCODE="";
+		String CORLID="";
+		String CPU="";
+		String PN="";
 		if(map.get("iSN")==null){
 			oErrMessage = "SN不能为空";
 			rmap.put("oErrMessage",oErrMessage);
@@ -670,7 +680,7 @@ 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, 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_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_UUID, MS_KEYID, MS_KEYPRODCODE, MS_ICCID, MS_IMSI, MS_SIM, MS_CARCODE, MS_CORLID, MS_CPU, MS_PN from MakeSerial where ms_id="+ms_id.toString());
 			if(rs.next()){
 				oWIFI = rs.getString("ms_mac");
 				oBT = rs.getString("ms_bt");
@@ -685,6 +695,16 @@ public class MESHelperServiceImpl implements MESHelperService {
 				oID1 = rs.getString("ms_othid3");
 				oID2 = rs.getString("ms_othid3");
 				oID3 = rs.getString("ms_othid3");
+				UUID=rs.getString("ms_uuid");
+				KEYID=rs.getString("ms_keyid");
+				KEYPRODCODE=rs.getString("ms_keyprodcode");
+				ICCID=rs.getString("ms_iccid");
+				IMSI=rs.getString("ms_imsi");
+				SIM=rs.getString("ms_sim");
+				CARCODE=rs.getString("ms_carcode");
+				CORLID=rs.getString("ms_corlid");
+				CPU=rs.getString("ms_cpu");
+				PN=rs.getString("ms_pn");
 			}
 		}else
 		{
@@ -708,6 +728,16 @@ public class MESHelperServiceImpl implements MESHelperService {
 			rmap.put("oCode1",oCode1);
 			rmap.put("oCode2",oCode2);
 			rmap.put("oCode3",oCode3);
+			rmap.put("oUUID",UUID);
+			rmap.put("oKEYID",KEYID);
+			rmap.put("oKEYPRODCODE",KEYPRODCODE);
+			rmap.put("oICCID",ICCID);
+			rmap.put("oIMSI",IMSI);
+			rmap.put("oSIM",SIM);
+			rmap.put("oCARCODE",CARCODE);
+			rmap.put("oCORLID",CORLID);
+			rmap.put("oCPU",CPU);
+			rmap.put("oPN",PN);
 		}
 		else
 			rmap.put("oErrMessage",oErrMessage);