Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderService.java

@@ -2209,7 +2209,8 @@ public class KwtWaybillOrderService {
         }
         //已卸货/审批不通过车辆运单才能审核
         if (waybillOrder.getStatus() != CarWaybillEnum.COMPLETION_UNLOADING.getCode()
-                && waybillOrder.getStatus() != CarWaybillEnum.APPROVAL_NO_PASS.getCode()) {
+                && waybillOrder.getStatus() != CarWaybillEnum.APPROVAL_NO_PASS.getCode()
+                && waybillOrder.getStatus() != CarWaybillEnum.APPROVAL_IN.getCode()) {
             return HttpResult.error("车辆运单当前状态已不能审核！");
         }
         //已卸货/审批不通过车辆运单只能审批通过或审批不通过