From a8ab74fdbc4e590a4c9778d447538c3bc30925e4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 24 八月 2020 08:54:44 +0800
Subject: [PATCH] Merge branches 'gdasrs' and 'jsasrs' of http://192.168.2.250:9527/r/zy-asrs into gdasrs
---
src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
index 4ef5683..b8636f2 100644
--- a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
+++ b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
@@ -6,6 +6,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.service.MatCodeService;
+import com.zy.asrs.utils.VersionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,19 +54,15 @@
MatCodeService matCodeService = SpringUtils.getBean(MatCodeService.class);
if (matCodeService.selectById(data.getMatNo()) == null) {
MatCode matCode = new MatCode();
- matCode.setMatNo(data.getMatNo());
- matCode.setMatName(data.getMatName());
- matCode.setBarcode(data.getBarcode());
- matCode.setStr1(data.getStr1());
+ VersionUtils.setMatCode(matCode, data);
matCode.setModiTime(new Date());
matCode.setModiUser(this.userId);
matCode.setAppeTime(new Date());
matCode.setAppeUser(this.userId);
- list.add(matCode);
- total ++;
- if (!matCodeService.insertBatch(list)) {
+ if (!matCodeService.insert(matCode)) {
throw new CoolException("瀵煎叆鏁版嵁寮傚父");
}
+ total ++;
}
// 杈惧埌BATCH_COUNT浜嗭紝闇�瑕佸幓瀛樺偍涓�娆℃暟鎹簱锛岄槻姝㈡暟鎹嚑涓囨潯鏁版嵁鍦ㄥ唴瀛橈紝瀹规槗OOM
// if (list.size() >= BATCH_COUNT) {
--
Gitblit v1.9.1