From ee8ee6b4864963e490c58219fe252eb2df69cde7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 11 Apr 2024 13:44:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=80=E4=BA=9B=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.删除接口和保存数据接口重新计算是否有bom； 2.getChild接口currentVersion和bomRowId逻辑调整 --- .../mapper/master/BomNewEbomParentMapper.java | 8 +++- .../master/BomNewOriginalParentMapper.java | 2 +- .../mapper/master/BomNewPbomParentMapper.java | 2 + .../service/BomNewEbomParentService.java | 23 +++++---- .../service/BomNewOriginalParentService.java | 47 +++++++++---------- .../service/BomNewPbomParentService.java | 35 +++++++++----- .../mapper/master/BomNewEbomParentMapper.xml | 6 +++ .../master/BomNewOriginalParentMapper.xml | 5 ++ .../mapper/master/BomNewPbomParentMapper.xml | 6 +++ 9 files changed, 86 insertions(+), 48 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java index c73fcf39..9a3e9b76 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity; import com.nflg.product.bomnew.pojo.query.BomNewEbomParentQuery; -import com.nflg.product.bomnew.pojo.query.OriginalBomQuery; -import com.nflg.product.bomnew.pojo.vo.*; +import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; +import com.nflg.product.bomnew.pojo.vo.BomNewEbomUpgradeChangeVO; +import com.nflg.product.bomnew.pojo.vo.MaterialHistoryProjectTypeVO; +import com.nflg.product.bomnew.pojo.vo.ReverseReportVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -69,4 +71,6 @@ public interface BomNewEbomParentMapper extends BaseMapper getChildForDrawingNoSeach(@Param("drawingNos") List drawingNos,@Param("state") Integer state); - + void resetBomExist(Long rowId); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java index dbf42682..9f44e4c8 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java @@ -51,4 +51,6 @@ public interface BomNewPbomParentMapper extends BaseMapper exportExcel(List bomRowIds); + + void resetBomExist(Long rowId); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index ffd7e5d4..8e51b11f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -318,14 +318,19 @@ public class BomNewEbomParentService extends ServiceImpl saveEnts = bom.getBomList().stream().filter(u -> u.getDelIs().equals(0)).collect(Collectors.toList()); List childEntities = Convert.toList(BomNewOriginalChildEntity.class, saveEnts); // originalChildService.getBaseMapper().deleteByMap(ImmutableMap.of("parent_row_id",bom.getParentRowId())); - childEntities.forEach(u -> { - u.setParentRowId(bom.getParentRowId()); - if (submitIs) { - u.setEditStatus(OriginalEditStatusEnum.HANDLER_FINISHED.getValue()); - } - }); if (CollUtil.isNotEmpty(childEntities)) { + childEntities.forEach(u -> { + u.setParentRowId(bom.getParentRowId()); + if (submitIs) { + u.setEditStatus(OriginalEditStatusEnum.HANDLER_FINISHED.getValue()); + } + }); //删除行 List delRowIds = bom.getBomList().stream().map(BomOriginalListVO::getRowId).filter(rowId -> rowId > 0).collect(Collectors.toList()); originalChildService.getBaseMapper().delOriginalChildNotInRowIds(delRowIds, bom.getParentRowId()); originalChildService.saveOrUpdateBatch(childEntities); + resetBomExist(bom.getParentRowId()); } return true; @@ -268,13 +269,19 @@ public class BomNewOriginalParentService extends ServiceImpl> submit = bomDetailPool.submit(detailTask); - - List result = submit.get(); - - return result; - + return submit.get(); } /** @@ -724,5 +721,7 @@ public class BomNewOriginalParentService extends ServiceImpl getChild(Long rowId) { + VUtils.isTure(rowId == 0).throwMessage("参数不正确"); return getChild(this.getById(rowId)); } public List getChild(BomNewPbomParentEntity parent) { @@ -269,14 +270,20 @@ public class BomNewPbomParentService extends ServiceImpl childList = Convert.toList(BomNewPbomChildEntity.class, paramDTO.getChildList()); childList.forEach(u -> u.setParentRowId(paramDTO.getBomRowId())); pbomChildService.saveOrUpdateBatch(childList); + parent.setBomExist(1); + } else { + parent.setBomExist(0); } + parent.setEditStatus(editStatus.getValue()); + parent.setModifyTime(LocalDateTime.now()); + this.updateById(parent); + if (editStatus == PBomEditStatusEnum.HANDLER_TEMP) { return getChild(parent); } else { @@ -406,16 +413,17 @@ public class BomNewPbomParentService extends ServiceImpl noDelList = childListVO.stream() .filter(u -> !u.getMaterialCategoryCode().startsWith("1003") && !u.getMaterialCategoryCode().startsWith("1020") && !u.getMaterialCategoryCode().startsWith("1021")) .collect(Collectors.toList()); - noDelList.removeAll(technologypackages); VUtils.isTure(CollUtil.isNotEmpty(noDelList)).throwMessage("非机加工件的子级只能删除辅助物料"); pbomChildService.getBaseMapper().delByRowId(paramDTO.getRowIdList()); + resetBomExist(parent.getRowId()); return hasTechnologypackage; } @@ -1036,4 +1044,7 @@ public class BomNewPbomParentService extends ServiceImpl select COUNT(1) from t_bom_new_ebom_child where material_no=#{materialNo} and edit_status=1 + + diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml index 35ba020a..7b7f8ad9 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml @@ -226,6 +226,11 @@ #{item} + + diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml index 274f9130..0edcee8f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml @@ -222,4 +222,10 @@ order by created_time desc + +