diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerSaveReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerSaveReqVO.java index 949a30bbc..f79e1cc15 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerSaveReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerSaveReqVO.java @@ -41,6 +41,9 @@ public class DeviceLedgerSaveReqVO { @Schema(description = "设备类型", example = "1") private String deviceType; + @Schema(description = "设备类型名称", example = "测试ID13") + private String typeName; + @Schema(description = "设备产线", example = "1") private Long deviceLine; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/deviceledger/DeviceLedgerDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/deviceledger/DeviceLedgerDO.java index b700ea3c7..3052c5c6a 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/deviceledger/DeviceLedgerDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/deviceledger/DeviceLedgerDO.java @@ -145,7 +145,6 @@ public class DeviceLedgerDO extends BaseDO { /** * 类型名称 */ - @TableField(exist = false) private String typeName; /** diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java index 5f3bbc3b3..2ae23f398 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java @@ -498,12 +498,11 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService { .collect(Collectors.toMap(DeviceLineDO::getId, Function.identity(), (a, b) -> a)); PageResult deviceLedgerDOPageResult = deviceLedgerMapper.selectPage(pageReqVO); for (DeviceLedgerDO deviceLedgerDO : deviceLedgerDOPageResult.getList()) { - if (deviceLedgerDO.getDeviceType()!=null){ - DeviceTypeDO deviceTypeDO = deviceTypeMapper.selectById(deviceLedgerDO.getDeviceType()); - deviceLedgerDO.setTypeName(deviceTypeDO.getName()); - } - if(deviceLedgerDO.getDeviceLine()!=null&&CollUtil.isNotEmpty(collect.get(deviceLedgerDO.getDeviceLine().longValue()))){ - deviceLedgerDO.setWorkshopName(collect.get(deviceLedgerDO.getDeviceLine().longValue()).get(0).getName()); + if(deviceLedgerDO.getDeviceLine()!=null){ + List deviceLines = collect.get(deviceLedgerDO.getDeviceLine()); + if(CollUtil.isNotEmpty(deviceLines)){ + deviceLedgerDO.setWorkshopName(deviceLines.get(0).getName()); + } } fillTopCategoryInfo(deviceLedgerDO, deviceLineMap); }