From f8863051073b0f08c4ab543957b2a296acd38f8f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 十一月 2025 16:10:56 +0800
Subject: [PATCH] 调整流程卡上图片的显示方式
---
north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 3 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 03629cc..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
@@ -1,13 +1,18 @@
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.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;
+import com.example.erp.entity.sd.Product;
+import lombok.Data;
import java.time.LocalDate;
-
+@Data
+@TableName("pp.`flow_card`")
public class FlowCard {
@TableId(type = IdType.AUTO)
//鑷id
@@ -18,14 +23,18 @@
private String productionId;
//娴佺▼鍗″彿
private String processId;
+ //钀芥灦椤哄簭
+ private Integer landingSequence;
//搴忓彿
private Integer orderNumber;
//宸ヨ壓纭搴忓彿
- private Integer technologyNumber;
+ private String technologyNumber;
+ //鍒嗘灦鏁伴噺
+ private Integer quantity;
//宸蹭紭鍖栨暟閲�
private Integer optimizeQuantity;
//鎺掔増鐘舵��
- private Integer layoutStatus;
+ private String layoutStatus;
//琛ョ墖鏁伴噺
private Integer numberPatches;
//搴撳瓨鏁伴噺
@@ -49,16 +58,80 @@
//鍒嗘灦鍛�
private String founder;
//鍒嗘灦鏃堕棿
+ @TableField(value = "`splitFrame_time`")
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;
+ //浜у搧鍚嶇О
+ @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 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)
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