From 61a77eb5425f6b70689559cd11a85271f36779fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 9 Oct 2024 16:25:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=88=B0SAP=E6=97=B6=E5=88=A4=E6=96=ADT=E9=A1=B9=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AD=98=E5=9C=A8=E7=9A=84=E9=80=BB=E8=BE=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/BomNewEbomExportToSAP.java | 4 +--- .../product/bomnew/service/BomNewPbomExportToSAPImpl.java | 3 +-- .../java/com/nflg/product/bomnew/service/DQBomService.java | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java index cd7c39c9..8f7934d3 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -148,8 +147,7 @@ public class BomNewEbomExportToSAP { } private void addToT1(T1ExtDTO dto) { - if (StrUtil.equals(dto.getPOSTP(), BomConstant.PROJECT_TYPE_TEMPORARY) - || children.stream().noneMatch(c -> Objects.equals(c.getChildRowId(), dto.getChildRowId()))) { + if (children.stream().noneMatch(c -> Objects.equals(c.getChildRowId(), dto.getChildRowId()))) { children.add(dto); } } 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 d4e8d7c5..c726a44a 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 @@ -331,8 +331,7 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP { } private void addToT1(T1ExtDTO dto) { - if (StrUtil.equals(dto.getPOSTP(), BomConstant.PROJECT_TYPE_TEMPORARY) - || children.stream().noneMatch(c -> Objects.equals(c.getChildRowId(), dto.getChildRowId()))) { + if (children.stream().noneMatch(c -> Objects.equals(c.getChildRowId(), dto.getChildRowId()))) { children.add(dto); } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java index 998f9bd8..8dd2d240 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java @@ -407,8 +407,7 @@ public class DQBomService { List t1s = new ArrayList<>(); String dateYMD = DateUtil.format(new Date(), "yyyyMMdd"); datas.forEach(d -> { - if (StrUtil.equals(BomConstant.PROJECT_TYPE_TEMPORARY, d.getProjectType()) - || t1s.stream().noneMatch(c -> Objects.equals(c.getChildRowId(), d.getRowId()))) { + if (t1s.stream().noneMatch(c -> Objects.equals(c.getChildRowId(), d.getRowId()))) { T1ExtDTO t1 = new T1ExtDTO(); t1.setID(RandomUtil.randomNumbers(5)); t1.setMATNR(d.getParentMaterialNo());