From bd02d873d7bbcae36a2a1262d921f2fc6b0cce09 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 14:33:41 +0800
Subject: [PATCH] feat(sales): 新增发货台账详情功能并优化库存管理

---
 src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java |   48 ++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java
index f8d75b9..ef8fc01 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java
@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.approve.utils.ListToStringTypeHandler;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -22,13 +22,13 @@
      * 璁″垝鏍囬
      */
     @Excel(name = "璁″垝鏍囬")
-    @ApiModelProperty("璁″垝鏍囬")
+    @Schema(description = "璁″垝鏍囬")
     private String title;
     /**
      * 璁″垝鎻忚堪
      */
     @Excel(name = "璁″垝鎻忚堪")
-    @ApiModelProperty("璁″垝鎻忚堪")
+    @Schema(description = "璁″垝鎻忚堪")
     private String description;
 
 
@@ -36,13 +36,13 @@
      * 璁″垝绾у埆
      */
     @Excel(name = "璁″垝绾у埆")
-    @ApiModelProperty("璁″垝绾у埆")
+    @Schema(description = "璁″垝绾у埆")
     private String level;
     /**
      * 鏃堕棿鍛ㄦ湡
      */
     @Excel(name = "鏃堕棿鍛ㄦ湡")
-    @ApiModelProperty("鏃堕棿鍛ㄦ湡")
+    @Schema(description = "鏃堕棿鍛ㄦ湡")
     private String period;
     /**
      * 寮�濮嬫椂闂�
@@ -63,33 +63,58 @@
      * 璐熻矗浜�
      */
     @Excel(name = "璐熻矗浜�")
-    @ApiModelProperty("璐熻矗浜�")
+    @Schema(description = "璐熻矗浜�")
     private String assignee;
     /**
      * 鐘舵��
      */
     @Excel(name = "鐘舵��")
-    @ApiModelProperty("鐘舵��")
+    @Schema(description = "鐘舵��")
     private String status;
     /**
      * 浼樺厛绾�
      */
     @Excel(name = "浼樺厛绾�")
-    @ApiModelProperty("浼樺厛绾�")
+    @Schema(description = "浼樺厛绾�")
     private String priority;
     /**
      * 瀹屾垚搴�
      */
     @Excel(name = "瀹屾垚搴�")
-    @ApiModelProperty("瀹屾垚搴�")
+    @Schema(description = "瀹屾垚搴�")
     private Integer progress;
     /**
      * 鏍囩
      */
     @Excel(name = "鏍囩")
-    @ApiModelProperty("鏍囩")
+    @Schema(description = "鏍囩")
     @TableField(value = "tags",typeHandler = ListToStringTypeHandler.class,jdbcType = JdbcType.VARCHAR)
     private List<String> tags;
+    /**
+     * 鍒涘缓鑰�
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+    /**
+     * 淇敼浜�
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
+    /**
+     * 淇敼鏃堕棿
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
     /**
      * 绉熸埛ID
      */
@@ -97,4 +122,7 @@
     private Long tenantId;
 
 
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3