提交解绑车辆bug

sckw-modules-api/sckw-fleet-api/src/main/java/com/sckw/fleet/api/RemoteFleetService.java

@@ -117,7 +117,7 @@ public interface RemoteFleetService {
 
     void updateTruckTareAmount(RTruckVo truckNo);
 
-    RFleetVo findFleetByTruckId(Long truckId, Long entId);
+    RFleetVo findFleetByTruckId(Long truckId);
 
     TruckDispatchCoefficientVO findAutoTruckDispatchByEntId(Long entId);
 

sckw-modules-api/sckw-product-api/src/main/java/com/sckw/product/api/model/KwpGoods.java

@@ -125,4 +125,5 @@ public class KwpGoods extends BaseModel implements Serializable {
      */
     private String carAxis;
 
+    private String priceUnit;
 }

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

@@ -251,7 +251,9 @@ public class AddLogisticOrderParam implements Serializable {
      */
     @NotNull(message = "平台实际派车数")
     private Integer actualDisPatch;
-
-
+    /**
+     * 商品单位
+     */
+    private String goodsUnit;
 
 }

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

@@ -1405,7 +1405,7 @@ public class KwcContractTradeService {
             updateKwcContractTrade.setStatus(ContractStatusEnum.CANNEL.getCode());
         }
         //手动完结 如果当前的状态是已经签约，订单变成已完结
-        if (Objects.equals(req.getStatus(), ContractStatusEnum.CANNEL.getCode()) && Objects.equals(kwcContractTrade.getStatus(),
+        if (Objects.equals(req.getStatus(), ContractStatusEnum.COMPLETE.getCode()) && Objects.equals(kwcContractTrade.getStatus(),
                 ContractStatusEnum.SIGNED.getCode())) {
             updateKwcContractTrade.setStatus(ContractStatusEnum.COMPLETE.getCode());
         }

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

@@ -486,8 +486,8 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
     }
 
     @Override
-    public RFleetVo findFleetByTruckId(Long truckId, Long entId) {
-        KwfFleetTruck fleetByTruckId = kwfFleetTruckRepository.findFleetByTruckId(truckId, entId);
+    public RFleetVo findFleetByTruckId(Long truckId) {
+        KwfFleetTruck fleetByTruckId = kwfFleetTruckRepository.findFleetByTruckId(truckId);
         if(Objects.isNull(fleetByTruckId)){
             return new RFleetVo();
         }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/repository/KwfFleetTruckRepository.java

@@ -36,11 +36,10 @@ public class KwfFleetTruckRepository extends ServiceImpl<KwfFleetTruckMapper, Kw
                 in(KwfFleetTruck::getTruckId, truckIds));
     }
 
-    public KwfFleetTruck findFleetByTruckId(Long truckId, Long entId) {
+    public KwfFleetTruck findFleetByTruckId(Long truckId) {
         return getOne(Wrappers.<KwfFleetTruck>lambdaQuery()
                 .eq(BaseModel::getDelFlag,0)
                 .eq(KwfFleetTruck::getTruckId, truckId)
-                .eq(KwfFleetTruck::getEntId,entId)
                 .orderByDesc(BaseModel::getId)
                 .last("limit 1"));
     }

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

@@ -257,7 +257,7 @@ public class KwfTruckRouteService {
 
     private void saveTruckRote(QueryTruckRouteByDriverReq req) {
         RWaybillOrderVo rWaybillOrderVo = transportRemoteService.queryWaybillOrderByWayBillOrderId(req.getWayBillOrderId());
-        KwfFleetTruck kwfFleetTruck = fleetTruckRepository.findFleetByTruckId(rWaybillOrderVo.getTruckId(),LoginUserHolder.getEntId());
+        KwfFleetTruck kwfFleetTruck = fleetTruckRepository.findFleetByTruckId(rWaybillOrderVo.getTruckId());
         // 在查询惯用路线之前，调用高德API生成装货地址和卸货地址之间的20个轨迹点位
         LocUtils.RouteResult routeResult = generateRoutePointsWithDuration(rWaybillOrderVo);
         KwfTruckRoute kwfTruckRoute = new KwfTruckRoute();

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

@@ -1302,6 +1302,7 @@ public class TransportServiceImpl implements TransportRemoteService {
         addLogisticOrderDTO.setEndTime(param.getEndTime());
         addLogisticOrderDTO.setDispatchWay(param.getDispatchWay());
         addLogisticOrderDTO.setActualDisPatch(param.getActualDisPatch());
+        addLogisticOrderDTO.setGoodsUnit(param.getGoodsUnit());
         return addLogisticOrderDTO;
     }
 

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

@@ -248,4 +248,8 @@ public class AddLogisticOrderDTO implements Serializable {
      */
     @NotNull(message = "平台实际派车数")
     private Integer actualDisPatch;
+    /**
+     * 商品单位
+     */
+    private String goodsUnit;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillOrderNodeVo.java

@@ -109,6 +109,11 @@ public class WaybillOrderNodeVo implements Serializable {
          */
         @Schema(description = "过磅图片路径")
         private String imageUrl;
+        /**
+         * 卸货凭证
+         */
+        @Schema(description = "卸货凭证")
+        private String credential;
 
     }
     @Data

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

@@ -3602,7 +3602,7 @@ public class KwtAcceptCarriageOrderService {
         kwtLogisticsOrder.setPrice(x.getPrice());
         kwtLogisticsOrder.setPriceType(x.getPriceType());
         kwtLogisticsOrder.setAmount(x.getAmount());
-        kwtLogisticsOrder.setUnit(x.getAmountUnit());
+        kwtLogisticsOrder.setUnit(orderDTO.getGoodsUnit());
         kwtLogisticsOrder.setLoss(x.getLoss() == null ? null : x.getLoss());
         kwtLogisticsOrder.setLossUnit(x.getLossUnit());
         kwtLogisticsOrder.setGoodsPrice(orderDTO.getGoodsPrice());

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

@@ -2453,19 +2453,20 @@ public class KwtLogisticsConsignmentService {
 
         KwtLogisticsOrderGoods goods = finalLogIdAndGoodsMap.getOrDefault(kwtLogisticsOrder.getId(), new KwtLogisticsOrderGoods());
         KwpGoods kwpGoods = finalGoodsIdAndGoodsMap.get(goods.getGoodsId());
+        String  priceUnit = kwpGoods.getPriceUnit();
         if (Objects.nonNull(kwpGoods)){
             logisticsOrderResp.setGoodsId(String.valueOf(goods.getGoodsId()));
             SysDictResDto dictResDto = dictValueAndDictResDtoMap.getOrDefault(kwpGoods.getGoodsType(), new SysDictResDto());
             logisticsOrderResp.setGoodsName(kwpGoods.getName()+"/"+dictResDto.getLabel()+"/"+kwpGoods.getSpec());
         }
         logisticsOrderResp.setTransportPrice(Objects.nonNull(kwtLogisticsOrder.getPrice()) ? kwtLogisticsOrder.getPrice().setScale(2,
-                RoundingMode.HALF_UP).toPlainString() : "0.00");
+                RoundingMode.HALF_UP).toPlainString() : "0.00" + priceUnit);
         logisticsOrderResp.setChargeType(kwtLogisticsOrder.getBillingMode());
         logisticsOrderResp.setChargeTypeDesc(DictEnum.getLabel(DictTypeEnum.CHARGING_TYPE.getType(),
                 String.valueOf(kwtLogisticsOrder.getBillingMode())));
         OrderDetailVo orderDetailVo = tradeIdAndOrderDetailVoMap.getOrDefault(kwtLogisticsOrder.getTOrderId(), new OrderDetailVo());
         logisticsOrderResp.setAmount(Objects.nonNull(orderDetailVo.getAmount()) ?
-                orderDetailVo.getAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00");
+                orderDetailVo.getAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00"+kwtLogisticsOrder.getUnit());
 
         BigDecimal expectedTransportPrice =
                 Objects.nonNull(kwtLogisticsOrder.getPrice()) && Objects.nonNull(orderDetailVo.getAmount()) ?
@@ -2473,12 +2474,12 @@ public class KwtLogisticsConsignmentService {
         BigDecimal actualTransportPrice = Objects.nonNull(kwtLogisticsOrder.getPrice()) && Objects.nonNull(kwtLogisticsOrder.getUnloadAmount()) ?
                 kwtLogisticsOrder.getPrice().multiply(kwtLogisticsOrder.getUnloadAmount()) : BigDecimal.ZERO;
 
-        logisticsOrderResp.setExpectedTransportPrice(expectedTransportPrice.setScale(2,RoundingMode.HALF_UP).toPlainString());
-        logisticsOrderResp.setActualTransportPrice(actualTransportPrice.setScale(2,RoundingMode.HALF_UP).toPlainString());
+        logisticsOrderResp.setExpectedTransportPrice(expectedTransportPrice.setScale(2,RoundingMode.HALF_UP).toPlainString()+priceUnit);
+        logisticsOrderResp.setActualTransportPrice(actualTransportPrice.setScale(2,RoundingMode.HALF_UP).toPlainString()+priceUnit);
         logisticsOrderResp.setLoadAmount(Objects.nonNull(kwtLogisticsOrder.getLoadAmount()) ?
-                kwtLogisticsOrder.getLoadAmount().setScale(2,RoundingMode.HALF_UP).toPlainString() : "0.00");
+                kwtLogisticsOrder.getLoadAmount().setScale(2,RoundingMode.HALF_UP).toPlainString() : "0.00"+kwtLogisticsOrder.getUnit());
         logisticsOrderResp.setUnloadAmount(Objects.nonNull(kwtLogisticsOrder.getUnloadAmount()) ?
-                kwtLogisticsOrder.getUnloadAmount().setScale(2,RoundingMode.HALF_UP).toPlainString() : "0.00");
+                kwtLogisticsOrder.getUnloadAmount().setScale(2,RoundingMode.HALF_UP).toPlainString() : "0.00"+kwtLogisticsOrder.getUnit());
 
         KwtLogisticsOrderAddress loadAdd = finalLogisticsOrderIdAndUnitTypeKeyAndAddressMap.getOrDefault(kwtLogisticsOrder.getId() + "-" + AddressTypeEnum.SHIPMENT.getCode(), new KwtLogisticsOrderAddress());
         logisticsOrderResp.setLoadAddress(loadAdd.getCityName()+loadAdd.getDetailAddress());
@@ -2574,7 +2575,7 @@ public class KwtLogisticsConsignmentService {
         setAddressInfo(logOrderIdAndUnitTypeKeyAndAddressMap, logisticsOrder, logisticsOrderDetailResp);
 
         //设置履约信息
-        setPerformInfo(logisticsOrder, waybillOrderSubtasks, logisticsOrderDetailResp,logOrderList, orderDetailVo);
+        setPerformInfo(logisticsOrder, waybillOrderSubtasks, logisticsOrderDetailResp,logOrderList, orderDetailVo,kwpGoods);
 
         //设置物流信息
         setLogisticInfo(logisticsOrder,logisticsOrderDetailResp);
@@ -2595,7 +2596,7 @@ public class KwtLogisticsConsignmentService {
                                        List<KwtWaybillOrderSubtask> waybillOrderSubtasks,
                                        LogisticsOrderDetailResp logisticsOrderDetailResp,
                                        List<KwtLogisticsOrder> logOrderList,
-                                       OrderDetailVo orderDetailVo) {
+                                       OrderDetailVo orderDetailVo,KwpGoods kwpGoods) {
         LogisticsOrderDetailResp.PerformanceInfoVO performanceInfoVO = new LogisticsOrderDetailResp.PerformanceInfoVO();
         performanceInfoVO.setBillingMode(logisticsOrder.getBillingMode());
         performanceInfoVO.setBillingModeDesc(DictEnum.getLabel(DictTypeEnum.CHARGING_TYPE.getType(),
@@ -2608,7 +2609,7 @@ public class KwtLogisticsConsignmentService {
                 .map(KwtWaybillOrderSubtask::getEntrustAmount)
                 .filter(x -> Objects.nonNull(x))
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
-        performanceInfoVO.setOrderAmount(orderAmount.setScale(2,RoundingMode.HALF_UP).toPlainString());
+        performanceInfoVO.setOrderAmount(orderAmount.setScale(2,RoundingMode.HALF_UP).toPlainString()+logisticsOrder.getUnit());
         BigDecimal loadAmount = BigDecimal.ZERO;
         BigDecimal unloadAmount = BigDecimal.ZERO;
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(waybillOrderSubtasks)){
@@ -2629,20 +2630,21 @@ public class KwtLogisticsConsignmentService {
                 DictEnum.CHARGING_TYPE_1.getValue())){
             totalCarriageCost = Objects.nonNull(logisticsOrder.getPrice()) ? loadAmount.multiply(logisticsOrder.getPrice()) :
                     BigDecimal.ZERO;
-            performanceInfoVO.setLoadAmount(loadAmount.setScale(2,RoundingMode.HALF_UP).toPlainString());
+            performanceInfoVO.setLoadAmount(loadAmount.setScale(2,RoundingMode.HALF_UP).toPlainString()+logisticsOrder.getUnit());
             performanceInfoVO.setUnloadAmount("-");
         }else if (org.apache.commons.lang3.StringUtils.equals(logisticsOrder.getBillingMode(),
                 DictEnum.CHARGING_TYPE_2.getValue())){
             totalCarriageCost = Objects.nonNull(logisticsOrder.getPrice()) ? unloadAmount.multiply(logisticsOrder.getPrice()) :
                     BigDecimal.ZERO;
-            performanceInfoVO.setLoadAmount(loadAmount.setScale(2,RoundingMode.HALF_UP).toPlainString());
-            performanceInfoVO.setUnloadAmount(unloadAmount.setScale(2,RoundingMode.HALF_UP).toPlainString());
+            performanceInfoVO.setLoadAmount(loadAmount.setScale(2,RoundingMode.HALF_UP).toPlainString()+logisticsOrder.getUnit());
+            performanceInfoVO.setUnloadAmount(unloadAmount.setScale(2,RoundingMode.HALF_UP).toPlainString()+logisticsOrder.getUnit());
         }
-        performanceInfoVO.setTotalCarriageCost(totalCarriageCost.setScale(2,RoundingMode.HALF_UP).toPlainString());
+        String priceUnit = Optional.ofNullable(kwpGoods).map(KwpGoods::getPriceUnit).orElse("");
+        performanceInfoVO.setTotalCarriageCost(totalCarriageCost.setScale(2,RoundingMode.HALF_UP).toPlainString()+priceUnit);
         BigDecimal tradeAmount = Optional.ofNullable(orderDetailVo).map(OrderDetailVo::getAmount).orElse(BigDecimal.ZERO);
        // BigDecimal totalAmount = getTotalAmount(logOrderList);
         BigDecimal surplusAmount = tradeAmount.subtract(orderAmount.add(unloadAmount));
-        performanceInfoVO.setSurplusAmount(surplusAmount.setScale(2,RoundingMode.HALF_UP).toPlainString());
+        performanceInfoVO.setSurplusAmount(surplusAmount.setScale(2,RoundingMode.HALF_UP).toPlainString()+logisticsOrder.getUnit());
 
         logisticsOrderDetailResp.setPerformanceInfoVO(performanceInfoVO);
     }
@@ -2711,15 +2713,16 @@ public class KwtLogisticsConsignmentService {
                                      LogisticsOrderDetailResp logisticsOrderDetailResp,
                                      OrderDetailVo orderDetailVo) {
         LogisticsOrderDetailResp.GoodsInfoVO goodsInfoVO = new LogisticsOrderDetailResp.GoodsInfoVO();
+        String priceUnit = "";
         if (Objects.nonNull(kwpGoods)){
             goodsInfoVO.setGoodsName(kwpGoods.getName());
-
+            priceUnit = kwpGoods.getPriceUnit();
         }
-        goodsInfoVO.setUnitPrice(Objects.nonNull(logisticsOrder.getPrice())? logisticsOrder.getPrice().setScale(2,RoundingMode.HALF_UP).toPlainString() : "0.00");
-        goodsInfoVO.setOrderAmount(Objects.nonNull(orderDetailVo.getAmount()) ? orderDetailVo.getAmount().setScale(2,RoundingMode.HALF_UP).toPlainString() : "0.00");
+        goodsInfoVO.setUnitPrice(Objects.nonNull(logisticsOrder.getPrice())? logisticsOrder.getPrice().setScale(2,RoundingMode.HALF_UP).toPlainString() : "0.00"+logisticsOrder.getUnit());
+        goodsInfoVO.setOrderAmount(Objects.nonNull(orderDetailVo.getAmount()) ? orderDetailVo.getAmount().setScale(2,RoundingMode.HALF_UP).toPlainString() : "0.00"+orderDetailVo.getUnit());
         BigDecimal carriageCost = Objects.nonNull(orderDetailVo.getAmount()) && Objects.nonNull(logisticsOrder.getPrice()) ?
                 orderDetailVo.getAmount().multiply(logisticsOrder.getPrice()) : BigDecimal.ZERO;
-        goodsInfoVO.setCarriageCost(carriageCost.setScale(2,RoundingMode.HALF_UP).toPlainString());
+        goodsInfoVO.setCarriageCost(carriageCost.setScale(2,RoundingMode.HALF_UP).toPlainString()+priceUnit);
         logisticsOrderDetailResp.setGoodsInfoVO(goodsInfoVO);
     }
 
@@ -2832,6 +2835,14 @@ public class KwtLogisticsConsignmentService {
                 .map(KwtLogisticsOrderCirculate::getTruckId)
                 .distinct()
                 .collect(Collectors.toList());
+        List<Long> logisticsOrderIds = records.stream()
+                .map(KwtLogisticsOrderCirculate::getLOrderId)
+                .distinct()
+                .collect(Collectors.toList());
+        List<KwtLogisticsOrder> logisticsOrders = Lists.newArrayList();
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(logisticsOrderIds)){
+            logisticsOrders = logisticsOrderRepository.queryByLogisticsOrderIds(logisticsOrderIds);
+        }
         List<RTruckVo> truckByTruckIds = remoteFleetService.findTruckByTruckIds(truckIds);
         Map<Long, RTruckVo> truckIdAndTruckMap = Maps.newHashMap();
         if (CollectionUtils.isNotEmpty(truckByTruckIds)){
@@ -2860,8 +2871,9 @@ public class KwtLogisticsConsignmentService {
 
         Map<Long, RTruckVo> finalTruckIdAndTruckMap = truckIdAndTruckMap;
         Map<Long, List<KwtWaybillOrder>> finalBillOrderIdAndWaybillOrderMap = billOrderIdAndWaybillOrderMap;
+        List<KwtLogisticsOrder> finalLogisticsOrders = logisticsOrders;
         List<CapacityVo> capacityVos = records.stream()
-                .map(t -> getCapacityVo(t, finalTruckIdAndTruckMap, finalBillOrderIdAndWaybillOrderMap,waybillOrderSubtasks))
+                .map(t -> getCapacityVo(t, finalTruckIdAndTruckMap, finalBillOrderIdAndWaybillOrderMap,waybillOrderSubtasks, finalLogisticsOrders))
                 .collect(Collectors.toList());
         return PageDataResult.of(page, capacityVos);
 
@@ -2870,7 +2882,8 @@ public class KwtLogisticsConsignmentService {
     @NotNull
     private static CapacityVo getCapacityVo(KwtLogisticsOrderCirculate t, Map<Long, RTruckVo> finalTruckIdAndTruckMap,
                                             Map<Long, List<KwtWaybillOrder>> finalBillOrderIdAndWaybillOrderMap,
-                                            List<KwtWaybillOrderSubtask> waybillOrderSubtasks) {
+                                            List<KwtWaybillOrderSubtask> waybillOrderSubtasks,
+                                            List<KwtLogisticsOrder> logisticsOrders) {
         CapacityVo capacityVo = new CapacityVo();
         capacityVo.setTruckId(String.valueOf(t.getTruckId()));
         capacityVo.setTruckNo(t.getTruckNo());
@@ -2878,6 +2891,10 @@ public class KwtLogisticsConsignmentService {
         capacityVo.setCarAxis(truckVo.getCarAxis());
         List<KwtWaybillOrder> waybillOrders = finalBillOrderIdAndWaybillOrderMap.get(t.getTruckId());
         capacityVo.setFinishWaybillCount("0");
+        BigDecimal loadAmount = BigDecimal.ZERO;
+        BigDecimal unloadAmount = BigDecimal.ZERO;
+        String unit = Optional.ofNullable(logisticsOrders).map(x -> x.get(0))
+                .map(KwtLogisticsOrder::getUnit).orElse("");
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(waybillOrders)){
             List<KwtWaybillOrder> waybillOrderList = Optional.ofNullable(waybillOrders).orElse(List.of())
                     .stream()
@@ -2895,18 +2912,17 @@ public class KwtLogisticsConsignmentService {
                     .stream()
                     .filter(x -> waybillOrderIds.contains(x.getWOrderId()))
                     .collect(Collectors.toList());
-            BigDecimal loadAmount = subtasks.stream()
+            loadAmount = subtasks.stream()
                     .filter(x -> Objects.nonNull(x.getLoadAmount()))
                     .map(KwtWaybillOrderSubtask::getLoadAmount)
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
-            BigDecimal unloadAmount = subtasks.stream()
+            unloadAmount = subtasks.stream()
                     .filter(x -> Objects.nonNull(x.getUnloadAmount()))
                     .map(KwtWaybillOrderSubtask::getUnloadAmount)
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
-            capacityVo.setLoadAmount(loadAmount.setScale(2,RoundingMode.HALF_UP).toPlainString());
-            capacityVo.setUnloadAmount(unloadAmount.setScale(2,RoundingMode.HALF_UP).toPlainString());
         }
-
+        capacityVo.setLoadAmount(loadAmount.setScale(2,RoundingMode.HALF_UP).toPlainString()+unit);
+        capacityVo.setUnloadAmount(unloadAmount.setScale(2,RoundingMode.HALF_UP).toPlainString()+unit);
         capacityVo.setDispatchStatus(String.valueOf(t.getStatus()));
         capacityVo.setDispatchStatusDesc(Objects.equals(t.getStatus(),0) ? "启用" : "关闭");
         return capacityVo;

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

@@ -3345,14 +3345,14 @@ public class KwtWaybillOrderV1Service {
             waybillOrderResp.setGoodsName(kwpGoods.getName()+"/"+sysDictResDto.getLabel()+"/"+kwpGoods.getSpec());
         }
         waybillOrderResp.setTaskNum(Objects.nonNull(record.getEntrustAmount()) ?
-                record.getEntrustAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00");
+                record.getEntrustAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00"+record.getUnit());
         waybillOrderResp.setLoadingNetWeight(Objects.nonNull(record.getLoadAmount()) ?
-                record.getLoadAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00");
+                record.getLoadAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00" +record.getUnit());
         KwtWaybillOrderAddress loadingAdd = finalSubOrderIdAddressTypeKeyAndAddressMap.getOrDefault(record.getId() + "-" + AddressTypeEnum.SHIPMENT.getCode(),
                 new KwtWaybillOrderAddress());
         waybillOrderResp.setLoadingAddress(loadingAdd.getDetailAddress());
         waybillOrderResp.setUnloadingNetWeight(Objects.nonNull(record.getUnloadAmount()) ?
-                record.getUnloadAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00");
+                record.getUnloadAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00"+record.getUnit());
         KwtWaybillOrderAddress unloadingAdd =
                 finalSubOrderIdAddressTypeKeyAndAddressMap.getOrDefault(record.getId() + "-" + AddressTypeEnum.SHIPMENT.getCode(),
                 new KwtWaybillOrderAddress());
@@ -3416,7 +3416,7 @@ public class KwtWaybillOrderV1Service {
 
         RFleetVo fleet = null;
         try {
-            fleet = remoteFleetService.findFleetByTruckId(billOrder.getTruckId(),LoginUserHolder.getEntId());
+            fleet = remoteFleetService.findFleetByTruckId(billOrder.getTruckId());
         } catch (Exception e) {
             log.info("查询车队信息异常：{}",  e.getMessage());
         }
@@ -4323,6 +4323,10 @@ public class KwtWaybillOrderV1Service {
             vo.setLat(node.getLat());
             vo.setHasWeighbridge(node.getWeighbridgeId() != null);
             vo.setImageUrl(node.getWeighUrl());
+            if (Objects.equals(node.getOrderStatus(), CarWaybillV1Enum.COMPLETION_LOADING.getCode())){
+                KwtWaybillOrderSubtask subtask = waybillOrderSubtaskRepository.queryByWOrderId(node.getWOrderId());
+                vo.setCredential(Optional.ofNullable(subtask).map(KwtWaybillOrderSubtask::getUnloadUrl).orElse(""));
+            }
 
             // 构建状态描述
             //KwtWaybillOrderSubtask subtask = subtaskMap.get(node.getWSubtaskId());

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

@@ -1469,7 +1469,7 @@ public class kwfTruckTraceService {
         }
         
         // 通过车牌ID查询所属车队信息
-        RFleetVo fleetByTruckId = fleetService.findFleetByTruckId(order.getTruckId(), order.getEntId());
+        RFleetVo fleetByTruckId = fleetService.findFleetByTruckId(order.getTruckId());
         
         // 查询物流订单信息
         KwtLogisticsOrder logisticsOrder = kwtLogisticsOrderRepository.queryByLogisticsOrderId(subOrders.getLOrderId());