From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro

---
 src/main/java/com/ruoyi/stock/pojo/StockInRecord.java |   39 ++++++++++++++++++++++++++-------------
 1 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
index 8ae86d5..6b8a807 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
@@ -2,8 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.enums.ReviewStatusEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -12,7 +12,7 @@
 
 @Data
 @TableName("stock_in_record")
-@ApiModel("鍏ュ簱绠$悊")
+@Schema(name = "鍏ュ簱绠$悊")
 public class StockInRecord {
 
     private static final long serialVersionUID = 1L;
@@ -22,40 +22,53 @@
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty(value = "鍏ュ簱鎵规")
+    @Schema(description = "鍏ュ簱鎵规")
     private String inboundBatches;
 
-    @ApiModelProperty(value = "鍏ュ簱鏁伴噺")
+    @Schema(description = "鍏ュ簱鏁伴噺")
     private BigDecimal stockInNum;
 
-    @ApiModelProperty(value = "璁板綍绫诲瀷  閲囪喘鍏ュ簱/鐢熶骇鍏ュ簱/璐ㄩ噺鍏ュ簱/鑷畾涔夊叆搴�")
+    @Schema(description = "鎵瑰彿")
+    private String batchNo;
+
+    @Schema(description = "璁板綍绫诲瀷  鏋氫妇")
     private String recordType;
 
-    @ApiModelProperty(value = "璁板綍ID  salesProductId/ProductrMainId/qualityInspectId/0")
+    @Schema(description = "璁板綍ID  ")
     private Long recordId;
 
-    @ApiModelProperty(value = "浜у搧瑙勬牸ID")
+    @Schema(description = "浜у搧瑙勬牸ID")
     private Long productModelId;
 
-    @ApiModelProperty(value = "澶囨敞")
+    @Schema(description = "澶囨敞")
     private String remark;
 
-    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @Schema(description = "绫诲瀷  0鍚堟牸鍏ュ簱 1涓嶅悎鏍煎叆搴�")
+    private String type;
+
+    @Schema(description = "鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
-    @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+    @Schema(description = "鍒涘缓鐢ㄦ埛")
     @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
 
-    @ApiModelProperty(value = "淇敼鏃堕棿")
+    @Schema(description = "淇敼鏃堕棿")
     @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
-    @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+    @Schema(description = "淇敼鐢ㄦ埛")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Integer updateUser;
 
+    @Schema(description = "瀹℃壒鐘舵��  0-寰呭鎵� 1-閫氳繃 2-椹冲洖", implementation = ReviewStatusEnum.class)
+    private Integer approvalStatus;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3