From 2315a80f10fcfb7d7c548fac832c6959241b0cf0 Mon Sep 17 00:00:00 2001 From: jing's Date: Sat, 30 Mar 2024 16:31:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=9B=9E=E5=B7=A5=E5=8E=82=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BomNewMbomBackMaterialService.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomBackMaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomBackMaterialService.java index e25b3969..8f4bde20 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomBackMaterialService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomBackMaterialService.java @@ -186,9 +186,12 @@ private void checkBackStatus( List backList){ //是否存在退回 List backRowId=rowIds.stream().map(BomNewMbomBackMaterialDTO::getRowId).collect(Collectors.toList()); + List backStatusList=new ArrayList<>(); + backStatusList.add(MBomConstantEnum.MBomBackStatusEnum.APPLY_0.getValue()); + backStatusList.add(MBomConstantEnum.MBomBackStatusEnum.DEAL_1.getValue()); QueryWrapper queryWrapper=new QueryWrapper<>(); queryWrapper.lambda().in(BomNewMbomBackMaterialEntity::getDetailRowId,backRowId); - queryWrapper.lambda().eq(BomNewMbomBackMaterialEntity::getBackStatus,MBomConstantEnum.MBomBackStatusEnum.REJECT_2.getValue()); + queryWrapper.lambda().in(BomNewMbomBackMaterialEntity::getBackStatus,backStatusList); List backList=getBaseMapper().selectList(queryWrapper); if(CollectionUtil.isNotEmpty(backList)){ @@ -205,12 +208,17 @@ private void checkBackStatus( List backList){ QueryWrapper queryWrapper2=new QueryWrapper<>(); queryWrapper2.lambda().in(BomNewMbomDetailEntity::getRowId,backRowId); List detailEntityList = SpringUtil.getBean(BomNewMbomDetailService.class).list(queryWrapper2); + + List checkVirtualPartList= detailEntityList.stream().filter(item->Objects.nonNull(item.getVirtualPartType())&&item.getVirtualPartType().intValue()>0).collect(Collectors.toList()); if(CollectionUtil.isNotEmpty(checkVirtualPartList)){ throw new NflgBusinessException(STATE.BusinessError,"虚拟包数据不能进行退回"); } - if(detailEntityList.get(0).getFacCode().equals(FactoryCodeEnum.FACTORY_1010.getValue())){ + //1010工厂不能退 + List facCode=detailEntityList.stream().map(BomNewMbomDetailEntity::getFacCode).collect(Collectors.toList()); + + if(facCode.contains(FactoryCodeEnum.FACTORY_1010.getValue())){ throw new NflgBusinessException(STATE.BusinessError,StrUtil.format("{}({}) 工厂数据不能退回",FactoryCodeEnum.FACTORY_1010.getDescription(),FactoryCodeEnum.FACTORY_1010.getValue())); }