From d7bd61f7f47fa0b25d89549c8686ee399991dd42 Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Tue, 29 Oct 2024 15:24:53 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=89=B9=E9=87=8F=E6=9B=BF=E4=BB=A3BO?=
 =?UTF-8?q?M=E3=80=91PBOM=E5=88=97=E8=A1=A8=E5=B7=A5=E5=8E=82=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/nflg/product/bomnew/pojo/vo/BaseBomVO.java | 5 +++++
 .../com/nflg/product/bomnew/service/BatchBomService.java     | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseBomVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseBomVO.java
index 84fcc9d6..8e4442f4 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseBomVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseBomVO.java
@@ -90,4 +90,9 @@ public class BaseBomVO {
     @ApiModelProperty(value = "版本过期时间")
     private LocalDateTime expireEndTime;
 
+    /**
+     * 工厂
+     */
+    @ApiModelProperty(value = "工厂")
+    private String factory;
 }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BatchBomService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BatchBomService.java
index aab67811..de62556d 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BatchBomService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BatchBomService.java
@@ -174,6 +174,7 @@ public class BatchBomService {
                         baseBomVO.setExpireEndTime(parent.getExpireEndTime());
                         baseBomVO.setDeviseUserCode(parent.getDeviseUserCode());
                         baseBomVO.setDeviseName(parent.getDeviseName());
+                        baseBomVO.setFactory(parent.getFacCode());
                         Optional<BomNewPbomChildEntity> first = pbomChildEntities.stream().filter(item -> item.getParentRowId().equals(parent.getRowId())).findFirst();
                         if (first.isPresent()) {
                             BomNewPbomChildEntity pbomChild = first.get();
@@ -539,6 +540,7 @@ public class BatchBomService {
         for (BaseBomVO baseBomVO: baseBomVOList) {
             BomNewPbomParentEntity draftParent = bomNewPbomParentService.lambdaQuery()
                     .eq(BomNewPbomParentEntity::getMaterialNo, baseBomVO.getParentMaterialNo())
+                    .eq(BomNewPbomParentEntity::getFacCode, baseBomVO.getFactory())
                     .lt(BomNewPbomParentEntity::getStatus, PBomStatusEnum.PUBLISH.getValue())
                     .one();
             if (ObjectUtil.isNotEmpty(draftParent)) {