From dec8951aae400e54f6ee83a8f95867dba9da8af1 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 23 五月 2025 17:17:33 +0800
Subject: [PATCH] [钣金计划大表] 优化：焊缝统计导出Excel样式

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartRouteStat.java |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartRouteStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartRouteStat.java
index 4eb129e..4eaf23b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartRouteStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartRouteStat.java
@@ -7,6 +7,7 @@
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 闆朵欢缁熻琛ㄥ璞� aps_part_route_stat
@@ -25,6 +26,8 @@
     @Excel(name = "宸ュ崟鍙�")
     private String workOrderNo;
 
+
+    private String resourceGroupName;
     /** 宸ュ簭鍙� */
     @Excel(name = "宸ュ簭鍙�")
     private BigDecimal roadProcessNumber;
@@ -35,19 +38,19 @@
 
     /** 鐢熶骇鏁伴噺 */
     @Excel(name = "鐢熶骇鏁伴噺")
-    private Long productionQuantity;
+    private BigDecimal productionQuantity;
 
     /** 鏍囧噯宸ユ椂 */
     @Excel(name = "鏍囧噯宸ユ椂")
-    private Long standardTime;
+    private BigDecimal standardTime;
 
     /** 宸ュ簭鎬诲伐鏃� */
     @Excel(name = "宸ュ簭鎬诲伐鏃�")
-    private Long processTotalTime;
+    private BigDecimal processTotalTime;
 
     /** 璁″垝寮�宸ユ棩 */
     @Excel(name = "璁″垝寮�宸ユ棩")
-    private LocalDateTime processPlanStartDay;
+    private Date processPlanStartDay;
 
     /** 璁捐宸ユ椂 */
     @Excel(name = "璁捐宸ユ椂")
@@ -100,42 +103,42 @@
         return currentProcessNumber;
     }
 
-    public void setProductionQuantity(Long productionQuantity) 
+    public void setProductionQuantity(BigDecimal productionQuantity)
     {
         this.productionQuantity = productionQuantity;
     }
 
-    public Long getProductionQuantity() 
+    public BigDecimal getProductionQuantity()
     {
         return productionQuantity;
     }
 
-    public void setStandardTime(Long standardTime) 
+    public void setStandardTime(BigDecimal standardTime)
     {
         this.standardTime = standardTime;
     }
 
-    public Long getStandardTime() 
+    public BigDecimal getStandardTime()
     {
         return standardTime;
     }
 
-    public void setProcessTotalTime(Long processTotalTime) 
+    public void setProcessTotalTime(BigDecimal processTotalTime)
     {
         this.processTotalTime = processTotalTime;
     }
 
-    public Long getProcessTotalTime() 
+    public BigDecimal getProcessTotalTime()
     {
         return processTotalTime;
     }
 
-    public void setProcessPlanStartDay(LocalDateTime processPlanStartDay)
+    public void setProcessPlanStartDay(Date processPlanStartDay)
     {
         this.processPlanStartDay = processPlanStartDay;
     }
 
-    public LocalDateTime getProcessPlanStartDay()
+    public Date getProcessPlanStartDay()
     {
         return processPlanStartDay;
     }
@@ -170,6 +173,14 @@
         return batchNumber;
     }
 
+    public String getResourceGroupName() {
+        return resourceGroupName;
+    }
+
+    public void setResourceGroupName(String resourceGroupName) {
+        this.resourceGroupName = resourceGroupName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

--
Gitblit v1.9.3