From dffdcaa14f32c51a63b4ab2cc7a38eebf17f8f44 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期日, 28 七月 2024 15:58:34 +0800
Subject: [PATCH] 修改发货报表

---
 north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 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 93f5d95..22dc95f 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;
@@ -20,16 +21,18 @@
     private String productionId;
     //娴佺▼鍗″彿
     private String processId;
+    //钀芥灦椤哄簭
+    private Integer landingSequence;
     //搴忓彿
     private Integer orderNumber;
     //宸ヨ壓纭搴忓彿
     private Integer technologyNumber;
     //鍒嗘灦鏁伴噺
-    private Integer binningQuantity;
+    private Integer quantity;
     //宸蹭紭鍖栨暟閲�
     private Integer optimizeQuantity;
     //鎺掔増鐘舵��
-    private Integer layoutStatus;
+    private String layoutStatus;
     //琛ョ墖鏁伴噺
     private Integer numberPatches;
     //搴撳瓨鏁伴噺
@@ -54,17 +57,31 @@
     private String founder;
     //鍒嗘灦鏃堕棿
     private LocalDate splitFrameTime;
+    //鎺掑簭
+    private Integer sort;
     //寤虹珛鏃堕棿
     private LocalDate createTime;
     //淇敼鏃堕棿
     private LocalDate updateTime;
 
+    //鏌ヨ鐢�
+    //鎶ュ伐缂栧彿
+    private String reportingWorkId;
+    //浜у搧鍚嶇О
+    private String glassChild;
+    //宸ヨ壓娴佺▼
+    private String process;
+
     //澶栭敭璁㈠崟琛�
+    @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