Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-QMS-API

src/main/java/com/steerinfo/dil/mapper/QueuingRulesMapper.java

@@ -73,5 +73,5 @@ public interface QueuingRulesMapper {
 
     int updateQRESULTEnsureTime(@Param("listId") BigDecimal listId);
 
-    Integer findStatus(Map<String,Object> map);
+    int findStatus(Map<String,Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/QmsQueueResultServiceImpl.java

@@ -108,9 +108,6 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
     public int addQueueResult(String capacityNumber, String isPDA) {
         //获取传入的车牌号查找最近的运输订单号
         Map<String, Object> mesMap = queuingRulesMapper.getOrderNumberByCapacityNumber(capacityNumber.split("_")[0]);
-        if(queuingRulesMapper.findStatus(mesMap)!=4){
-            return -4;//未审批的订单，不允许排队
-        }
         if(mesMap == null){
             judgeCancelSub(capacityNumber); //判断是否需要取消订阅
             return -1;