xins
/
hwmom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(mes): 将重量相关字段类型从 Long 改为 BigDecimal，数据库字段为decimal

Browse Source 
- 修改了 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
master
zch 1 day ago
parent a6408e61e2
commit f5403092b4
6 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File

21
ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialInfo.java
Unescape Escape View File

@ -1,13 +1,16 @@
package org.dromara.mes.domain; package org.dromara.mes.domain;
import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date; import org.dromara.common.tenant.core.TenantEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 物料信息对象 base_material_info * 物料信息对象 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否) * 绑定标识(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有) * 内胎标记(0无 1有)

9
ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseToolingInfo.java
Unescape Escape View File

@ -1,11 +1,14 @@
package org.dromara.mes.domain; package org.dromara.mes.domain;
import org.dromara.common.tenant.core.TenantEntity; 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.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.tenant.core.TenantEntity;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal;
/** /**
* 载具工装信息对象 base_tooling_info * 载具工装信息对象 base_tooling_info
@ -65,7 +68,7 @@ public class BaseToolingInfo extends TenantEntity {
/** /**
* 重量 * 重量
*/ */
private Long weight; private BigDecimal weight;
/** /**
* 备注 * 备注

23
ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseMaterialInfoBo.java
Unescape Escape View File

@ -1,15 +1,16 @@
package org.dromara.mes.domain.bo; 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 io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; 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 java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/** /**
* 物料信息业务对象 base_material_info * 物料信息业务对象 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否) * 绑定标识(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有) * 内胎标记(0无 1有)

11
ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseToolingInfoBo.java
Unescape Escape View File

@ -1,13 +1,12 @@
package org.dromara.mes.domain.bo; 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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; 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 * 载具工装信息业务对象 base_tooling_info
@ -63,7 +62,7 @@ public class BaseToolingInfoBo extends BaseEntity {
/** /**
* 重量 * 重量
*/ */
private Long weight; private BigDecimal weight;
/** /**
* 备注 * 备注

21
ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java
Unescape Escape View File

@ -1,19 +1,16 @@
package org.dromara.mes.domain.vo; 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.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; 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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; 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.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@ -126,13 +123,13 @@ public class BaseMaterialInfoVo implements Serializable {
* 净重 * 净重
*/ */
@ExcelProperty(value = "净重") @ExcelProperty(value = "净重")
private Long netWeight; private BigDecimal netWeight;
/** /**
* 毛重 * 毛重
*/ */
@ExcelProperty(value = "毛重") @ExcelProperty(value = "毛重")
private Long grossWeight; private BigDecimal grossWeight;
/** /**
* 绑定标识(1是 0否) * 绑定标识(1是 0否)
@ -305,19 +302,19 @@ public class BaseMaterialInfoVo implements Serializable {
* 标准重量 * 标准重量
*/ */
@ExcelProperty(value = "标准重量") @ExcelProperty(value = "标准重量")
private Long standardWeight; private BigDecimal standardWeight;
/** /**
* 标准重量上限 * 标准重量上限
*/ */
@ExcelProperty(value = "标准重量上限") @ExcelProperty(value = "标准重量上限")
private Long weightUpperLimit; private BigDecimal weightUpperLimit;
/** /**
* 标准重量下限 * 标准重量下限
*/ */
@ExcelProperty(value = "标准重量下限") @ExcelProperty(value = "标准重量下限")
private Long weightLowerLimit; private BigDecimal weightLowerLimit;
/** /**
* 内胎标记(0无 1有) * 内胎标记(0无 1有)

9
ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseToolingInfoVo.java
Unescape Escape View File

@ -1,15 +1,16 @@
package org.dromara.mes.domain.vo; package org.dromara.mes.domain.vo;
import org.dromara.mes.domain.BaseToolingInfo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; 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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; 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.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@ -88,7 +89,7 @@ public class BaseToolingInfoVo implements Serializable {
* 重量 * 重量
*/ */
@ExcelProperty(value = "重量") @ExcelProperty(value = "重量")
private Long weight; private BigDecimal weight;
/** /**
* 备注 * 备注

Write Preview
Loading…
Cancel
Save