From 0047f8ce5986c577e6b887403dd24ea884c9ce4b Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 10 三月 2026 13:15:19 +0800
Subject: [PATCH] 入库前需审批,审批后入库（消息通知）

---
 src/main/java/com/ruoyi/approve/pojo/ApproveNode.java |   85 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
index de3a255..462b961 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
@@ -1,28 +1,45 @@
 package com.ruoyi.approve.pojo;
 
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 瀹℃壒鑺傜偣琛�
  * @TableName approve_node
  */
 @Data
+@TableName("approve_node")
+@ApiModel
 public class ApproveNode implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("闄勪欢id")
+    @TableField(exist = false)
+    private List<String> tempFileIds;
+
+    @TableField(exist = false)
+    @ApiModelProperty("闄勪欢鍒楄〃")
+    private String url;
+
     /**
      * 
      */
     private Long id;
 
     /**
-     * 瀹℃壒id
+     * 瀹℃壒缂栧彿
      */
-    private Long approveProcessId;
+    private String approveProcessId;
 
     /**
      * 瀹℃壒鑺傜偣椤哄簭
@@ -33,6 +50,11 @@
      * 瀹℃壒鑺傜偣鐢ㄦ埛鍚嶅瓧
      */
     private String approveNodeUser;
+
+    /**
+     * 瀹℃壒鑺傜偣鐢ㄦ埛id
+     */
+    private Long approveNodeUserId;
 
     /**
      * 瀹℃壒鑺傜偣鏃堕棿
@@ -48,19 +70,49 @@
     @TableField(exist = false)
     private Boolean isFirst;
 
+
+    /**
+     * 鏄惁涓烘渶鍚庝竴姝�
+     */
     @TableField(exist = false)
     private Boolean isLast;
 
     /**
+     * 鏄惁涓哄綋鍓嶅鏍歌妭鐐�
+     */
+    @TableField(exist = false)
+    private Boolean isShen = false;
+
+    /**
      * 绉熸埛id
      */
-    @TableField(fill = FieldFill.INSERT)
+//    @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
     /**
      * 鍒犻櫎鏍囪:0姝ｅ父锛�1鍒犻櫎
      */
     private Integer deleteFlag;
+
+    /**
+     * 鍏ュ簱鐢ㄦ埛id
+     */
+    private Long createUser;
+
+    /**
+     * 鍏ュ簱鏃堕棿
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 淇敼鑰�
+     */
+    private Long updateUser;
+
+    /**
+     * 淇敼鏃堕棿
+     */
+    private LocalDateTime updateTime;
 
     /**
      * 瀹℃壒鑺傜偣鎷掔粷鍘熷洜
@@ -72,7 +124,24 @@
      */
     private String approveNodeRemark;
 
-    private static final long serialVersionUID = 1L;
+    /**
+     * 鍏ュ簱id
+     */
+    @TableField(exist = false)
+    private Long recordId;
 
+    /**
+     * 鏄惁鍏ュ簱瀹℃牳閫氳繃
+     */
+    @ApiModelProperty(value = "鏄惁鍏ュ簱瀹℃牳閫氳繃")
+    @TableField(exist = false)
+    private boolean inventoryReview;
+
+    /**
+     * 鍏ュ簱绫诲瀷锛堝悎鏍�/涓嶅悎鏍硷級
+     */
+    @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+    @TableField(exist = false)
+    private String storageType;
 
 }
\ No newline at end of file

--
Gitblit v1.9.3