From a97c0e84c8d1f50aa65935643a580527f30b7ece Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 12 三月 2024 08:39:38 +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/FlowCard.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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..fdcfa82 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,14 @@
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 com.example.erp.entity.sd.Product;
+import lombok.Data;
import java.time.LocalDate;
-
+@Data
public class FlowCard {
@TableId(type = IdType.AUTO)
//鑷id
@@ -15,14 +20,18 @@
private String productionId;
//娴佺▼鍗″彿
private String processId;
+ //钀芥灦椤哄簭
+ private Integer landingSequence;
//搴忓彿
private Integer orderNumber;
//宸ヨ壓纭搴忓彿
private Integer technologyNumber;
+ //鍒嗘灦鏁伴噺
+ private Integer quantity;
//宸蹭紭鍖栨暟閲�
private Integer optimizeQuantity;
//鎺掔増鐘舵��
- private Integer layoutStatus;
+ private String layoutStatus;
//琛ョ墖鏁伴噺
private Integer numberPatches;
//搴撳瓨鏁伴噺
@@ -53,9 +62,11 @@
private LocalDate updateTime;
//澶栭敭璁㈠崟琛�
-// private Order order;
-// //澶栭敭璁㈠崟鏄庣粏琛�
-// private OrderDetail orderDetail;
-// //澶栭敭璁㈠崟宸ヨ壓瀹℃牳琛�
-// private orderGlassDetail orderGlassDetail;
+ private Order order;
+ //澶栭敭璁㈠崟鏄庣粏琛�
+ private OrderDetail orderDetail;
+ //澶栭敭璁㈠崟宸ヨ壓瀹℃牳琛�
+ private OrderGlassDetail orderGlassDetail;
+
+ private Product product;
}
--
Gitblit v1.8.0