rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

optimize: bom比较 

添加非null判断
This commit is contained in:
曹鹏飞 2024-06-27 17:25:34 +08:00
parent 711c104a91
commit 963062bee5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/CompareReportService.java
View File

@ -2,25 +2,21 @@ package com.nflg.product.bomnew.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.TypeReference;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.support.ExcelTypeEnum;
import com.nflg.product.bomnew.constant.ReportConstant;
import com.nflg.product.bomnew.pojo.vo.*;
import com.nflg.product.bomnew.pojo.query.CompareReportQuery;
import com.nflg.product.bomnew.pojo.vo.*;
import com.nflg.product.bomnew.util.EecExcelUtil;
import com.nflg.product.bomnew.util.VUtils;
import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
import org.springframework.util.FileCopyUtils;
import org.ttzero.excel.entity.ListSheet;
import java.io.*;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@ -39,6 +35,10 @@ public class CompareReportService {
ReportBomVO left = SpringUtil.getBean(ForwardReportService.class).factoryBomType(query.getLeft());
ReportBomVO right = SpringUtil.getBean(ForwardReportService.class).factoryBomType(query.getRight());
VUtils.isTure(Objects.isNull(left) && Objects.isNull(right)).throwMessage("两边的物料都未查到，无需比较");
VUtils.isTure(Objects.isNull(left)).throwMessage("未找到左边物料信息");
VUtils.isTure(Objects.isNull(right)).throwMessage("未找到右边物料信息");
if (CollUtil.isEmpty(left.getChildNodes()) && CollUtil.isEmpty(right.getChildNodes())) {
VUtils.isTure(true).throwMessage(StrUtil.format("{}和{}下无物料数据 ", left.getParent().getMaterialNo(), right.getParent().getMaterialNo()));
}