From 75b347940e058f0afe0cb564ed584d92dc73441f Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Thu, 27 Mar 2025 15:37:56 +0800
Subject: [PATCH] =?UTF-8?q?refactor(dms):=20=E5=BA=8F=E5=88=97=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=B1=BBSeq=E6=96=B0=E5=A2=9E6=E4=B8=AA=E5=B9=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9String=20getId(String=20type,String=20code)?=
 =?UTF-8?q?=EF=BC=8Cdms=E6=A8=A1=E5=9D=97=E6=96=B0=E5=A2=9E=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E7=B1=BB=E5=B9=B6=E5=9C=A8pom=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

— 将"物料"统一更正为"设备"
---
 .../dromara/common/core/utils/uuid/Seq.java   |  24 ++++++
 ruoyi-modules/hwmom-dms/pom.xml               |  14 ++++
 .../DmsBaseMachineInfoController.java         |  26 +++----
 .../DmsInspectProjectDeviceController.java    |  26 +++----
 .../dromara/dms/domain/BaseDeviceType.java    |   2 +-
 .../dromara/dms/domain/DmsBaseDeviceBom.java  |   2 +-
 .../dms/domain/DmsBaseDeviceDebugging.java    |   2 +-
 .../dms/domain/DmsBaseDeviceDepreciation.java |   2 +-
 .../dms/domain/DmsBaseDeviceFiles.java        |   2 +-
 .../dms/domain/DmsBaseDeviceInstall.java      |   2 +-
 .../dms/domain/DmsBaseDevicePurchase.java     |   2 +-
 .../dms/domain/DmsBaseDeviceSupplies.java     |   2 +-
 .../dms/domain/DmsBaseMachineInfo.java        |  14 ++--
 .../dromara/dms/domain/DmsBaseShutReason.java |   2 +-
 .../dms/domain/DmsBaseTransferInfo.java       |   2 +-
 .../dms/domain/DmsInspectProjectDevice.java   |   2 +-
 .../dms/domain/DmsInspectRouteDetail.java     |   2 +-
 .../dms/domain/DmsPlanMaintDetail.java        |   2 +-
 .../dromara/dms/domain/DmsRealtimeStatus.java |   2 +-
 .../dromara/dms/domain/DmsRecordShutDown.java |   2 +-
 .../dms/domain/bo/BaseDeviceTypeBo.java       |   4 +-
 .../dms/domain/bo/DmsBaseMachineInfoBo.java   |  18 ++---
 .../domain/bo/DmsInspectProjectDeviceBo.java  |   2 +-
 .../dms/domain/vo/BaseDeviceTypeVo.java       |   4 +-
 .../dms/domain/vo/DmsBaseDeviceBomVo.java     |   4 +-
 .../domain/vo/DmsBaseDeviceDebuggingVo.java   |   2 +-
 .../vo/DmsBaseDeviceDepreciationVo.java       |   4 +-
 .../dms/domain/vo/DmsBaseDeviceFilesVo.java   |   2 +-
 .../dms/domain/vo/DmsBaseDeviceInstallVo.java |   4 +-
 .../domain/vo/DmsBaseDevicePurchaseVo.java    |   4 +-
 .../domain/vo/DmsBaseDeviceSuppliesVo.java    |   2 +-
 .../dms/domain/vo/DmsBaseMachineInfoVo.java   |  26 +++----
 .../dms/domain/vo/DmsBaseShutReasonVo.java    |   2 +-
 .../dms/domain/vo/DmsBaseTransferInfoVo.java  |   4 +-
 .../domain/vo/DmsInspectProjectDeviceVo.java  |   2 +-
 .../domain/vo/DmsInspectRouteDetailVo.java    |   2 +-
 .../dms/domain/vo/DmsPlanMaintDetailVo.java   |   2 +-
 .../dms/domain/vo/DmsRealtimeStatusVo.java    |   2 +-
 .../dms/domain/vo/DmsRecordShutDownVo.java    |   2 +-
 .../dms/mapper/DmsBaseMachineInfoMapper.java  |   2 +-
 .../dms/mapper/DmsBaseMachineMapper.java      |   2 +-
 .../mapper/DmsInspectProjectDeviceMapper.java |   2 +-
 .../service/IDmsBaseMachineInfoService.java   |  24 +++---
 .../impl/DmsBaseMachineInfoServiceImpl.java   |  42 +++++-----
 .../impl/DmsBaseTransferInfoServiceImpl.java  |  32 ++++----
 .../DmsInspectProjectDeviceServiceImpl.java   |  24 +++---
 .../java/org/dromara/dms/utils/CronUtils.java |  63 +++++++++++++++
 .../dromara/dms/utils/TemplateExcelUtils.java |  73 ++++++++++++++++++
 .../{ => dms}/BaseDeviceCategoryMapper.xml    |   0
 .../mapper/{ => dms}/BaseDeviceTypeMapper.xml |   0
 .../hwmom-dms/src/main/resources/weixiu.xlsx  | Bin 0 -> 12714 bytes
 51 files changed, 334 insertions(+), 156 deletions(-)
 create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/utils/CronUtils.java
 create mode 100644 ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/utils/TemplateExcelUtils.java
 rename ruoyi-modules/hwmom-dms/src/main/resources/mapper/{ => dms}/BaseDeviceCategoryMapper.xml (100%)
 rename ruoyi-modules/hwmom-dms/src/main/resources/mapper/{ => dms}/BaseDeviceTypeMapper.xml (100%)
 create mode 100644 ruoyi-modules/hwmom-dms/src/main/resources/weixiu.xlsx

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/uuid/Seq.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/uuid/Seq.java
index 5b145c10..26f05f6f 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/uuid/Seq.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/uuid/Seq.java
@@ -34,6 +34,26 @@ public class Seq {
     // 计划编号标识
     public static final String mesPlanCodeCode = "PL";
 
+    // 润滑计划序列类型
+    public static final String dmsPlanLubeSeqType = "PLANLUBE";
+
+    // 润滑计划接口序列数
+    private static AtomicInteger dmsPlanLubeSeq = new AtomicInteger(1);
+
+    // 润滑记录标识
+    public static final String dmsPlanLubeCode = "PL";
+
+
+    // 润滑工单序列类型
+    public static final String dmsLubeInstanceSeqType = "LUBEINSTANCE";
+
+    // 润滑工单接口序列数
+    private static AtomicInteger dmsLubeInstanceSeq = new AtomicInteger(1);
+
+    // 润滑工单标识
+    public static final String dmsLubeInstanceCode = "LI";
+
+
     /**
      * 获取通用序列号
      *
@@ -98,6 +118,10 @@ public class Seq {
         AtomicInteger atomicInt = commSeq;
         if (mesPlanCodeSeqType.equals(type)) {
             atomicInt = mesPlanCodeSeq;
+        }else if (dmsPlanLubeSeqType.equals(type)) {
+            atomicInt = dmsPlanLubeSeq;
+        }else if (dmsLubeInstanceSeqType.equals(type)) {
+            atomicInt = dmsLubeInstanceSeq;
         }
         return getId(atomicInt, 4, code);
     }
diff --git a/ruoyi-modules/hwmom-dms/pom.xml b/ruoyi-modules/hwmom-dms/pom.xml
index 2dda9049..7b29c815 100644
--- a/ruoyi-modules/hwmom-dms/pom.xml
+++ b/ruoyi-modules/hwmom-dms/pom.xml
@@ -114,6 +114,20 @@
             <artifactId>mssql-jdbc</artifactId>
         </dependency>
 
+
+        <dependency>
+            <groupId>net.sf.jxls</groupId>
+            <artifactId>jxls-core</artifactId>
+            <version>1.0.3</version>
+        </dependency>
+
+        <!--用于cron表达式工具类CronUtils-->
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+        </dependency>
+
+
     </dependencies>
 
     <build>
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMachineInfoController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMachineInfoController.java
index c6a8f15b..85cfb7cf 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMachineInfoController.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBaseMachineInfoController.java
@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
- * 机台信息
+ * 设备信息
  * 前端访问路由地址为:/dms/dmsBaseMachineInfo
  *
  * @author zangch
@@ -39,7 +39,7 @@ public class DmsBaseMachineInfoController extends BaseController {
     private final IDmsBaseMachineInfoService dmsBaseMachineInfoService;
 
     /**
-     * 查询机台信息列表
+     * 查询设备信息列表
      */
     @SaCheckPermission("dms:dmsBaseMachineInfo:list")
     @GetMapping("/list")
@@ -48,18 +48,18 @@ public class DmsBaseMachineInfoController extends BaseController {
     }
 
     /**
-     * 导出机台信息列表
+     * 导出设备信息列表
      */
     @SaCheckPermission("dms:dmsBaseMachineInfo:export")
-    @Log(title = "机台信息", businessType = BusinessType.EXPORT)
+    @Log(title = "设备信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(DmsBaseMachineInfoBo bo, HttpServletResponse response) {
         List<DmsBaseMachineInfoVo> list = dmsBaseMachineInfoService.queryList(bo);
-        ExcelUtil.exportExcel(list, "机台信息", DmsBaseMachineInfoVo.class, response);
+        ExcelUtil.exportExcel(list, "设备信息", DmsBaseMachineInfoVo.class, response);
     }
 
     /**
-     * 获取机台信息详细信息
+     * 获取设备信息详细信息
      *
      * @param machineId 主键
      */
@@ -71,10 +71,10 @@ public class DmsBaseMachineInfoController extends BaseController {
     }
 
     /**
-     * 新增机台信息
+     * 新增设备信息
      */
 /*    @SaCheckPermission("dms:dmsBaseMachineInfo:add")
-    @Log(title = "机台信息", businessType = BusinessType.INSERT)
+    @Log(title = "设备信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody DmsBaseMachineInfoBo bo) {
@@ -82,10 +82,10 @@ public class DmsBaseMachineInfoController extends BaseController {
     }*/
 
     /**
-     * 修改机台信息
+     * 修改设备信息
      */
 /*    @SaCheckPermission("dms:dmsBaseMachineInfo:edit")
-    @Log(title = "机台信息", businessType = BusinessType.UPDATE)
+    @Log(title = "设备信息", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody DmsBaseMachineInfoBo bo) {
@@ -93,12 +93,12 @@ public class DmsBaseMachineInfoController extends BaseController {
     }*/
 
     /**
-     * 删除机台信息
+     * 删除设备信息
      *
      * @param machineIds 主键串
      */
 /*    @SaCheckPermission("dms:dmsBaseMachineInfo:remove")
-    @Log(title = "机台信息", businessType = BusinessType.DELETE)
+    @Log(title = "设备信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{machineIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] machineIds) {
@@ -107,7 +107,7 @@ public class DmsBaseMachineInfoController extends BaseController {
 
 
     /**
-     * 下拉框查询机台信息列表
+     * 下拉框查询设备信息列表
      */
 
     @GetMapping("getDmsBaseMachineInfoList")
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsInspectProjectDeviceController.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsInspectProjectDeviceController.java
index 31dc4249..c0611b99 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsInspectProjectDeviceController.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsInspectProjectDeviceController.java
@@ -23,7 +23,7 @@ import org.dromara.dms.service.IDmsInspectProjectDeviceService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
- * 点巡检项目关联物料信息
+ * 点巡检项目关联设备信息
  * 前端访问路由地址为:/dms/dmsInspectProjectDevice
  *
  * @author zch
@@ -38,7 +38,7 @@ public class DmsInspectProjectDeviceController extends BaseController {
     private final IDmsInspectProjectDeviceService dmsInspectProjectDeviceService;
 
     /**
-     * 查询点巡检项目关联物料信息列表
+     * 查询点巡检项目关联设备信息列表
      */
     @SaCheckPermission("dms:dmsInspectProjectDevice:list")
     @GetMapping("/list")
@@ -47,18 +47,18 @@ public class DmsInspectProjectDeviceController extends BaseController {
     }
 
     /**
-     * 导出点巡检项目关联物料信息列表
+     * 导出点巡检项目关联设备信息列表
      */
     @SaCheckPermission("dms:dmsInspectProjectDevice:export")
-    @Log(title = "点巡检项目关联物料信息", businessType = BusinessType.EXPORT)
+    @Log(title = "点巡检项目关联设备信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(DmsInspectProjectDeviceBo bo, HttpServletResponse response) {
         List<DmsInspectProjectDeviceVo> list = dmsInspectProjectDeviceService.queryList(bo);
-        ExcelUtil.exportExcel(list, "点巡检项目关联物料信息", DmsInspectProjectDeviceVo.class, response);
+        ExcelUtil.exportExcel(list, "点巡检项目关联设备信息", DmsInspectProjectDeviceVo.class, response);
     }
 
     /**
-     * 获取点巡检项目关联物料信息详细信息
+     * 获取点巡检项目关联设备信息详细信息
      *
      * @param inspectProjectId 主键
      */
@@ -70,10 +70,10 @@ public class DmsInspectProjectDeviceController extends BaseController {
     }
 
     /**
-     * 新增点巡检项目关联物料信息
+     * 新增点巡检项目关联设备信息
      */
     @SaCheckPermission("dms:dmsInspectProjectDevice:add")
-    @Log(title = "点巡检项目关联物料信息", businessType = BusinessType.INSERT)
+    @Log(title = "点巡检项目关联设备信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody DmsInspectProjectDeviceBo bo) {
@@ -81,10 +81,10 @@ public class DmsInspectProjectDeviceController extends BaseController {
     }
 
     /**
-     * 修改点巡检项目关联物料信息
+     * 修改点巡检项目关联设备信息
      */
     @SaCheckPermission("dms:dmsInspectProjectDevice:edit")
-    @Log(title = "点巡检项目关联物料信息", businessType = BusinessType.UPDATE)
+    @Log(title = "点巡检项目关联设备信息", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody DmsInspectProjectDeviceBo bo) {
@@ -92,12 +92,12 @@ public class DmsInspectProjectDeviceController extends BaseController {
     }
 
     /**
-     * 删除点巡检项目关联物料信息
+     * 删除点巡检项目关联设备信息
      *
      * @param inspectProjectIds 主键串
      */
     @SaCheckPermission("dms:dmsInspectProjectDevice:remove")
-    @Log(title = "点巡检项目关联物料信息", businessType = BusinessType.DELETE)
+    @Log(title = "点巡检项目关联设备信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{inspectProjectIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] inspectProjectIds) {
@@ -106,7 +106,7 @@ public class DmsInspectProjectDeviceController extends BaseController {
 
 
     /**
-     * 下拉框查询点巡检项目关联物料信息列表
+     * 下拉框查询点巡检项目关联设备信息列表
      */
 
     @GetMapping("/getDmsInspectProjectDeviceList")
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseDeviceType.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseDeviceType.java
index 1e5adc0b..8ae73523 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseDeviceType.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/BaseDeviceType.java
@@ -25,7 +25,7 @@ public class BaseDeviceType extends TenantEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 物料类型ID
+     * 设备类型ID
      */
     @TableId(value = "device_type_id", type = IdType.AUTO)
     private Long deviceTypeId;
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceBom.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceBom.java
index 939ffeb7..acf40e59 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceBom.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceBom.java
@@ -60,7 +60,7 @@ public class DmsBaseDeviceBom extends TenantEntity {
 
 
     /**
-     * 机台名称
+     * 设备名称
      */
     @TableField(exist = false)
     private String machineName;//join映射字段
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceDebugging.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceDebugging.java
index e5c7bc07..3b1d9e2b 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceDebugging.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceDebugging.java
@@ -60,7 +60,7 @@ public class DmsBaseDeviceDebugging extends TenantEntity {
     private String remark;
 
     /**
-     * 机台名称
+     * 设备名称
      */
     @TableField(exist = false)
     private String machineName;//JOIN
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceDepreciation.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceDepreciation.java
index a3257c7f..af2199f6 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceDepreciation.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceDepreciation.java
@@ -72,7 +72,7 @@ public class DmsBaseDeviceDepreciation extends TenantEntity {
     private String activeFlag;
 
     /**
-     * 机台名称
+     * 设备名称
      */
     @TableField(exist = false)
     private String machineName;//join
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceFiles.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceFiles.java
index 37dcbde3..fd7ee319 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceFiles.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceFiles.java
@@ -58,7 +58,7 @@ public class DmsBaseDeviceFiles extends TenantEntity {
     private String remark;
 
     /**
-     * 机台名称
+     * 设备名称
      */
     @TableField(exist = false)
     private String machineName;//JOIN
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceInstall.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceInstall.java
index d3d2b2c8..66b05ce8 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceInstall.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceInstall.java
@@ -56,7 +56,7 @@ public class DmsBaseDeviceInstall extends TenantEntity {
 
 
     /**
-     * 机台名称
+     * 设备名称
      */
     @TableField(exist = false)
     private String machineName;//join
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDevicePurchase.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDevicePurchase.java
index d74c58bf..8c75646d 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDevicePurchase.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDevicePurchase.java
@@ -60,7 +60,7 @@ public class DmsBaseDevicePurchase extends TenantEntity {
     private String remark;
 
     /**
-     * 机台名称
+     * 设备名称
      */
     @TableField(exist = false)
     private String machineName;//JOIN
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceSupplies.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceSupplies.java
index eb469e2d..078dba9b 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceSupplies.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceSupplies.java
@@ -54,7 +54,7 @@ public class DmsBaseDeviceSupplies extends TenantEntity {
     private String remark;
 
     /**
-     * 机台名称
+     * 设备名称
      */
     @TableField(exist = false)
     private String machineName;//JOIN
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMachineInfo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMachineInfo.java
index bb0bdba5..90e8f20a 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMachineInfo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseMachineInfo.java
@@ -11,7 +11,7 @@ import org.dromara.common.tenant.core.TenantEntity;
 import java.io.Serial;
 
 /**
- * 机台信息对象 prod_base_machine_info
+ * 设备信息对象 prod_base_machine_info
  *
  * @author zangch
  * @date 2025-01-20
@@ -31,12 +31,12 @@ public class DmsBaseMachineInfo extends TenantEntity {
     private Long machineId;
 
     /**
-     * 机台编号
+     * 设备编号
      */
     private String machineCode;
 
     /**
-     * 机台名称
+     * 设备名称
      */
     private String machineName;
 
@@ -46,17 +46,17 @@ public class DmsBaseMachineInfo extends TenantEntity {
     private String assetNumber;
 
     /**
-     * 机台位置
+     * 设备位置
      */
     private String machineLocation;
 
     /**
-     * 机台类型
+     * 设备类型
      */
     private String machineType;
 
     /**
-     * 机台规格
+     * 设备规格
      */
     private String machineSpec;
 
@@ -66,7 +66,7 @@ public class DmsBaseMachineInfo extends TenantEntity {
     private String supplierId;
 
     /**
-     * 机台状态(0停用 1启用 2报废)
+     * 设备状态(0停用 1启用 2报废)
      */
     private String machineStatus;
 
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseShutReason.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseShutReason.java
index d05c2599..c2ef53af 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseShutReason.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseShutReason.java
@@ -58,7 +58,7 @@ public class DmsBaseShutReason extends BaseEntity {
     private String remark;
 
     /**
-     * 机台名称
+     * 设备名称
      */
     @TableField(exist = false)
     private String machineName;//JOIN
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseTransferInfo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseTransferInfo.java
index 56545fe1..4b6cd493 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseTransferInfo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseTransferInfo.java
@@ -70,7 +70,7 @@ public class DmsBaseTransferInfo extends TenantEntity {
     private String activeFlag;
 
     /**
-     * 机台名称
+     * 设备名称
      */
     @TableField(exist = false)
     private String machineName;//JOIN
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectProjectDevice.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectProjectDevice.java
index 63d97103..e99eac59 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectProjectDevice.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectProjectDevice.java
@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 import java.io.Serial;
 
 /**
- * 点巡检项目关联物料信息对象 dms_inspect_project_device
+ * 点巡检项目关联设备信息对象 dms_inspect_project_device
  *
  * @author zch
  * @date 2025-03-24
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectRouteDetail.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectRouteDetail.java
index c24ffc03..c0d6b72d 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectRouteDetail.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsInspectRouteDetail.java
@@ -59,7 +59,7 @@ public class DmsInspectRouteDetail extends TenantEntity {
     private String routeName;//JOIN
 
     /**
-     * 机台名称
+     * 设备名称
      */
     @TableField(exist = false)
     private String machineName;//JOIN
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanMaintDetail.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanMaintDetail.java
index bac00f31..bf05b223 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanMaintDetail.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsPlanMaintDetail.java
@@ -70,7 +70,7 @@ public class DmsPlanMaintDetail extends TenantEntity {
     private String maintStandardCode;//JOIN
 
     /**
-     * 机台名称
+     * 设备名称
      */
     @TableField(exist = false)
     private String machineName;//JOIN
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRealtimeStatus.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRealtimeStatus.java
index 1df684f8..11a9967e 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRealtimeStatus.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRealtimeStatus.java
@@ -48,7 +48,7 @@ public class DmsRealtimeStatus extends TenantEntity {
     private String statusValue;
 
     /**
-     * 机台名称
+     * 设备名称
      */
     @TableField(exist = false)
     private String machineName;//JOIN
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordShutDown.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordShutDown.java
index 2a792c0f..330d9af1 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordShutDown.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsRecordShutDown.java
@@ -82,7 +82,7 @@ public class DmsRecordShutDown extends TenantEntity {
     private String remark;
 
     /**
-     * 机台名称
+     * 设备名称
      */
     @TableField(exist = false)
     private String machineName;//JOIN
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/BaseDeviceTypeBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/BaseDeviceTypeBo.java
index 13dfe631..ee8b9541 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/BaseDeviceTypeBo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/BaseDeviceTypeBo.java
@@ -18,9 +18,9 @@ import org.dromara.dms.domain.BaseDeviceType;
 public class BaseDeviceTypeBo extends BaseEntity {
 
     /**
-     * 物料类型ID
+     * 设备类型ID
      */
-/*    @NotNull(message = "物料类型ID不能为空", groups = { AddGroup.class, EditGroup.class })*/
+/*    @NotNull(message = "设备类型ID不能为空", groups = { AddGroup.class, EditGroup.class })*/
     private Long deviceTypeId;
 
     /**
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMachineInfoBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMachineInfoBo.java
index fe1f238e..0806f4dc 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMachineInfoBo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseMachineInfoBo.java
@@ -13,7 +13,7 @@ import org.dromara.dms.domain.DmsBaseMachineInfo;
 import java.util.List;
 
 /**
- * 机台信息业务对象 prod_base_machine_info
+ * 设备信息业务对象 prod_base_machine_info
  *
  * @author zangch
  * @date 2025-01-20
@@ -29,15 +29,15 @@ public class DmsBaseMachineInfoBo extends BaseEntity {
     private Long machineId;
 
     /**
-     * 机台编号
+     * 设备编号
      */
-    @NotBlank(message = "机台编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "设备编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String machineCode;
 
     /**
-     * 机台名称
+     * 设备名称
      */
-    @NotBlank(message = "机台名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "设备名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String machineName;
 
     /**
@@ -46,17 +46,17 @@ public class DmsBaseMachineInfoBo extends BaseEntity {
     private String assetNumber;
 
     /**
-     * 机台位置
+     * 设备位置
      */
     private String machineLocation;
 
     /**
-     * 机台类型
+     * 设备类型
      */
     private String machineType;
 
     /**
-     * 机台规格
+     * 设备规格
      */
     private String machineSpec;
 
@@ -66,7 +66,7 @@ public class DmsBaseMachineInfoBo extends BaseEntity {
     private String supplierId;
 
     /**
-     * 机台状态(0停用 1启用 2报废)
+     * 设备状态(0停用 1启用 2报废)
      */
     private String machineStatus;
 
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsInspectProjectDeviceBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsInspectProjectDeviceBo.java
index e46a62cb..e308f9da 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsInspectProjectDeviceBo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsInspectProjectDeviceBo.java
@@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
 /**
- * 点巡检项目关联物料信息业务对象 dms_inspect_project_device
+ * 点巡检项目关联设备信息业务对象 dms_inspect_project_device
  *
  * @author zch
  * @date 2025-03-24
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/BaseDeviceTypeVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/BaseDeviceTypeVo.java
index 0bed3a34..bc048002 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/BaseDeviceTypeVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/BaseDeviceTypeVo.java
@@ -27,9 +27,9 @@ public class BaseDeviceTypeVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 物料类型ID
+     * 设备类型ID
      */
-    @ExcelProperty(value = "物料类型ID")
+    @ExcelProperty(value = "设备类型ID")
     private Long deviceTypeId;
 
     /**
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceBomVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceBomVo.java
index a889461d..e5dc918f 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceBomVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceBomVo.java
@@ -72,9 +72,9 @@ public class DmsBaseDeviceBomVo implements Serializable {
     private String remark;
 
     /**
-     * 机台名称
+     * 设备名称
      */
-    @ExcelProperty(value = "机台名称")
+    @ExcelProperty(value = "设备名称")
     private String machineName;//join映射字段
 
 }
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceDebuggingVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceDebuggingVo.java
index e966ea7f..f56fb50a 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceDebuggingVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceDebuggingVo.java
@@ -74,7 +74,7 @@ public class DmsBaseDeviceDebuggingVo implements Serializable {
     private String remark;
 
     /**
-     * 机台名称
+     * 设备名称
      */
     private String machineName;//JOIN
 
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceDepreciationVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceDepreciationVo.java
index 635744f4..d0b5814e 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceDepreciationVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceDepreciationVo.java
@@ -87,9 +87,9 @@ public class DmsBaseDeviceDepreciationVo implements Serializable {
     private String activeFlag;
 
     /**
-     * 机台名称
+     * 设备名称
      */
-    @ExcelProperty(value = "机台名称")
+    @ExcelProperty(value = "设备名称")
     private String machineName;//join
 
 }
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceFilesVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceFilesVo.java
index b84131c5..c65065f4 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceFilesVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceFilesVo.java
@@ -72,7 +72,7 @@ public class DmsBaseDeviceFilesVo implements Serializable {
     private String remark;
 
     /**
-     * 机台名称
+     * 设备名称
      */
     private String machineName;//JOIN
 
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceInstallVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceInstallVo.java
index 197d846e..454d60c4 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceInstallVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceInstallVo.java
@@ -68,9 +68,9 @@ public class DmsBaseDeviceInstallVo implements Serializable {
     private String activeFlag;
 
     /**
-     * 机台名称
+     * 设备名称
      */
-    @ExcelProperty(value = "机台名称")
+    @ExcelProperty(value = "设备名称")
     private String machineName;//join
 
 }
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDevicePurchaseVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDevicePurchaseVo.java
index dbe2d8a9..806786d6 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDevicePurchaseVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDevicePurchaseVo.java
@@ -73,9 +73,9 @@ public class DmsBaseDevicePurchaseVo implements Serializable {
     private String remark;
 
     /**
-     * 机台名称
+     * 设备名称
      */
-    @ExcelProperty(value = "机台名称")
+    @ExcelProperty(value = "设备名称")
     private String machineName;//JOIN
 
 }
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceSuppliesVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceSuppliesVo.java
index 5d82beae..6157bf69 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceSuppliesVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceSuppliesVo.java
@@ -66,7 +66,7 @@ public class DmsBaseDeviceSuppliesVo implements Serializable {
     private String remark;
 
     /**
-     * 机台名称
+     * 设备名称
      */
     private String machineName;//JOIN
 
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMachineInfoVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMachineInfoVo.java
index 137c3728..ece91281 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMachineInfoVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseMachineInfoVo.java
@@ -15,7 +15,7 @@ import java.util.List;
 
 
 /**
- * 机台信息视图对象 prod_base_machine_info
+ * 设备信息视图对象 prod_base_machine_info
  *
  * @author zangch
  * @date 2025-01-20
@@ -41,15 +41,15 @@ public class DmsBaseMachineInfoVo implements Serializable {
     private String tenantId;
 
     /**
-     * 机台编号
+     * 设备编号
      */
-    @ExcelProperty(value = "机台编号")
+    @ExcelProperty(value = "设备编号")
     private String machineCode;
 
     /**
-     * 机台名称
+     * 设备名称
      */
-    @ExcelProperty(value = "机台名称")
+    @ExcelProperty(value = "设备名称")
     private String machineName;
 
     /**
@@ -59,21 +59,21 @@ public class DmsBaseMachineInfoVo implements Serializable {
     private String assetNumber;
 
     /**
-     * 机台位置
+     * 设备位置
      */
-    @ExcelProperty(value = "机台位置")
+    @ExcelProperty(value = "设备位置")
     private String machineLocation;
 
     /**
-     * 机台类型
+     * 设备类型
      */
-    @ExcelProperty(value = "机台类型")
+    @ExcelProperty(value = "设备类型")
     private String machineType;
 
     /**
-     * 机台规格
+     * 设备规格
      */
-    @ExcelProperty(value = "机台规格")
+    @ExcelProperty(value = "设备规格")
     private String machineSpec;
 
     /**
@@ -83,9 +83,9 @@ public class DmsBaseMachineInfoVo implements Serializable {
     private String supplierId;
 
     /**
-     * 机台状态(0停用 1启用 2报废)
+     * 设备状态(0停用 1启用 2报废)
      */
-    @ExcelProperty(value = "机台状态(0停用 1启用 2报废)", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "设备状态(0停用 1启用 2报废)", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "machine_status")
     private String machineStatus;
 
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseShutReasonVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseShutReasonVo.java
index c2871a95..2838f38d 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseShutReasonVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseShutReasonVo.java
@@ -72,7 +72,7 @@ public class DmsBaseShutReasonVo implements Serializable {
     private String remark;
 
     /**
-     * 机台名称
+     * 设备名称
      */
     private String machineName;//JOIN
 
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseTransferInfoVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseTransferInfoVo.java
index d61f1669..e7dafd39 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseTransferInfoVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseTransferInfoVo.java
@@ -86,9 +86,9 @@ public class DmsBaseTransferInfoVo implements Serializable {
     private String activeFlag;
 
     /**
-     * 机台名称
+     * 设备名称
      */
-    @ExcelProperty(value = "机台名称")
+    @ExcelProperty(value = "设备名称")
     private String machineName;//JOIN
 
 }
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectProjectDeviceVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectProjectDeviceVo.java
index 56c4ac68..24d8e93d 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectProjectDeviceVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectProjectDeviceVo.java
@@ -15,7 +15,7 @@ import java.util.Date;
 
 
 /**
- * 点巡检项目关联物料信息视图对象 dms_inspect_project_device
+ * 点巡检项目关联设备信息视图对象 dms_inspect_project_device
  *
  * @author zch
  * @date 2025-03-24
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectRouteDetailVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectRouteDetailVo.java
index 6c675ad5..34a3290d 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectRouteDetailVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsInspectRouteDetailVo.java
@@ -71,7 +71,7 @@ public class DmsInspectRouteDetailVo implements Serializable {
     private String routeName;//JOIN
 
     /**
-     * 机台名称
+     * 设备名称
      */
     private String machineName;//JOIN
 
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsPlanMaintDetailVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsPlanMaintDetailVo.java
index 43e8a5da..7b00b559 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsPlanMaintDetailVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsPlanMaintDetailVo.java
@@ -81,7 +81,7 @@ public class DmsPlanMaintDetailVo implements Serializable {
     private String maintStandardCode;//JOIN
 
     /**
-     * 机台名称
+     * 设备名称
      */
     private String machineName;//JOIN
 
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRealtimeStatusVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRealtimeStatusVo.java
index 5b36c55e..e3e8a7e5 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRealtimeStatusVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRealtimeStatusVo.java
@@ -59,7 +59,7 @@ public class DmsRealtimeStatusVo implements Serializable {
     private String statusValue;
 
     /**
-     * 机台名称
+     * 设备名称
      */
     private String machineName;//JOIN
 
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRecordShutDownVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRecordShutDownVo.java
index b808d7f2..ddef0479 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRecordShutDownVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsRecordShutDownVo.java
@@ -97,7 +97,7 @@ public class DmsRecordShutDownVo implements Serializable {
     private String remark;
 
     /**
-     * 机台名称
+     * 设备名称
      */
     private String machineName;//JOIN
 
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMachineInfoMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMachineInfoMapper.java
index 9f9b690a..29e1623c 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMachineInfoMapper.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMachineInfoMapper.java
@@ -5,7 +5,7 @@ import org.dromara.dms.domain.DmsBaseMachineInfo;
 import org.dromara.dms.domain.vo.DmsBaseMachineInfoVo;
 
 /**
- * 机台信息Mapper接口
+ * 设备信息Mapper接口
  *
  * @author zangch
  * @date 2025-01-20
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMachineMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMachineMapper.java
index a0a835ae..af532a96 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMachineMapper.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBaseMachineMapper.java
@@ -4,7 +4,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.dms.domain.DmsBaseMachineInfo;
 
 /**
- * 设备(机台)Mapper接口
+ * 设备(设备)Mapper接口
  *
  * @author Yinq
  * @date 2025-03-11
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsInspectProjectDeviceMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsInspectProjectDeviceMapper.java
index 01480bc9..6635e577 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsInspectProjectDeviceMapper.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsInspectProjectDeviceMapper.java
@@ -5,7 +5,7 @@ import org.dromara.dms.domain.vo.DmsInspectProjectDeviceVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
- * 点巡检项目关联物料信息Mapper接口
+ * 点巡检项目关联设备信息Mapper接口
  *
  * @author zch
  * @date 2025-03-24
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseMachineInfoService.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseMachineInfoService.java
index 9e2d4f8d..64952493 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseMachineInfoService.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBaseMachineInfoService.java
@@ -9,7 +9,7 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * 机台信息Service接口
+ * 设备信息Service接口
  *
  * @author zangch
  * @date 2025-01-20
@@ -17,48 +17,48 @@ import java.util.List;
 public interface IDmsBaseMachineInfoService {
 
     /**
-     * 查询机台信息
+     * 查询设备信息
      *
      * @param machineId 主键
-     * @return 机台信息
+     * @return 设备信息
      */
     DmsBaseMachineInfoVo queryById(Long machineId);
 
     /**
-     * 分页查询机台信息列表
+     * 分页查询设备信息列表
      *
      * @param bo        查询条件
      * @param pageQuery 分页参数
-     * @return 机台信息分页列表
+     * @return 设备信息分页列表
      */
     TableDataInfo<DmsBaseMachineInfoVo> queryPageList(DmsBaseMachineInfoBo bo, PageQuery pageQuery);
 
     /**
-     * 查询符合条件的机台信息列表
+     * 查询符合条件的设备信息列表
      *
      * @param bo 查询条件
-     * @return 机台信息列表
+     * @return 设备信息列表
      */
     List<DmsBaseMachineInfoVo> queryList(DmsBaseMachineInfoBo bo);
 
 /*    *//**
-     * 新增机台信息
+     * 新增设备信息
      *
-     * @param bo 机台信息
+     * @param bo 设备信息
      * @return 是否新增成功
      *//*
     Boolean insertByBo(DmsBaseMachineInfoBo bo);
 
     *//**
-     * 修改机台信息
+     * 修改设备信息
      *
-     * @param bo 机台信息
+     * @param bo 设备信息
      * @return 是否修改成功
      *//*
     Boolean updateByBo(DmsBaseMachineInfoBo bo);
 
     *//**
-     * 校验并批量删除机台信息信息
+     * 校验并批量删除设备信息信息
      *
      * @param ids     待删除的主键集合
      * @param isValid 是否进行有效性校验
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMachineInfoServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMachineInfoServiceImpl.java
index ea6a16fe..ff64fb9d 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMachineInfoServiceImpl.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMachineInfoServiceImpl.java
@@ -1,13 +1,9 @@
 package org.dromara.dms.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.RequiredArgsConstructor;
-import org.dromara.common.core.exception.ServiceException;
-import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -15,16 +11,14 @@ import org.dromara.dms.domain.DmsBaseMachineInfo;
 import org.dromara.dms.domain.bo.DmsBaseMachineInfoBo;
 import org.dromara.dms.domain.vo.DmsBaseMachineInfoVo;
 import org.dromara.dms.mapper.DmsBaseMachineInfoMapper;
-
 import org.dromara.dms.service.IDmsBaseMachineInfoService;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
 /**
- * 机台信息Service业务层处理
+ * 设备信息Service业务层处理
  *
  * @author zangch
  * @date 2025-01-20
@@ -37,10 +31,10 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService
 
 
     /**
-     * 查询机台信息
+     * 查询设备信息
      *
      * @param machineId 主键
-     * @return 机台信息
+     * @return 设备信息
      */
     @Override
     public DmsBaseMachineInfoVo queryById(Long machineId) {
@@ -48,16 +42,22 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService
         bo.setMachineId(machineId);
         MPJLambdaWrapper<DmsBaseMachineInfo> lqw = buildQueryWrapper(bo);
         DmsBaseMachineInfoVo prodBaseMachineInfoVo = baseMapper.selectVoOne(lqw);
-
+        //机台关联工序
+/*        MPJLambdaWrapper<ProdBaseMachineProcess> lqwRelation = JoinWrappers.lambda(ProdBaseMachineProcess.class)
+            .selectAll(ProdBaseMachineProcess.class)
+            .eq(bo.getMachineId() != null, ProdBaseMachineProcess::getMachineId, bo.getMachineId())
+            .orderByAsc(ProdBaseMachineProcess::getCreateTime);
+        List<ProdBaseMachineProcess> prodBaseMachineProcesses = prodBaseMachineProcessMapper.selectList(lqwRelation);
+        prodBaseMachineInfoVo.setBaseMachineProcessList(prodBaseMachineProcesses);*/
         return prodBaseMachineInfoVo;
     }
 
     /**
-     * 分页查询机台信息列表
+     * 分页查询设备信息列表
      *
      * @param bo        查询条件
      * @param pageQuery 分页参数
-     * @return 机台信息分页列表
+     * @return 设备信息分页列表
      */
     @Override
     public TableDataInfo<DmsBaseMachineInfoVo> queryPageList(DmsBaseMachineInfoBo bo, PageQuery pageQuery) {
@@ -67,10 +67,10 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService
     }
 
     /**
-     * 查询符合条件的机台信息列表
+     * 查询符合条件的设备信息列表
      *
      * @param bo 查询条件
-     * @return 机台信息列表
+     * @return 设备信息列表
      */
     @Override
     public List<DmsBaseMachineInfoVo> queryList(DmsBaseMachineInfoBo bo) {
@@ -83,6 +83,10 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<DmsBaseMachineInfo> lqw = JoinWrappers.lambda(DmsBaseMachineInfo.class)
             .selectAll(DmsBaseMachineInfo.class)
+/*            .select(ProdBaseWorkshopInfo::getWorkshopName)
+            .select(ProdBaseDeviceMode::getDeviceModeName)
+            .leftJoin(ProdBaseWorkshopInfo.class, ProdBaseWorkshopInfo::getWorkshopId, ProdBaseMachineInfo::getWorkshopId)
+            .leftJoin(ProdBaseDeviceMode.class, ProdBaseDeviceMode::getDeviceModeId, ProdBaseMachineInfo::getDeviceModeId)*/
             .eq(bo.getMachineId() != null, DmsBaseMachineInfo::getMachineId, bo.getMachineId())
             .like(StringUtils.isNotBlank(bo.getMachineCode()), DmsBaseMachineInfo::getMachineCode, bo.getMachineCode())
             .like(StringUtils.isNotBlank(bo.getMachineName()), DmsBaseMachineInfo::getMachineName, bo.getMachineName())
@@ -97,9 +101,9 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService
     }
 
 /*    *//**
-     * 新增机台信息
+     * 新增设备信息
      *
-     * @param bo 机台信息
+     * @param bo 设备信息
      * @return 是否新增成功
      *//*
     @Override
@@ -114,9 +118,9 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService
     }
 
     *//**
-     * 修改机台信息
+     * 修改设备信息
      *
-     * @param bo 机台信息
+     * @param bo 设备信息
      * @return 是否修改成功
      *//*
     @Override
@@ -145,7 +149,7 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService
     }
 
     *//**
-     * 校验并批量删除机台信息信息
+     * 校验并批量删除设备信息信息
      *
      * @param ids     待删除的主键集合
      * @param isValid 是否进行有效性校验
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseTransferInfoServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseTransferInfoServiceImpl.java
index 541df530..86c7f510 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseTransferInfoServiceImpl.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseTransferInfoServiceImpl.java
@@ -1,33 +1,31 @@
 package org.dromara.dms.service.impl;
 
-import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.dms.domain.DmsBaseDeviceInstall;
 import org.dromara.dms.domain.DmsBaseMachineInfo;
-import org.dromara.dms.mapper.DmsBaseDeviceInstallMapper;
-import org.dromara.dms.mapper.DmsBaseMachineInfoMapper;
-import org.springframework.stereotype.Service;
+import org.dromara.dms.domain.DmsBaseTransferInfo;
 import org.dromara.dms.domain.bo.DmsBaseTransferInfoBo;
 import org.dromara.dms.domain.vo.DmsBaseTransferInfoVo;
-import org.dromara.dms.domain.DmsBaseTransferInfo;
+import org.dromara.dms.mapper.DmsBaseDeviceInstallMapper;
+import org.dromara.dms.mapper.DmsBaseMachineInfoMapper;
 import org.dromara.dms.mapper.DmsBaseTransferInfoMapper;
 import org.dromara.dms.service.IDmsBaseTransferInfoService;
-import org.dromara.common.core.exception.ServiceException;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
-import java.util.stream.Collectors;
 
 /**
  * 设备转移信息Service业务层处理
@@ -153,6 +151,7 @@ public class DmsBaseTransferInfoServiceImpl implements IDmsBaseTransferInfoServi
         }
 
         // 2. 校验转移前必须有安装位置
+        //设备安装时会赋值给设备信息表的设备位置；新增或修改转移信息时，前端会将设备信息的设备位置赋值给转移信息的旧位置（自动赋值，不可编辑）
         if (StringUtils.isBlank(entity.getDevicePosition())) {
             throw new ServiceException("转移前必须有安装位置");
         }
@@ -161,11 +160,12 @@ public class DmsBaseTransferInfoServiceImpl implements IDmsBaseTransferInfoServi
         if (entity.getDeviceTransferTime() != null) {
 
             //校验转移时间不能小于之前记录的安装时间
+            //理论上安装记录只有一条，即使不止一条，只是查询时间最晚的实体也可以完成逻辑，保险点用列表，后续影响性能再优化
             List<DmsBaseDeviceInstall> installRecords = dmsBaseDeviceInstallMapper.selectList(
                 JoinWrappers.lambda(DmsBaseDeviceInstall.class)
                     .eq(DmsBaseDeviceInstall::getMachineId, entity.getMachineId())
                     .select(DmsBaseDeviceInstall::getInstallTime)
-                    .orderByAsc(DmsBaseDeviceInstall::getInstallTime)
+                    .orderByDesc(DmsBaseDeviceInstall::getInstallTime)
             );
 
             boolean hasInvalidInstallTime = installRecords.stream()
@@ -178,7 +178,7 @@ public class DmsBaseTransferInfoServiceImpl implements IDmsBaseTransferInfoServi
             }
 
             // 使用分页功能限制记录数量
-            Page<DmsBaseTransferInfo> page = new Page<>(1, 100);
+            Page<DmsBaseTransferInfo> page = new Page<>(1, 30);
             IPage<DmsBaseTransferInfo> resultPage = baseMapper.selectPage(page,
                 Wrappers.<DmsBaseTransferInfo>lambdaQuery()
                     .select(DmsBaseTransferInfo::getDeviceTransferTime)
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectProjectDeviceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectProjectDeviceServiceImpl.java
index b839fb4f..85dbb2af 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectProjectDeviceServiceImpl.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsInspectProjectDeviceServiceImpl.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.Collection;
 
 /**
- * 点巡检项目关联物料信息Service业务层处理
+ * 点巡检项目关联设备信息Service业务层处理
  *
  * @author zch
  * @date 2025-03-24
@@ -33,10 +33,10 @@ public class DmsInspectProjectDeviceServiceImpl implements IDmsInspectProjectDev
     private final DmsInspectProjectDeviceMapper baseMapper;
 
     /**
-     * 查询点巡检项目关联物料信息
+     * 查询点巡检项目关联设备信息
      *
      * @param inspectProjectId 主键
-     * @return 点巡检项目关联物料信息
+     * @return 点巡检项目关联设备信息
      */
     @Override
     public DmsInspectProjectDeviceVo queryById(Long inspectProjectId){
@@ -44,11 +44,11 @@ public class DmsInspectProjectDeviceServiceImpl implements IDmsInspectProjectDev
     }
 
     /**
-     * 分页查询点巡检项目关联物料信息列表
+     * 分页查询点巡检项目关联设备信息列表
      *
      * @param bo        查询条件
      * @param pageQuery 分页参数
-     * @return 点巡检项目关联物料信息分页列表
+     * @return 点巡检项目关联设备信息分页列表
      */
     @Override
     public TableDataInfo<DmsInspectProjectDeviceVo> queryPageList(DmsInspectProjectDeviceBo bo, PageQuery pageQuery) {
@@ -58,10 +58,10 @@ public class DmsInspectProjectDeviceServiceImpl implements IDmsInspectProjectDev
     }
 
     /**
-     * 查询符合条件的点巡检项目关联物料信息列表
+     * 查询符合条件的点巡检项目关联设备信息列表
      *
      * @param bo 查询条件
-     * @return 点巡检项目关联物料信息列表
+     * @return 点巡检项目关联设备信息列表
      */
     @Override
     public List<DmsInspectProjectDeviceVo> queryList(DmsInspectProjectDeviceBo bo) {
@@ -81,9 +81,9 @@ public class DmsInspectProjectDeviceServiceImpl implements IDmsInspectProjectDev
     }
 
     /**
-     * 新增点巡检项目关联物料信息
+     * 新增点巡检项目关联设备信息
      *
-     * @param bo 点巡检项目关联物料信息
+     * @param bo 点巡检项目关联设备信息
      * @return 是否新增成功
      */
     @Override
@@ -98,9 +98,9 @@ public class DmsInspectProjectDeviceServiceImpl implements IDmsInspectProjectDev
     }
 
     /**
-     * 修改点巡检项目关联物料信息
+     * 修改点巡检项目关联设备信息
      *
-     * @param bo 点巡检项目关联物料信息
+     * @param bo 点巡检项目关联设备信息
      * @return 是否修改成功
      */
     @Override
@@ -118,7 +118,7 @@ public class DmsInspectProjectDeviceServiceImpl implements IDmsInspectProjectDev
     }
 
     /**
-     * 校验并批量删除点巡检项目关联物料信息信息
+     * 校验并批量删除点巡检项目关联设备信息信息
      *
      * @param ids     待删除的主键集合
      * @param isValid 是否进行有效性校验
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/utils/CronUtils.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/utils/CronUtils.java
new file mode 100644
index 00000000..31b3927d
--- /dev/null
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/utils/CronUtils.java
@@ -0,0 +1,63 @@
+package org.dromara.dms.utils;
+
+import org.quartz.CronExpression;
+import java.text.ParseException;
+import java.util.Date;
+
+/**
+ * cron表达式工具类
+ *
+ * @author ruoyi
+ *
+ */
+public class CronUtils
+{
+    /**
+     * 返回一个布尔值代表一个给定的Cron表达式的有效性
+     *
+     * @param cronExpression Cron表达式
+     * @return boolean 表达式是否有效
+     */
+    public static boolean isValid(String cronExpression)
+    {
+        return CronExpression.isValidExpression(cronExpression);
+    }
+
+    /**
+     * 返回一个字符串值,表示该消息无效Cron表达式给出有效性
+     *
+     * @param cronExpression Cron表达式
+     * @return String 无效时返回表达式错误描述,如果有效返回null
+     */
+    public static String getInvalidMessage(String cronExpression)
+    {
+        try
+        {
+            new CronExpression(cronExpression);
+            return null;
+        }
+        catch (ParseException pe)
+        {
+            return pe.getMessage();
+        }
+    }
+
+    /**
+     * 返回下一个执行时间根据给定的Cron表达式
+     *
+     * @param cronExpression Cron表达式
+     * @return Date 下次Cron表达式执行时间
+     */
+    public static Date getNextExecution(String cronExpression)
+    {
+        try
+        {
+            CronExpression cron = new CronExpression(cronExpression);
+            return cron.getNextValidTimeAfter(new Date(System.currentTimeMillis()));
+        }
+        catch (ParseException e)
+        {
+            throw new IllegalArgumentException(e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/utils/TemplateExcelUtils.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/utils/TemplateExcelUtils.java
new file mode 100644
index 00000000..91054fd7
--- /dev/null
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/utils/TemplateExcelUtils.java
@@ -0,0 +1,73 @@
+package org.dromara.dms.utils;
+
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.poi.ss.usermodel.Workbook;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.Map;
+import net.sf.jxls.transformer.XLSTransformer;
+
+public class TemplateExcelUtils {
+
+    /**
+     * 根据模板导出数据
+     * @param fileName 文件名
+     * @param sourcePath resource/template文件夹下路径
+     * @param beanParams 模板参数
+     * @param response HTTP响应对象
+     * @throws Exception 抛出异常
+     */
+    public static void downLoadExcel(String fileName, String sourcePath, Map<String, Object> beanParams, HttpServletResponse response)
+        throws Exception {
+        try{
+            // 获取输出流，用于写入生成的Excel文件
+            OutputStream os = getOutputStream(fileName,response);
+            // 读取模板文件
+            InputStream is = TemplateExcelUtils.class.getResourceAsStream("/weixiu.xlsx");
+            XLSTransformer transformer = new XLSTransformer();
+            // 向模板中写入内容，生成新的Workbook对象
+            Workbook workbook = transformer.transformXLS(is, beanParams);
+            // 将生成的Workbook对象写入输出流
+            workbook.write(os);
+        }catch (Exception e){
+            // 捕获并打印异常信息
+            e.printStackTrace();
+            // 抛出异常
+            throw e;
+        }
+    }
+
+    /**
+     * 导出文件时为Writer生成OutputStream.
+     * @param fileName 文件名
+     * @param response response
+     * @return ""
+     */
+    private static OutputStream getOutputStream(String fileName,
+                                                HttpServletResponse response) throws Exception {
+        try {
+            // 对文件名进行URL编码，防止特殊字符导致的问题
+            fileName = URLEncoder.encode(fileName, "UTF-8");
+            // 设置响应内容类型为Excel文件格式
+            response.setContentType("application/vnd.ms-excel");
+            // 设置响应的字符编码为UTF-8
+            response.setCharacterEncoding("utf8");
+            // 设置响应头，指示浏览器以附件形式下载文件，并指定文件名
+            response.setHeader("Content-Disposition", "attachment; filename=" + fileName + ".xls");
+            // 设置响应头，指示缓存策略为公共缓存
+            response.setHeader("Pragma", "public");
+            // 设置响应头，指示不缓存
+            response.setHeader("Cache-Control", "no-store");
+            // 添加响应头，指示缓存的最大年龄为0
+            response.addHeader("Cache-Control", "max-age=0");
+            // 返回响应的输出流，用于写入数据到客户端
+            return response.getOutputStream();
+        } catch (IOException e) {
+            // 捕获IO异常，抛出自定义异常信息
+            throw new Exception("导出excel表格失败!", e);
+        }
+    }
+}
diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/BaseDeviceCategoryMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/BaseDeviceCategoryMapper.xml
similarity index 100%
rename from ruoyi-modules/hwmom-dms/src/main/resources/mapper/BaseDeviceCategoryMapper.xml
rename to ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/BaseDeviceCategoryMapper.xml
diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/BaseDeviceTypeMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/BaseDeviceTypeMapper.xml
similarity index 100%
rename from ruoyi-modules/hwmom-dms/src/main/resources/mapper/BaseDeviceTypeMapper.xml
rename to ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/BaseDeviceTypeMapper.xml
diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/weixiu.xlsx b/ruoyi-modules/hwmom-dms/src/main/resources/weixiu.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..167ee73b3d0d5ab5ee883787158065b4e13d12bb
GIT binary patch
literal 12714
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
J-2LDG`+w6?$NK;P

literal 0
HcmV?d00001