1、电车排队

2、取消排队不显示在队列中

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

@@ -111,8 +111,8 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
     @Override
     public int addQueueResult(String capacityNumber, String isPDA) {
         //获取传入的车牌号查找最近的运输订单号
-        String capacityNo = capacityNumber.substring(0,7);
-        Map<String, Object> mesMap = queuingRulesMapper.getOrderNumberByCapacityNumber(capacityNo);
+        //String capacityNo = capacityNumber.substring(0,7);
+        Map<String, Object> mesMap = queuingRulesMapper.getOrderNumberByCapacityNumber(capacityNumber);
         try{
             if(mesMap!=null && mesMap.get("orderId")!=null){
                 saleLogUtil.logOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")),capacityNumber+"触发排队，尚未向钢材科申请",null,SaleLogUtil.UPDATE);

src/main/resources/com/steerinfo/dil/mapper/QmsQueueResultMapper.xml

@@ -913,6 +913,7 @@
         LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
         ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         where oo.ORDER_STATUS = 5
+        AND oo.CAPACITY_ID != 35128
         AND ASO.SALE_ORDER_STATUS = 4
         and nvl(aso.DELETED,0) in (0,2)
         <if test="oYeFlag == null">
@@ -1063,6 +1064,7 @@
         LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
         ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         where oo.ORDER_STATUS = 5
+        AND oo.CAPACITY_ID != 35128
         AND ASO.SALE_ORDER_STATUS = 4
         and nvl(aso.DELETED,0) in (0,2)
         <if test="oYeFlag == null">
@@ -1179,6 +1181,7 @@
         LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
         ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         where oo.ORDER_STATUS = 5
+        AND oo.CAPACITY_ID != 35128
         AND ASO.SALE_ORDER_STATUS = 4
         and nvl(aso.DELETED,0) in (0,2)
         <if test="oYeFlag == null">