From 2e4fc5726a1ae46d7c83f7397ad326075a4b194c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 13 六月 2024 14:47:32 +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 | 12 ++++++++++++
1 files changed, 12 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..1df4277 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,19 @@
//鍒涘缓鏃堕棿
private LocalDate createTime;
+ private Integer pendingProductionQuantity;
+
+ private Double pendingProductionArea;
+
+ private Integer productionScheduledQuantity;
+
+ private Double productionScheduledArea;
+
+
//澶栭敭璁㈠崟琛�
private Order order;
//澶栭敭璁㈠崟鏄庣粏琛�
private OrderDetail orderDetail;
+ //澶栭敭璁㈠崟鏄庣粏琛�
+ private OrderGlassDetail orderGlassDetail;
}
--
Gitblit v1.8.0