|
@@ -1838,11 +1838,11 @@ public class KwfTruckService {
|
|
|
KwfTruckVo truckVo = new KwfTruckVo();
|
|
KwfTruckVo truckVo = new KwfTruckVo();
|
|
|
truckVo.setId(String.valueOf(truck.getId()));
|
|
truckVo.setId(String.valueOf(truck.getId()));
|
|
|
truckVo.setTruckNo(truck.getTruckNo());
|
|
truckVo.setTruckNo(truck.getTruckNo());
|
|
|
- truckVo.setActualWeight(truck.getActualWeight() != null ? String.valueOf(truck.getActualWeight()) : null);
|
|
|
|
|
if (StringUtils.isNotBlank(truck.getCarAxis())) {
|
|
if (StringUtils.isNotBlank(truck.getCarAxis())) {
|
|
|
- TmsTruckAxleNum axleNum = truckAxleNumRepository.getOneById(Integer.valueOf(truck.getCarAxis()));
|
|
|
|
|
|
|
+ TmsTruckAxleNum carAxisInfo = getCarAxisInfo(truck.getCarAxis());
|
|
|
truckVo.setCarAxisId(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);
|
|
truckVoList.add(truckVo);
|
|
|
}
|
|
}
|