From 613e4e92157dd697629dbad17fd091ae37637bc7 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 17 十一月 2025 08:50:44 +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 | 16 ++++++++++++++++
1 files changed, 16 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 541d41c..0d09f44 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
@@ -11,6 +12,7 @@
import java.time.LocalDate;
@Data
+@TableName("pp.`flow_card`")
public class FlowCard {
@TableId(type = IdType.AUTO)
//鑷id
@@ -74,6 +76,9 @@
private LocalDate updateTime;
//鏌ヨ鐢�
+ //娴佺▼鍗￠潰绉�
+ @TableField(select = false,exist = false)
+ private Double computeGrossArea;
//鏍囩鎵撳嵃鏁伴噺
@TableField(select = false,exist = false)
private Integer printQuantity;
@@ -99,12 +104,21 @@
//鐗堝浘ID
@TableField(select = false,exist = false)
private String stockId;
+ //灏忕墖搴忓彿
+ @TableField(select = false,exist = false)
+ private Integer polysId;
//灏忕墖鏁伴噺
@TableField(select = false,exist = false)
private String glassCount;
//琛ョ墖鐘舵��
@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)
@@ -118,4 +132,6 @@
@TableField(select = false,exist= false)
private Product product;
+
+
}
--
Gitblit v1.8.0