From e0f5380c21b72184c1455c24eaffe371585e1691 Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期一, 12 一月 2026 10:12:29 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/controller/MatController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index bd16c36..21a3fa2 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -157,6 +157,9 @@
if (Cools.isEmpty(mat) || null==mat.getId()){
return R.error();
}
+ if (null != matService.selectByMatnr(mat.getMatnr())) {
+ return R.error("鍟嗗搧妯″叿鍚嶇О宸插瓨鍦�");
+ }
if (mat.getColor().equals("姝ｅ父")){
mat.setColor("鎶ュ簾");
}else if (mat.getColor().equals("鎶ュ簾")){
@@ -361,7 +364,7 @@
public R matExcelImport(MultipartFile file) throws IOException {
MatExcelListener listener = new MatExcelListener(getUserId());
EasyExcel.read(file.getInputStream(), MatExcel.class, listener).sheet().doRead();
- return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
+ return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉″晢鍝佹暟鎹�,鏇存柊" + listener.getCount() + "鏉″晢鍝佹暟鎹�");
}
/*************************************** xm-select ***********************************************/
--
Gitblit v1.9.1