From 24d684de6602ce1b142e5be01d9e5b357df32799 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期四, 21 十二月 2023 15:34:50 +0800 Subject: [PATCH] # --- zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 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..5632f3c 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; @@ -54,20 +54,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(); NodeUtils nodeUtils = new NodeUtils(); nodeUtils.executePath(top.getId()); - priTag = new ManTag( + priTag = new Tag( null, // 缂栧彿 excel.getPriClass(), // 鍚嶇О top.getId(), // 鐖剁骇 @@ -93,11 +93,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(), // 鐖剁骇 @@ -127,7 +127,7 @@ tagId = tagService.getTop().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