donglang 2 miesięcy temu
rodzic
commit
783fc88ddd

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

@@ -12,7 +12,6 @@ import com.sckw.core.utils.DateUtils;
 import com.sckw.fleet.api.model.vo.DriverConductRulesVO;
 import com.sckw.fleet.api.model.vo.RTruckVo;
 import com.sckw.fleet.api.model.vo.TruckDispatchCoefficientVO;
-import com.sckw.fleet.model.enums.TruckStatusEnum;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.transport.model.*;
@@ -61,7 +60,7 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
         }
         // 校验车辆
         RTruckVo truckNo = remoteFleetService.findTruckByTruckNo(param.getTruckNo());
-        if (truckNo == null || !Objects.equals(TruckStatusEnum.NORMAL.getCode(), truckNo.getStatus())) {
+        if (truckNo == null || !Objects.equals(truckNo.getStatus(), 0)) {
             throw new BusinessPlatfromException(ErrorCodeEnum.TRUCK_STATUS_ERROR, "当前车辆非正常状态,无法到达装货点!");
         }
     }

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

@@ -12,7 +12,6 @@ import com.sckw.fleet.api.model.vo.RDriverScoreVo;
 import com.sckw.fleet.api.model.vo.RDriverVo;
 import com.sckw.fleet.api.model.vo.RTruckVo;
 import com.sckw.fleet.api.model.vo.TruckDispatchCoefficientVO;
-import com.sckw.fleet.model.enums.TruckStatusEnum;
 import com.sckw.order.api.model.OrderDetailVo;
 import com.sckw.order.api.model.UpdateActualAmountParam;
 import com.sckw.transport.model.*;
@@ -254,7 +253,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
      */
     private RTruckVo checkTruck(OrderCirculateTakingQueryParam param) {
         RTruckVo truckNo = remoteFleetService.findTruckByTruckNo(param.getTruckNo());
-        if (truckNo == null || !Objects.equals(TruckStatusEnum.NORMAL.getCode(), truckNo.getStatus())) {
+        if (truckNo == null || !Objects.equals(truckNo.getStatus(), 0)) {
             throw new BusinessPlatfromException(ErrorCodeEnum.TRUCK_STATUS_ERROR, "当前车辆非正常状态,不能接单!");
         }
         //核定载重