|
|
@@ -1526,11 +1526,13 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
|
return rmap;
|
|
|
}
|
|
|
+
|
|
|
String iSN=map.get("iSN").toString();
|
|
|
String iResCode = null;
|
|
|
String iOperator = null;
|
|
|
String iResult = null;
|
|
|
String iErrCode = null;
|
|
|
+
|
|
|
if(map.get("iResCode")!=null){
|
|
|
iResCode=map.get("iResCode").toString();
|
|
|
}
|
|
|
@@ -1543,7 +1545,13 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
if(map.get("iErrCode")!=null){
|
|
|
iErrCode=map.get("iErrCode").toString();
|
|
|
}
|
|
|
-
|
|
|
+ oErrMessage+=CheckRoutePassed(iSN,iResCode);
|
|
|
+ if(oErrMessage.equals("null")){
|
|
|
+ oErrMessage="";
|
|
|
+ }else{
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
JSONObject map3=new JSONObject();
|
|
|
map3.put("iSN",iSN);
|
|
|
Map<Object, Object> map2=GetRcardMOInfo(map3);
|