From c9e03f50097efcc341e65487b7eaf82da66685e6 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 10:22:25 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E5=AD=90=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E4=B8=BA=E7=A9=BA=E5=88=A4=E6=96=AD=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E4=B8=BA=E7=A9=BA=E5=88=99=E4=B8=8D=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BomNewPbomParentService.java | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index 95d71802..2c911632 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -243,13 +243,13 @@ public class BomNewPbomParentService extends ServiceImpl(result)).writeTo(response.getOutputStream()); } - public List getChild(Long rowId) { - - List parentChild = this.getBaseMapper().getParentChild(rowId); - BomNewPbomParentEntity parent = this.getById(rowId); + public List getChild(BomNewPbomParentEntity parent) { + //List parentChild = this.getBaseMapper().getParentChild(rowId); + //BomNewPbomParentEntity parent = this.getById(rowId); + List parentChild = this.getBaseMapper().getParentChild(parent.getRowId()); if (CollUtil.isNotEmpty(parentChild)) { materialMainService.intiMaterialInfo(parentChild, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); - List materialNos = parentChild.stream().map(u -> u.getMaterialNo()).collect(Collectors.toList()); + List materialNos = parentChild.stream().map(BaseMaterialVO::getMaterialNo).collect(Collectors.toList()); if (CollUtil.isNotEmpty(materialNos)) { List list = this.lambdaQuery().in(BomNewPbomParentEntity::getMaterialNo, materialNos) .eq(!PBomStatusEnum.PUBLISH.equalsValue(parent.getStatus()), BomNewPbomParentEntity::getLastVersionIs, 1) @@ -325,15 +325,18 @@ public class BomNewPbomParentService extends ServiceImpl childList = Convert.toList(BomNewPbomChildEntity.class, paramDTO.getChildList()); - childList.forEach(u -> { - u.setParentRowId(paramDTO.getBomRowId()); - }); - pbomChildService.saveOrUpdateBatch(childList); parent.setEditStatus(editStatus.getValue()); + parent.setModifyTime(LocalDateTime.now()); this.updateById(parent); + + if (CollUtil.isNotEmpty(paramDTO.getChildList())) { + List childList = Convert.toList(BomNewPbomChildEntity.class, paramDTO.getChildList()); + childList.forEach(u -> u.setParentRowId(paramDTO.getBomRowId())); + pbomChildService.saveOrUpdateBatch(childList); + } + if (editStatus == PBomEditStatusEnum.HANDLER_TEMP) { - return getChild(paramDTO.getBomRowId()); + return getChild(parent); } else { return null; } @@ -431,7 +434,8 @@ public class BomNewPbomParentService extends ServiceImpl child = this.getChild(bomRowId); + BomNewPbomParentEntity parent = this.getById(bomRowId); + List child = this.getChild(parent); List result = Convert.toList(BomNewPbomEditExcelVO.class, child); new Workbook().addSheet(new ListSheet<>(result)).writeTo(response.getOutputStream()); @@ -440,7 +444,8 @@ public class BomNewPbomParentService extends ServiceImpl child = this.getChild(param.getBomRowId()); + BomNewPbomParentEntity parent = this.getById(param.getBomRowId()); + List child = this.getChild(parent); if (CollUtil.isNotEmpty(param.getRowIds())) { child = child.stream().filter(u -> param.getRowIds().contains(u.getRowId())).collect(Collectors.toList()); } From 743191a5be3fc6ab01145099d0543a7a2c1d42d7 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 10:25:17 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E5=AD=90=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E4=B8=BA=E7=A9=BA=E5=88=A4=E6=96=AD=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E4=B8=BA=E7=A9=BA=E5=88=99=E4=B8=8D=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/BomNewPbomParentService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index 2c911632..718ce967 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -243,6 +243,9 @@ public class BomNewPbomParentService extends ServiceImpl(result)).writeTo(response.getOutputStream()); } + public List getChild(Long rowId) { + return getChild(this.getById(rowId)); + } public List getChild(BomNewPbomParentEntity parent) { //List parentChild = this.getBaseMapper().getParentChild(rowId); //BomNewPbomParentEntity parent = this.getById(rowId); 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 3/9] =?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 + + From 376bf37de11e4c384c34116d799e5fe5a548ca4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 12 Apr 2024 14:41:37 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8E=9F=E5=A7=8B?= =?UTF-8?q?bom=E7=B2=BE=E7=A1=AE=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../master/BomNewOriginalParentMapper.java | 5 ++-- .../service/BomNewOriginalParentService.java | 20 ++++--------- .../master/BomNewOriginalParentMapper.xml | 30 ++++++------------- 3 files changed, 17 insertions(+), 38 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalParentMapper.java index 3ab79b5d..ee7a906e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewOriginalParentMapper.java @@ -8,6 +8,7 @@ import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Set; /** * t_bom_new_original_parent 表数据库访问层 @@ -57,9 +58,9 @@ public interface BomNewOriginalParentMapper extends BaseMapper getParentForDrawingNoSeach(@Param("drawingNos") List drawingNos ,@Param("state") Integer state); + List getParentForDrawingNoSeach(@Param("drawingNos") Set drawingNos, @Param("state") Integer state); - List getChildForDrawingNoSeach(@Param("drawingNos") List drawingNos,@Param("state") Integer state); + List getChildForDrawingNoSeach(@Param("drawingNos") Set 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/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java index 3620f936..389175d0 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java @@ -157,18 +157,13 @@ public class BomNewOriginalParentService extends ServiceImpl materialBoms = this.lambdaQuery().in(BomNewOriginalParentEntity::getDrawingNo, queryDrawingNos).eq(BomNewOriginalParentEntity::getLastVersionIs, 1) -// .eq(BomNewOriginalParentEntity::getStatus, OriginalStatusEnum.UN_CONVERT.getValue()).list(); -// if(query.getStatus().equals(1) && CollUtil.isEmpty(materialBoms)){ -// return result; -// } - List parentDrawingNos = new ArrayList<>(getParentDrawingNoByMaterialNo(queryDrawingNos)); + Set parentDrawingNos = new HashSet<>(getParentDrawingNoByMaterialNo(queryDrawingNos)); parentDrawingNos.addAll(queryDrawingNos); if (CollUtil.isNotEmpty(parentDrawingNos)) { List parents = this.getBaseMapper().getParentForDrawingNoSeach(parentDrawingNos, query.getStatus()); - materialMainService.intiMaterialInfo(parents, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); + materialMainService.intiMaterialInfo(parents, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2); List childs = this.getBaseMapper().getChildForDrawingNoSeach(parentDrawingNos,query.getStatus()); - materialMainService.intiMaterialInfo(childs, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); + materialMainService.intiMaterialInfo(childs, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2); childs.stream().filter(f -> StrUtil.isBlank(f.getCurrentVersion())).forEach(f -> { if (MaterialshouldBomExistUtil.checkShouldBomExist(f.getMaterialCategoryCode(), f.getMaterialGetType())) { f.setCurrentVersion(OriginalConstant.NO_BOM_VERSION); @@ -176,10 +171,6 @@ public class BomNewOriginalParentService extends ServiceImpl data = new ArrayList<>(); -// data.addAll(parents); -// data.addAll(childs); -// materialMainService.intiMaterialInfo(data, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); result = handSeachToTree(parents, childs); } } @@ -194,7 +185,6 @@ public class BomNewOriginalParentService extends ServiceImpl #{materialNo} - union all + union select drawing_no from t_bom_new_original_parent where material_no in #{materialNo} @@ -192,37 +192,25 @@ From 3c8d341bdb78fe8baf112d59a40bcdd090eb7c67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 15 Apr 2024 10:03:53 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E5=8E=9F=E5=A7=8Bbom=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2ebom=E5=90=8E=E9=87=8D=E6=96=B0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89bom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/api/user/OriginalBomApi.java | 2 ++ .../mapper/master/BomNewEbomParentMapper.java | 8 ++++++-- .../bomnew/service/BomNewEbomParentService.java | 15 ++++++++++++++- .../OriginalBom/OriginalBomToEBomConvert.java | 3 +-- .../mapper/master/BomNewEbomParentMapper.xml | 6 ++++++ 5 files changed, 29 insertions(+), 5 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java index 071dcd8d..4d243fac 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java @@ -176,6 +176,8 @@ public class OriginalBomApi extends BaseApi { ebomParentService.getBaseMapper().updateRootState(); ebomParentService.getBaseMapper().updateRootForWaitReview(); + ebomParentService.resetAllBomExist(); + return ResultVO.success(result); } 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 5246146c..7042abf3 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.Collection; @@ -74,4 +76,6 @@ public interface BomNewEbomParentMapper extends BaseMapper getMaterialParent(@Param("materialNos") Collection materialNos ,@Param("createdBy") String createdBy); + + void resetAllBomExist(); } 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 4c1de7c3..1260cb62 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 @@ -2045,7 +2045,20 @@ public class BomNewEbomParentService extends ServiceImpl 0 ? 1 : 0); eBomParent.setDeviseName(SessionUtil.getRealName()); eBomParent.setDeptName(SessionUtil.getDepartName()); diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml index 87a529a2..8ae61f3a 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml @@ -353,4 +353,10 @@ SET p.bom_exist = (IF(EXISTS (SELECT 1 FROM t_bom_new_ebom_child WHERE parent_row_id = p.row_id), 1, 0)) WHERE p.row_id = #{rowId}; + +