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

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

@@ -3535,11 +3535,13 @@ public class KwtLogisticsConsignmentService {
         BigDecimal totalAmount = BigDecimal.ZERO;
         if (Objects.equals(logisticsOrder.getOrderType(), 1)){
             log.info("物流单类型为1,原矿转运");
+            BigDecimal orderAmount1 = Objects.nonNull(logisticsOrder.getAmount()) ? logisticsOrder.getAmount() : BigDecimal.ZERO;
+            performanceInfoVO.setOrderAmount(orderAmount1.setScale(2, RoundingMode.HALF_UP).toPlainString() + "吨");
             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() + "吨");
-            BigDecimal surplusAmount = tradeAmount.subtract(orderAmount.add(unloadAmount)).compareTo(BigDecimal.ZERO) <= 0 ? BigDecimal.ZERO : tradeAmount.subtract(orderAmount.add(unloadAmount));
+            BigDecimal surplusAmount = orderAmount1.subtract(orderAmount.add(unloadAmount)).compareTo(BigDecimal.ZERO) <= 0 ? BigDecimal.ZERO : tradeAmount.subtract(orderAmount.add(unloadAmount));
             performanceInfoVO.setSurplusAmount(surplusAmount.setScale(2, RoundingMode.HALF_UP).toPlainString() + "吨");
         }else {
             log.info("物流单类型不为1,普通物流");
@@ -3818,6 +3820,11 @@ public class KwtLogisticsConsignmentService {
                 .map(KwtLogisticsOrder::getUnit).orElse("");
         capacityVo.setStatus("0");
         capacityVo.setStatusDesc("待接单");
+        KwtLogisticsOrder kwtLogisticsOrder = Optional.ofNullable(logisticsOrders).map(x -> x.get(0)).orElse(new KwtLogisticsOrder());
+        if (Objects.equals(kwtLogisticsOrder.getOrderType(), 1)){
+            log.info("物流单类型为1,原矿转运");
+            unit = "吨";
+        }
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(waybillOrders)) {
             List<KwtWaybillOrder> waybillOrderList = Optional.ofNullable(waybillOrders).orElse(List.of())
                     .stream()

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

@@ -4227,6 +4227,8 @@ public class KwtWaybillOrderV1Service {
                     contractGoodsDto.getPrice().multiply(record.getUnloadAmount()) : BigDecimal.ZERO;
             waybillOrderResp.setActualPrice(actualPrice.setScale(2, RoundingMode.HALF_UP).toPlainString());
             waybillOrderResp.setActualGoodsPrice(actualGoodsPrice.setScale(2, RoundingMode.HALF_UP).toPlainString());
+            waybillOrderResp.setUnloadingNetWeight((Objects.nonNull(record.getUnloadAmount()) ?
+                    record.getUnloadAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00")+"吨");
         } else {
             log.info("普通订单，计算运费{}", record.getWOrderNo());
             if (org.apache.commons.lang3.StringUtils.equals(logOrder.getBillingMode(), DictEnum.CHARGING_TYPE_1.getValue())){