|
@@ -1268,6 +1268,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
String oIMEI2 = "";
|
|
String oIMEI2 = "";
|
|
|
String oMEID = "";
|
|
String oMEID = "";
|
|
|
String oNetCode = "";
|
|
String oNetCode = "";
|
|
|
|
|
+ String oNetCard = "";
|
|
|
String oPSN = "";
|
|
String oPSN = "";
|
|
|
String oID1 = "";
|
|
String oID1 = "";
|
|
|
String oID2 = "";
|
|
String oID2 = "";
|
|
@@ -1288,12 +1289,13 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
Object ms_id =baseDao.getFieldDataByCondition("makeserial", "max(ms_id)", "ms_sncode='" + iSN + "'");
|
|
Object ms_id =baseDao.getFieldDataByCondition("makeserial", "max(ms_id)", "ms_sncode='" + iSN + "'");
|
|
|
if(ms_id!=null)
|
|
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_netcard from MakeSerial where ms_id="+ms_id.toString());
|
|
|
if(rs.next()){
|
|
if(rs.next()){
|
|
|
oWIFI = rs.getString("ms_mac");
|
|
oWIFI = rs.getString("ms_mac");
|
|
|
oBT = rs.getString("ms_bt");
|
|
oBT = rs.getString("ms_bt");
|
|
|
oPSN = rs.getString("ms_psn");
|
|
oPSN = rs.getString("ms_psn");
|
|
|
oNetCode = rs.getString("ms_netcode");
|
|
oNetCode = rs.getString("ms_netcode");
|
|
|
|
|
+ oNetCard = rs.getString("ms_netcard");
|
|
|
oMEID = rs.getString("ms_meid");
|
|
oMEID = rs.getString("ms_meid");
|
|
|
oIMEI1 = rs.getString("ms_imei1");
|
|
oIMEI1 = rs.getString("ms_imei1");
|
|
|
oIMEI2 = rs.getString("ms_imei2");
|
|
oIMEI2 = rs.getString("ms_imei2");
|
|
@@ -1315,6 +1317,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap.put("oIMEI2",oIMEI2);
|
|
rmap.put("oIMEI2",oIMEI2);
|
|
|
rmap.put("oMEID",oMEID);
|
|
rmap.put("oMEID",oMEID);
|
|
|
rmap.put("oNetCode",oNetCode);
|
|
rmap.put("oNetCode",oNetCode);
|
|
|
|
|
+ rmap.put("oNetCard",oNetCard);
|
|
|
rmap.put("oPSN",oPSN);
|
|
rmap.put("oPSN",oPSN);
|
|
|
rmap.put("oID1",oID1);
|
|
rmap.put("oID1",oID1);
|
|
|
rmap.put("oID2",oID2);
|
|
rmap.put("oID2",oID2);
|
|
@@ -1455,10 +1458,14 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
String iIMEI3 = null;
|
|
String iIMEI3 = null;
|
|
|
String iIMEI4 = null;
|
|
String iIMEI4 = null;
|
|
|
String iMEID = null;
|
|
String iMEID = null;
|
|
|
|
|
+ String iPSN = null;
|
|
|
String iNET = null;
|
|
String iNET = null;
|
|
|
String iID1 = null;
|
|
String iID1 = null;
|
|
|
String iID2 = null;
|
|
String iID2 = null;
|
|
|
String iID3 = null;
|
|
String iID3 = null;
|
|
|
|
|
+ if(map.get("iPSN")!=null){
|
|
|
|
|
+ iPSN=map.get("iPSN").toString();
|
|
|
|
|
+ }
|
|
|
if(map.get("iIMEI1")!=null){
|
|
if(map.get("iIMEI1")!=null){
|
|
|
iIMEI1=map.get("iIMEI1").toString();
|
|
iIMEI1=map.get("iIMEI1").toString();
|
|
|
}
|
|
}
|
|
@@ -1495,7 +1502,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
String.valueOf(iIMEI4),
|
|
String.valueOf(iIMEI4),
|
|
|
String.valueOf(iMEID),
|
|
String.valueOf(iMEID),
|
|
|
String.valueOf(iNET),
|
|
String.valueOf(iNET),
|
|
|
- String.valueOf(""),
|
|
|
|
|
|
|
+ String.valueOf(iPSN),
|
|
|
String.valueOf(iID1),
|
|
String.valueOf(iID1),
|
|
|
String.valueOf(iID2),
|
|
String.valueOf(iID2),
|
|
|
String.valueOf(iID3),
|
|
String.valueOf(iID3),
|
