From 90a3568945b0d9e840e6ea5a0585f9e895543676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Thu, 21 Mar 2024 10:10:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E5=A7=8BBOM=E8=BD=ACEbom=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAList<ImportOriginalBomVO>=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=A4=B1=E8=B4=A5=E7=9A=84=E5=8E=9F=E5=9B=A0?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/api/user/OriginalBomApi.java  | 10 ++++------
 .../service/BomNewOriginalParentService.java     | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 11 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 e8b5b688..458a3ab2 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
@@ -157,16 +157,16 @@ public class OriginalBomApi extends BaseApi {
     @LogRecord(success = "删除BOM-图号：{{#bom.drawingNo}} 版本：{{#bom.currentVersion}},操作结果:{{#_ret}}",
             bizNo = "{{#bomRowIds.toString()}}" ,type = "原始BOM转Ebom")
     @Transactional(rollbackFor = Exception.class)
-    public ResultVO<Boolean> convertToEBom(@RequestBody List<Long> bomRowIds) throws ExecutionException, InterruptedException {
+    public ResultVO<List<ImportOriginalBomVO>> convertToEBom(@RequestBody List<Long> bomRowIds) throws ExecutionException, InterruptedException {
 
         VUtils.isTure(CollUtil.isEmpty(bomRowIds)).throwMessage("请选择要转换的BOM");
         VUtils.isTure(bomRowIds.size() > 20).throwMessage("你选择的BOM数据大于20");
-        originalParentService.convertToEBom(bomRowIds);
+        List<ImportOriginalBomVO> result = originalParentService.convertToEBom(bomRowIds);
         //更新物料使用
         bomNewEbomChildMapper.updateEBomMaterialUse();
 
         //更新-原始BOM跟节点
-        CompletableFuture.runAsync(()->{
+        CompletableFuture.runAsync(() -> {
             originalParentService.getBaseMapper().updateRootState_2(OriginalStatusEnum.OVER_CONVERT.getValue());
             originalParentService.getBaseMapper().updateRootState_3(OriginalStatusEnum.OVER_CONVERT.getValue());
         });
@@ -174,9 +174,7 @@ public class OriginalBomApi extends BaseApi {
         //跟新EBom 根节点
         ebomParentService.getBaseMapper().updateRootState();
 
-
-        return ResultVO.success(true);
-
+        return ResultVO.success(result);
     }
 
     @GetMapping("getOriginalBomExcelTemplate")
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 a6bcc939..37ad37e7 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
@@ -472,32 +472,38 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
      *
      * @return
      */
-    public Boolean convertToEBom(List<Long> bomRowIds) throws ExecutionException, InterruptedException {
+    public List<ImportOriginalBomVO> convertToEBom(List<Long> bomRowIds) throws ExecutionException, InterruptedException {
         List<BomNewOriginalParentEntity> bomNewOriginalParentEntities = this.getBaseMapper().selectBatchIds(bomRowIds);
 
         //List<BomNewOriginalParentEntity> convertedBom = bomNewOriginalParentEntities.stream().filter(u -> OriginalStatusEnum.OVER_CONVERT.equalsValue(u.getStatus())).collect(Collectors.toList());
         // VUtils.isTure(CollUtil.isNotEmpty(convertedBom)).throwMessage("所选BOM中存在已转换的BOM");
         //检查：有子级的物料编码不能为空
 
+        List<ImportOriginalBomVO> importOriginalBomVOList = new ArrayList<>();
 
         //开始转换
         for (BomNewOriginalParentEntity parent : bomNewOriginalParentEntities) {
 
             if (!Objects.equals(parent.getCreatedBy(), SessionUtil.getUserCode())){
+                importOriginalBomVOList.add(new ImportOriginalBomVO(parent.getDrawingNo(),"非本人创建"));
                 log.warn(SessionUtil.getRealName()+"("+SessionUtil.getUserCode()+")转换原始bom("+parent.getRowId().toString()+")到ebom的操作被阻止");
                 continue;
             }
 
             LogRecordContext.putVariable("bom",parent);
             Long ebomRowId = IdWorker.getId();
-            convertToEBomDo(parent, ebomRowId);
+
+            try {
+                convertToEBomDo(parent, ebomRowId);
+            } catch (Exception e) {
+                importOriginalBomVOList.add(new ImportOriginalBomVO(parent.getDrawingNo(), "操作失败：" + e.getMessage()));
+                throw e;
+            }
 
             //更新并保存异常信息
             ebomParentService.checkAndSaveEBomException(ebomRowId);
-
         }
-        return true;
-
+        return importOriginalBomVOList;
     }
 
     /**