From 50db789b31b73fc54223320ce4e85a48aade7e50 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 01 三月 2024 09:41:36 +0800
Subject: [PATCH] 报工相关修改

---
 north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 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 0d2ca2b..d8e9db5 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,5 +1,13 @@
 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 {
     //鑷ID
     private Integer id;
@@ -12,9 +20,11 @@
     //瀹屽伐鏁伴噺
     private Integer completedQuantity;
     //娆$牬鏁伴噺
-    private Integer breakageNumber;
+    private Integer breakageQuantity;
     //娆$牬鍘熷洜
     private String breakageReason;
+    //绫诲瀷
+    private String breakageType;
     //鍙埄鐢�
     private Integer available;
     //閫�鍥炲伐搴�
@@ -38,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