From a58a3a44a8d4799c5650de3529404fb759e65237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sun, 23 Jun 2024 19:46:11 +0800 Subject: [PATCH] =?UTF-8?q?fix(ebom):=20=E8=99=9A=E6=8B=9F=E5=8C=85?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ewEbomGenerateVirtualPackageServiceFor31Impl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomGenerateVirtualPackageServiceFor31Impl.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomGenerateVirtualPackageServiceFor31Impl.java index ff051b22..7b6ec54f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomGenerateVirtualPackageServiceFor31Impl.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomGenerateVirtualPackageServiceFor31Impl.java @@ -14,6 +14,7 @@ import com.nflg.product.bomnew.pojo.dto.AddVirtrualMaterialDTO; import com.nflg.product.bomnew.pojo.dto.MaterialUpdateBillDTO; import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity; import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity; +import com.nflg.product.bomnew.pojo.entity.MaterialMainEntity; import com.nflg.product.bomnew.pojo.query.GenerateVirtualPackageItem; import com.nflg.product.bomnew.pojo.query.GenerateVirtualPackageQuery; import com.nflg.product.bomnew.pojo.vo.ChildListForGenerateVirtualPackageVO; @@ -48,6 +49,7 @@ public class BomNewEbomGenerateVirtualPackageServiceFor31Impl implements IBomNew private final BomNewEbomChildService ebomChildService = SpringUtil.getBean(BomNewEbomChildService.class); private final MaterialMainClient materialMainClient = SpringUtil.getBean(MaterialMainClient.class); private final MaterialService materialService = SpringUtil.getBean(MaterialService.class); + private final MaterialMainService materialMainService = SpringUtil.getBean(MaterialMainService.class); private final PlatformTransactionManager transactionManager = SpringUtil.getBean(PlatformTransactionManager.class); private final List childrenForAdd = Collections.synchronizedList(new ArrayList<>()); @@ -535,12 +537,12 @@ public class BomNewEbomGenerateVirtualPackageServiceFor31Impl implements IBomNew child.setMaterialName(child.getDrawingNo()); child.setMaterialCategoryCode(type.getMaterialCategoryCode()); child.setVirtualPartRootMaterialNo(root.getMaterialNo()); - BomNewEbomParentEntity p = ebomParentService.lambdaQuery() - .eq(BomNewEbomParentEntity::getDrawingNo, drawingNo) - .lt(BomNewEbomParentEntity::getStatus, EBomStatusEnum.PUBLISHED.getValue()) + MaterialMainEntity me = materialMainService.lambdaQuery() + .eq(MaterialMainEntity::getDrawingNo, drawingNo) + .last(" limit 1") .one(); - if (Objects.nonNull(p)) { - child.setMaterialNo(p.getMaterialNo()); + if (Objects.nonNull(me)) { + child.setMaterialNo(me.getMaterialNo()); } else { child.setMaterialNo(getMaterialNoForAdd(child)); }