From f5403092b489f3dc315699c0764726edf51fd51c Mon Sep 17 00:00:00 2001 From: zch Date: Tue, 25 Mar 2025 10:59:44 +0800 Subject: [PATCH] =?UTF-8?q?refactor(mes):=20=E5=B0=86=E9=87=8D=E9=87=8F?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=BB=8E?= =?UTF-8?q?=20Long=20=E6=94=B9=E4=B8=BA=20BigDecimal=EF=BC=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5=E4=B8=BAdecimal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改了 BaseMaterialInfo、BaseMaterialInfoBo、BaseMaterialInfoVo、BaseToolingInfo、BaseToolingInfoBo 和 BaseToolingInfoVo 中的重量相关字段类型 - 从 Long 改为 BigDecimal，以更准确地表示重量值，Long不保留小数 - 这个改动会影响以下表格中的字段： - base_material_info: net_weight, gross_weight, standard_weight, weight_upper_limit, weight_lower_limit - base_tooling_info: weight --- .../dromara/mes/domain/BaseMaterialInfo.java | 21 +++++++++-------- .../dromara/mes/domain/BaseToolingInfo.java | 9 +++++--- .../mes/domain/bo/BaseMaterialInfoBo.java | 23 ++++++++++--------- .../mes/domain/bo/BaseToolingInfoBo.java | 11 ++++----- .../mes/domain/vo/BaseMaterialInfoVo.java | 21 ++++++++--------- .../mes/domain/vo/BaseToolingInfoVo.java | 9 ++++---- 6 files changed, 49 insertions(+), 45 deletions(-) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java index c2aa8b6c..9da1de05 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java @@ -1,13 +1,16 @@ package org.dromara.mes.domain; -import org.dromara.common.tenant.core.TenantEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.common.tenant.core.TenantEntity; import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; /** * 物料信息对象 base_material_info @@ -97,12 +100,12 @@ public class BaseMaterialInfo extends TenantEntity { /** * 净重 */ - private Long netWeight; + private BigDecimal netWeight; /** * 毛重 */ - private Long grossWeight; + private BigDecimal grossWeight; /** * 绑定标识(1是 0否) @@ -237,17 +240,17 @@ public class BaseMaterialInfo extends TenantEntity { /** * 标准重量 */ - private Long standardWeight; + private BigDecimal standardWeight; /** * 标准重量上限 */ - private Long weightUpperLimit; + private BigDecimal weightUpperLimit; /** * 标准重量下限 */ - private Long weightLowerLimit; + private BigDecimal weightLowerLimit; /** * 内胎标记(0无 1有) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseToolingInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseToolingInfo.java index ead00ff2..b55811d0 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseToolingInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseToolingInfo.java @@ -1,11 +1,14 @@ package org.dromara.mes.domain; -import org.dromara.common.tenant.core.TenantEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; import java.io.Serial; +import java.math.BigDecimal; /** * 载具工装信息对象 base_tooling_info @@ -65,7 +68,7 @@ public class BaseToolingInfo extends TenantEntity { /** * 重量 */ - private Long weight; + private BigDecimal weight; /** * 备注 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialInfoBo.java index e28a0311..f6cd7ee1 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialInfoBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialInfoBo.java @@ -1,15 +1,16 @@ package org.dromara.mes.domain.bo; -import org.dromara.mes.domain.BaseMaterialInfo; -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.mes.domain.BaseMaterialInfo; + +import java.math.BigDecimal; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; /** * 物料信息业务对象 base_material_info @@ -98,12 +99,12 @@ public class BaseMaterialInfoBo extends BaseEntity { /** * 净重 */ - private Long netWeight; + private BigDecimal netWeight; /** * 毛重 */ - private Long grossWeight; + private BigDecimal grossWeight; /** * 绑定标识(1是 0否) @@ -238,17 +239,17 @@ public class BaseMaterialInfoBo extends BaseEntity { /** * 标准重量 */ - private Long standardWeight; + private BigDecimal standardWeight; /** * 标准重量上限 */ - private Long weightUpperLimit; + private BigDecimal weightUpperLimit; /** * 标准重量下限 */ - private Long weightLowerLimit; + private BigDecimal weightLowerLimit; /** * 内胎标记(0无 1有) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseToolingInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseToolingInfoBo.java index eb055fb6..79f4dee2 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseToolingInfoBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseToolingInfoBo.java @@ -1,13 +1,12 @@ package org.dromara.mes.domain.bo; -import org.dromara.mes.domain.BaseToolingInfo; -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.mes.domain.BaseToolingInfo; + +import java.math.BigDecimal; /** * 载具工装信息业务对象 base_tooling_info @@ -63,7 +62,7 @@ public class BaseToolingInfoBo extends BaseEntity { /** * 重量 */ - private Long weight; + private BigDecimal weight; /** * 备注 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java index b2817308..dc1ebcf9 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java @@ -1,19 +1,16 @@ package org.dromara.mes.domain.vo; -import java.util.Date; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.mes.domain.BaseMaterialInfo; 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.mes.domain.BaseMaterialInfo; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @@ -126,13 +123,13 @@ public class BaseMaterialInfoVo implements Serializable { * 净重 */ @ExcelProperty(value = "净重") - private Long netWeight; + private BigDecimal netWeight; /** * 毛重 */ @ExcelProperty(value = "毛重") - private Long grossWeight; + private BigDecimal grossWeight; /** * 绑定标识(1是 0否) @@ -305,19 +302,19 @@ public class BaseMaterialInfoVo implements Serializable { * 标准重量 */ @ExcelProperty(value = "标准重量") - private Long standardWeight; + private BigDecimal standardWeight; /** * 标准重量上限 */ @ExcelProperty(value = "标准重量上限") - private Long weightUpperLimit; + private BigDecimal weightUpperLimit; /** * 标准重量下限 */ @ExcelProperty(value = "标准重量下限") - private Long weightLowerLimit; + private BigDecimal weightLowerLimit; /** * 内胎标记(0无 1有) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseToolingInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseToolingInfoVo.java index a152827d..28763dd1 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseToolingInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseToolingInfoVo.java @@ -1,15 +1,16 @@ package org.dromara.mes.domain.vo; -import org.dromara.mes.domain.BaseToolingInfo; 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.mes.domain.BaseToolingInfo; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @@ -88,7 +89,7 @@ public class BaseToolingInfoVo implements Serializable { * 重量 */ @ExcelProperty(value = "重量") - private Long weight; + private BigDecimal weight; /** * 备注