From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro
---
src/main/java/com/ruoyi/stock/pojo/StockInRecord.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
index 8c4f036..df39946 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
@@ -2,18 +2,22 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.enums.ReviewStatusEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.io.Serial;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
@TableName("stock_in_record")
@Schema(name = "鍏ュ簱绠＄悊")
-public class StockInRecord {
+public class StockInRecord implements Serializable {
+ @Serial
private static final long serialVersionUID = 1L;
/**
* 搴忓彿
@@ -27,6 +31,9 @@
@Schema(description = "鍏ュ簱鏁伴噺")
private BigDecimal stockInNum;
+ @Schema(description = "鎵瑰彿")
+ private String batchNo;
+
@Schema(description = "璁板綍绫诲瀷 鏋氫妇")
private String recordType;
@@ -39,11 +46,13 @@
@Schema(description = "澶囨敞")
private String remark;
+ @Schema(description = "棰勮鏁伴噺")
+ private BigDecimal warnNum;
+
@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;
@@ -62,6 +71,9 @@
@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