From 8668e5ce64e1d7b3dbfffc42cf6767cb9ea2d6c0 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 25 六月 2024 09:54:15 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

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

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ProductionScheduling.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ProductionScheduling.java
index f5f9809..fabe09f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ProductionScheduling.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ProductionScheduling.java
@@ -2,6 +2,7 @@
 
 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;
@@ -33,8 +34,20 @@
     //鍒涘缓鏃堕棿
     private LocalDate createTime;
 
+    private Integer pendingProductionQuantity;
+
+    private Double pendingProductionArea;
+
+    private Integer productionScheduledQuantity;
+
+    private Double productionScheduledArea;
+
+    private  String reviewer;
+
     //澶栭敭璁㈠崟琛�
     private Order order;
     //澶栭敭璁㈠崟鏄庣粏琛�
     private OrderDetail orderDetail;
+    //澶栭敭璁㈠崟鏄庣粏琛�
+    private OrderGlassDetail orderGlassDetail;
 }

--
Gitblit v1.8.0