fix:修改模具组接口

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;

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;

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);

yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/mold/MoldOperateQueryMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="cn.iocoder.yudao.module.erp.dal.mysql.mold.MoldOperateQueryMapper">
 
     <select id="selectByMoldIds" resultType="cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldOperateSimpleDO">
-        SELECT id, operate_type, mold_id, device_name, operate_time
+        SELECT id, operate_type, mold_id, device_id,device_name, operate_time
         FROM mes_mold_operate
         WHERE deleted = 0
         <if test="moldIds != null and moldIds.size() > 0">