From c4409fac0044cc1efeda07b6a7709c3fde1aa9fe Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期六, 24 十月 2026 10:46:32 +0800
Subject: [PATCH] fix(仓储物流): ①出库新增临时跳过租户插件修复 SetOperationList 解析异常 ②库存预警查询补 warningLevel/warningStatus/warningTime/expectedShortageTime/suggestionType/suggestionContent 字段 ③currentStock 别名
---
src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
index 5599500..ed008ac 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -40,6 +41,29 @@
@TableField(exist = false)
private String timeStr;
+
+ // ===== 搴撳瓨棰勮鐩稿叧灞曠ず瀛楁锛堟潵鑷� custom_storage_warning_record锛岄潪鏈〃瀛楁锛�=====
+ /** 褰撳墠搴撳瓨锛堥〉闈㈠垪 currentStock锛孲QL 閲岀敱 availableStock 鍒悕鑰屾潵锛� */
+ @TableField(exist = false)
+ private BigDecimal currentStock;
+ /** 棰勮绾у埆 */
+ @TableField(exist = false)
+ private String warningLevel;
+ /** 棰勮鐘舵�� */
+ @TableField(exist = false)
+ private String warningStatus;
+ /** 棰勮鏃堕棿 */
+ @TableField(exist = false)
+ private LocalDateTime warningTime;
+ /** 棰勮缂鸿揣鏃堕棿 */
+ @TableField(exist = false)
+ private LocalDateTime expectedShortageTime;
+ /** 寤鸿绫诲瀷 */
+ @TableField(exist = false)
+ private String suggestionType;
+ /** 寤鸿鍐呭 */
+ @TableField(exist = false)
+ private String suggestionContent;
/**
* 寰呭嚭搴撴暟閲�
@@ -124,5 +148,13 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "鐧昏浜�")
+ private String registrant;
+
+ /**
+ * 棰勮鏁伴噺
+ */
+ @ApiModelProperty("棰勮鏁伴噺")
+ private BigDecimal warnNum;
}
--
Gitblit v1.9.3