Explorar o código

修改车库核定载重

donglang hai 5 meses
pai
achega
1c3e72d063

+ 3 - 3
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -1838,11 +1838,11 @@ public class KwfTruckService {
             KwfTruckVo truckVo = new KwfTruckVo();
             truckVo.setId(String.valueOf(truck.getId()));
             truckVo.setTruckNo(truck.getTruckNo());
-            truckVo.setActualWeight(truck.getActualWeight() != null ? String.valueOf(truck.getActualWeight()) : null);
             if (StringUtils.isNotBlank(truck.getCarAxis())) {
-                TmsTruckAxleNum axleNum = truckAxleNumRepository.getOneById(Integer.valueOf(truck.getCarAxis()));
+                TmsTruckAxleNum carAxisInfo = getCarAxisInfo(truck.getCarAxis());
                 truckVo.setCarAxisId(truck.getCarAxis());
-                truckVo.setCarAxis(axleNum.getName());
+                truckVo.setCarAxis(carAxisInfo.getName());
+                truckVo.setActualWeight(carAxisInfo.getLegalLoad() != null ? String.valueOf(carAxisInfo.getLegalLoad()) : "0.00");
             }
             truckVoList.add(truckVo);
         }