From 047545d48c78f39e8cf4082dbcdd2be15654470f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 11 十二月 2025 16:12:20 +0800
Subject: [PATCH] 订单bom界面bom查询bug,部分情况重量不显示bug

---
 north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
index 1a207ad..57cba52 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
@@ -6,6 +6,7 @@
 import com.example.erp.entity.sd.Order;
 import com.example.erp.entity.sd.OrderDetail;
 import com.example.erp.entity.sd.OrderGlassDetail;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.time.LocalDate;
@@ -30,6 +31,10 @@
     private String breakageReason;
     //绫诲瀷
     private String breakageType;
+    //瀹�
+    private Double childWidth;
+    //楂�
+    private Double childHeight;
     //鍙埄鐢�
     private Integer available;
     //閫�鍥炲伐搴�
@@ -63,8 +68,10 @@
     //杩斿伐瀹℃牳浜�
     private String reviewer;
     //杩斿伐鏃堕棿
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate reworkTime;
     //杩斿伐鏇存柊鏃堕棿
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate reworkUpdateTime;
     //杩斿伐闈㈢Н
    // private double reworkArea;

--
Gitblit v1.8.0