核定载重取值更改

sckw-modules-api/sckw-fleet-api/src/main/java/com/sckw/fleet/api/model/vo/TmsTruckAxleNumVO.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * Author: donglang
@@ -27,5 +28,9 @@ public class TmsTruckAxleNumVO implements Serializable {
      */
     private String name;
 
+    /**
+     * 核定载重
+     */
+    private BigDecimal legalLoad;
 
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dubbo/RemoteFleetServiceImpl.java

@@ -427,6 +427,7 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
         TmsTruckAxleNumVO vo = new TmsTruckAxleNumVO();
         vo.setId(axleNum.getId());
         vo.setName(axleNum.getName());
+        vo.setLegalLoad(axleNum.getLegalLoad());
         return vo;
     }
 

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

@@ -10,8 +10,10 @@ import com.sckw.core.model.enums.AddressTypeEnum;
 import com.sckw.core.model.enums.CarWaybillV1Enum;
 import com.sckw.core.model.enums.LogisticsOrderV1Enum;
 import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.StringUtils;
 import com.sckw.fleet.api.model.vo.RDriverVo;
 import com.sckw.fleet.api.model.vo.RTruckVo;
+import com.sckw.fleet.api.model.vo.TmsTruckAxleNumVO;
 import com.sckw.order.api.model.OrderDetailVo;
 import com.sckw.order.api.model.UpdateActualAmountParam;
 import com.sckw.transport.model.*;
@@ -220,8 +222,12 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
      */
     private BigDecimal queryCurTruckLoadVolume(RTruckVo truckNo, OrderDetailVo tradeOrder) {
         log.info("开始计算当前车辆任务量！");
+        TmsTruckAxleNumVO carAxisInfo = remoteFleetService.getCarAxisInfo(StringUtils.isBlank(truckNo.getCarAxis()) ? Integer.parseInt(truckNo.getCarAxis()) : -1);
+        if (carAxisInfo == null || carAxisInfo.getLegalLoad() == null || carAxisInfo.getLegalLoad().compareTo(BigDecimal.ZERO) == 0) {
+            throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "当前车辆无轴数信息");
+        }
         //核定载重
-        BigDecimal actualWeight = truckNo.getActualWeight();
+        BigDecimal actualWeight = carAxisInfo.getLegalLoad();
         //首次皮重
         BigDecimal tareWeight = truckNo.getTareWeight();
         //任务量