update mes生产信息加列余料数量

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdPlanInfo.java

@@ -4,6 +4,8 @@ import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
@@ -107,17 +109,17 @@ public class ProdPlanInfo extends TenantEntity {
     /**
      * 工单计划数量
      */
-    private Long planAmount;
+    private BigDecimal planAmount;
 
     /**
      * 派工数量
      */
-    private Long dispatchAmount;
+    private BigDecimal dispatchAmount;
 
     /**
      * 完成数量
      */
-    private Long completeAmount;
+    private BigDecimal completeAmount;
 
     /**
      * 计划时间

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdProductPlanDetail.java

@@ -4,6 +4,8 @@ import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
 import java.util.Date;
 
 import java.io.Serial;
@@ -66,7 +68,7 @@ public class ProdProductPlanDetail extends TenantEntity {
     /**
      * 完成数量
      */
-    private Long completeAmount;
+    private BigDecimal completeAmount;
 
     /**
      * 单位ID
@@ -163,6 +165,11 @@ public class ProdProductPlanDetail extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 余料数量
+     */
+    private BigDecimal remainingAmount;
+
     /**
      * 删除标识（1是 0否）
      */

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdPlanInfoBo.java

@@ -8,6 +8,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -112,18 +114,18 @@ public class ProdPlanInfoBo extends BaseEntity {
      * 工单计划数量
      */
     @NotNull(message = "工单计划数量不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long planAmount;
+    private BigDecimal planAmount;
 
     /**
      * 派工数量
      */
 //    @NotNull(message = "派工数量不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long dispatchAmount;
+    private BigDecimal dispatchAmount;
 
     /**
      * 完成数量
      */
-    private Long completeAmount;
+    private BigDecimal completeAmount;
 
     /**
      * 计划开始时间

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdProductPlanDetailBo.java

@@ -1,5 +1,6 @@
 package org.dromara.mes.domain.bo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import org.dromara.mes.domain.ProdProductPlanDetail;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
@@ -9,6 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -72,7 +74,7 @@ public class ProdProductPlanDetailBo extends BaseEntity {
      * 完成数量
      */
     @NotNull(message = "完成数量不能为空", groups = {AddGroup.class, EditGroup.class})
-    private Long completeAmount;
+    private BigDecimal completeAmount;
 
     /**
      * 单位ID
@@ -174,5 +176,8 @@ public class ProdProductPlanDetailBo extends BaseEntity {
      */
     private Long workshopId;
 
-
+    /**
+     * 余料数量
+     */
+    private BigDecimal remainingAmount;
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java

@@ -1,5 +1,6 @@
 package org.dromara.mes.domain.vo;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
@@ -135,19 +136,19 @@ public class ProdPlanInfoVo implements Serializable {
      * 工单计划数量
      */
     @ExcelProperty(value = "工单计划数量")
-    private Long planAmount;
+    private BigDecimal planAmount;
 
     /**
      * 派工数量
      */
     @ExcelProperty(value = "派工数量")
-    private Long dispatchAmount;
+    private BigDecimal dispatchAmount;
 
     /**
      * 完成数量
      */
     @ExcelProperty(value = "完成数量")
-    private Long completeAmount;
+    private BigDecimal completeAmount;
 
     /**
      * 计划时间

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdProductPlanDetailVo.java

@@ -10,6 +10,7 @@ import org.dromara.mes.domain.ProdProductPlanDetail;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -80,7 +81,7 @@ public class ProdProductPlanDetailVo implements Serializable {
      * 完成数量
      */
     @ExcelProperty(value = "完成数量")
-    private Long completeAmount;
+    private BigDecimal completeAmount;
 
     /**
      * 单位ID
@@ -201,6 +202,12 @@ public class ProdProductPlanDetailVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 余料数量
+     */
+    @ExcelProperty(value = "余料数量")
+    private BigDecimal remainingAmount;
+
     /**
      * 工装名称
      */