From 911ea91bf388a124e15b6fe4d1884231fe117b07 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 02 十二月 2024 16:11:43 +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 | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 4378f0a..a8ab5bc 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
@@ -26,7 +26,7 @@
//搴忓彿
private Integer orderNumber;
//宸ヨ壓纭搴忓彿
- private Integer technologyNumber;
+ private String technologyNumber;
//鍒嗘灦鏁伴噺
private Integer quantity;
//宸蹭紭鍖栨暟閲�
@@ -56,6 +56,7 @@
//鍒嗘灦鍛�
private String founder;
//鍒嗘灦鏃堕棿
+ @TableField(value = "`splitFrame_time`")
private LocalDate splitFrameTime;
//鎺掑簭
private Integer sort;
@@ -65,15 +66,35 @@
private LocalDate updateTime;
//鏌ヨ鐢�
+ //鏍囩鎵撳嵃鏁伴噺
+ @TableField(select = false,exist = false)
+ private Integer printQuantity;
//鎶ュ伐缂栧彿
+ @TableField(select = false,exist = false)
private String reportingWorkId;
//浜у搧鍚嶇О
+ @TableField(select = false,exist = false)
private String glassChild;
//宸ヨ壓娴佺▼
+ @TableField(select = false,exist = false)
private String process;
//娴佺▼鍗″悎骞�
+ @TableField(select = false,exist = false)
private Integer merge;
+ //琛ョ墖鍘熷洜
+ @TableField(select = false,exist = false)
+ private String patchReason;
+ //宸ョ▼鍙�
+ @TableField(select = false,exist = false)
+ private String projectNo;
+ //鐗堝浘ID
+ @TableField(select = false,exist = false)
+ private String stockId;
+ //灏忕墖鏁伴噺
+ @TableField(select = false,exist = false)
+ private String glassCount;
+
//澶栭敭璁㈠崟琛�
@TableField(select = false,exist= false)
private Order order;
--
Gitblit v1.8.0