From 77c7984fb636f81a87208aea2bcffc701f6419e8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 23 十月 2024 16:01:26 +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 | 17 +++++++++++++++++
1 files changed, 17 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..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;
@@ -33,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