#

Junjie

2023-12-21 f2eebff1b85e3b44bdc00dcd5eb00127edef617f

 zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java

@@ -4,8 +4,8 @@
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.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;
@@ -62,12 +62,12 @@
        // 分类
        // 一级分类
        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);