From 901b2ab3e0e7c592602848cfa256f34c5b0c7bb8 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 11 一月 2024 09:57:01 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 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 200b6cc..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
@@ -4,11 +4,11 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.domain.entity.MatExcel;
-import com.zy.asrs.common.wms.entity.ManMat;
-import com.zy.asrs.common.wms.entity.ManTag;
-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.entity.Mat;
+import com.zy.asrs.common.wms.entity.Tag;
+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,20 +56,20 @@
*/
@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;
// 鍒嗙被
// 涓�绾у垎绫�
if (!Cools.isEmpty(excel.getPriClass()) && !Cools.isEmpty(excel.getSecClass())) {
- ManTag priTag = tagService.getOne(new LambdaQueryWrapper<ManTag>().eq(ManTag::getName, excel.getPriClass()).eq(ManTag::getLevel, 2));
+ Tag priTag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getName, excel.getPriClass()).eq(Tag::getLevel, 2));
if (priTag == null) {
- ManTag top = tagService.getTop();
+ Tag top = tagService.getTop(hostId);
NodeUtils nodeUtils = new NodeUtils();
nodeUtils.executePath(top.getId());
- priTag = new ManTag(
+ priTag = new Tag(
null, // 缂栧彿
excel.getPriClass(), // 鍚嶇О
top.getId(), // 鐖剁骇
@@ -93,11 +95,11 @@
}
}
// 浜岀骇鍒嗙被
- ManTag secTag = tagService.getOne(new LambdaQueryWrapper<ManTag>().eq(ManTag::getName, excel.getPriClass()).eq(ManTag::getLevel, 3));
+ Tag secTag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getName, excel.getPriClass()).eq(Tag::getLevel, 3));
if (secTag == null) {
NodeUtils nodeUtils = new NodeUtils();
nodeUtils.executePath(priTag.getId());
- secTag = new ManTag(
+ secTag = new Tag(
null, // 缂栧彿
excel.getSecClass(), // 鍚嶇О
priTag.getId(), // 鐖剁骇
@@ -124,10 +126,10 @@
}
tagId = secTag.getId();
} else {
- tagId = tagService.getTop().getId();
+ tagId = tagService.getTop(hostId).getId();
}
// 鍟嗗搧
- ManMat mat = matService.getOne(new LambdaQueryWrapper<ManMat>().eq(ManMat::getMatnr, excel.getMatnr()));
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, excel.getMatnr()));
if (mat == null) {
mat = excel;
mat.setTagId(tagId);
--
Gitblit v1.9.1