From f5aab939e04ea074f97a8d70bd7235ef01ab49b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Sat, 3 Aug 2024 10:35:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BD=ACPBOM=E4=BC=98=E5=8C=96-3(=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E9=94=99=E9=97=AE=E9=A2=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/mapper/master/BomNewEbomParentMapper.java | 4 +++- .../product/bomnew/service/BomNewEbomParentService.java | 3 ++- .../resources/mapper/master/BomNewEbomParentMapper.xml | 9 +++++++-- 3 files changed, 12 insertions(+), 4 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 532088a2..26e60dc3 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 @@ -59,7 +59,9 @@ public interface BomNewEbomParentMapper extends BaseMapper rowIds); - void updateStateBatchByRowIds(@Param("status") Integer status, String userName, @Param("list") List list); + void updateStateBatchByRowIdsParent(@Param("status") Integer status, String userName, @Param("list") List list); + + void updateStateBatchByRowIdsChild( @Param("list") List list); Integer checkIsRoot(@Param("materialNo") String materialNo); 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 5254741b..c800af6e 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 @@ -1028,7 +1028,8 @@ public class BomNewEbomParentService extends ServiceImpl bomRowIds = bomTree.stream().filter(u ->!EBomStatusEnum.PUBLISHED.equalsValue(u.getStatus()) && u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList()); if (CollUtil.isNotEmpty(eBomToPBom.getAddEBomNew())) { - this.getBaseMapper().updateStateBatchByRowIds(EBomStatusEnum.PUBLISHED.getValue(), SessionUtil.getRealName(), eBomToPBom.getAddEBomNew()); + this.getBaseMapper().updateStateBatchByRowIdsParent(EBomStatusEnum.PUBLISHED.getValue(), SessionUtil.getRealName(), eBomToPBom.getAddEBomNew()); + this.getBaseMapper().updateStateBatchByRowIdsChild(eBomToPBom.getAddEBomNew()); } //替换需覆盖的受影响的虚拟包 if(CollUtil.isNotEmpty(eBomToPBom.getUpgradeChangeResultForCover())){ 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 76d47dc8..7cef6dbf 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 @@ -310,13 +310,18 @@ ; - + update t_bom_new_ebom_parent set status=#{status} , convert_to_ebom_time=now(),release_time=now(),release_user_name=#{userName},edit_status=2,exception_status=1 where row_id in #{item} - ; + + + + + + UPDATE t_bom_new_ebom_child SET edit_status=2 WHERE parent_row_id IN #{item} From 16c877882c753134dd2f0ce20f4e1161092e8bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 3 Aug 2024 10:58:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?optimize:=20=E5=8F=8D=E6=9F=A5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=8F=82=E6=95=B0=E6=B7=BB=E5=8A=A0bomVersion?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=8C=BA=E5=88=86=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=B8=BA=E4=B8=80=E4=B8=AAbom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/pojo/vo/ReverseReportVO.java | 5 ++-- .../ReverseReport/EBomQueryService.java | 29 ++++++++++++------- .../ReverseReport/PBomQueryService.java | 29 ++++++++++++------- .../mapper/master/BomNewEbomParentMapper.xml | 3 +- .../mapper/master/BomNewPbomParentMapper.xml | 3 +- 5 files changed, 45 insertions(+), 24 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ReverseReportVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ReverseReportVO.java index 9db39f46..7a4128d7 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ReverseReportVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/ReverseReportVO.java @@ -64,7 +64,7 @@ public class ReverseReportVO { private String childDrawingNo; @ApiModelProperty("层级") - private String levelNum; + private Integer levelNum; @ApiModelProperty("物料类别") private String categoryName; @@ -85,5 +85,6 @@ public class ReverseReportVO { return Objects.isNull(expireEndTime)? LocalDateTime.parse("9999-12-31 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")):expireEndTime; } - + @ApiModelProperty("bom颜色区分") + private String bomVersion; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java index dbc8ca36..9f2e0398 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java @@ -81,7 +81,7 @@ public class EBomQueryService { if (CollUtil.isNotEmpty(vos)) { List materialVOS = materialMainService.getMaterialBaseInfo(vos.stream().map(ReverseReportVO::getMaterialNo).collect(Collectors.toList())); vos.forEach(it -> { - it.setLevelNum("1"); + it.setLevelNum(1); BaseMaterialVO materialVO = materialVOS.stream() .filter(f -> StrUtil.equals(f.getMaterialNo(), it.getMaterialNo())) .findFirst() @@ -113,7 +113,7 @@ public class EBomQueryService { if (Objects.nonNull(parent)) { List pVOs = getReverseBoms(parent.getRowId()); pVOs.forEach(p -> { - vos.add(createVO(p, 1)); + // vos.add(createVO(p, 1)); bindData(p, 1, vos); }); } else { @@ -132,7 +132,7 @@ public class EBomQueryService { p.setCurrentVersion(OriginalConstant.NO_BOM_VERSION); } } - vos.add(createVO(p, 1)); + // vos.add(createVO(p, 1)); bindData(p, 1, vos); }); } @@ -155,14 +155,18 @@ public class EBomQueryService { return vos; } - private void bindData(BomNewPbomParentVO pVO, Integer level, List vos) { + private void bindData(BomNewPbomParentVO pVO, final Integer level, List vos) { if (Objects.nonNull(pVO.getParentRowId())) { List parents = getReverseBoms(pVO.getParentRowId()); - level++; - Integer finalLevel = level; for (BomNewPbomParentVO it : parents) { - vos.add(createVO(it, finalLevel)); - bindData(it, finalLevel, vos); + if (vos.stream().noneMatch(v -> StrUtil.equals(v.getMaterialNo(), it.getMaterialNo()) + && Objects.equals(v.getLevelNum(), level) + && Objects.equals(v.getNum(), it.getNum()) + && StrUtil.equals(v.getMaterialUnit(), it.getMaterialUnit()) + && StrUtil.equals(v.getCreatedBy(), it.getCreatedBy()))) { + vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1))); + } + bindData(it, level + 1, vos); } } } @@ -171,9 +175,14 @@ public class EBomQueryService { return ebomParentService.getReverseBoms(parentRowId); } - private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level) { + private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO) { ReverseReportVO vo = Convert.convert(ReverseReportVO.class, parentVO); - vo.setLevelNum(String.valueOf(level)); + vo.setLevelNum(level); + if (Objects.isNull(lastVO)) { + vo.setBomVersion("1"); + } else { + vo.setBomVersion(level >= lastVO.getLevelNum() ? lastVO.getBomVersion() : String.valueOf(Integer.parseInt(lastVO.getBomVersion()) + 1)); + } return vo; } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/PBomQueryService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/PBomQueryService.java index 09e80574..524bc659 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/PBomQueryService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/PBomQueryService.java @@ -80,7 +80,7 @@ public class PBomQueryService { if (CollUtil.isNotEmpty(vos)) { List materialVOS = materialMainService.getMaterialBaseInfo(vos.stream().map(ReverseReportVO::getMaterialNo).collect(Collectors.toList())); vos.forEach(it -> { - it.setLevelNum("1"); + it.setLevelNum(1); BaseMaterialVO materialVO = materialVOS.stream() .filter(f -> StrUtil.equals(f.getMaterialNo(), it.getMaterialNo())) .findFirst() @@ -107,7 +107,7 @@ public class PBomQueryService { if (Objects.nonNull(parent)) { List pVOs = getReverseBoms(parent.getRowId()); pVOs.forEach(p -> { - vos.add(createVO(p, 1)); + // vos.add(createVO(p, 1)); bindData(p, 1, vos); }); } else { @@ -126,7 +126,7 @@ public class PBomQueryService { p.setCurrentVersion(OriginalConstant.NO_BOM_VERSION); } } - vos.add(createVO(p, 1)); + // vos.add(createVO(p, 1)); bindData(p, 1, vos); }); } @@ -149,14 +149,18 @@ public class PBomQueryService { return vos; } - private void bindData(BomNewPbomParentVO pVO, Integer level, List vos) { + private void bindData(BomNewPbomParentVO pVO, final Integer level, List vos) { if (Objects.nonNull(pVO.getParentRowId())) { List parents = getReverseBoms(pVO.getParentRowId()); - level++; - Integer finalLevel = level; for (BomNewPbomParentVO it : parents) { - vos.add(createVO(it, finalLevel)); - bindData(it, finalLevel, vos); + if (vos.stream().noneMatch(v -> StrUtil.equals(v.getMaterialNo(), it.getMaterialNo()) + && Objects.equals(v.getLevelNum(), level) + && Objects.equals(v.getNum(), it.getNum()) + && StrUtil.equals(v.getMaterialUnit(), it.getMaterialUnit()) + && StrUtil.equals(v.getCreatedBy(), it.getCreatedBy()))) { + vos.add(createVO(it, level, vos.isEmpty() ? null : vos.get(vos.size() - 1))); + } + bindData(it, level + 1, vos); } } } @@ -165,9 +169,14 @@ public class PBomQueryService { return pbomParentService.getReverseBoms(parentRowId); } - private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level) { + private ReverseReportVO createVO(BomNewPbomParentVO parentVO, Integer level, ReverseReportVO lastVO) { ReverseReportVO vo = Convert.convert(ReverseReportVO.class, parentVO); - vo.setLevelNum(String.valueOf(level)); + vo.setLevelNum(level); + if (Objects.isNull(lastVO)) { + vo.setBomVersion("1"); + } else { + vo.setBomVersion(level >= lastVO.getLevelNum() ? lastVO.getBomVersion() : String.valueOf(Integer.parseInt(lastVO.getBomVersion()) + 1)); + } return vo; } } 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 76d47dc8..a6df823c 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 @@ -561,11 +561,12 @@ ; 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 6bd0ca80..b1cdd216 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 @@ -296,12 +296,13 @@ WHERE p.created_by = #{userCode} From d0268eeac9f85096cd61fe0557d2d829acfcfa52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Sat, 3 Aug 2024 12:33:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BD=ACPBOM=E4=BC=98=E5=8C=96-3(=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E9=94=99=E9=97=AE=E9=A2=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/api/user/OriginalBomApi.java | 3 +- .../mapper/master/BomNewEbomParentMapper.java | 7 +++ .../mapper/master/BomNewMbomParentMapper.java | 3 ++ .../master/BomNewOriginalChildMapper.java | 9 ++++ .../master/BomNewOriginalParentMapper.java | 13 ++++++ .../mapper/master/BomNewPbomParentMapper.java | 4 ++ .../service/BomNewEbomParentService.java | 19 ++++++-- .../BomNewEbomUpgradeChangeService.java | 2 +- .../service/BomNewMbomParentService.java | 7 +++ .../service/BomNewOriginalChildService.java | 17 ++++++++ .../service/BomNewOriginalParentService.java | 27 +++++++++--- .../BomNewOriginalParentV2Service.java | 9 ++-- .../service/BomNewPbomParentService.java | 7 ++- .../domain/PBom/ConvertToMBomBase.java | 4 +- .../mapper/master/BomNewEbomParentMapper.xml | 43 +++++++++++++++++++ .../mapper/master/BomNewMbomParentMapper.xml | 9 ++++ .../master/BomNewOriginalChildMapper.xml | 36 ++++++++++++++++ .../master/BomNewOriginalParentMapper.xml | 42 ++++++++++++++++++ .../mapper/master/BomNewPbomParentMapper.xml | 13 ++++++ 19 files changed, 258 insertions(+), 16 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 dbdb262e..c398d113 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 @@ -171,7 +171,8 @@ public class OriginalBomApi extends BaseApi { }); //跟新EBom 根节点 - ebomParentService.getBaseMapper().updateRootState(); +// ebomParentService.getBaseMapper().updateRootState(); + ebomParentService.updateRootState(); ebomParentService.getBaseMapper().updateRootForWaitReview(); 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 26e60dc3..699b0cfd 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 @@ -55,10 +55,17 @@ public interface BomNewEbomParentMapper extends BaseMapper getChildForMaterialNoSeach(@Param("materialNoList") List materialNoList,@Param("bomRowIds") Collection bomRowIds , @Param("createdBy") String createdBy ); + @Deprecated void updateRootState(); + void updateRootState1(); + void updateRootState2(); + void updateRootState3(); + @Deprecated void delBatch(@Param("rowIds") List rowIds); + void delBatch1(@Param("rowIds") List rowIds); + void delBatch2(@Param("rowIds") List rowIds); void updateStateBatchByRowIdsParent(@Param("status") Integer status, String userName, @Param("list") List list); void updateStateBatchByRowIdsChild( @Param("list") List list); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java index 38d90fe4..304ba74b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java @@ -51,8 +51,11 @@ public interface BomNewMbomParentMapper extends BaseMapper drawingNos); + void delOriginalFormalBomChild(@Param("drawingNos") List drawingNos); + + void delOriginalFormalBomParent(@Param("drawingNos") List drawingNos); + /** * 原始BOM-同步到正式表 * @param rowIds */ + @Deprecated void syncOriginalBomToFormal(@Param("rowIds") List rowIds); + void syncOriginalBomToFormalParent(@Param("rowIds") List rowIds); + void syncOriginalBomToFormalChild(@Param("rowIds") List rowIds); + void deleteChildByParentRowIds(@Param("parentRowIds") List parentRowIds); } 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 ec3666ea..46ed0d66 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 @@ -28,12 +28,25 @@ public interface BomNewOriginalParentMapper extends BaseMapper getParentChildBatch(@Param("rowIds") List rowIds); + @Deprecated void delBatch(@Param("rowIds") List rowIds); + void delBatchParent(@Param("rowIds") List rowIds); + void delBatchChild(@Param("rowIds") List rowIds); + @Deprecated void updateBomState(@Param("editStatus") Integer editStatus, @Param("status") Integer status ,@Param("rowIds") List rowIds); + void updateBomStateParent(@Param("editStatus") Integer editStatus, @Param("status") Integer status ,@Param("rowIds") List rowIds); + + void updateBomStateChild(@Param("editStatus") Integer editStatus, @Param("status") Integer status ,@Param("rowIds") List rowIds); + + + @Deprecated void updateRevertBom( @Param("status") Integer status ,@Param("editStatus") Integer editStatus ,@Param("rowIds") List rowIds); + void updateRevertBomParent( @Param("status") Integer status ,@Param("editStatus") Integer editStatus ,@Param("rowIds") List rowIds); + + void updateRevertBomChild( @Param("status") Integer status ,@Param("editStatus") Integer editStatus ,@Param("rowIds") List rowIds); 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 4323916a..ea4b9edf 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 @@ -65,8 +65,12 @@ public interface BomNewPbomParentMapper extends BaseMapper bomRowIds); + @Deprecated void delPBom(@Param("bomRowIds") List bomRowIds); + void delPBomParent(@Param("bomRowIds") List bomRowIds); + void delPBomChild(@Param("bomRowIds") List bomRowIds); + List getLatestParents(Set materialNos, String facCode); 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 cb473d29..e57334b7 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 @@ -1004,7 +1004,8 @@ public class BomNewEbomParentService extends ServiceImpl delParentBom = delEBomParents.stream().filter(u -> u.getBomRowId() > 0).map(BomNewEbomParentVO::getBomRowId).collect(Collectors.toList()); if(CollUtil.isNotEmpty(delParentBom)){ - this.getBaseMapper().delBatch(delParentBom); +// this.getBaseMapper().delBatch(delParentBom); + this.delBatch(delParentBom); // ebomChildService.getBaseMapper().delBomChild(delParentBom); } } @@ -1060,6 +1061,11 @@ public class BomNewEbomParentService extends ServiceImpl rowIds){ + this.getBaseMapper().delBatch1(rowIds); + this.getBaseMapper().delBatch2(rowIds); + } + /** * EBOM 正式版转PBom * @param paramDto @@ -1360,7 +1366,7 @@ public class BomNewEbomParentService extends ServiceImpl { try { - this.getBaseMapper().updateRootState(); + this.updateRootState(); ebomChildService.updateEBomMaterialUse(materialNos); //this.compucteLevelNum(); @@ -1370,6 +1376,12 @@ public class BomNewEbomParentService extends ServiceImpl createBomImport(BomNewEbomImportDTO dto, InputStream inputStream) throws IOException, ExecutionException, InterruptedException { @@ -1999,7 +2011,8 @@ public class BomNewEbomParentService extends ServiceImpl parentWrapper=new QueryWrapper<>(); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomUpgradeChangeService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomUpgradeChangeService.java index 667a64f9..58c2d2e6 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomUpgradeChangeService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomUpgradeChangeService.java @@ -114,7 +114,7 @@ public class BomNewEbomUpgradeChangeService extends ServiceImpl oldPbomRowIds = updateImpact.getOldPBomList().stream().map(u -> u.getRowId()).collect(Collectors.toList()); - pbomParentService.getBaseMapper().delPBom(oldPbomRowIds); + pbomParentService.delPBom(oldPbomRowIds); } } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java index d73b8624..1422b4de 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java @@ -26,6 +26,7 @@ import com.nflg.product.bomnew.service.domain.MBom.IndexListTree; import com.nflg.product.bomnew.util.VUtils; import nflg.product.common.vo.ResultVO; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.*; @@ -322,4 +323,10 @@ public class BomNewMbomParentService extends ServiceImpl { + + public void delOriginalFormalBom(List drawingNos){ + this.getBaseMapper().delOriginalFormalBomChild(drawingNos); + this.getBaseMapper().delOriginalFormalBomParent(drawingNos); + } + + /** + * 同步正式 + */ + @Transactional + public void syncOriginalBomToFormal(List rowIds){ + this.getBaseMapper().syncOriginalBomToFormalParent(rowIds); + this.getBaseMapper().syncOriginalBomToFormalChild(rowIds); + } } 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 bab9d24e..3779a3dc 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 @@ -359,7 +359,7 @@ public class BomNewOriginalParentService extends ServiceImpl { syncToFormal(convert.getHasHandlerParentIds()); @@ -735,9 +736,9 @@ public class BomNewOriginalParentService extends ServiceImpl rowIds){ + this.getBaseMapper().delBatchParent(rowIds); + this.getBaseMapper().delBatchChild(rowIds); + } + + public void updateRevertBom(Integer status ,Integer editStatus,List rowIds){ + this.getBaseMapper().updateRevertBomParent(status,editStatus,rowIds); + this.getBaseMapper().updateRevertBomChild(status,editStatus,rowIds); + } + + public void updateBomState(Integer editStatus,Integer status ,List rowIds){ + this.getBaseMapper().updateBomStateParent(editStatus,status,rowIds); + this.getBaseMapper().updateBomStateChild(editStatus,status,rowIds); + + } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java index 5c8d59fb..e6d2684c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java @@ -86,6 +86,9 @@ public class BomNewOriginalParentV2Service extends ServiceImpl { syncToFormal(convert.getHasHandlerParentIds()); @@ -308,9 +311,9 @@ public class BomNewOriginalParentV2Service extends ServiceImpl oldPBomRowIds = toParents.stream().map(u -> u.getRowId()).collect(Collectors.toList()); //转移后删除 - this.getBaseMapper().delPBom(oldPBomRowIds); + this.delPBom(oldPBomRowIds); } } @@ -1799,4 +1799,9 @@ public class BomNewPbomParentService extends ServiceImpl bomRowIds){ + this.getBaseMapper().delPBomParent(bomRowIds); + this.getBaseMapper().delPBomChild(bomRowIds); + } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBomBase.java index b7578192..9673c9f0 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBomBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBomBase.java @@ -80,8 +80,8 @@ public class ConvertToMBomBase { if (Objects.nonNull(oldParent)) { if (SapStatusEnum.PUB_SUCCESS.equalsValue(oldParent.getStatus())) { //将数据迁移到历史表 - SpringUtil.getBean(BomNewMbomParentService.class).getBaseMapper().insertMBomIntoHistory(oldParent.getRowId()); - +// SpringUtil.getBean(BomNewMbomParentService.class).getBaseMapper().insertMBomIntoHistory(oldParent.getRowId()); + SpringUtil.getBean(BomNewMbomParentService.class).insertMBomIntoHistory(oldParent.getRowId()); mBomParent.setCurrentVersion(VersionUtil.getMBomNextVersion(oldParent.getCurrentVersion())); SpringUtil.getBean(BomNewMbomDetailService.class).getBaseMapper().deleteByMap(ImmutableMap.of("bom_row_id", oldParent.getRowId())); 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 7cef6dbf..3a9e1436 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 @@ -256,6 +256,37 @@ + + update t_bom_new_ebom_parent + set root_is=0, + user_root_is=0 + where last_version_is = 1 + AND `status` < 4 + + + update t_bom_new_ebom_parent a left join ( + select b.row_id, b.material_no,a.`status` from t_bom_new_ebom_parent a join t_bom_new_ebom_child b on a.row_id=b.parent_row_id + and a.`status` < 4 + ) b + on a.material_no=b.material_no + set a.root_is=1, + a.user_root_is=1 + where a.`status` < 4 and b.row_id is null and a.last_version_is=1 + + + update t_bom_new_ebom_parent a left join ( + select b.row_id, b.material_no,a.`status` , a.created_by from t_bom_new_ebom_parent a join t_bom_new_ebom_child b on a.row_id=b.parent_row_id + and a.`status` < 4 + ) b + on a.material_no=b.material_no and a.created_by=b.created_by + set a.user_root_is=1 + where a.`status` + < 4 + and b.row_id is null + and a.last_version_is = 1 + AND a.virtual_package_is = 0; + + update t_bom_new_ebom_parent set root_is=0, @@ -298,6 +329,18 @@ where a.`status` in (1, 3) and last_version_is=1 and b.row_id is null; + + delete from t_bom_new_ebom_parent where row_id in + + #{rowId} + + + + delete from t_bom_new_ebom_child where parent_row_id in + + #{rowId} + + delete from t_bom_new_ebom_parent where row_id in diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml index c0441966..5b5aad31 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml @@ -185,8 +185,17 @@ ]]> + + INSERT INTO `nflg`.`t_bom_new_mbom_parent_history` (`row_id`, `batch_no`, `drawing_no`, `fac_code`, `material_no`, `order_number`, `material_name`, `material_desc`, `material_texture`, `material_unit`, `unit_weight`, `total_weight`, `current_version`, `num`, `last_version_is`, `status`, `sysn_sap_user_name`, `sysn_sap_time`, `source_row_id`, `devise_user_code`, `devise_name`, `created_by`, `created_time`, `expire_end_time`, `remark`, `dept_name`, `level_num`, `change_desc`, `notice_nums`, `order_no`, `modify_time`) + select `row_id`, `batch_no`, `drawing_no`, `fac_code`, `material_no`, `order_number`, `material_name`, `material_desc`, `material_texture`, `material_unit`, `unit_weight`, `total_weight`, `current_version`, `num`, `last_version_is`, `status`, `sysn_sap_user_name`, `sysn_sap_time`, `source_row_id`, `devise_user_code`, `devise_name`, `created_by`, `created_time`, `expire_end_time`, `remark`, `dept_name`, `level_num`, `change_desc`, `notice_nums`, `order_no`, `modify_time` from t_bom_new_mbom_parent where row_id=#{rowId} + + + INSERT INTO `nflg`.`t_bom_new_mbom_detail_history` (`row_id`, `bom_row_id`, `parent_row_id`, `drawing_no`, `fac_code`, `material_no`, `current_version`, `order_number`, `material_name`, `material_desc`, `material_texture`, `material_unit`, `unit_weight`, `total_weight`, `num`, `project_type`, `super_material_status`, `virtual_part_is`, `source_row_id`, `devise_user_code`, `devise_name`, `created_by`, `created_time`, `remark`, `dept_name`, `level_num`, `change_desc`, `notice_nums`, `modify_time`, `material_back_status`, `virtual_part_type`) + + select `row_id`, `bom_row_id`, `parent_row_id`, `drawing_no`, `fac_code`, `material_no`, `current_version`, `order_number`, `material_name`, `material_desc`, `material_texture`, `material_unit`, `unit_weight`, `total_weight`, `num`, `project_type`, `super_material_status`, `virtual_part_is`, `source_row_id`, `devise_user_code`, `devise_name`, `created_by`, `created_time`, `remark`, `dept_name`, `level_num`, `change_desc`, `notice_nums`, `modify_time`, `material_back_status`, `virtual_part_type` from t_bom_new_mbom_detail where bom_row_id=#{rowId} + INSERT INTO `nflg`.`t_bom_new_mbom_parent_history` (`row_id`, `batch_no`, `drawing_no`, `fac_code`, `material_no`, `order_number`, `material_name`, `material_desc`, `material_texture`, `material_unit`, `unit_weight`, `total_weight`, `current_version`, `num`, `last_version_is`, `status`, `sysn_sap_user_name`, `sysn_sap_time`, `source_row_id`, `devise_user_code`, `devise_name`, `created_by`, `created_time`, `expire_end_time`, `remark`, `dept_name`, `level_num`, `change_desc`, `notice_nums`, `order_no`, `modify_time`) diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml index d6310f1e..13fd15fc 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml @@ -53,6 +53,23 @@ + + delete from t_bom_new_original_child_formal where parent_row_id in + ( select row_id from t_bom_new_original_parent_formal where drawing_no in + + #{drawingNo} + + ) + + + + delete from t_bom_new_original_parent_formal where drawing_no in + + #{drawingNo} + + ) + + delete from t_bom_new_original_child_formal where parent_row_id in @@ -68,6 +85,25 @@ ); + + INSERT INTO `nflg`.`t_bom_new_original_parent_formal` (`row_id`, `batch_no`, `drawing_no`, `material_no`, `material_name`, `material_desc`, `current_version`, `num`, `root_is`, `user_root_is`, `bom_exist`, `should_bom_exist`, `last_version_is`, `material_texture`, `unit_weight`, `total_weight`, `devise_user_code`, `devise_name`, `status`, `edit_status`, `convert_to_ebom_time`, `dept_row_id`, `dept_name`, `source`, `remark`, `created_by`, `created_time`, `expire_end_time`, `level_num`) + + select `row_id`, `batch_no`, `drawing_no`, `material_no`, `material_name`, `material_desc`, `current_version`, `num`, `root_is`, `user_root_is`, `bom_exist`, `should_bom_exist`, `last_version_is`, `material_texture`, `unit_weight`, `total_weight`, `devise_user_code`, `devise_name`, `status`, `edit_status`, `convert_to_ebom_time`, `dept_row_id`, `dept_name`, `source`, `remark`, `created_by`, `created_time`, `expire_end_time`, `level_num` + from t_bom_new_original_parent where row_id in + + #{rowId} + + + + + INSERT INTO `t_bom_new_original_child_formal` (`row_id`, `parent_row_id`, `order_number`, `drawing_no`, `material_no`, `material_name`, `material_desc`, `unit_weight`, `num`, `total_weight`, `remark`, `created_time`, `created_by`, `edit_status`, `status`, `material_texture`, `should_bom_exist`, `bom_version_row_id`) + select `row_id`, `parent_row_id`, `order_number`, `drawing_no`, `material_no`, `material_name`, `material_desc`, `unit_weight`, `num`, `total_weight`, `remark`, `created_time`, `created_by`, `edit_status`, `status`, `material_texture`, `should_bom_exist`, `bom_version_row_id` + from t_bom_new_original_child + where parent_row_id in + + #{rowId} + + 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 5105bb5a..1c2a792c 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 @@ -101,6 +101,18 @@ + + delete from t_bom_new_original_parent where row_id in + + #{rowId} + + + + delete from t_bom_new_original_child where parent_row_id in + + #{rowId} + + delete from t_bom_new_original_parent where row_id in @@ -112,6 +124,21 @@ ; + + update t_bom_new_original_parent set status = #{status},edit_status=#{editStatus} where + row_id in + + #{rowId} + + + + update t_bom_new_original_child set status = #{status},edit_status=#{editStatus} where + parent_row_id in + + #{rowId} + + + update t_bom_new_original_parent set status = #{status},edit_status=#{editStatus} where row_id in @@ -126,7 +153,22 @@ ; + + update t_bom_new_original_parent set status = #{status},edit_status=#{editStatus}, convert_to_ebom_time=now() + where + row_id in + + #{rowId} + + + + update t_bom_new_original_child set status = #{status} ,edit_status=#{editStatus} where + parent_row_id in + + #{rowId} + + update t_bom_new_original_parent set status = #{status},edit_status=#{editStatus}, convert_to_ebom_time=now() where 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 6bd0ca80..2a86826f 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 @@ -343,6 +343,19 @@ + + delete from t_bom_new_pbom_parent where row_id in + + #{item} + + + + delete from t_bom_new_pbom_child where parent_row_id in + + #{item} + + + delete from t_bom_new_pbom_parent where row_id in