From dcb687e06191ebd38fd1b44a76a77bf20a1d9b8e Mon Sep 17 00:00:00 2001
From: zhang_nuo <zhang_12370@163.com>
Date: 星期二, 21 七月 2026 18:15:30 +0800
Subject: [PATCH] 提交 两企业的配置文件 提交配置文件

---
 src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

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..07d70a5 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -105,7 +105,11 @@
             newStockInventory.setBatchNo(stockInventoryDto.getBatchNo());
             newStockInventory.setLockedQuantity(stockInventoryDto.getLockedQuantity());
             newStockInventory.setWarnNum(stockInventoryDto.getWarnNum());
-            stockInventoryMapper.insert(newStockInventory);
+            try {
+                stockInventoryMapper.insert(newStockInventory);
+            } catch (org.springframework.dao.DuplicateKeyException e) {
+                stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
+            }
         } else {
             stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
         }
@@ -168,6 +172,7 @@
         stockInRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
         stockInRecordDto.setType("0");
         stockInRecordDto.setRemark(stockInventoryDto.getRemark());
+        stockInRecordDto.setWarnNum(stockInventoryDto.getWarnNum());
         stockInRecordService.add(stockInRecordDto);
         return true;
     }

--
Gitblit v1.9.3