From 341f1b9bd7dbf6c93b1306882cc5e6f7b44a5c32 Mon Sep 17 00:00:00 2001 From: zhongwenkai <3478244299@qq.com> Date: Thu, 16 Jul 2026 15:56:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E6=96=B0=E5=A2=9EtypeName=E5=AD=97=E6=AE=B5=E5=86=97=E4=BD=99?= =?UTF-8?q?=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/deviceledger/vo/DeviceLedgerSaveReqVO.java | 3 +++ .../dal/dataobject/deviceledger/DeviceLedgerDO.java | 1 - .../service/deviceledger/DeviceLedgerServiceImpl.java | 11 +++++------ 3 files changed, 8 insertions(+), 7 deletions(-) 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); }