From 1c15dbfcab5dd355f00e35a963adffe8ca135b4f Mon Sep 17 00:00:00 2001
From: dy <dingyang@lnfxkj.tech>
Date: 星期三, 23 四月 2025 11:08:13 +0800
Subject: [PATCH] 零件计划统计表和钣金计划统计表后台代码提交

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java
index 77a1bd1..9afd5bc 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java
@@ -1,7 +1,6 @@
 package com.aps.core.domain;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -30,8 +29,6 @@
     @Excel(name = "宸ュ簭鍚嶇О")
     private String processName;
 
-    /** 鎺掑簭 */
-    @Excel(name = "鎺掑簭")
     private Integer num;
 
     /** 宸ュ簭鍙� */
@@ -44,24 +41,23 @@
 
     /** 鐢熶骇鏁伴噺 */
     @Excel(name = "鐢熶骇鏁伴噺")
-    private Integer productionQuantity;
+    private BigDecimal productionQuantity;
 
     /** 鏍囧噯宸ユ椂 */
     @Excel(name = "鏍囧噯宸ユ椂")
-    private Integer standardTime;
+    private BigDecimal standardTime;
 
     /** 宸ュ簭鎬诲伐鏃� */
     @Excel(name = "宸ュ簭鎬诲伐鏃�")
-    private Integer processTotalTime;
+    private BigDecimal processTotalTime;
 
     /** 璁″垝瀹屾垚鏃� */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "璁″垝瀹屾垚鏃�", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "璁″垝瀹屾垚鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date processPlanEndDay;
 
     /** 璁＄畻瀹屾垚鏃� */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "璁＄畻瀹屾垚鏃�", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date computePlanEndDay;
 
 
@@ -77,15 +73,19 @@
     private Date orderPlanEndDay;
 
     /** 璁捐宸ユ椂 */
-    @Excel(name = "璁捐宸ユ椂")
+
     private Long designTimes;
 
     /** 鎵规鍙� */
-    @Excel(name = "鎵规鍙�")
+
     private String batchNumber;
 
     /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
     private String delFlag;
+
+
+
+    private Boolean warning;
 
     public void setId(String id) 
     {
@@ -147,32 +147,32 @@
         return currentProcessNumber;
     }
 
-    public void setProductionQuantity(Integer productionQuantity) 
+    public void setProductionQuantity(BigDecimal productionQuantity)
     {
         this.productionQuantity = productionQuantity;
     }
 
-    public Integer getProductionQuantity() 
+    public BigDecimal getProductionQuantity()
     {
         return productionQuantity;
     }
 
-    public void setStandardTime(Integer standardTime) 
+    public void setStandardTime(BigDecimal standardTime)
     {
         this.standardTime = standardTime;
     }
 
-    public Integer getStandardTime() 
+    public BigDecimal getStandardTime()
     {
         return standardTime;
     }
 
-    public void setProcessTotalTime(Integer processTotalTime) 
+    public void setProcessTotalTime(BigDecimal processTotalTime)
     {
         this.processTotalTime = processTotalTime;
     }
 
-    public Integer getProcessTotalTime() 
+    public BigDecimal getProcessTotalTime()
     {
         return processTotalTime;
     }
@@ -240,6 +240,13 @@
     {
         return delFlag;
     }
+    public Boolean getWarning() {
+        return warning;
+    }
+
+    public void setWarning(Boolean warning) {
+        this.warning = warning;
+    }
 
     @Override
     public String toString() {

--
Gitblit v1.9.3