Merge remote-tracking branch 'origin/dev_20251130' into dev_20251130

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/model/dto/res/ContractLogisticsOrderResDto.java

@@ -61,11 +61,19 @@ public class ContractLogisticsOrderResDto implements Serializable {
      * 托运企业名称
      */
     private String consignEntName;
+    /**
+     * 托运企业电话
+     */
+    private String consignEntPhone;
 
     /**
      * 承运企业id
      */
     private Long acceptCarriageEntId;
+    /**
+     * 承运企业电话
+     */
+    private String acceptCarriageEntPhone;
 
     /**
      * 承运企业名称

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/param/AddLogisticOrderParam.java

@@ -160,5 +160,14 @@ public class AddLogisticOrderParam implements Serializable {
      */
     @NotBlank(message = "卸货详细地址不能为空")
     private String unLoadDetailAddress;
-
+    /**
+     * 卸货联系人
+     */
+    @NotBlank(message = "卸货联系人不能为空")
+    private String unloadContacts;
+    /**
+     * 卸货联系电话
+     */
+    @NotBlank(message = "卸货联系电话不能为空")
+    private String unloadPhone;
 }

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/param/LogisticInfo.java

@@ -89,26 +89,6 @@ public class LogisticInfo implements Serializable {
         private LocalDate startTime;
 
 
-
-        /**
-         * 卸货联系人
-         */
-        @NotBlank(message = "卸货联系人不能为空")
-        private String unloadContacts;
-
-        /**
-         * 卸货联系电话
-         */
-        @NotBlank(message = "卸货联系电话不能为空")
-        private String unloadPhone;
-
-        /**
-         * 卸货详细地址
-         */
-        @NotBlank(message = "卸货详细地址不能为空")
-        private String unloadDetailAddress;
-
-
         /**
          * 总量
          */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -1740,8 +1740,10 @@ public class KwcContractTradeService {
                 new KwcContractLogisticsUnit());
         contractLogisticsOrderResDto.setConsignEntId(consignEnt.getEntId());
         contractLogisticsOrderResDto.setConsignEntName(consignEnt.getFirmName());
+        contractLogisticsOrderResDto.setConsignEntPhone(consignEnt.getPhone());
         contractLogisticsOrderResDto.setAcceptCarriageEntId(acceptCarriageEnt.getEntId());
         contractLogisticsOrderResDto.setAcceptCarriageEntName(acceptCarriageEnt.getFirmName());
+        contractLogisticsOrderResDto.setAcceptCarriageEntPhone(acceptCarriageEnt.getPhone());
         KwcContractLogisticsGoods goods = contractLogisticsGoodsMap.getOrDefault(log.getId(),
                 new KwcContractLogisticsGoods());
         contractLogisticsOrderResDto.setPrice(StringUtils.isNotBlank(goods.getPrice()) ? goods.getPrice() : log.getCommonPrice());

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -2354,9 +2354,6 @@ public class KwoTradeOrderService {
                 logisticInfo.setPriceType(0L);
                 logisticInfo.setEndTime(LocalDate.now());
                 logisticInfo.setStartTime(LocalDate.now());
-                logisticInfo.setUnloadContacts("");
-                logisticInfo.setUnloadPhone("");
-                logisticInfo.setUnloadDetailAddress("");
                 logisticInfo.setAmount(new BigDecimal("0"));
                 logisticInfo.setAmountUnit("");
                 logisticInfo.setLoss(new BigDecimal("0"));
@@ -2388,9 +2385,6 @@ public class KwoTradeOrderService {
                             logisticInfo.setPriceType(0L);
                             logisticInfo.setEndTime(LocalDate.now());
                             logisticInfo.setStartTime(LocalDate.now());
-                            logisticInfo.setUnloadContacts("");
-                            logisticInfo.setUnloadPhone("");
-                            logisticInfo.setUnloadDetailAddress("");
                             logisticInfo.setAmount(new BigDecimal("0"));
                             logisticInfo.setAmountUnit("");
                             logisticInfo.setLoss(new BigDecimal("0"));

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/enterpriseApp/AppWayBillController.java

@@ -240,10 +240,10 @@ public class AppWayBillController {
     /**
      * 运单状态统计
      */
-    @GetMapping("/statisticsWaybillOrder")
+    @PostMapping("/statisticsWaybillOrder")
     @Operation(summary = "运单状态统计")
-    public BaseResult<StatisticsWaybillResp> statisticsWaybillOrder() {
-        return BaseResult.success(waybillOrderService.statisticsWaybillOrder());
+    public BaseResult<StatisticsWaybillResp> statisticsWaybillOrder(@RequestBody @Valid WaybillStatisticsParam param) {
+        return BaseResult.success(waybillOrderService.statisticsWaybillOrder(param));
     }
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportServiceImpl.java

@@ -1200,6 +1200,9 @@ public class TransportServiceImpl implements TransportRemoteService {
         addLogisticOrderDTO.setUnloadName(param.getUnloadName());
         addLogisticOrderDTO.setUnloadCityCode(param.getUnloadCityCode());
         addLogisticOrderDTO.setUnloadCityName(param.getUnloadCityName());
+        addLogisticOrderDTO.setUnLoadDetailAddress(param.getUnLoadDetailAddress());
+        addLogisticOrderDTO.setUnloadContacts(param.getUnloadContacts());
+        addLogisticOrderDTO.setUnloadPhone(param.getUnloadPhone());
         return addLogisticOrderDTO;
     }
 
@@ -1221,9 +1224,6 @@ public class TransportServiceImpl implements TransportRemoteService {
 //        info.setUnloadName(logistic.getUnloadName());
 //        info.setUnloadCityCode(logistic.getUnloadCityCode());
 //        info.setUnloadCityName(logistic.getUnloadCityName());
-        info.setUnloadContacts(logistic.getUnloadContacts());
-        info.setUnloadPhone(logistic.getUnloadPhone());
-        info.setUnloadDetailAddress(logistic.getUnloadDetailAddress());
         info.setAmount(logistic.getAmount());
         info.setAmountUnit(logistic.getAmountUnit());
         info.setLoss(logistic.getLoss());

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

@@ -22,7 +22,7 @@ import java.util.Optional;
 /**
  * Author: donglang
  * Time: 2025-11-19
- * Des: 卸货
+ * Des: 取消
  * Version: 1.0
  */
 
@@ -114,6 +114,10 @@ public class CancelHandler extends AbstractWaybillOrderHandler<WaybillOrderCance
         // 已取消状态
         waybill.setStatus(CarWaybillV1Enum.APPROVAL_TREAT.getCode());
         waybillOrderRepository.updateById(waybill);
+
+        KwtWaybillOrderSubtask waybillSubtask = getWaybillSubtask(waybill.getId());
+        waybillSubtask.setStatus(CarWaybillV1Enum.APPROVAL_TREAT.getCode());
+        waybillOrderSubtaskRepository.updateById(waybillSubtask);
     }
 
     @Override

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

@@ -10,6 +10,7 @@ import com.sckw.core.model.enums.CarWaybillV1Enum;
 import com.sckw.fleet.api.model.vo.RTruckVo;
 import com.sckw.transport.model.KwtWaybillOrder;
 import com.sckw.transport.model.KwtWaybillOrderNode;
+import com.sckw.transport.model.KwtWaybillOrderSubtask;
 import com.sckw.transport.model.KwtWaybillOrderTicket;
 import com.sckw.transport.model.param.WaybillOrderCmeIntoWeighParam;
 import com.sckw.transport.repository.KwtWaybillOrderTicketRepository;
@@ -17,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Objects;
 
 /**
@@ -53,11 +55,11 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
                 .eq(KwtWaybillOrderTicket::getType, AddressTypeEnum.SHIPMENT.getCode());
         KwtWaybillOrderTicket orderTicket = waybillOrderTicketRepository.getOne(queryWrapper);
         orderTicket.setTareAmount(param.getTareAmount());
-        waybillOrderTicketRepository.save(orderTicket);
+        waybillOrderTicketRepository.updateById(orderTicket);
 
         //2.填充首次皮重
         RTruckVo truck = remoteFleetService.findTruckByTruckNo(param.getTruckNo());
-        if (truck != null && truck.getTareWeight() == null) {
+        if (truck != null && (truck.getTareWeight() == null || BigDecimal.ZERO.compareTo(truck.getTareWeight()) == 0)) {
             RTruckVo truckNo = new RTruckVo();
             truckNo.setId(truck.getId());
             truckNo.setTareWeight(param.getTareAmount());
@@ -70,6 +72,10 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
         // 到达装货地点状态
         waybillOrder.setStatus(CarWaybillV1Enum.REFUSE_TRAFFIC.getCode());
         waybillOrderRepository.updateById(waybillOrder);
+
+        KwtWaybillOrderSubtask waybillSubtask = getWaybillSubtask(waybillOrder.getId());
+        waybillSubtask.setStatus(CarWaybillV1Enum.REFUSE_TRAFFIC.getCode());
+        waybillOrderSubtaskRepository.updateById(waybillSubtask);
     }
 
 

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

@@ -5,6 +5,7 @@ import com.sckw.core.common.enums.enums.ErrorCodeEnum;
 import com.sckw.core.exception.BusinessPlatfromException;
 import com.sckw.core.model.enums.CarWaybillV1Enum;
 import com.sckw.transport.model.KwtWaybillOrder;
+import com.sckw.transport.model.KwtWaybillOrderSubtask;
 import com.sckw.transport.model.param.WaybillOrderLeaveParam;
 import com.sckw.transport.repository.KwtWaybillOrderSubtaskRepository;
 import com.sckw.transport.repository.KwtWaybillOrderTicketRepository;
@@ -53,6 +54,10 @@ public class LeaveHandler extends AbstractWaybillOrderHandler<WaybillOrderLeaveP
         // 已离场状态
         waybill.setStatus(CarWaybillV1Enum.WAIT_LOADING.getCode());
         waybillOrderRepository.updateById(waybill);
+
+        KwtWaybillOrderSubtask waybillSubtask = getWaybillSubtask(waybill.getId());
+        waybillSubtask.setStatus(CarWaybillV1Enum.WAIT_LOADING.getCode());
+        waybillOrderSubtaskRepository.updateById(waybillSubtask);
     }
 
     @Override

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

@@ -5,6 +5,7 @@ import com.sckw.core.common.enums.enums.ErrorCodeEnum;
 import com.sckw.core.exception.BusinessPlatfromException;
 import com.sckw.core.model.enums.CarWaybillV1Enum;
 import com.sckw.transport.model.KwtWaybillOrder;
+import com.sckw.transport.model.KwtWaybillOrderSubtask;
 import com.sckw.transport.model.param.WaybillOrderLoadingParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -43,6 +44,10 @@ public class LoadingHandler extends AbstractWaybillOrderHandler<WaybillOrderLoad
         // 已装货状态
         waybillOrder.setStatus(CarWaybillV1Enum.EXIT_COMPLETED.getCode());
         waybillOrderRepository.updateById(waybillOrder);
+
+        KwtWaybillOrderSubtask waybillSubtask = getWaybillSubtask(waybillOrder.getId());
+        waybillSubtask.setStatus(CarWaybillV1Enum.EXIT_COMPLETED.getCode());
+        waybillOrderSubtaskRepository.updateById(waybillSubtask);
     }
 
     @Override

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

@@ -180,7 +180,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
             throw new BusinessPlatfromException(ErrorCodeEnum.TRUCK_STATUS_ERROR, "当前车辆已锁定");
         }
         //核定载重
-        if (truckNo.getActualWeight() == null) {
+        if (BigDecimal.ZERO.compareTo(truckNo.getActualWeight()) == 0) {
             throw new BusinessPlatfromException(ErrorCodeEnum.RESOURCE_NOT_FOUND, "车辆核定载重不能为空！");
         }
 
@@ -230,10 +230,10 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
         }
 
         //订单分配总量
-        BigDecimal entrustAmount = tradeOrder.getEntrustAmount();
+        BigDecimal entrustAmount = tradeOrder.getAmount();
         //订单实际交付量
         BigDecimal actualAmount = tradeOrder.getActualAmount();
-        if (entrustAmount == null || actualAmount == null) {
+        if (entrustAmount == null || actualAmount == null ||  BigDecimal.ZERO.compareTo(actualAmount) == 0) {
             throw new BusinessPlatfromException(ErrorCodeEnum.PARAM_ERROR, "订单分配总量或订单实际交付量不能为空！");
         }
         //订单余量 = 分配总量 - 实际交付量

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

@@ -61,6 +61,10 @@ public class UnloadingHandler extends AbstractWaybillOrderHandler<WaybillOrderUn
         // 已卸货状态
         waybill.setStatus(CarWaybillV1Enum.COMPLETION_LOADING.getCode());
         waybillOrderRepository.updateById(waybill);
+
+        KwtWaybillOrderSubtask waybillSubtask = getWaybillSubtask(waybill.getId());
+        waybillSubtask.setStatus(CarWaybillV1Enum.COMPLETION_LOADING.getCode());
+        waybillOrderSubtaskRepository.updateById(waybillSubtask);
     }
 
     @Override

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/AddLogisticOrderDTO.java

@@ -151,6 +151,21 @@ public class AddLogisticOrderDTO implements Serializable {
      */
     @NotBlank(message = "卸货城市名称不能为空")
     private String unloadCityName;
+    /**
+     * 卸货详细地址
+     */
+    @NotBlank(message = "卸货详细地址不能为空")
+    private String unLoadDetailAddress;
+    /**
+     * 卸货联系人
+     */
+    @NotBlank(message = "卸货联系人不能为空")
+    private String unloadContacts;
+    /**
+     * 卸货联系电话
+     */
+    @NotBlank(message = "卸货联系电话不能为空")
+    private String unloadPhone;
 
 
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/LogisticData.java

@@ -92,27 +92,6 @@ public  class LogisticData implements Serializable {
         private LocalDate startTime;
 
 
-
-
-        /**
-         * 卸货联系人
-         */
-        @NotBlank(message = "卸货联系人不能为空")
-        private String unloadContacts;
-
-        /**
-         * 卸货联系电话
-         */
-        @NotBlank(message = "卸货联系电话不能为空")
-        private String unloadPhone;
-
-        /**
-         * 卸货详细地址
-         */
-        @NotBlank(message = "卸货详细地址不能为空")
-        private String unloadDetailAddress;
-
-
         /**
          * 总量
          */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/WaybillStatisticsParam.java

@@ -0,0 +1,41 @@
+package com.sckw.transport.model.param;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author :donglang
+ * @version :1.0
+ * @description :
+ * @create :2025-11-13 08:59:00
+ */
+@Data
+public class WaybillStatisticsParam implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 6124647833601153571L;
+
+    /**
+     * 企业id
+     */
+    @Schema(description = "企业id")
+    @NotNull(message = "企业id不能为空！")
+    private Long entId;
+
+    /**
+     * 车牌号
+     */
+    @Schema(description = "车牌号")
+    @NotBlank(message = "车牌号不能为空！")
+    private String truckNo;
+
+
+
+
+
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtAcceptCarriageOrderService.java

@@ -3292,6 +3292,7 @@ public class KwtAcceptCarriageOrderService {
         contract.setContractName(x.getContractName());
         contract.setSigningWay(String.valueOf(x.getSigningWay()));
         contract.setCreateBy(orderDTO.getUserId());
+        contract.setStatus(NumberConstant.ZERO);
         contract.setCreateTime(new Date());
         contract.setUpdateBy(orderDTO.getUserId());
         contract.setUpdateTime(new Date());
@@ -3303,6 +3304,7 @@ public class KwtAcceptCarriageOrderService {
         goods.setId(new IdWorker(NumberConstant.ONE).nextId());
         goods.setLOrderId(lOrderId);
         goods.setLOrderNo(lOrderNo);
+        goods.setGoodsId(orderDTO.getGoodsId());
         goods.setGoodsName(orderDTO.getGoodsName());
         goods.setGoodsType(orderDTO.getGoodsType());
         goods.setStatus(NumberConstant.ZERO);
@@ -3325,7 +3327,7 @@ public class KwtAcceptCarriageOrderService {
         loadAddress.setCityCode(orderDTO.getLoadCityCode());
         loadAddress.setCityName(orderDTO.getLoadCityName());
         loadAddress.setDetailAddress(orderDTO.getLoadDetailAddress());
-
+        loadAddress.setSort(NumberConstant.ZERO);
         loadAddress.setEntryType(NumberConstant.FOUR);
         loadAddress.setStatus(NumberConstant.ZERO);
         loadAddress.setCreateBy(orderDTO.getUserId());
@@ -3340,13 +3342,14 @@ public class KwtAcceptCarriageOrderService {
         unloadAddress.setAddressType(NumberConstant.TWO);
         unloadAddress.setName(orderDTO.getUnloadName());
 //        unloadAddress.setType();
-        unloadAddress.setContacts(x.getUnloadContacts());
-        unloadAddress.setPhone(x.getUnloadPhone());
+        unloadAddress.setContacts(orderDTO.getUnloadContacts());
+        unloadAddress.setPhone(orderDTO.getUnloadPhone());
         unloadAddress.setCityCode(orderDTO.getUnloadCityCode());
         unloadAddress.setCityName(orderDTO.getUnloadCityName());
-        unloadAddress.setDetailAddress(x.getUnloadDetailAddress());
+        unloadAddress.setDetailAddress(orderDTO.getUnLoadDetailAddress());
         unloadAddress.setEntryType(NumberConstant.FOUR);
         unloadAddress.setStatus(NumberConstant.ZERO);
+        unloadAddress.setSort(NumberConstant.ZERO);
         unloadAddress.setCreateBy(orderDTO.getUserId());
         unloadAddress.setCreateTime(date1);
         unloadAddress.setUpdateBy(orderDTO.getUserId());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -3523,7 +3523,7 @@ public class KwtWaybillOrderV1Service {
             KwtLogisticsOrder kwtLogisticsOrder = getKwtLogisticsOrder(kwtLogistics, subtask);
             boolean b1 = kwtLogisticsOrderRepository.updateById(kwtLogisticsOrder);
             //如果物流订单状态是已完成需要通知贸易订单完成
-            noticeTraderOrder(kwtLogisticsOrder, kwtLogistics);
+           // noticeTraderOrder(kwtLogisticsOrder, kwtLogistics);
 
             // 存储记录
             String remark = null;
@@ -3630,13 +3630,13 @@ public class KwtWaybillOrderV1Service {
             throw new BusinessException("物流订单信息不存在");
         }
         //调物流订单完结订单
-        List<KwtWaybillOrderSubtask> waybillOrderSubtasks = kwtWaybillOrderSubtaskRepository.queryByLogId(subtask.getLOrderId());
-        boolean b2 = waybillOrderSubtasks.stream()
-                .allMatch(x -> Arrays.asList(CarWaybillV1Enum.WAIT_UNLOADING.getCode(), CarWaybillV1Enum.APPROVAL_TREAT.getCode()).contains(x.getStatus()));
+//        List<KwtWaybillOrderSubtask> waybillOrderSubtasks = kwtWaybillOrderSubtaskRepository.queryByLogId(subtask.getLOrderId());
+//        boolean b2 = waybillOrderSubtasks.stream()
+//                .allMatch(x -> Arrays.asList(CarWaybillV1Enum.WAIT_UNLOADING.getCode(), CarWaybillV1Enum.APPROVAL_TREAT.getCode()).contains(x.getStatus()));
         // KwtLogisticsOrder logisticsOrder = kwtLogisticsOrderRepository.queryByLogisticsOrderId(subtask.getLOrderId());
 
-        BigDecimal entrustAmount  = Objects.isNull(kwtLogistics.getEntrustAmount())  ? BigDecimal.ZERO: kwtLogistics.getEntrustAmount();
-        BigDecimal subEntrustAmount = Objects.isNull(subtask.getEntrustAmount()) ? BigDecimal.ZERO: subtask.getEntrustAmount();
+//        BigDecimal entrustAmount  = Objects.isNull(kwtLogistics.getEntrustAmount())  ? BigDecimal.ZERO: kwtLogistics.getEntrustAmount();
+//        BigDecimal subEntrustAmount = Objects.isNull(subtask.getEntrustAmount()) ? BigDecimal.ZERO: subtask.getEntrustAmount();
         BigDecimal loadAmount  = Objects.isNull(kwtLogistics.getLoadAmount())  ? BigDecimal.ZERO: kwtLogistics.getLoadAmount();
         BigDecimal subLoadAmount = Objects.isNull(subtask.getLoadAmount()) ? BigDecimal.ZERO: subtask.getLoadAmount();
         BigDecimal unloadAmount  = Objects.isNull(kwtLogistics.getUnloadAmount())  ? BigDecimal.ZERO: kwtLogistics.getUnloadAmount();
@@ -3645,13 +3645,13 @@ public class KwtWaybillOrderV1Service {
 
         KwtLogisticsOrder kwtLogisticsOrder = new KwtLogisticsOrder();
         kwtLogisticsOrder.setId(kwtLogistics.getId());
-        kwtLogisticsOrder.setEntrustAmount(entrustAmount.add(subEntrustAmount));
+       // kwtLogisticsOrder.setEntrustAmount(entrustAmount.add(subEntrustAmount));
         kwtLogisticsOrder.setLoadAmount(loadAmount.add(subLoadAmount));
         kwtLogisticsOrder.setUnloadAmount(unloadAmount.add(subUnloadAmount));
-        if (b2){
-            //调物流订单完结订单
-            kwtLogisticsOrder.setStatus(LogisticsOrderV1Enum.HAVE_RECONCILED.getCode());
-        }
+//        if (b2){
+//            //调物流订单完结订单
+//            kwtLogisticsOrder.setStatus(LogisticsOrderV1Enum.HAVE_RECONCILED.getCode());
+//        }
         return kwtLogisticsOrder;
     }
 

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

@@ -487,7 +487,7 @@ public class WaybillOrderService {
                                                        Map<String, KwtWaybillOrderTicket> ticketMap) {
         WaybillOrderStatusResp wbOrderResp = new WaybillOrderStatusResp();
         wbOrderResp.setId(wbOrder.getId());
-
+        wbOrderResp.setLogisticsOrderId(Optional.ofNullable(wbOrder.getLOrderId()).map(String::valueOf).orElse(null));
         //装货、卸货净重、任务量
         KwtWaybillOrderSubtask subtask = subtaskMap.getOrDefault(wbOrder.getId(), new KwtWaybillOrderSubtask());
         wbOrderResp.setLoadingNetWeight(subtask.getLoadAmount());
@@ -557,10 +557,12 @@ public class WaybillOrderService {
 
     }
 
-    public StatisticsWaybillResp statisticsWaybillOrder() {
+    public StatisticsWaybillResp statisticsWaybillOrder(WaybillStatisticsParam param) {
         StatisticsWaybillResp waybillResp = new StatisticsWaybillResp();
         log.info("运单状态统计");
         WaybillOrderReq waybillOrderReq = new WaybillOrderReq();
+        waybillOrderReq.setEntId(String.valueOf(param.getEntId()));
+        waybillOrderReq.setTruckNo(param.getTruckNo());
         StatisticsWaybillResp statisticsWaybillResp = waybillOrderV1Service.statisticsWaybillOrder(waybillOrderReq);
         if (statisticsWaybillResp == null || CollectionUtils.isEmpty(statisticsWaybillResp.getOrderStatusStatistics())) {
             return new StatisticsWaybillResp();