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

src/main/java/com/steerinfo/dil/controller/QmsQueueResultController.java

@@ -75,6 +75,8 @@ public class QmsQueueResultController extends BaseRESTfulController {
             return failed("请勿重复申请排队");
         }else if(i == -3){
             return failed("非钢材订单不能申请排队");
+        }else if(i == -4){
+            return failed("订单未审核，不能排队");
         }
         return success();
     }

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

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

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

@@ -108,6 +108,9 @@ 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;

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

@@ -229,4 +229,13 @@
     <select id="checkoutQQR" resultType="int">
         select QQR.RESULT_ID from QMS_QUEUE_RESULT QQR where QQR.RESULT_TOTAL_ID = #{resultTotalId}
     </select>
+    <select id="findStatus" resultType="java.lang.Integer">
+        SELECT ASO.SALE_ORDER_STATUS AS "saleStatus"
+        FROM AMS_SALE_ORDER_MATERIAL ASOM
+                 LEFT JOIN AMS_SALE_ORDER ASO
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN OMSTRUCK_ORDER OO
+                           ON OO.ORDER_PLAN_ID=ASOM .SALE_ORDER_MATERIAL_ID
+        WHERE OO .ORDER_ID =#{orderId}
+    </select>
 </mapper>