From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 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 6c8ec86..914f8bd 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
@@ -60,12 +60,23 @@
     private LocalDate splitFrameTime;
     //鎺掑簭
     private Integer sort;
+    //鏋跺彿
+    private String rack;
+    //璁㈠崟杞Щ瀵煎叆鏁伴噺
+    private Integer importNumber;
+    //璁㈠崟杞Щ瀵煎嚭鏁伴噺
+    private Integer exportNumber;
+    //杩炵嚎鐘舵��(0涓嶈繛绾�1杩炵嚎锛岄粯璁�1锛屾坊鍔犳椂闂�
+    private Integer onlineStatus;
     //寤虹珛鏃堕棿
     private LocalDate createTime;
     //淇敼鏃堕棿
     private LocalDate updateTime;
 
     //鏌ヨ鐢�
+    //娴佺▼鍗¢潰绉�
+    @TableField(select = false,exist = false)
+    private Double computeGrossArea;
     //鏍囩鎵撳嵃鏁伴噺
     @TableField(select = false,exist = false)
     private Integer printQuantity;
@@ -97,6 +108,12 @@
     //琛ョ墖鐘舵��
     @TableField(select = false,exist = false)
     private Integer patchState;
+    //鎵规
+    @TableField(select = false,exist = false)
+    private String batch;
+    //浜у搧鍚嶇О
+    @TableField(select = false,exist = false)
+    private String productName;
 
     //澶栭敭璁㈠崟琛�
     @TableField(select = false,exist= false)
@@ -110,4 +127,6 @@
 
     @TableField(select = false,exist= false)
     private  Product product;
+
+
 }

--
Gitblit v1.8.0