From bea49667b0a34a17490c4b47f6a14857a737f647 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期三, 17 七月 2024 08:47:31 +0800
Subject: [PATCH] 新增生产日志历史表,每天00:05把生产日志表中的数据移动到历史表中

---
 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
index 580f0f2..e11151c 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
@@ -5,12 +5,12 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dy.common.po.BaseEntity;
+import com.dy.pmsGlobal.pojoBa.BaUser;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 
-
-
 import java.util.Date;
+import java.util.List;
 
 /**
 * 鐢熶骇绾跨敓浜т换鍔¤棰嗚〃
@@ -41,9 +41,11 @@
     /**
     * 鐢熶骇绾垮疄浣撶紪鍙�
     */
-    @NotNull(message="[鐢熶骇绾垮疄浣撶紪鍙穄涓嶈兘涓虹┖")
     @JSONField(serializeUsing= ObjectWriterImplToString.class)
     public Long lineId;
+
+    @TableField(exist = false)
+    public String lineName;
     /**
     * 宸ョ珯瀹炰綋缂栧彿
     */
@@ -54,24 +56,46 @@
     @TableField(exist = false)
     public String stationName;
 
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    public Long proId;
+
+    @TableField(exist = false)
+    public String proName;
+
+    @TableField(exist = false)
+    public String devicePrefix;
+
     /**
     * 缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿
     */
     @NotNull(message="[缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿]涓嶈兘涓虹┖")
     @JSONField(serializeUsing= ObjectWriterImplToString.class)
     public Long planId;
+
+    @TableField(exist = false)
+    public String planName;
+
     /**
     * 鐢熶骇娴佺▼瀹炰綋缂栧彿
     */
     @NotNull(message="[鐢熶骇娴佺▼瀹炰綋缂栧彿]涓嶈兘涓虹┖")
     @JSONField(serializeUsing= ObjectWriterImplToString.class)
     public Long processId;
+
+    @TableField(exist = false)
+    public String processName;
     /**
     * 鐢熶骇娴佺▼鑺傜偣瀹炰綋缂栧彿
     */
     @NotNull(message="[鐢熶骇娴佺▼鑺傜偣瀹炰綋缂栧彿]涓嶈兘涓虹┖")
     @JSONField(serializeUsing= ObjectWriterImplToString.class)
     public Long nodeId;
+
+    @TableField(exist = false)
+    public String nodeName;
+
+    public Integer workType;
+
     /**
     * 浠诲姟璁ら鏃堕棿
     */
@@ -93,5 +117,8 @@
     */
     public String assistants;
 
+    @TableField(exist = false)
+    public List<BaUser> assistantsList;
+
 
 }

--
Gitblit v1.8.0