Przeglądaj źródła

修改司机和运单关联需求业务

donglang 1 miesiąc temu
rodzic
commit
bf432572f8

+ 1 - 1
sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/CarWaybillV1Enum.java

@@ -30,7 +30,7 @@ public enum CarWaybillV1Enum {
     /**
      * 离场过磅:  弃用
      */
-    WEIGHT_TRAFFIC(11, "离场过磅"),
+    WEIGHT_TRAFFIC(110, "离场过磅"),
 
 
     /**

+ 3 - 2
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/LoadingHandler.java

@@ -32,8 +32,9 @@ public class LoadingHandler extends AbstractWaybillOrderHandler<WaybillOrderLoad
 
     @Override
     protected void checkState(WaybillOrderLoadingParam param, KwtWaybillOrder waybillOrder) {
-        if (!Objects.equals(CarWaybillV1Enum.REFUSE_TRAFFIC.getCode(), waybillOrder.getStatus())) {
-            throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_STATUS_ERROR, "运单状态不是“到达装货地点”状态, 无法推进下一节点!");
+        if (!Objects.equals(CarWaybillV1Enum.REFUSE_TRAFFIC.getCode(), waybillOrder.getStatus())
+                && !Objects.equals(CarWaybillV1Enum.REPLENISHING.getCode(), waybillOrder.getStatus())) {
+            throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_STATUS_ERROR, "运单状态不是“到达装货地点”或“卸货中”状态, 无法推进下一节点!");
         }
     }
 

+ 2 - 2
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/ReplenishHandler.java

@@ -40,8 +40,8 @@ public class ReplenishHandler extends AbstractWaybillOrderHandler<WaybillOrderRe
 
     @Override
     protected void checkState(WaybillOrderReplenishParam param, KwtWaybillOrder waybill) {
-        if (!Objects.equals(CarWaybillV1Enum.EMPTY_WAIT_LEAVE.getCode(), waybill.getStatus())) {
-            throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_STATUS_ERROR, "运单状态不是“空载待离场”状态, 无法推进下一节点!");
+        if (!Objects.equals(CarWaybillV1Enum.WAIT_LEAVE.getCode(), waybill.getStatus())) {
+            throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_STATUS_ERROR, "运单状态不是“待离场”状态, 无法推进下一节点!");
         }
     }