|
|
@@ -490,10 +490,10 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return rmap;
|
|
|
}
|
|
|
iSN=map.get("iSN").toString();
|
|
|
- Object ms_id =baseDao.getFieldDataByCondition("makeserial", "max(ms_id)", "ms_sncode='" + iSN + "'");
|
|
|
+ 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 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 from "+Master+".MakeSerial where ms_id="+ms_id.toString());
|
|
|
if(rs.next()){
|
|
|
oWIFI = rs.getString("ms_mac");
|
|
|
oBT = rs.getString("ms_bt");
|
|
|
@@ -627,7 +627,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
iErrCode=map.get("iErrCode").toString();
|
|
|
}
|
|
|
List<String> list = new ArrayList<String>();
|
|
|
- list = baseDao.callProcedureWithOut("CS_DLLSNCHANGE_TOOL", new Object[]{
|
|
|
+ list = baseDao.callProcedureWithOut(Master+".CS_DLLSNCHANGE_TOOL", new Object[]{
|
|
|
String.valueOf(iTSN),
|
|
|
String.valueOf(iSN),
|
|
|
String.valueOf(iSourceCode),
|
