From f7fc1a9d41a3af4ce6dd4009c1b505d7d7b63563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Tue, 16 Jan 2024 19:00:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/api/user/EbomApi.java |  6 +++---
 .../pojo/dto/EBomUpgradeChangesParamDTO.java  | 21 +++++++++++++++++++
 .../service/BomNewEbomParentService.java      | 13 ++++++++----
 3 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/EBomUpgradeChangesParamDTO.java

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java
index 6138b368..4209ca3d 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java
@@ -155,9 +155,9 @@ public class EbomApi extends BaseApi {
 
     @PostMapping("upgradeChanges")
     @ApiOperation("发起变更")
-    public ResultVO<Boolean> upgradeChanges(@RequestBody List<Long> bomRowIds) {
-        VUtils.isTure(CollUtil.isEmpty(bomRowIds)).throwMessage("请选择要发起变更的物料");
-        bomNewEbomParentService.upgradeChanges(bomRowIds);
+    public ResultVO<Boolean> upgradeChanges(@RequestBody EBomUpgradeChangesParamDTO param) {
+        VUtils.isTure(CollUtil.isEmpty(param.getBomRowIds())).throwMessage("请选择要发起变更的物料");
+        bomNewEbomParentService.upgradeChanges(param);
         return ResultVO.success(true);
 
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/EBomUpgradeChangesParamDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/EBomUpgradeChangesParamDTO.java
new file mode 100644
index 00000000..3441f3a9
--- /dev/null
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/EBomUpgradeChangesParamDTO.java
@@ -0,0 +1,21 @@
+package com.nflg.product.bomnew.pojo.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class EBomUpgradeChangesParamDTO {
+
+    @ApiModelProperty("bom行ID")
+    private List<Long> bomRowIds;
+
+    @ApiModelProperty("升版说明")
+    private String changeDesc;
+
+
+    @ApiModelProperty("通知单号")
+    private String noticeNums;
+}
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 32dcfb55..2cb26233 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
@@ -304,6 +304,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                         child.setBomExist(parentEntity.getBomExist());
                         child.setShouldBomExist(parentEntity.getShouldBomExist());
                         child.setVirtualPackageIs(parentEntity.getVirtualPackageIs());
+                        child.setChangeDesc(parentEntity.getChangeDesc());
+                        child.setNoticeNums(parentEntity.getNoticeNums());
 
 
                         if (parentEntity.getStatus().equals(EBomStatusEnum.PUBLISHED.getValue()) &&  EBomStatusEnum.PUBLISHED.getValue()>parentEntity.getStatus()) {
@@ -672,16 +674,16 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
     /**
      * 发起变更
      *
-     * @param bomRowIds
+     * @param paramDTO
      */
     @Transactional(rollbackFor = Exception.class)
-    public void upgradeChanges(List<Long> bomRowIds) {
-        List<BomNewEbomParentEntity> list = this.lambdaQuery().in(BomNewEbomParentEntity::getRowId, bomRowIds).list();
+    public void upgradeChanges(EBomUpgradeChangesParamDTO paramDTO) {
+        List<BomNewEbomParentEntity> list = this.lambdaQuery().in(BomNewEbomParentEntity::getRowId, paramDTO.getBomRowIds()).list();
         List<String> notConvertToPbom = list.stream().filter(u -> u.getStatus() < EBomStatusEnum.PUBLISHED.getValue()).map(u -> u.getMaterialNo()).collect(Collectors.toList());
         VUtils.isTure(CollUtil.isNotEmpty(notConvertToPbom)).throwMessage(StrUtil.join(",", notConvertToPbom) + "未转PBom,不能发起变更");
         List<BomNewEbomParentEntity> parentResult = new ArrayList<>();
         List<BomNewEbomChildEntity> childResult = new ArrayList<>();
-        for (Long bomRowId : bomRowIds) {
+        for (Long bomRowId : paramDTO.getBomRowIds()) {
             BomNewEbomParentEntity parent = this.getById(bomRowId);
             List<BomNewEbomChildEntity> child = ebomChildService.lambdaQuery().eq(BomNewEbomChildEntity::getParentRowId, bomRowId).list();
 
@@ -691,10 +693,13 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             newParent.setLastVersionIs(1);
             newParent.setCurrentVersion(VersionUtil.getNextVersionForSmallVersion(parent.getCurrentVersion()));
             newParent.setExceptionStatus(EBomExceptionStatusEnum.EXCEPT_NO_11.getValue());
+            newParent.setChangeDesc(paramDTO.getChangeDesc());
+            newParent.setNoticeNums(paramDTO.getNoticeNums());
             parent.setLastVersionIs(0);
             parentResult.add(newParent);
             parentResult.add(parent);
 
+
             for (BomNewEbomChildEntity childEnt : child) {
                 BomNewEbomChildEntity newChild = new BomNewEbomChildEntity();
                 BeanUtil.copyProperties(childEnt, newChild);