From 4408f77aac1a6f382758c142e9cf59e9685a1daa Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 19 十二月 2025 08:40:44 +0800
Subject: [PATCH] 修改在制品报表终止数量不显示问题，添加报工后续工序减去对应终止数量
---
north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java
index 6992587..cfc468d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java
@@ -3,6 +3,8 @@
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+
@Data
public class WorkInProgressDTO {
@ExcelProperty("宸ュ簭")
@@ -28,17 +30,24 @@
@ExcelProperty("璁㈠崟鏁�")
private Integer quantity;
@ExcelProperty("瀹�")
- private String childWidth;
+ private Double childWidth;
@ExcelProperty("楂�")
- private String childHeight;
+ private Double childHeight;
+ @ExcelProperty("鍘氬害")
+ private BigDecimal thickness;
@ExcelProperty("搴撳瓨鏁�")
private Integer stockNum;
@ExcelProperty("搴撳瓨闈㈢Н")
- private Double stockArea;
+ private BigDecimal stockArea;
@ExcelProperty("鎴愬搧鍚嶇О")
private String productName;
+ @ExcelProperty("鍦ㄥ埗鍝佸悕绉�")
+ private String glassName;
@ExcelProperty("寮挗鍗婂緞")
private String bendRadius;
@ExcelProperty("缂栧彿")
private String glassNumber;
+ @ExcelProperty("涓婂伐搴忔姤宸ョ彮缁�")
+ private String teamsGroupsName;
+
}
--
Gitblit v1.8.0