取消限制接口

src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -986,7 +986,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 	private String CheckRoutePassed(String iSN,String iResCode){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();
-		String oErrMessage=null;
+		String oErrMessage;
 		if (iSN ==null)
 		{
 			oErrMessage = "SN不能为空";
@@ -1545,13 +1545,11 @@ public class MESHelperServiceImpl implements MESHelperService {
 		if(map.get("iErrCode")!=null){
 			iErrCode=map.get("iErrCode").toString();
 		}
-//		oErrMessage=CheckRoutePassed(iSN,iResCode);
-//		if(oErrMessage.equals("null")||oErrMessage.equals("")||oErrMessage==null){
-//			oErrMessage="";
-//		}else{
-//			rmap.put("oErrMessage",oErrMessage);
-//			return rmap;
-//		}
+		oErrMessage=CheckRoutePassed(iSN,iResCode);
+		if(oErrMessage!=null){
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
 		JSONObject map3=new JSONObject();
 		map3.put("iSN",iSN);
 		Map<Object, Object> map2=GetRcardMOInfo(map3);