|
@@ -1250,7 +1250,7 @@ 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, 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());
|
|
|
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");
|