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 | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 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 f7847a9..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
@@ -26,7 +28,7 @@
//搴忓彿
private Integer orderNumber;
//宸ヨ壓纭搴忓彿
- private Integer technologyNumber;
+ private String technologyNumber;
//鍒嗘灦鏁伴噺
private Integer quantity;
//宸蹭紭鍖栨暟閲�
@@ -60,12 +62,26 @@
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;
//鎶ュ伐缂栧彿
@TableField(select = false,exist = false)
private String reportingWorkId;
@@ -88,9 +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)
@@ -104,4 +132,6 @@
@TableField(select = false,exist= false)
private Product product;
+
+
}
--
Gitblit v1.8.0