From 8abdca3bf172f687ae17bd707dfdaa65d55d1547 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 11:46:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 f126d56..8cf9977 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
@@ -239,7 +239,10 @@
public R<Boolean> clinicAdd(@Validated @RequestBody TErpClinicGoodsAddDto dto) {
SysUser user = tokenService.getLoginUser().getUser();
if (erpGoodsService.isExit(dto.getGoodsIdCode(), dto.getQuasiNumber(),null)) {
- return R.fail("erp商品已存在");
+ return R.fail("erp商品已存在，商品条码重复");
+ }
+ if (erpGoodsService.isExitOne(dto.getGoodsIdCode(), dto.getQuasiNumber(),null)) {
+ return R.fail("erp商品已存在，国药准字号重复");
}
Integer roleType = user.getRoleType();
TErpGoods goods = new TErpGoods();
--
Gitblit v1.7.1