From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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 | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 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 fdcfa82..48ffb43 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,6 +1,7 @@
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;
@@ -25,7 +26,7 @@
//搴忓彿
private Integer orderNumber;
//宸ヨ壓纭搴忓彿
- private Integer technologyNumber;
+ private String technologyNumber;
//鍒嗘灦鏁伴噺
private Integer quantity;
//宸蹭紭鍖栨暟閲�
@@ -55,18 +56,64 @@
//鍒嗘灦鍛�
private String founder;
//鍒嗘灦鏃堕棿
+ @TableField(value = "`splitFrame_time`")
private LocalDate splitFrameTime;
+ //鎺掑簭
+ private Integer sort;
+ //鏋跺彿
+ private String rack;
+ //璁㈠崟杞Щ瀵煎叆鏁伴噺
+ private Integer importNumber;
+ //璁㈠崟杞Щ瀵煎嚭鏁伴噺
+ private Integer exportNumber;
//寤虹珛鏃堕棿
private LocalDate createTime;
//淇敼鏃堕棿
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 Integer patchState;
+
//澶栭敭璁㈠崟琛�
+ @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