From c76954bbb2cdc4624d126f125fc9e841194846cd Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 23 五月 2026 17:18:45 +0800
Subject: [PATCH] fix: 修复预警数量丢失问题
---
src/main/java/com/ruoyi/stock/pojo/StockInRecord.java | 3 +++
src/main/resources/mapper/stock/StockInventoryMapper.xml | 2 +-
src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java | 2 ++
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 1 +
4 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
index 6b8a807..2c1fecb 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
@@ -43,6 +43,9 @@
@Schema(description = "澶囨敞")
private String remark;
+ @Schema(description = "棰勮鏁伴噺")
+ private BigDecimal warnNum;
+
@Schema(description = "绫诲瀷 0鍚堟牸鍏ュ簱 1涓嶅悎鏍煎叆搴�")
private String type;
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
index e718611..a84374c 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
@@ -238,10 +238,12 @@
stockInventoryDto.setBatchNo(stockInRecord.getBatchNo());
stockInventoryDto.setQualitity(stockInRecord.getStockInNum());
stockInventoryDto.setRemark(stockInRecord.getRemark());
+ stockInventoryDto.setWarnNum(stockInRecord.getWarnNum());
if (stockInventory == null) {
stockInventoryMapper.insert(new StockInventory() {{
setProductModelId(stockInRecord.getProductModelId());
setQualitity(stockInRecord.getStockInNum());
+ setWarnNum(stockInRecord.getWarnNum());
setBatchNo(stockInRecord.getBatchNo());
setRemark(stockInRecord.getRemark());
setVersion(1);
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 24605ba..ba74248 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -166,6 +166,7 @@
stockInRecordDto.setStockInNum(stockInventoryDto.getQualitity());
stockInRecordDto.setBatchNo(batchNo);
stockInRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
+ stockInRecordDto.setWarnNum(stockInventoryDto.getWarnNum());
stockInRecordDto.setType("0");
stockInRecordDto.setRemark(stockInventoryDto.getRemark());
stockInRecordService.add(stockInRecordDto);
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 6ca5bf7..06c1863 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -113,7 +113,7 @@
product_model_id,
MAX(create_time) as create_time,
MAX(update_time) as update_time,
- MAX(warn_num) as warn_num,
+ SUM(warn_num) as warn_num,
MAX(version) as version,
model,
MAX(remark) as remark,
--
Gitblit v1.9.3