From a77936dc42d7acea8614a93771d5e5f49b167e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 26 Aug 2024 10:12:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(dqbom):=20=E4=BC=98=E5=8C=96=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/service/DQBomService.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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)) {