diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/vo/MoldBrandRespVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/vo/MoldBrandRespVO.java index 28dcbfb90..7bd7a66f9 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/vo/MoldBrandRespVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/vo/MoldBrandRespVO.java @@ -57,6 +57,9 @@ public class MoldBrandRespVO { @ExcelProperty("当前位置") private String currentPosition; + @Schema(description = "设备id", requiredMode = Schema.RequiredMode.REQUIRED, example = "2336") + private Long deviceId; + @Schema(description = "当前设备", example = "") @ExcelProperty("当前设备") private String deviceName; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/mold/MoldOperateSimpleDO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/mold/MoldOperateSimpleDO.java index 4bab10c71..a288377ba 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/mold/MoldOperateSimpleDO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/mold/MoldOperateSimpleDO.java @@ -13,6 +13,8 @@ public class MoldOperateSimpleDO { private String moldId; + private Long deviceId; + private String deviceName; private LocalDateTime operateTime; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/mold/MoldBrandServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/mold/MoldBrandServiceImpl.java index 8d636edbf..cbd725a4e 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/mold/MoldBrandServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/mold/MoldBrandServiceImpl.java @@ -370,6 +370,7 @@ public class MoldBrandServiceImpl implements MoldBrandService { } if (Objects.equals(latestOperate.getOperateType(), "1") && item.getStatus().equals(MoldBrandStatusEnum.ON_MACHINE.getStatus())) { item.setDeviceName(latestOperate.getDeviceName()); + item.setDeviceId(latestOperate.getDeviceId()); return; } item.setDeviceName(null); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/mold/MoldOperateQueryMapper.xml b/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/mold/MoldOperateQueryMapper.xml index 7686ab819..c200ae2e5 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/mold/MoldOperateQueryMapper.xml +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/mold/MoldOperateQueryMapper.xml @@ -3,7 +3,7 @@