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 52d7e5d4..dbac4065 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,7 +10,6 @@ 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; @@ -24,7 +23,10 @@ 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.*; +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.query.BomNewEbomMaterialQuery; import com.nflg.product.bomnew.pojo.query.BomNewEbomParentQuery; import com.nflg.product.bomnew.pojo.vo.*; @@ -240,8 +242,7 @@ public class BomNewEbomParentService extends ServiceImpl getSelfMaterialNo(Set relSkuNo) { - Set selfParentMaterialNo = this.getBaseMapper().getSelfParentMaterialNo(SessionUtil.getUserCode(), relSkuNo); - return selfParentMaterialNo; + return this.getBaseMapper().getSelfParentMaterialNo(SessionUtil.getUserCode(), relSkuNo); } @@ -256,17 +257,6 @@ public class BomNewEbomParentService extends ServiceImpl 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; @@ -280,9 +270,7 @@ public class BomNewEbomParentService extends ServiceImpl getUpgradeChangeList(BomNewEbomParentQuery query) { - Page result = this.getBaseMapper().getUpgradeChangeList(new Page<>(query.getPage(), query.getPageSize()), query); - - return result; + return this.getBaseMapper().getUpgradeChangeList(new Page<>(query.getPage(), query.getPageSize()), query); }