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

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/RequestCheckFilter.java

@@ -131,6 +131,7 @@ public class RequestCheckFilter implements Filter {
         /*2.2、token解析*/
         Map<String, Object> tokenMap = EncryUtil.descryV2(Global.PRI_KEY, token);
         if (tokenMap == null) {
+            log.error("认证失效: token {}", token);
             ResponseUtil.writer(response, HttpResult.error(HttpStatus.TOKEN_INVALID_CODE, HttpStatus.TOKEN_INVALID_MESSAGE));
             return;
         }
@@ -140,6 +141,7 @@ public class RequestCheckFilter implements Filter {
         String key = Global.getFullUserTokenKey(clientType, userId);
         String redisUserToken = RedissonUtils.getString(key);
         if (StringUtils.isBlank(redisUserToken)) {
+            log.error("认证失效: clientType {} userId {}", clientType, userId);
             ResponseUtil.writer(response, HttpResult.error(HttpStatus.TOKEN_INVALID_CODE, HttpStatus.TOKEN_INVALID_MESSAGE));
             return;
         }
@@ -155,6 +157,8 @@ public class RequestCheckFilter implements Filter {
         String userInfoStr = RedissonUtils.getString(key);
         LoginUserInfo loginUserInfo = StringUtils.isNotBlank(userInfoStr) ? JSON.parseObject(userInfoStr, LoginUserInfo.class) : null;
         if (Objects.isNull(loginUserInfo)) {
+            log.error("认证失效,systemType {} userId {}", systemType, userId);
+
             ResponseUtil.writer(response, HttpResult.error(HttpStatus.TOKEN_INVALID_CODE, HttpStatus.TOKEN_INVALID_MESSAGE));
             return;
         }

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

@@ -30,6 +30,11 @@ public enum CarWaybillV1Enum {
      * 已装货
      */
     EXIT_COMPLETED(10,  "已装货"),
+
+    /**
+     * 离场过磅
+     */
+    WEIGHT_TRAFFIC(11, "离场过磅"),
     /**
      * 已离场
      */

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

@@ -21,6 +21,14 @@ import java.util.List;
 public class AddLogisticOrderParam implements Serializable {
     @Serial
     private static final long serialVersionUID = 6529826978061848338L;
+    /**
+     * 企业id
+     */
+    private Long entId;
+    /**
+     * 用户id
+     */
+    private Long userId;
     //物流信息
     private List<LogisticInfo> logisticInfo;
     /**
@@ -152,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/controller/KwoTradeOrderController.java

@@ -96,7 +96,7 @@ public class KwoTradeOrderController {
     /**
      * 门户贸易订单下单
      */
-//    @GlobalTransactional(name = "default_tx_group")
+    @GlobalTransactional(name = "default_tx_group")
     @RepeatSubmit(interval = 1000, message = "前方拥堵，请稍后尝试")
     @PostMapping(value = "/addOrder", produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "门户贸易订单下单", description = "门户贸易订单下单")

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

@@ -2205,10 +2205,10 @@ public class KwoTradeOrderService {
         kwoTradeOrderUnitService.insertBatch(list);
 
         //扣减库存
-        HttpResult updateResult = goodsInfoService.updateGoodsAmount(tradeOrderParam.getGoodsId(), tradeOrderParam.getAmount());
-        if (!Objects.equals(HttpStatus.SUCCESS_CODE, updateResult.getCode())) {
-            throw new BusinessException(updateResult.getMsg());
-        }
+//        HttpResult updateResult = goodsInfoService.updateGoodsAmount(tradeOrderParam.getGoodsId(), tradeOrderParam.getAmount());
+//        if (!Objects.equals(HttpStatus.SUCCESS_CODE, updateResult.getCode())) {
+//            throw new BusinessException(updateResult.getMsg());
+//        }
     }
 
     private TradeContractResDto checkPara(TradeOrderParam tradeOrderParam, KwoTradeOrder order, KwpGoods goodsById) {
@@ -2284,8 +2284,10 @@ public class KwoTradeOrderService {
         if (unitMap.keySet().size() < 2) {
             throw new BusinessException("贸易订单企业信息缺失");
         }
-        TradeContractResDto tradeContractResDto = remoteContractService.queryTradeContract(tradeOrderAuditParam.getTradeContractId(), tradeOrderAuditParam.getGoodsId());
-
+        TradeContractResDto tradeContractResDto = remoteContractService.queryTradeContract(tradeOrderAuditParam.getTradeContractId(), byOrderId.getGoodsId());
+        if (Objects.isNull(tradeContractResDto)) {
+            throw new BusinessException("贸易合同不存在");
+        }
         List<LogisticsEntDto> logisticsContractId = tradeOrderAuditParam.getLogisticsContractList();
         if (Objects.equals(tradeContractResDto.getConsignment(), 2) && CollUtil.isEmpty(logisticsContractId)) {
             throw new BusinessException("卖方托运时，物流合同不能为空");
@@ -2352,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"));
@@ -2386,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"));
@@ -2454,7 +2450,8 @@ public class KwoTradeOrderService {
             addLogisticOrderParam.setUnloadCityName(unloadAddress.getCityName());
             addLogisticOrderParam.setUnLoadDetailAddress(unloadAddress.getDetailAddress());
         }
-
+        addLogisticOrderParam.setEntId(LoginUserHolder.getEntId());
+        addLogisticOrderParam.setUserId(LoginUserHolder.getUserId());
         log.info("创建物流订单：{}", JSONObject.toJSONString(addLogisticOrderParam));
         transportRemoteService.addLogisticOrder(addLogisticOrderParam);
         return true;

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/res/GoodsDetailVo.java

@@ -174,7 +174,11 @@ public class GoodsDetailVo {
      */
     @Schema(description = "状态label")
     private String statusLabel;
+    @Schema(description = "签约价")
+    private BigDecimal signPrice;
 
+    @Schema(description = "是否签约")
+    private boolean signFlag;
     @Schema(description = "供应商信息")
     private GoodsEntInfo goodsEntInfo;
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -304,7 +304,15 @@ public class KwpGoodsService {
             addressInfo.setTypeName(CollectionUtils.isNotEmpty(addressMap) ? addressMap.get(addressInfo.getType()) : null);
         }
         detail.setImages(images).setPrice(price).setGoodsEntInfo(goodsEntInfo).setAttributes(attributes).setAddressInfo(addressInfo);
-
+        Long entId = LoginUserHolder.getEntId();
+        detail.setSignFlag(false);
+        if (Objects.nonNull(entId)) {
+            TradeContractGoodsDto tradeContractResDto = remoteContractService.queryTradeContractNew(entId, id,LocalDateTime.now());
+            if (Objects.nonNull(tradeContractResDto)) {
+                detail.setSignPrice(tradeContractResDto.getPrice());
+                detail.setSignFlag(true);
+            }
+        }
         return detail;
     }
 

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

@@ -1176,6 +1176,8 @@ public class TransportServiceImpl implements TransportRemoteService {
                 .map(TransportServiceImpl::getLogisticInfo)
                 .collect(Collectors.toList());
         addLogisticOrderDTO.setLogisticInfo(infos);
+        addLogisticOrderDTO.setEntId(param.getEntId());
+        addLogisticOrderDTO.setUserId(param.getUserId());
         addLogisticOrderDTO.setTradeOrderId(param.getTradeOrderId());
         addLogisticOrderDTO.setTradeOrderNo(param.getTradeOrderNo());
         addLogisticOrderDTO.setConsignCompany(param.getConsignCompany());
@@ -1198,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;
     }
 
@@ -1219,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/model/dto/AddLogisticOrderDTO.java

@@ -18,6 +18,15 @@ public class AddLogisticOrderDTO implements Serializable {
     private static final long serialVersionUID = 6529826978061848338L;
     //物流信息
     private List<LogisticData> logisticInfo;
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+    /**
+     * 用户id
+     */
+    private Long userId;
     /**
      * 交易订单id
      */
@@ -142,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/service/KwtAcceptCarriageOrderService.java

@@ -3221,7 +3221,7 @@ public class KwtAcceptCarriageOrderService {
             //商品信息
             setLogisticGoodsInfo(orderDTO, lOrderId, lOrderNo, savelogOrderGoodsList);
             //物流订单与合同信息
-            setLogisticContractInfo(x, lOrderId, saveContractList);
+            setLogisticContractInfo(orderDTO,x, lOrderId, saveContractList);
             //企业信息数据
             setLogisticUnitInfo(orderDTO, x, lOrderId, savelogOrderUnitList);
 
@@ -3254,9 +3254,9 @@ public class KwtAcceptCarriageOrderService {
         consignUnit.setPhone(orderDTO.getConsignContactPhone());
 //        consignUnit.setRemark(orderDTO.getRemark());
         consignUnit.setStatus(NumberConstant.ZERO);
-        consignUnit.setCreateBy(LoginUserHolder.getUserId());
+        consignUnit.setCreateBy(orderDTO.getUserId());
         consignUnit.setCreateTime(new Date());
-        consignUnit.setUpdateBy(LoginUserHolder.getUserId());
+        consignUnit.setUpdateBy(orderDTO.getUserId());
         consignUnit.setUpdateTime(new Date());
         savelogOrderUnitList.add(consignUnit);
         //承运
@@ -3276,14 +3276,14 @@ public class KwtAcceptCarriageOrderService {
         unit.setPhone(x.getAcceptContactPhone());
 //        unit.setRemark(orderDTO.getRemark());
         unit.setStatus(NumberConstant.ZERO);
-        unit.setCreateBy(LoginUserHolder.getUserId());
+        unit.setCreateBy(orderDTO.getUserId());
         unit.setCreateTime(new Date());
-        unit.setUpdateBy(LoginUserHolder.getUserId());
+        unit.setUpdateBy(orderDTO.getUserId());
         unit.setUpdateTime(new Date());
         savelogOrderUnitList.add(unit);
     }
 
-    private static void setLogisticContractInfo(LogisticData x, Long lOrderId, List<KwtLogisticsOrderContract> saveContractList) {
+    private static void setLogisticContractInfo(AddLogisticOrderDTO orderDTO,LogisticData x, Long lOrderId, List<KwtLogisticsOrderContract> saveContractList) {
         KwtLogisticsOrderContract contract = new KwtLogisticsOrderContract();
         contract.setId(new IdWorker(NumberConstant.ONE).nextId());
         contract.setContractId(x.getContractId());
@@ -3291,9 +3291,10 @@ public class KwtAcceptCarriageOrderService {
         contract.setContractNo(x.getContractNo());
         contract.setContractName(x.getContractName());
         contract.setSigningWay(String.valueOf(x.getSigningWay()));
-        contract.setCreateBy(LoginUserHolder.getUserId());
+        contract.setCreateBy(orderDTO.getUserId());
+        contract.setStatus(NumberConstant.ZERO);
         contract.setCreateTime(new Date());
-        contract.setUpdateBy(LoginUserHolder.getUserId());
+        contract.setUpdateBy(orderDTO.getUserId());
         contract.setUpdateTime(new Date());
         saveContractList.add(contract);
     }
@@ -3303,12 +3304,13 @@ 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);
-        goods.setCreateBy(LoginUserHolder.getUserId());
+        goods.setCreateBy(orderDTO.getUserId());
         goods.setCreateTime(new Date());
-        goods.setUpdateBy(LoginUserHolder.getUserId());
+        goods.setUpdateBy(orderDTO.getUserId());
         goods.setUpdateTime(new Date());
         savelogOrderGoodsList.add( goods);
     }
@@ -3325,13 +3327,13 @@ 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(LoginUserHolder.getUserId());
+        loadAddress.setCreateBy(orderDTO.getUserId());
         Date date1 = new Date();
         loadAddress.setCreateTime(date1);
-        loadAddress.setUpdateBy(LoginUserHolder.getUserId());
+        loadAddress.setUpdateBy(orderDTO.getUserId());
         loadAddress.setUpdateTime(date1);
         saveAddressList.add(loadAddress);
         KwtLogisticsOrderAddress unloadAddress = new KwtLogisticsOrderAddress();
@@ -3340,16 +3342,17 @@ 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.setCreateBy(LoginUserHolder.getUserId());
+        unloadAddress.setSort(NumberConstant.ZERO);
+        unloadAddress.setCreateBy(orderDTO.getUserId());
         unloadAddress.setCreateTime(date1);
-        unloadAddress.setUpdateBy(LoginUserHolder.getUserId());
+        unloadAddress.setUpdateBy(orderDTO.getUserId());
         unloadAddress.setUpdateTime(date1);
         saveAddressList.add(unloadAddress);
     }
@@ -3357,7 +3360,7 @@ public class KwtAcceptCarriageOrderService {
     private static void setLogisticOrderInfo(AddLogisticOrderDTO orderDTO, LogisticData x, Long lOrderId, String lOrderNo, List<KwtLogisticsOrder> saveLogisticsOrderList) {
         KwtLogisticsOrder kwtLogisticsOrder = new KwtLogisticsOrder();
         kwtLogisticsOrder.setId(lOrderId);
-        kwtLogisticsOrder.setEntId(LoginUserHolder.getEntId());
+        kwtLogisticsOrder.setEntId(orderDTO.getEntId());
         kwtLogisticsOrder.setType(String.valueOf(x.getType()));
         kwtLogisticsOrder.setTOrderId(orderDTO.getTradeOrderId());
         kwtLogisticsOrder.setTOrderNo(orderDTO.getTradeOrderNo());
@@ -3390,10 +3393,10 @@ public class KwtAcceptCarriageOrderService {
         kwtLogisticsOrder.setPayment(x.getPayment());
         kwtLogisticsOrder.setRemark(x.getRemark());
         kwtLogisticsOrder.setStatus(LogisticsOrderV1Enum.PENDING_ORDER.getCode());
-        kwtLogisticsOrder.setCreateBy(LoginUserHolder.getUserId());
+        kwtLogisticsOrder.setCreateBy(orderDTO.getUserId());
         Date date = new Date();
         kwtLogisticsOrder.setCreateTime(date);
-        kwtLogisticsOrder.setUpdateBy(LoginUserHolder.getUserId());
+        kwtLogisticsOrder.setUpdateBy(orderDTO.getUserId());
         kwtLogisticsOrder.setUpdateTime(date);
         kwtLogisticsOrder.setBindStatus(String.valueOf(NumberConstant.ZERO));
         saveLogisticsOrderList.add(kwtLogisticsOrder);

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;
     }
 
@@ -3662,6 +3662,7 @@ public class KwtWaybillOrderV1Service {
 
         statisticsWaybillResp.setTotalNum("0");
         List<CarWaybillV1Enum> carWaybillV1Enums = Arrays.stream(CarWaybillV1Enum.values())
+                .filter(x -> !Objects.equals(x.getCode(), CarWaybillV1Enum.WEIGHT_TRAFFIC.getCode()))
                 .sorted(Comparator.comparing(CarWaybillV1Enum::getCode))
                 .collect(Collectors.toList());
 
@@ -3741,30 +3742,6 @@ public class KwtWaybillOrderV1Service {
             return new WaybillOrderNodeVo();
         }
 
-        // 查询运单子单信息，用于获取商品名称和重量
-        Set<Long> subtaskIds = nodes.stream()
-                .map(KwtWaybillOrderNode::getWSubtaskId)
-                .collect(Collectors.toSet());
-        List<KwtWaybillOrderSubtask> subtasks = kwtWaybillOrderSubtaskRepository.listByIds(subtaskIds);
-        Map<Long, KwtWaybillOrderSubtask> subtaskMap = subtasks.stream()
-                .collect(Collectors.toMap(KwtWaybillOrderSubtask::getId, Function.identity()));
-
-        // 查询物流订单商品信息
-        Set<Long> logisticsOrderIds = subtasks.stream()
-                .map(KwtWaybillOrderSubtask::getLOrderId)
-                .collect(Collectors.toSet());
-        List<KwtLogisticsOrderGoods> goodsList = kwtLogisticsOrderGoodsRepository.queryByLogOrderIds(
-                new ArrayList<>(logisticsOrderIds));
-        Map<Long, KwtLogisticsOrderGoods> goodsMap = goodsList.stream()
-                .collect(Collectors.toMap(KwtLogisticsOrderGoods::getLOrderId, Function.identity(), (k1, k2) -> k1));
-
-
-        // 单位字典
-//        Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(
-//                List.of(DictTypeEnum.UNIT_TYPE.getType()));
-//        Map<String, String> unitMap = CollectionUtils.isNotEmpty(dict) ?
-//                dict.get(DictTypeEnum.UNIT_TYPE.getType()) : new HashMap<>(NumberConstant.SIXTEEN);
-
         // 转换为VO对象
         WaybillOrderNodeVo waybillOrderNodeVo = new WaybillOrderNodeVo();
         //获取时间线
@@ -3810,7 +3787,7 @@ public class KwtWaybillOrderV1Service {
     @NotNull
     private static List<WaybillOrderNodeVo.WaybillOrderNode> getWaybillOrderNodes(List<WaybillOrderNodeVo.Timeline> voList) {
         Map<Integer, List<WaybillOrderNodeVo.Timeline>> statusAndTimelineMap = voList.stream()
-                .filter(t ->!Arrays.asList(CarWaybillV1Enum.WAIT_UNLOADING.getCode(),CarWaybillV1Enum.APPROVAL_TREAT.getCode(), CarWaybillV1Enum.COMPLETION_UNLOADING.getCode()).contains(t.getOrderStatus()))
+                .filter(t ->!Arrays.asList(CarWaybillV1Enum.WEIGHT_TRAFFIC.getCode(),CarWaybillV1Enum.WAIT_UNLOADING.getCode(),CarWaybillV1Enum.APPROVAL_TREAT.getCode(), CarWaybillV1Enum.COMPLETION_UNLOADING.getCode()).contains(t.getOrderStatus()))
                 .sorted(Comparator.comparing(WaybillOrderNodeVo.Timeline::getCreateTime))
                 .collect(Collectors.groupingBy(WaybillOrderNodeVo.Timeline::getOrderStatus));
         List<WaybillOrderNodeVo.WaybillOrderNode> nodeList = Lists.newArrayList();