修改bug

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -1200,7 +1200,7 @@ public class KwfDriverService {
 
     /**
      * @param params 参数
-     * @desc 修改司机
+     * @desc 绑定车辆
      * @author zk
      * @date 2023/7/6
      **/
@@ -1211,11 +1211,12 @@ public class KwfDriverService {
 
     /**
      * @param params 参数
-     * @desc 修改司机
+     * @desc 绑定车辆
      * @author zk
      * @date 2023/7/6
      **/
     public void bindTruck(Long driverId, Long truckId) {
+        log.info("绑定车辆，入参参数，driverId：{}， truckId：{}", driverId, truckId);
         if (driverId == null || truckId == null) {
             throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "司机id和车辆id不能为空!");
         }
@@ -1245,6 +1246,7 @@ public class KwfDriverService {
                 throw new BusinessPlatfromException(ErrorCodeEnum.DB_OPERATE_FAIL, "车辆绑定失败!");
             }
         }
+        log.info("接绑定车辆成功！");
     }
 
 

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

@@ -112,7 +112,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
 //        updateTradeOrder(tradeOrder, truckLoadVolume);
 
         //7、绑定车辆
-        driverBindTruck(waybill);
+        driverBindTruck(waybillOrder);
 
         BusinessContext.set("createdWaybillOrder", waybillOrder);
 
@@ -219,9 +219,9 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
      * @param truckNo
      */
     private BigDecimal queryCurTruckLoadVolume(RTruckVo truckNo, OrderDetailVo tradeOrder) {
+        log.info("开始计算当前车辆任务量！");
         //核定载重
         BigDecimal actualWeight = truckNo.getActualWeight();
-        log.info("车辆核定载重：{}", actualWeight);
         //首次皮重
         BigDecimal tareWeight = truckNo.getTareWeight();
         //任务量
@@ -255,7 +255,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
             taskAmount = loadVolume;
             log.info("订单余量适中，按基础任务量接单，最终任务量: {}", taskAmount);
         }
-        log.info("最终任务量：{}", taskAmount);
+        log.info("计算当前车辆任务量结束，最终任务量：{}", taskAmount);
         return taskAmount;
     }
 
@@ -312,7 +312,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
      * @param param
      */
     private KwtWaybillOrder createWaybillOrder(OrderCirculateTakingQueryParam param, RDriverVo driver, RTruckVo truckNo) {
-        log.info("创建物流运单入参参数：{}", JSON.toJSONString(param));
+        log.info("生成物流运单，入参参数：{}", JSON.toJSONString(param));
         KwtWaybillOrder waybillOrder = new KwtWaybillOrder();
         waybillOrder.setEntId(param.getEntId());
         waybillOrder.setLOrderId(param.getLogOrderId());
@@ -342,7 +342,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
      */
     private KwtWaybillOrderSubtask createWaybillOrderSubtask(OrderCirculateTakingQueryParam param, KwtWaybillOrder waybillOrder,
                                                              BigDecimal truckLoadVolume) {
-        log.info("创建物流子运单入参参数：{}", JSON.toJSONString(param));
+        log.info("创建物流子运单，入参参数：{}", JSON.toJSONString(param));
         KwtWaybillOrderSubtask subtask = new KwtWaybillOrderSubtask();
 
         subtask.setEntId(param.getEntId());
@@ -369,7 +369,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
      */
     private List<KwtWaybillOrderAddress> createWaybillOrderAddress(OrderCirculateTakingQueryParam param, KwtWaybillOrder waybillOrder,
                                                                    KwtWaybillOrderSubtask waybillOrderSubtask) {
-        log.info("创建物流运单地址入参参数，logOrderId：{}", param.getLogOrderId());
+        log.info("创建物流运单地址，入参参数，logOrderId：{}", param.getLogOrderId());
         //地址
         Map<String, KwtLogisticsOrderAddress> logOrderIdAndAddressMap = getKwtLogisticsOrderAddressMap(Lists.newArrayList(param.getLogOrderId()));
         List<KwtWaybillOrderAddress> createdAddresses = new ArrayList<>();
@@ -388,7 +388,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
         createdAddresses.add(takeAddress);
         log.info("创建物流运单卸货地址成功，运单地址ID：{}", takeAddress.getId());
 
-        log.info("成功创建{}个运单地址", createdAddresses.size());
+        log.info("创建物流运单地址成功，创建{}个运单地址", createdAddresses.size());
         return createdAddresses;
     }
 
@@ -434,7 +434,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
     private void createWaybillOrderTicket(OrderCirculateTakingQueryParam param, KwtLogisticsOrder logOrder,
                                           KwtWaybillOrder waybillOrder, KwtWaybillOrderSubtask waybillOrderSubtask,
                                           List<KwtWaybillOrderAddress> waybillOrderAddresses) {
-        log.info("创建车辆运单-装卸货信息入参参数：{}", JSON.toJSONString(param));
+        log.info("创建车辆运单-装卸货信息，入参参数：{}", JSON.toJSONString(param));
 
         //装货地址
         KwtWaybillOrderAddress shipmentAddress = getWaybillOrderAddress(waybillOrderAddresses, AddressTypeEnum.SHIPMENT);
@@ -506,7 +506,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
      * @param logOrder
      */
     private void updateLogOrder(KwtLogisticsOrder logOrder, BigDecimal truckLoadVolume) {
-        log.info("更新上游物流运输量数据，logOrderId：{}", logOrder);
+        log.info("更新上游物流订单运输量数据，logOrderId：{}", logOrder);
         // 计算当前车辆总运输量
         if (logOrder.getEntrustAmount() == null || BigDecimal.ZERO.compareTo(logOrder.getEntrustAmount()) == 0) {
             logOrder.setEntrustAmount(truckLoadVolume);
@@ -514,7 +514,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
             logOrder.setEntrustAmount(logOrder.getEntrustAmount().add(truckLoadVolume));
         }
         logisticsOrderRepository.updateById(logOrder);
-        log.info("更新上游物流运输量成功, 物流订单ID：{}", logOrder.getId());
+        log.info("更新上游物流订单运输量成功, 物流订单ID：{}", logOrder.getId());
     }
 
     /**

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

@@ -89,7 +89,7 @@ public class UnloadingHandler extends AbstractWaybillOrderHandler<WaybillOrderUn
             if (param.getUnloadAmount() == null || StringUtils.isBlank(param.getUnloadUrl())) {
                 throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "卸货净重和卸货凭证不能为空！");
             }
-            this.targetStatus = Global.NUMERICAL_ONE;
+            this.targetStatus = Global.NUMERICAL_TWO;
             //按照卸货量计算：推送到已卸货状态，更新子运单卸货净重
             KwtWaybillOrderSubtask subtask = getWaybillSubtask(waybill.getId());
             subtask.setUnloadAmount(param.getUnloadAmount());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -903,7 +903,7 @@ public class WaybillOrderService {
     private static List<StatisticsWaybillResp.OrderBillStatusStatistics> calculateStatusStatistics(List<WaybillOrderStatusResp> waybillOrdertDatas) {
         // 定义状态码聚合规则
         Map<List<String>, String[]> aggregateRules = Map.of(
-                Arrays.asList("1", "5", "10", "15"), new String[]{"1", "进行中"},
+                Arrays.asList("1", "5", "10", "11", "15"), new String[]{"1", "进行中"},
                 Arrays.asList("20", "30"), new String[]{"2", "单证审核"},
                 Arrays.asList("25", "99"), new String[]{"3", "已完成"}
         );