From 3674ef3acb7d1ee7c496331d2c97e1f34b2c725b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 23 Aug 2024 11:14:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(ebom):=20=E5=AF=BC=E5=85=A5=E5=88=B0SAP?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=8F=96=E6=B6=88=E4=BB=8ESAP=E8=BF=9B?= =?UTF-8?q?=E6=9D=A5=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=88=B0SAP=E5=8E=BB=E7=9A=84=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewEbomExportToSAP.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 850f3c31..a0f3c98b 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 @@ -10,7 +10,10 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.base.core.exception.NflgBusinessException; -import com.nflg.product.bomnew.constant.*; +import com.nflg.product.bomnew.constant.BomConstant; +import com.nflg.product.bomnew.constant.EBomStatusEnum; +import com.nflg.product.bomnew.constant.SapStatusEnum; +import com.nflg.product.bomnew.constant.VirtualPackageTypeEnum; import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO; import com.nflg.product.bomnew.pojo.dto.sap.impart2.T1DTO; import com.nflg.product.bomnew.pojo.dto.sap.impart2.T1ExtDTO; @@ -160,7 +163,7 @@ public class BomNewEbomExportToSAP { t.setDATUM(dateYMD); t.setMEINS(child.getMaterialUnit()); t.setIDNRK(child.getMaterialNo()); - t.setIgnore(Objects.equals(p.getSource(), EBomSourceEnum.FROM_SAP.getValue())); + // t.setIgnore(Objects.equals(p.getSource(), EBomSourceEnum.FROM_SAP.getValue())); t.setZFB(isZFB); if (BomConstant.PROJECT_TYPE_TEMPORARY.equals(child.getProjectType())) { t.setIDNRK(""); @@ -176,7 +179,7 @@ public class BomNewEbomExportToSAP { , BomNewEbomParentEntity::getMaterialDesc, BomNewEbomParentEntity::getUserRootIs , BomNewEbomParentEntity::getSource, BomNewEbomParentEntity::getSapState) .eq(BomNewEbomParentEntity::getMaterialNo, c.getMaterialNo()) - // .eq(BomNewEbomParentEntity::getUserRootIs, 0) + .eq(BomNewEbomParentEntity::getUserRootIs, 0) .eq(BomNewEbomParentEntity::getStatus, EBomStatusEnum.PUBLISHED.getValue()) // .ne(BomNewEbomParentEntity::getSource, EBomSourceEnum.FROM_SAP.getValue()) .orderByDesc(BomNewEbomParentEntity::getCurrentVersion)