From 940cab832331ab054d2a4c74f13aacc6847dd79d Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 08:43:26 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/utils/MatExcelListener.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/MatExcelListener.java b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
index e2e7ebd..6f29fc9 100644
--- a/src/main/java/com/zy/asrs/utils/MatExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
@@ -2,6 +2,7 @@
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
@@ -132,9 +133,14 @@
mat = excel;
mat.setTagId(tagId);
if (!matService.insert(mat)) {
- throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽崟鎹彿锛�" + excel.getMatnr());
+ throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛岀墿鏂欏彿锛�" + excel.getMatnr());
}
total++;
+ }else {
+ mat = excel;
+ mat.setTagId(tagId);
+ matService.update(mat,new EntityWrapper<Mat>().eq("matnr",mat.getMatnr()));
+ total++;
}
}
--
Gitblit v1.9.1