|
|
@@ -1266,6 +1266,8 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
String oErrMessage = null;
|
|
|
String oIMEI1 = "";
|
|
|
String oIMEI2 = "";
|
|
|
+ String oIMEI3 = "";
|
|
|
+ String oIMEI4 = "";
|
|
|
String oMEID = "";
|
|
|
String oNetCode = "";
|
|
|
String oNetCard = "";
|
|
|
@@ -1289,7 +1291,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,ms_netcard 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");
|
|
|
@@ -1299,12 +1301,15 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
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_othid1");
|
|
|
oID2 = rs.getString("ms_othid2");
|
|
|
oID3 = rs.getString("ms_othid3");
|
|
|
+
|
|
|
}
|
|
|
}else
|
|
|
{
|
|
|
@@ -1315,6 +1320,8 @@ 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("oIMEI3",oIMEI4);
|
|
|
rmap.put("oMEID",oMEID);
|
|
|
rmap.put("oNetCode",oNetCode);
|
|
|
rmap.put("oNetCard",oNetCard);
|
callm