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

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

@@ -109,6 +109,13 @@ public class WaybillOrderDetailResp implements Serializable {
      */
     @Schema(description = "任务量")
     private String taskVolume;
+
+    /**
+     * 装货量（不带单位）
+     */
+    @Schema(description = "（不带单位）")
+    private BigDecimal loadingNetWeight;
+
     /**
      * 装货量
      */

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

@@ -4664,7 +4664,8 @@ public class KwtWaybillOrderV1Service {
         resp.setLoadLongitude(loadAdd.getLng());
         resp.setUnloadLatitude(unLoadAdd.getLat());
         resp.setUnloadLongitude(unLoadAdd.getLng());
-
+        //装货净重
+        resp.setLoadingNetWeight(subtask.getLoadAmount());
         // 数量信息
         String unit = subtask.getUnit();
         resp.setTaskVolume(formatAmount(subtask.getEntrustAmount()) + unit);

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

@@ -735,8 +735,7 @@ public class TradeOrderTransportInfoService {
         log.debug("开始查询车辆轴数，truckNo:{}", truckNo);
         try {
             BaseResult<Map<String, Object>> result = fleetTruckFeignService.truckDetail(Map.of("truckNo", truckNo));
-
-            if (Objects.isNull(result) || !result.isSuccess() || Objects.isNull(result.getData())) {
+            if (Objects.isNull(result) || !Objects.equals(result.getCode(),HttpStatus.SUCCESS_CODE)|| Objects.isNull(result.getData())) {
                 log.warn("查询车辆轴数失败：远程服务返回异常或数据为空，truckNo:{}, resultCode:{}, dataType:{}",
                         truckNo,
                         Objects.nonNull(result) ? result.getCode() : "N/A",
@@ -746,7 +745,7 @@ public class TradeOrderTransportInfoService {
                 return null;
             }
 
-            Object carAxis = result.getData().get("carAxis");
+            Object carAxis = result.getData().get("carAxisName");
             if (Objects.nonNull(carAxis)) {
                 String axleStr = String.valueOf(carAxis);
                 log.debug("成功查询到车辆轴数，truckNo:{}, axle:{}", truckNo, axleStr);

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

@@ -1295,6 +1295,9 @@ public class WaybillOrderService {
         }
         param.setWaybillOrderId(wbOrderByTruckNo.get(0).getId());
 
+        //mock
+        param.setWeighbridgeName("测试名称");
+        param.setWeighUrl("chengdu.aliyuncs.com/kll/uploads/20251126/792a668bf5034ddc24d7a3dbe4ca88bf1764125000057.png");
         comeIntoHandler.handler(param);
     }