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 2f2a31c1..70a904ca 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
@@ -584,7 +584,7 @@ public class DQBomService {
             p.setReleaseTime(LocalDateTime.now());
             p.setReleaseUserName(SessionUtil.getUserName());
             p.setDeptRowId(SessionUtil.getDepartRowId());
-            p.setSource(2);
+            p.setSource(PbomSourceEnum.FROM_DQBOM.getValue());
         });
         bomNewPbomParentService.saveBatch(pparents);
     }
@@ -600,8 +600,10 @@ public class DQBomService {
         wrapper.ne(BomNewDQbomParentEntity::getRowId, parent.getRowId());
         dQBomParentService.getBaseMapper().delete(wrapper);
 
-        BomNewPbomParentEntity pp = bomNewPbomParentService.lambdaQuery().eq(BomNewPbomParentEntity::getMaterialNo, parent.getMaterialNo())
-                .orderByDesc(BomNewPbomParentEntity::getRowId)
+        BomNewPbomParentEntity pp = bomNewPbomParentService.lambdaQuery()
+                .eq(BomNewPbomParentEntity::getMaterialNo, parent.getMaterialNo())
+                .eq(BomNewPbomParentEntity::getFacCode, FactoryCodeEnum.FACTORY_1010.getValue())
+                .orderByDesc(BomNewPbomParentEntity::getCurrentVersion)
                 .last(" limit 1")
                 .one();
         if (!Objects.isNull(pp)) {