Parcourir la source

1.修改离场过磅后可以继续称重

donglang il y a 1 mois
Parent
commit
d43a05d352

+ 13 - 10
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/ComeIntoHandler.java

@@ -309,7 +309,10 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
             return;
         }
         // 非空载情况,必须校验是否完成装载
-        checkStatus(waybillOrder);
+        if (!Objects.equals(CarWaybillV1Enum.EXIT_COMPLETED.getCode(), waybillOrder.getStatus())
+                && !Objects.equals(CarWaybillV1Enum.REPLENISH_FINISH.getCode(), waybillOrder.getStatus())) {
+            return;
+        }
 
         // 场景二:正常流程,0.5<净重<=任务量
         if (loadAmount.compareTo(entrustAmount) <= 0) {
@@ -320,15 +323,15 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
         waybillOrder.setTargetStatus(3);
     }
 
-    /**
-     * 正常流程和超载流程,需校验是否已完成装载
-     */
-    private void checkStatus(KwtWaybillOrder waybillOrder) {
-        if (!Objects.equals(CarWaybillV1Enum.EXIT_COMPLETED.getCode(), waybillOrder.getStatus())
-                && !Objects.equals(CarWaybillV1Enum.REPLENISH_FINISH.getCode(), waybillOrder.getStatus())) {
-            throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_STATUS_ERROR, "当前物流运单状态不是“已装货/补货完成”状态,无法推进待离场/卸货中状态!");
-        }
-    }
+//    /**
+//     * 正常流程和超载流程,需校验是否已完成装载
+//     */
+//    private void checkStatus(KwtWaybillOrder waybillOrder) {
+//        if (!Objects.equals(CarWaybillV1Enum.EXIT_COMPLETED.getCode(), waybillOrder.getStatus())
+//                && !Objects.equals(CarWaybillV1Enum.REPLENISH_FINISH.getCode(), waybillOrder.getStatus())) {
+//            return;
+//        }
+//    }
 
     @Override
     protected String getProcessName() {