From 1761db79655ae3137a371579c77501e65452a9ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 21 Mar 2024 11:29:53 +0800 Subject: [PATCH] =?UTF-8?q?ebom=E6=AD=A3=E5=BC=8F=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E8=A1=A8=E7=B2=BE=E7=A1=AE=E6=90=9C=E7=B4=A2=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=AD=98=E5=9C=A8=E7=89=A9=E6=96=99=EF=BC=8C?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E6=AD=A4=E7=89=A9=E6=96=99=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E4=B8=8B=E7=BA=A7=E6=97=B6=EF=BC=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E2=80=9C=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=AD=A4BOM=E7=89=A9?= =?UTF-8?q?=E6=96=99=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BomNewEbomParentService.java | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index ac737861..e05eebe6 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -10,6 +10,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -23,10 +24,7 @@ import com.nflg.product.base.core.exception.NflgBusinessException; import com.nflg.product.bomnew.constant.*; import com.nflg.product.bomnew.mapper.master.BomNewEbomParentMapper; import com.nflg.product.bomnew.pojo.dto.*; -import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity; -import com.nflg.product.bomnew.pojo.entity.BomNewEbomMaterialUseEntity; -import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity; -import com.nflg.product.bomnew.pojo.entity.MaterialMainEntity; +import com.nflg.product.bomnew.pojo.entity.*; import com.nflg.product.bomnew.pojo.query.BomNewEbomMaterialQuery; import com.nflg.product.bomnew.pojo.query.BomNewEbomParentQuery; import com.nflg.product.bomnew.pojo.vo.*; @@ -256,7 +254,21 @@ public class BomNewEbomParentService extends ServiceImpl formalWorksheet(BomNewEbomParentQuery query) { Page result = this.getBaseMapper().formalWorksheet(new Page<>(query.getPage(), query.getPageSize()), query); - materialMainService.intiMaterialInfo(result.getRecords()); + if (CollUtil.isNotEmpty(result.getRecords())) { + materialMainService.intiMaterialInfo(result.getRecords()); + } else { + //查bom是否存在 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (StrUtil.isNotBlank(query.getDrawingNo())) { + wrapper.eq(BomNewEbomChildEntity::getDrawingNo, query.getDrawingNo()); + } else if (StrUtil.isNotBlank(query.getMaterialNo())) { + wrapper.eq(BomNewEbomChildEntity::getMaterialNo, query.getMaterialNo()); + } + if (wrapper.nonEmptyOfWhere() && ebomChildService.getBaseMapper().selectCount(wrapper) > 0) { + VUtils.isTure(true).throwMessage("不存在此BOM物料"); + } + } + return result; }