From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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/ProductionScheduling.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 2a3d7f6..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,8 +1,12 @@
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;
@Data
public class ProductionScheduling {
@@ -14,23 +18,40 @@
private String orderId;
//璁㈠崟搴忓彿
private String orderNumber;
+ //灏忕墖椤哄簭
+ private String technologyNumber;
//鎺掍骇宸ュ簭
private String processes;
//鎺掍骇鏁伴噺
private Integer schedulingQuantity;
//璁″垝寮�濮嬫椂闂�
- private Integer scheduledStartTime;
+ private LocalDate scheduledStartTime;
//璁″垝缁撴潫鏃堕棿
- private Integer planEndTime;
+ private LocalDate planEndTime;
//瀹℃牳鐘舵��
private String reviewStatus;
//澶囨敞
private String notes;
//鍒涘缓鏃堕棿
- private String createTime;
+ 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