From 207b1a6d44fb3e5f6ad5262296ae9bbd0e5f77a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Wed, 29 May 2024 15:38:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(pbom):=20=E4=BF=AE=E5=A4=8D=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=88=B0sap=E6=97=B6=EF=BC=8C=E5=8F=AA=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E4=BA=86=E7=AC=AC=E4=B8=80=E5=B1=82=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewPbomParentService.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index e6a9142d..b7a58a5a 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -1117,7 +1117,11 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
 
         ImportSapParamDTO sapDto = new ImportSapParamDTO();
         sapDto.setZID(RandomUtil.randomNumbers(5));
-        sapDto.setI_WERKS("1");
+        if (StrUtil.equals(root.getFacCode(), EBomConstant.MAIN_FACTORY_CODE_1010)) {
+            sapDto.setI_WERKS("1");
+        } else if (StrUtil.equals(root.getFacCode(), EBomConstant.XIAN_TAO_FACTORY_CODE_1020)) {
+            sapDto.setI_WERKS("2");
+        }
         sapDto.setI_STLAN("1");
         sapDto.setI_EMPNO(root.getCreatedBy());
         List<T1DTO> t1s = new ArrayList<>();
@@ -1155,7 +1159,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
             for (BomNewPbomChildEntity c : children) {
                 BomNewPbomParentEntity cp = lambdaQuery()
                         .eq(BomNewPbomParentEntity::getMaterialNo, c.getMaterialNo())
-                        .eq(BomNewPbomParentEntity::getStatus, EBomStatusEnum.PUBLISHED.getValue())
+                        .eq(BomNewPbomParentEntity::getFacCode, parent.getFacCode())
+                        .eq(BomNewPbomParentEntity::getStatus, PBomStatusEnum.FACTORY_CONFIRM.getValue())
                         .orderByDesc(BomNewPbomParentEntity::getRowId)
                         .last(" limit 1")
                         .one();