From 8697691fc8eee9f732bc8ab4ff2e5771af88009d Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 24 十二月 2025 14:55:53 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/utils/MatExcelListener.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/MatExcelListener.java b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
index 081e136..d747de8 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;
@@ -10,13 +11,11 @@
import com.zy.asrs.entity.MatBarcode;
import com.zy.asrs.entity.Tag;
import com.zy.asrs.mapper.TagMapper;
-import com.zy.asrs.service.InOutService;
-import com.zy.asrs.service.MatBarcodeService;
-import com.zy.asrs.service.MatService;
-import com.zy.asrs.service.TagService;
+import com.zy.asrs.service.*;
import com.zy.common.entity.MatExcel;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import java.util.ArrayList;
import java.util.Date;
@@ -63,6 +62,9 @@
MatService matService = SpringUtils.getBean(MatService.class);
InOutService inOutService = SpringUtils.getBean(InOutService.class);
MatBarcodeService matBarcodeService = SpringUtils.getBean(MatBarcodeService.class);
+ WrkDetlService wrkDetlService = SpringUtils.getBean(WrkDetlService.class);
+ LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
+ WaitPakinService waitPakinService = SpringUtils.getBean(WaitPakinService.class);
Date now = new Date();
Long tagId;
// 鍒嗙被
@@ -143,6 +145,7 @@
inOut.setMaktx(mat.getMaktx());
inOut.setColor(mat.getColor());
inOut.setSpecs(mat.getSpecs());
+ inOut.setName(excel.getName());
inOut.setTemp1("");
if (!matService.insert(mat)) {
throw new CoolException("淇濆瓨鍟嗗搧妗ｆ澶辫触锛屽晢鍝佺紪鐮侊細" + excel.getMatnr());
@@ -156,6 +159,11 @@
//妯″叿鐘舵�佹洿鏂颁负鎶ュ簾 妯″叿涓庢墭鐩樿В缁�
List<MatBarcode> list = new ArrayList<>();
MatBarcode matBarcode = matBarcodeService.selectbyMatnr(excel.getMatnr() + "__" + excel.getName());
+ InOut inOut = inOutService.selectByMatnr(excel.getMatnr() + "__" + excel.getName());
+ if (inOut != null){
+ inOut.setColor(excel.getColor());
+ inOutService.updateById(inOut);
+ }
if (matBarcode != null){
list.add(matBarcode);
matBarcodeService.deleteMatBarcode(list);
@@ -163,10 +171,10 @@
}
//妯″叿淇℃伅鏇存柊
- matService.deleteById(mat.getId());
+ matService.delete(new EntityWrapper<Mat>().eq("matnr",mat.getMatnr()));
mat = excel;
mat.setTagId(tagId);
- mat.setMatnr(excel.getMatnr()+"__"+excel.getName());
+ mat.setMatnr(excel.getMatnr() + "__" + excel.getName());
if (!matService.insert(mat)) {
throw new CoolException("淇濆瓨鍟嗗搧妗ｆ澶辫触锛屽晢鍝佺紪鐮侊細" + excel.getMatnr());
}
--
Gitblit v1.9.1