From 232979ac0285b4f350ddf49e1f1d070cff6cb954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 3 Jun 2024 11:06:43 +0800 Subject: [PATCH] =?UTF-8?q?fix(pbom):=20=E4=BC=98=E5=8C=96=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E5=8A=9F=E8=83=BD=EF=BC=8C=E8=AE=BE=E7=BD=AE=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BA=BA=E4=B8=BA=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=94=A8=E6=88=B7=EF=BC=8C=E9=83=A8=E9=97=A8=E4=B8=BA=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E6=89=80=E5=B1=9E?= =?UTF-8?q?=E9=83=A8=E9=97=A8=EF=BC=8C=E6=97=B6=E9=97=B4=E4=B8=BA=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/domain/PBom/BomCopy.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/BomCopy.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/BomCopy.java index a570f082..6eb98802 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/BomCopy.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/BomCopy.java @@ -2,8 +2,10 @@ package com.nflg.product.bomnew.service.domain.PBom; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.bomnew.constant.PBomStatusEnum; import com.nflg.product.bomnew.pojo.entity.BomNewPbomChildEntity; import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity; @@ -15,6 +17,7 @@ import com.nflg.product.bomnew.util.ListCommonUtil; import com.nflg.product.bomnew.util.VersionUtil; import lombok.Getter; +import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -101,6 +104,14 @@ public class BomCopy { private BomNewPbomParentEntity getOldBom(BomNewPbomParentVO parent) { //目标工厂历史版本 + BomNewPbomParentEntity p = this.parentResult.stream() + .filter(it -> StrUtil.equals(it.getMaterialNo(), parent.getMaterialNo()) + && StrUtil.equals(it.getFacCode(), targetFacCode)) + .findFirst() + .orElse(null); + if (Objects.nonNull(p)) { + return p; + } return pBomParentService.lambdaQuery().eq(BomNewPbomParentEntity::getMaterialNo, parent.getMaterialNo()) .eq(BomNewPbomParentEntity::getLastVersionIs, 1) .eq(BomNewPbomParentEntity::getFacCode, targetFacCode).one(); @@ -117,6 +128,10 @@ public class BomCopy { newBom.setRowId(IdWorker.getId()); newBom.setCurrentVersion(VersionUtil.getNextVersion(preVersion)); newBom.setFacCode(targetFacCode); + newBom.setDeptName(SessionUtil.getDepartName()); + newBom.setDeptRowId(SessionUtil.getDepartRowId()); + newBom.setCreatedBy(SessionUtil.getUserCode()); + newBom.setCreatedTime(LocalDateTime.now()); parentResult.add(newBom); //子级 buildChildren(newBom.getRowId(),oldBomRowId); @@ -135,6 +150,8 @@ public class BomCopy { child.setRowId(IdWorker.getId()); child.setFacCode(targetFacCode); child.setParentRowId(newParentRowId); + child.setCreatedBy(SessionUtil.getUserCode()); + child.setCreatedTime(LocalDateTime.now()); childResult.add(child); } }