From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +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/ProductionScheduling.java | 19 +++++++++++++++++++
1 files changed, 19 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 d9485b2..baa4d60 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
@@ -1,7 +1,9 @@
package com.example.erp.entity.pp;
+import com.baomidou.mybatisplus.annotation.TableField;
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;
@@ -16,6 +18,8 @@
private String orderId;
//璁㈠崟搴忓彿
private String orderNumber;
+ //灏忕墖椤哄簭
+ private String technologyNumber;
//鎺掍骇宸ュ簭
private String processes;
//鎺掍骇鏁伴噺
@@ -31,8 +35,23 @@
//鍒涘缓鏃堕棿
private LocalDate createTime;
+ private Integer pendingProductionQuantity;
+
+ private Double pendingProductionArea;
+
+ private Integer productionScheduledQuantity;
+
+ private Double productionScheduledArea;
+
+ private String reviewer;
+
//澶栭敭璁㈠崟琛�
+ @TableField(select = false,exist= false)
private Order order;
//澶栭敭璁㈠崟鏄庣粏琛�
+ @TableField(select = false,exist= false)
private OrderDetail orderDetail;
+ //澶栭敭璁㈠崟鏄庣粏琛�
+ @TableField(select = false,exist= false)
+ private OrderGlassDetail orderGlassDetail;
}
--
Gitblit v1.8.0