From 43322d13c1876b1705f8ba1eb2ef32e7a433cacc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 十二月 2025 16:57:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 6cac444..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;
//閫�鍥炲伐搴�
@@ -59,16 +64,22 @@
//寰呰繑宸ユ暟閲�
private Integer waitReworkQuantity;
//杩斿伐瀹℃牳鐘舵��
- private Integer reviewerState;
+ private Integer reviewStatus;
//杩斿伐瀹℃牳浜�
private String reviewer;
//杩斿伐鏃堕棿
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate reworkTime;
//杩斿伐鏇存柊鏃堕棿
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate reworkUpdateTime;
//杩斿伐闈㈢Н
// private double reworkArea;
+ //鎶ュ伐淇敼鐢ㄨˉ鐗囩姸鎬�
+ @TableField(select = false,exist= false)
+ private String patchStatusOther;
+
//娆＄牬鍒楄〃
@TableField(select = false,exist= false)
private List<DamageDetails>
--
Gitblit v1.8.0