From 27ecc1025e2796f4c58b41b7970d5a21a5e6ef0d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 09 六月 2026 13:14:43 +0800
Subject: [PATCH] fix:库存导入优化
---
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 c82ac34..89302b7 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -372,16 +372,25 @@
}
// 鏋勫缓杩斿洖淇℃伅
- StringBuilder message = new StringBuilder();
- if (!unmatchedRecords.isEmpty()) {
- message.append("瀵煎叆鎴愬姛 " + successCount + " 鏉¤褰曪紝浠ヤ笅浜у搧鏈壘鍒板尮閰嶉」锛歕n");
+ if (successCount > 0 && unmatchedRecords.isEmpty()) {
+ return R.ok("瀵煎叆鎴愬姛 " + successCount + " 鏉¤褰�");
+ } else if (successCount > 0 && !unmatchedRecords.isEmpty()) {
+ StringBuilder message = new StringBuilder();
+ message.append("瀵煎叆鎴愬姛 " + successCount + " 鏉¤褰曪紝浠ヤ笅浜у搧鏈壘鍒板尮閰嶉」锛屾湭瀵煎叆锛歕n");
for (String record : unmatchedRecords) {
message.append(record).append("\n");
}
- return R.ok(message.toString());
+ return R.fail(message.toString());
+ } else if (!unmatchedRecords.isEmpty()) {
+ StringBuilder message = new StringBuilder();
+ message.append("瀵煎叆澶辫触锛屼互涓嬩骇鍝佹湭鎵惧埌鍖归厤椤癸細\n");
+ for (String record : unmatchedRecords) {
+ message.append(record).append("\n");
+ }
+ return R.fail(message.toString());
+ } else {
+ return R.fail("鏈壘鍒板彲瀵煎叆鐨勫簱瀛樻暟鎹紝璇锋鏌ュ鍏ヨ〃鏍间腑鐨勪骇鍝佸悕绉板拰鍨嬪彿鏄惁姝ｇ‘");
}
-
- return R.ok("瀵煎叆鎴愬姛锛屽叡澶勭悊 " + successCount + " 鏉¤褰�");
} catch (Exception e) {
log.error("瀵煎叆搴撳瓨澶辫触", e);
return R.fail("瀵煎叆澶辫触锛�" + e.getMessage());
--
Gitblit v1.9.3