From e1f093023d26e2393bbb30c37d28ffcf30ff44e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 17 May 2024 18:27:58 +0800 Subject: [PATCH] =?UTF-8?q?fix(pbom):=2031=E7=BC=96=E7=A0=81=E7=9A=84?= =?UTF-8?q?=E6=89=8D=E4=B8=80=E5=AE=9A=E9=9C=80=E8=A6=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/BomNewPbomExportToSAPImpl.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java index 94ec3542..0fc66a88 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java @@ -54,11 +54,14 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP { List rcs = bomNewPbomChildService.lambdaQuery() .eq(BomNewPbomChildEntity::getParentRowId, rootBomRowId) .list(); - List unVirtualParts = rcs.stream() - .filter(c -> Objects.equals(c.getVirtualPartType(), VirtualPackageTypeEnum.UN_VIRTUAL_PACKAGE.getValue())) - .collect(Collectors.toList()); - if (CollUtil.isNotEmpty(unVirtualParts)) { - return unVirtualParts.stream().map(c -> OperationErrorMsgVO.create(c.getMaterialNo(), "未生成发货包")).collect(Collectors.toList()); + if (root.getMaterialNo().startsWith("31")) { + List unVirtualParts = rcs.stream() + .filter(c -> Objects.equals(c.getVirtualPartType(), VirtualPackageTypeEnum.UN_VIRTUAL_PACKAGE.getValue()) + && !StrUtil.equals(BomConstant.PROJECT_TYPE_TEMPORARY, c.getProjectType(), true)) + .collect(Collectors.toList()); + if (CollUtil.isNotEmpty(unVirtualParts)) { + return unVirtualParts.stream().map(c -> OperationErrorMsgVO.create(c.getMaterialNo(), "未生成发货包")).collect(Collectors.toList()); + } } children.addAll(convert(rcs, root.getMaterialNo())); rcs.forEach(it -> {