From 6f2a4980f4ca7a794b103cfde9946a905c5ba399 Mon Sep 17 00:00:00 2001
From: NNowhZzU <1539353356@qq.com>
Date: 星期五, 26 一月 2024 16:21:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
index aed3c54..457fe82 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
@@ -2,9 +2,13 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+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 FlowCard {
@TableId(type = IdType.AUTO)
//鑷id
@@ -19,6 +23,8 @@
private Integer orderNumber;
//宸ヨ壓纭搴忓彿
private Integer technologyNumber;
+ //鍒嗘灦鏁伴噺
+ private Integer binningQuantity;
//宸蹭紭鍖栨暟閲�
private Integer optimizeQuantity;
//鎺掔増鐘舵��
@@ -53,9 +59,9 @@
private LocalDate updateTime;
//澶栭敭璁㈠崟琛�
-// private Order order;
-// //澶栭敭璁㈠崟鏄庣粏琛�
-// private OrderDetail orderDetail;
-// //澶栭敭璁㈠崟宸ヨ壓瀹℃牳琛�
-// private orderGlassDetail orderGlassDetail;
+ private Order order;
+ //澶栭敭璁㈠崟鏄庣粏琛�
+ private OrderDetail orderDetail;
+ //澶栭敭璁㈠崟宸ヨ壓瀹℃牳琛�
+ private OrderGlassDetail orderGlassDetail;
}
--
Gitblit v1.8.0