From 2d932e208bc78ef9a07aa0ef9a832333b1eb64bb Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 02 二月 2024 15:55:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 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 bf4fef3..9db4304 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
@@ -1,6 +1,11 @@
package com.example.erp.entity.pp;
+import com.example.erp.entity.sd.Order;
+import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.entity.sd.OrderGlassDetail;
import lombok.Data;
+
+import java.time.LocalDate;
@Data
public class ReportingWorkDetail {
@@ -18,6 +23,8 @@
private Integer breakageNumber;
//娆＄牬鍘熷洜
private String breakageReason;
+ //绫诲瀷
+ private String breakageType;
//鍙埄鐢�
private Integer available;
//閫�鍥炲伐搴�
@@ -41,7 +48,25 @@
//鎶ュ伐绫诲瀷
private Integer type;
+ /*杩斿伐閮ㄥ垎*/
+ //杩斿伐鐝粍
+ private String reworkTeam;
+ //杩斿伐瀹℃牳鐘舵��
+ private Integer reviewerState;
+ //杩斿伐瀹℃牳浜�
+ private String reviewer;
+ //杩斿伐鏃堕棿
+ private LocalDate reworkTime;
+ //杩斿伐鏇存柊鏃堕棿
+ private LocalDate reworkUpdateTime;
+ //杩斿伐闈㈢Н
+ private double reworkArea;
+
+
//澶栭敭鎶ュ伐涓昏〃
- private ReportingWork reportingWork;
+ private ReportingWork reportingWork;
+ private Order order;
+ private OrderDetail orderDetail;
+ private OrderGlassDetail orderGlassDetail;
}
--
Gitblit v1.8.0