From fe1b02a121c173e9b2d56bbe5a1982e0e69e0548 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 28 四月 2026 18:06:08 +0800
Subject: [PATCH] feat(production): 新增生产工单管理功能 - 创建 ProductionOperationTask 实体类定义工单数据结构 - 实现 ProductionOperationTaskController 提供工单的增删改查接口 - 开发 ProductionOperationTaskService 和实现类处理业务逻辑 - 配置 ProductionOperationTaskMapper 及 XML 文件实现数据库操作 - 添加 ProductionOperationTaskVo 视图对象用于数据展示 - 扩展 ProductionOrder 实体类增加生产订单相关属性 - 更新 ProductionOrderMapper.xml 完善订单查询映射配置 - 优化 ProductionOrderPickRecordMapper.xml 记录物料领取明细 - 新增 ProductionOrderRoutingOperationParam 参数配置实体 - 完善 工序参数处理逻辑

---
 src/main/java/com/ruoyi/approve/pojo/ApproveNode.java |   63 +++++++++++++++++++++++++++++--
 1 files changed, 59 insertions(+), 4 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..2c5da10 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
@@ -1,11 +1,16 @@
 package com.ruoyi.approve.pojo;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 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 com.ruoyi.sales.pojo.CommonFile;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -13,16 +18,28 @@
  * @TableName approve_node
  */
 @Data
-public class ApproveNode implements Serializable {
+@TableName("approve_node")
+@Schema
+public class ApproveNode{
+
+
+    @Schema(description = "闄勪欢id")
+    @TableField(exist = false)
+    private List<String> tempFileIds;
+
+    @TableField(exist = false)
+    @Schema(description = "闄勪欢鍒楄〃")
+    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;
 
     /**
      * 瀹℃壒鑺傜偣鎷掔粷鍘熷洜
@@ -75,4 +127,7 @@
     private static final long serialVersionUID = 1L;
 
 
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }
\ No newline at end of file

--
Gitblit v1.9.3