liding
11 小时以前 27ecc1025e2796f4c58b41b7970d5a21a5e6ef0d
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());