From ea531a6f0efba09ca671fee7e406e42955d1f0d1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 27 五月 2026 17:48:26 +0800
Subject: [PATCH] 编辑采购台账报错异常+供应商往来查询入库金额sql调整优化
---
src/main/java/com/ruoyi/stock/pojo/StockInRecord.java | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
index 1ac862a..f9525ee 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
@@ -2,19 +2,22 @@
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;
+import java.io.Serial;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
@TableName("stock_in_record")
-@ApiModel("鍏ュ簱绠＄悊")
-public class StockInRecord {
+@Schema(name = "鍏ュ簱绠＄悊")
+public class StockInRecord implements Serializable {
+ @Serial
private static final long serialVersionUID = 1L;
/**
* 搴忓彿
@@ -22,43 +25,57 @@
@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")
+ @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 = "棰勮鏁伴噺")
+ @TableField(exist = false)
+ 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;
- @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;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "瀹℃壒鐘舵�� 0-寰呭鎵� 1-閫氳繃 2-椹冲洖", implementation = ReviewStatusEnum.class)
+ private Integer approvalStatus;
+
@TableField(fill = FieldFill.INSERT)
- private Long tenantId;
+ private Long deptId;
}
--
Gitblit v1.9.3