From 41ab7abd0b0ec0fefb03b60bbaf42c02fbda666b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 15:53:16 +0800
Subject: [PATCH] feat(production): 添加生产订单与销售台账关联功能

---
 src/main/java/com/ruoyi/warehouse/pojo/Documentation.java |   61 ++++++++++++++++--------------
 1 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java b/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
index 8c50afa..d9e85e4 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
@@ -8,8 +8,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -18,62 +17,63 @@
  */
 @TableName(value ="documentation")
 @Data
-@ApiModel(value = "鏂囨。淇℃伅琛�")
+@Schema(name = "鏂囨。淇℃伅琛�")
 public class Documentation implements Serializable {
     /**
      * 
      */
     @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "鏂囨。ID")
+    @Schema(description = "鏂囨。ID")
     private Long id;
 
     /**
-     * 绫诲埆鍚嶇О
+     * 绫诲埆鍚嶇Оid
      */
-    @Excel(name = "绫诲埆鍚嶇О")
-    @ApiModelProperty(value = "绫诲埆鍚嶇О")
-    private String categoryName;
+    @Excel(name = "绫诲埆鍚嶇Оid")
+    @Schema(description = "绫诲埆鍚嶇Оid")
+    private Long documentClassificationId;
 
     /**
      * 鏂囨。鍚嶇О
      */
     @Excel(name = "鏂囨。鍚嶇О")
-    @ApiModelProperty(value = "鏂囨。鍚嶇О")
+    @Schema(description = "鏂囨。鍚嶇О")
     private String docName;
 
     /**
      * 鏂囨。缂栧彿
      */
     @Excel(name = "鏂囨。缂栧彿")
-    @ApiModelProperty(value = "鏂囨。缂栧彿")
-    private Long docNumber;
+    @Schema(description = "鏂囨。缂栧彿")
+    private String docNumber;
 
     /**
      * 骞翠唤
      */
     @Excel(name = "骞翠唤")
-    @ApiModelProperty(value = "骞翠唤")
+    @Schema(description = "骞翠唤")
     private Long year;
 
     /**
      * 璐ｄ换浜�
      */
     @Excel(name = "璐ｄ换浜�")
-    @ApiModelProperty(value = "璐ｄ换浜�")
+    @Schema(description = "璐ｄ换浜�")
     private String responsiblePerson;
 
     /**
      * 鏂囨。鏀剧疆浣嶇疆
      */
     @Excel(name = "鏂囨。鏀剧疆浣嶇疆")
-    @ApiModelProperty(value = "鏂囨。鏀剧疆浣嶇疆")
+    @Schema(description = "鏂囨。鏀剧疆浣嶇疆")
     private Long warehouseGoodsShelvesRowcolId;
 
     /**
      * 鏂囨。鏃ユ湡
      */
-    @Excel(name = "鏂囨。鏃ユ湡")
-    @ApiModelProperty(value = "鏂囨。鏃ユ湡")
+
+    @Excel(name = "鏂囨。鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
+    @Schema(description = "鏂囨。鏃ユ湡")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime docDate;
 
@@ -81,63 +81,63 @@
      * 淇濈鏈熼檺
      */
     @Excel(name = "淇濈鏈熼檺")
-    @ApiModelProperty(value = "淇濈鏈熼檺")
+    @Schema(description = "淇濈鏈熼檺")
     private Long retentionPeriod;
 
     /**
      * 淇濆瘑绾у埆
      */
     @Excel(name = "淇濆瘑绾у埆")
-    @ApiModelProperty(value = "淇濆瘑绾у埆")
+    @Schema(description = "淇濆瘑绾у埆")
     private String securityLevel;
 
     /**
      * 浠芥暟
      */
     @Excel(name = "浠芥暟")
-    @ApiModelProperty(value = "浠芥暟")
+    @Schema(description = "浠芥暟")
     private Long copyCount;
 
     /**
      * 椤垫暟
      */
     @Excel(name = "椤垫暟")
-    @ApiModelProperty(value = "椤垫暟")
+    @Schema(description = "椤垫暟")
     private Long pageCount;
 
     /**
      * 鏂囨。绫诲埆
      */
     @Excel(name = "鏂囨。绫诲埆")
-    @ApiModelProperty(value = "鏂囨。绫诲埆")
+    @Schema(description = "鏂囨。绫诲埆")
     private String docCategory;
 
     /**
      * 鏂囨。绉嶇被
      */
     @Excel(name = "鏂囨。绉嶇被")
-    @ApiModelProperty(value = "鏂囨。绉嶇被")
+    @Schema(description = "鏂囨。绉嶇被")
     private String docType;
 
     /**
      * 绱ф�ョ▼搴�
      */
     @Excel(name = "绱ф�ョ▼搴�")
-    @ApiModelProperty(value = "绱ф�ョ▼搴�")
+    @Schema(description = "绱ф�ョ▼搴�")
     private String urgencyLevel;
 
     /**
      * 鏂囨。鐘舵��
      */
     @Excel(name = "鏂囨。鐘舵��")
-    @ApiModelProperty(value = "鏂囨。鐘舵��")
+    @Schema(description = "鏂囨。鐘舵��")
     private String docStatus;
 
     /**
      * 澶囨敞
      */
     @Excel(name = "澶囨敞")
-    @ApiModelProperty(value = "澶囨敞")
+    @Schema(description = "澶囨敞")
     private String remark;
 
     /**
@@ -150,19 +150,19 @@
      * 鍒涘缓鐢ㄦ埛
      */
     @TableField(fill = FieldFill.INSERT)
-    private Long createUser;
+    private Integer createUser;
 
     /**
      * 淇敼鏃堕棿
      */
-    @TableField(fill = FieldFill.UPDATE)
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
 
     /**
      * 淇敼鐢ㄦ埛
      */
-    @TableField(fill = FieldFill.UPDATE)
-    private Long updateUser;
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
 
     /**
      * 绉熸埛ID
@@ -171,4 +171,7 @@
     private Long tenantId;
 
     private static final long serialVersionUID = 1L;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }
\ No newline at end of file

--
Gitblit v1.9.3