核定载重取值更改

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/AddressTypeEnum.java

@@ -16,12 +16,12 @@ public enum AddressTypeEnum {
     NO(0, ""),
 
     /**
-     * 装货地址
+     * 装货
      */
     SHIPMENT(1, "装货"),
 
     /**
-     * 收货地址
+     * 卸货
      */
     TAKE(2, "卸货"),
 

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

@@ -76,10 +76,22 @@ public class RTruckVo implements Serializable {
      * 车队id
      */
     private String fleetId;
+
+    /**
+     * 轴数id
+     */
+    private Integer carAxisId;
+
     /**
      * 轴数
      */
     private String carAxis;
+
+    /**
+     * 法定载重
+     */
+    private BigDecimal legalLoad;
+
     /**
      * 车辆状态
      */

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

@@ -361,7 +361,9 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
         rTruckVo.setTruckType(StringUtils.isBlank(truck.getType()) ? "": String.valueOf(truck.getType()));
         rTruckVo.setStatus(truck.getStatus());
         TmsTruckAxleNum carAxisInfo = getCarAxisInfo(truck.getCarAxis());
+        rTruckVo.setCarAxisId(carAxisInfo.getId());
         rTruckVo.setCarAxis(carAxisInfo.getName());
+        rTruckVo.setLegalLoad(carAxisInfo.getLegalLoad());
         rTruckVo.setEnergyType(truck.getEnergyType());
         return rTruckVo;
     }

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

@@ -89,7 +89,7 @@ public class LeaveMockHandler extends AbstractWaybillOrderHandler<WaybillOrderLe
      * @param ticketMap
      */
     private void updateLoadAmount(WaybillOrderLeaveMockParam param, KwtWaybillOrder waybillOrder, Map<Integer, KwtWaybillOrderTicket> ticketMap) {
-        //查询卸货信息，用于获取皮重
+        //查询装货信息，用于获取皮重
         KwtWaybillOrderTicket shipmentTicket  = ticketMap.get(AddressTypeEnum.SHIPMENT.getCode());
         if (shipmentTicket == null) {
             throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_TICKET_NOT_FOUND, "当前物流运单装卸货信息不存在，无法获取皮重！");
@@ -97,7 +97,7 @@ public class LeaveMockHandler extends AbstractWaybillOrderHandler<WaybillOrderLe
         //皮重
         BigDecimal tareAmount = shipmentTicket.getTareAmount();
 
-        //更新子运单的装货净重
+        //更新子运单装货净重
         KwtWaybillOrderSubtask subtask = waybillOrderSubtaskRepository.queryByWOrderId(waybillOrder.getId());
         if (subtask == null) {
             throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_SUB_NOT_FOUND, "未找到关联的子运单！");

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

@@ -190,7 +190,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
             throw new BusinessPlatfromException(ErrorCodeEnum.TRUCK_STATUS_ERROR, "当前车辆已锁定");
         }
         //核定载重
-        if (BigDecimal.ZERO.compareTo(truckNo.getActualWeight()) == 0) {
+        if (truckNo.getLegalLoad() == null || BigDecimal.ZERO.compareTo(truckNo.getLegalLoad()) == 0) {
             throw new BusinessPlatfromException(ErrorCodeEnum.RESOURCE_NOT_FOUND, "车辆核定载重不能为空！");
         }
 
@@ -222,12 +222,8 @@ 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 = carAxisInfo.getLegalLoad();
+        BigDecimal actualWeight = truckNo.getLegalLoad();
         //首次皮重
         BigDecimal tareWeight = truckNo.getTareWeight();
         //任务量