From b670c64208a10c789bc7ab61eddb1f8528ef8daa Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 18 三月 2024 15:22:41 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
index ee86eb7..231555a 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
@@ -6,9 +6,9 @@
import com.zy.asrs.common.domain.entity.MatExcel;
import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.entity.Tag;
-import com.zy.asrs.common.wms.mapper.ManTagMapper;
-import com.zy.asrs.common.wms.service.ManMatService;
-import com.zy.asrs.common.wms.service.ManTagService;
+import com.zy.asrs.common.wms.mapper.TagMapper;
+import com.zy.asrs.common.wms.service.MatService;
+import com.zy.asrs.common.wms.service.TagService;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.framework.exception.CoolException;
@@ -27,12 +27,14 @@
private int total = 0;
private Long userId;
+ private Long hostId;
public MatExcelListener() {
}
- public MatExcelListener(Long userId) {
+ public MatExcelListener(Long userId, Long hostId) {
this.userId = userId;
+ this.hostId = hostId;
}
/**
@@ -54,9 +56,9 @@
*/
@Override
public void invoke(MatExcel excel, AnalysisContext ctx) {
- ManTagService tagService = SpringUtils.getBean(ManTagService.class);
- ManTagMapper tagMapper = SpringUtils.getBean(ManTagMapper.class);
- ManMatService matService = SpringUtils.getBean(ManMatService.class);
+ TagService tagService = SpringUtils.getBean(TagService.class);
+ TagMapper tagMapper = SpringUtils.getBean(TagMapper.class);
+ MatService matService = SpringUtils.getBean(MatService.class);
Date now = new Date();
Long tagId;
// 鍒嗙被
@@ -64,7 +66,7 @@
if (!Cools.isEmpty(excel.getPriClass()) && !Cools.isEmpty(excel.getSecClass())) {
Tag priTag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getName, excel.getPriClass()).eq(Tag::getLevel, 2));
if (priTag == null) {
- Tag top = tagService.getTop();
+ Tag top = tagService.getTop(hostId);
NodeUtils nodeUtils = new NodeUtils();
nodeUtils.executePath(top.getId());
priTag = new Tag(
@@ -124,7 +126,7 @@
}
tagId = secTag.getId();
} else {
- tagId = tagService.getTop().getId();
+ tagId = tagService.getTop(hostId).getId();
}
// 鍟嗗搧
Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, excel.getMatnr()));
--
Gitblit v1.9.1