|
|
@@ -773,6 +773,9 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
String iOperator = null;
|
|
|
String iResult = null;
|
|
|
String iErrCode = null;
|
|
|
+ String mac_wifi = "";
|
|
|
+ String mac_bt = "";
|
|
|
+
|
|
|
if(map.get("iResCode")!=null){
|
|
|
iResCode=map.get("iResCode").toString();
|
|
|
}
|
|
|
@@ -788,6 +791,12 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
if(map.get("iErrCode")!=null){
|
|
|
iErrCode=map.get("iErrCode").toString();
|
|
|
}
|
|
|
+ if(map.get("iMAC_WIFI")!=null){
|
|
|
+ mac_wifi=map.get("iMAC_WIFI").toString();
|
|
|
+ }
|
|
|
+ if(map.get("iMAC_BT")!=null){
|
|
|
+ mac_bt=map.get("iMAC_BT").toString();
|
|
|
+ }
|
|
|
JSONObject map3=new JSONObject();
|
|
|
map3.put("iSN",iSN);
|
|
|
Map<Object, Object> map2=GetRcardMOInfo(map3);
|
|
|
@@ -800,6 +809,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap = SetTestDetail(map);
|
|
|
if (rmap.get("oErrMessage")==null)
|
|
|
{
|
|
|
+ baseDao.updateByCondition("makeserial","MS_MACWIFI = '"+mac_wifi+"',MS_MACBT = '"+mac_bt+"'","ms_sncode = '"+iSN+"' and ms_makecode = '"+oMoCode+"'");
|
|
|
return SetStepFinish(oMoCode, iResCode, iSN, "", iResult, iOperator, iErrCode);
|
|
|
}
|
|
|
return rmap;
|