From 2f894921e5cf74910805f08a5e3180b68ac09e18 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 23 四月 2024 15:50:32 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 03629cc..82874c7 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
@@ -1,13 +1,16 @@
package com.example.erp.entity.pp;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
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
@@ -18,14 +21,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;
//搴撳瓨鏁伴噺
@@ -56,9 +63,15 @@
private LocalDate updateTime;
//澶栭敭璁㈠崟琛�
+ @TableField(select = false,exist= false)
private Order order;
//澶栭敭璁㈠崟鏄庣粏琛�
+ @TableField(select = false,exist= false)
private OrderDetail orderDetail;
//澶栭敭璁㈠崟宸ヨ壓瀹℃牳琛�
+ @TableField(select = false,exist= false)
private OrderGlassDetail orderGlassDetail;
+
+ @TableField(select = false,exist= false)
+ private Product product;
}
--
Gitblit v1.8.0