From 84e8c13e1885892631e52f71508150c0ff1ee55f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 25 九月 2025 18:52:01 +0800
Subject: [PATCH] 诊所erp
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
index 01534bf..40bd0f9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
@@ -359,7 +359,7 @@
List<TErpGoodsExcel> carAnnuallyImportExcels = ExcelImportUtil.importExcel(inputStream, TErpGoodsExcel.class, params);
Set<String> collect = carAnnuallyImportExcels.stream().map(TErpGoodsExcel::getGoodsIdCode).collect(Collectors.toSet());
if (collect.size() != carAnnuallyImportExcels.size()) {
- return AjaxResult.error("导入数据中商品标识码重复");
+ return AjaxResult.error("导入数据中商品条码重复");
}
Integer roleType = user.getRoleType();
for (TErpGoodsExcel erpGoodsExcel : carAnnuallyImportExcels) {
@@ -400,10 +400,10 @@
}
goods.setGoodsName(erpGoodsExcel.getGoodsName());
// 判断数据是否正确
- // 判断标识码是否重复
+ // 判断条码是否重复
long count = erpGoodsService.count(new QueryWrapper<TErpGoods>().eq("goods_id_code", erpGoodsExcel.getGoodsIdCode()));
if(count>0){
- names.add(erpGoodsExcel.getGoodsName() + " :标识码重复");
+ names.add(erpGoodsExcel.getGoodsName() + " :条码重复");
continue;
}
goods.setGoodsIdCode(erpGoodsExcel.getGoodsIdCode());
--
Gitblit v1.7.1