refactor(dms): 将设备相关实体类中的 Long 类型替换为 BigDecimal,为DmsBaseDeviceType实体类添加了 @TableId 注解

- 将这些实体类中的 Long 类型字段改为 BigDecimal 类型
- 相应地修改了对应的 BO 和 VO 类
- 为DmsBaseDeviceType实体类添加了 @TableId 注解

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceBom.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
+import java.math.BigDecimal;
 
 /**
  * 设备BOM信息对象 dms_base_device_bom
@@ -40,7 +41,7 @@ public class DmsBaseDeviceBom extends TenantEntity {
     /**
      * BOM数量
      */
-    private Long bomAmount;
+    private BigDecimal bomAmount;
 
     /**
      * 祖级列表

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceSupplies.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
+import java.math.BigDecimal;
 
 /**
  * 设备配套信息对象 dms_base_device_supplies
@@ -45,7 +46,7 @@ public class DmsBaseDeviceSupplies extends TenantEntity {
     /**
      * 需要数量
      */
-    private Long requireAmount;
+    private BigDecimal requireAmount;
 
     /**
      * 备注

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBaseDeviceType.java

@@ -1,5 +1,7 @@
 package org.dromara.dms.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,6 +26,7 @@ public class DmsBaseDeviceType extends TenantEntity {
     /**
      * 设备类型ID
      */
+    @TableId(value = "device_type_id", type = IdType.AUTO)
     private Long deviceTypeId;
 
     /**

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeFunction.java

@@ -1,10 +1,12 @@
 package org.dromara.dms.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serial;
+import java.math.BigDecimal;
 
 /**
  * 设备模型功能对象 dms_device_mode_function
@@ -118,7 +120,7 @@ public class DmsDeviceModeFunction {
     /**
      * 预留字段，步长
      */
-    private Long propertyStep;
+    private BigDecimal propertyStep;
 
     /**
      * 预留字段

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsDeviceModeParameter.java

@@ -1,11 +1,12 @@
 package org.dromara.dms.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
+import java.math.BigDecimal;
 
 /**
  * 设备参数对象 dms_device_mode_parameter
@@ -69,7 +70,7 @@ public class DmsDeviceModeParameter {
     /**
      * 预留字段，步长
      */
-    private Long propertyStep;
+    private BigDecimal propertyStep;
 
 
 }

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceBomBo.java

@@ -1,13 +1,12 @@
 package org.dromara.dms.domain.bo;
 
-import org.dromara.dms.domain.DmsBaseDeviceBom;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.dms.domain.DmsBaseDeviceBom;
+
+import java.math.BigDecimal;
 
 /**
  * 设备BOM信息业务对象 dms_base_device_bom
@@ -38,7 +37,7 @@ public class DmsBaseDeviceBomBo extends BaseEntity {
     /**
      * BOM数量
      */
-    private Long bomAmount;
+    private BigDecimal bomAmount;
 
     /**
      * 祖级列表

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBaseDeviceSuppliesBo.java

@@ -1,13 +1,16 @@
 package org.dromara.dms.domain.bo;
 
-import org.dromara.dms.domain.DmsBaseDeviceSupplies;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.dms.domain.DmsBaseDeviceSupplies;
+
+import java.math.BigDecimal;
 
 /**
  * 设备配套信息业务对象 dms_base_device_supplies
@@ -45,7 +48,7 @@ public class DmsBaseDeviceSuppliesBo extends BaseEntity {
     /**
      * 需要数量
      */
-    private Long requireAmount;
+    private BigDecimal requireAmount;
 
     /**
      * 备注

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeFunctionBo.java

@@ -1,15 +1,16 @@
 package org.dromara.dms.domain.bo;
 
-import org.dromara.dms.domain.DmsDeviceModeFunction;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.dms.domain.DmsDeviceModeFunction;
 import org.dromara.dms.domain.DmsDeviceModeParameter;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -123,7 +124,7 @@ public class DmsDeviceModeFunctionBo extends BaseEntity {
     /**
      * 预留字段，步长
      */
-    private Long propertyStep;
+    private BigDecimal propertyStep;
 
     /**
      * 预留字段

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsDeviceModeParameterBo.java

@@ -1,13 +1,15 @@
 package org.dromara.dms.domain.bo;
 
-import org.dromara.dms.domain.DmsDeviceModeParameter;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.dms.domain.DmsDeviceModeParameter;
+
+import java.math.BigDecimal;
 
 /**
  * 设备参数业务对象 dms_device_mode_parameter
@@ -71,7 +73,7 @@ public class DmsDeviceModeParameterBo extends BaseEntity {
     /**
      * 预留字段，步长
      */
-    private Long propertyStep;
+    private BigDecimal propertyStep;
 
 
 }

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceBomVo.java

@@ -1,16 +1,16 @@
 package org.dromara.dms.domain.vo;
 
-import org.dromara.dms.domain.DmsBaseDeviceBom;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.dms.domain.DmsBaseDeviceBom;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
+import java.math.BigDecimal;
 
 
 
@@ -50,7 +50,7 @@ public class DmsBaseDeviceBomVo implements Serializable {
      * BOM数量
      */
     @ExcelProperty(value = "BOM数量")
-    private Long bomAmount;
+    private BigDecimal bomAmount;
 
     /**
      * 祖级列表

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBaseDeviceSuppliesVo.java

@@ -1,16 +1,16 @@
 package org.dromara.dms.domain.vo;
 
-import org.dromara.dms.domain.DmsBaseDeviceSupplies;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.dms.domain.DmsBaseDeviceSupplies;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
+import java.math.BigDecimal;
 
 
 
@@ -57,7 +57,7 @@ public class DmsBaseDeviceSuppliesVo implements Serializable {
      * 需要数量
      */
     @ExcelProperty(value = "需要数量")
-    private Long requireAmount;
+    private BigDecimal requireAmount;
 
     /**
      * 备注

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeFunctionVo.java

@@ -1,17 +1,17 @@
 package org.dromara.dms.domain.vo;
 
-import org.dromara.dms.domain.DmsDeviceModeFunction;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.dms.domain.DmsDeviceModeFunction;
 import org.dromara.dms.domain.DmsDeviceModeParameter;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -157,7 +157,7 @@ public class DmsDeviceModeFunctionVo implements Serializable {
      * 预留字段，步长
      */
     @ExcelProperty(value = "预留字段，步长")
-    private Long propertyStep;
+    private BigDecimal propertyStep;
 
     /**
      * 预留字段

ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsDeviceModeParameterVo.java

@@ -1,16 +1,16 @@
 package org.dromara.dms.domain.vo;
 
-import org.dromara.dms.domain.DmsDeviceModeParameter;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.dms.domain.DmsDeviceModeParameter;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
+import java.math.BigDecimal;
 
 
 
@@ -89,7 +89,7 @@ public class DmsDeviceModeParameterVo implements Serializable {
      * 预留字段，步长
      */
     @ExcelProperty(value = "预留字段，步长")
-    private Long propertyStep;
+    private BigDecimal propertyStep;
 
 
 }