From 30060679e8bb07366fcba6984e18df8b6607db9a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 27 一月 2026 15:58:26 +0800
Subject: [PATCH] refactor(stock): 预警数量返回
---
src/main/java/com/ruoyi/stock/pojo/StockInventory.java | 2 +-
src/main/resources/mapper/stock/StockInventoryMapper.xml | 5 ++++-
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 1 +
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInventory.java b/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
index 3e0ad52..36e7cf0 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
@@ -59,7 +59,7 @@
private BigDecimal lockedQuantity;
@ApiModelProperty("棰勮鏁伴噺")
- private Integer warnNum;
+ private BigDecimal warnNum;
@ApiModelProperty("澶囨敞")
private String remark;
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
index 4a83a22..b15f881 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -70,6 +70,7 @@
newStockInventory.setQualitity(stockInventoryDto.getQualitity());
newStockInventory.setVersion(1);
newStockInventory.setRemark(stockInventoryDto.getRemark());
+ newStockInventory.setWarnNum(stockInventoryDto.getWarnNum());
stockInventoryMapper.insert(newStockInventory);
}else {
stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index e14b9ce..e7f365f 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -25,6 +25,9 @@
<if test="ew.remark != null and ew.remark !=''">
remark = #{ew.remark},
</if>
+ <if test="ew.warnNum != null and ew.warnNum !=''">
+ warn_num = #{ew.warnNum},
+ </if>
update_time = now()
</set>
where product_model_id = #{ew.productModelId}
@@ -52,7 +55,7 @@
si.product_model_id,
si.create_time,
si.update_time,
- si.warn_num,
+ COALESCE(si.warn_num, 0) as warn_num,
si.version,
(si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
pm.model,
--
Gitblit v1.9.3