From 4a9d9b538529d953e60a868b4d3bdf955b77e854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Wed, 24 Jan 2024 10:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A01|=E8=87=AA=E5=88=B6;2|=E5=A4=96?=
 =?UTF-8?q?=E5=8D=8F;3|=E9=87=87=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewPbomParentService.java  | 9 +++++++--
 .../com/nflg/product/bomnew/service/MaterialService.java | 2 +-
 .../bomnew/service/domain/PBom/ConvertToMBom.java        | 6 +++---
 3 files changed, 11 insertions(+), 6 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 6ea99e8b..6a499d88 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
@@ -398,7 +398,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
             result = Convert.convert(BomNewPbomParentVO.class, parent);
         }
         materialMainService.intiMaterialInfo(ImmutableList.of(result));
-        VUtils.isTure(StrUtil.isBlank(result.getMaterialCategoryCode()) || !result.getMaterialCategoryCode().startsWith("20")).throwMessage("插入工艺包的物料需时制作物料");
+        VUtils.isTure(StrUtil.isBlank(result.getMaterialCategoryCode()) || !result.getMaterialCategoryCode().startsWith("20")).throwMessage("插入工艺包的物料需为制作物料");
 
 //        drawingNo = StrUtil.join("", result.getDrawingNo(), technologyPackageTypeEntity.getDrawingNoSuffix());
         // 检查改图号是否已存在主数据中
@@ -421,7 +421,12 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
         Map<String, AddVirtrualMaterialDTO> mMap = materialService.batchAddMaterial(ImmutableList.of(toM));
 //        String materialNo = materialService.addMaterial(drawingNo, materialName, materialDesc, "201201");
         String materialNo=mMap.get(key).getMaterialNo();
-        return materialMainService.getMaterialBaseInfo(ImmutableList.of(materialNo)).get(0);
+        BaseMaterialVO resultD = materialMainService.getMaterialBaseInfo(ImmutableList.of(materialNo)).get(0);
+        //插入工艺包
+        packageParam.setTechnologyPackageMaterialNo(materialNo);
+        insertTechnologyPackage(packageParam);
+
+        return resultD;
     }
 
     @Transactional(rollbackFor = Exception.class)
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
index b9d39887..7ece978c 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
@@ -381,7 +381,7 @@ public class MaterialService {
             if (optional.isPresent()) {
                 OaResult oaResult = optional.get();
                 materialMainEntity.setOaRowId(oaResult.getInstId());
-                materialMainEntity.setProcessState(100);
+               // materialMainEntity.setProcessState(10);
             }
         }
         materialMainService.updateBatchById(entityList);
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBom.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBom.java
index b9de2283..1dfb0efb 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBom.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/ConvertToMBom.java
@@ -163,9 +163,9 @@ public class ConvertToMBom {
      *
      * @param
      */
-    private void handEmptyMakePackage() {
+    private void handEmptyMakePackage(List<ConvertToMBomDTO> childBomTree) {
 
-        List<ConvertToMBomDTO> childBomTree = ConvertToMbomUtil.toTree(parent.getRowId(), allChildTreeList_1020, ConvertToMBomDTO::getRelParentRowId, ConvertToMBomDTO::getBomRowId);
+//        List<ConvertToMBomDTO> childBomTree = ConvertToMbomUtil.toTree(parent.getRowId(), allChildTreeList_1020, ConvertToMBomDTO::getRelParentRowId, ConvertToMBomDTO::getBomRowId);
         for (ConvertToMBomDTO item : childBomTree) {
             if (VirtualPackageTypeEnum.DELIVERY_PACKAGE.equalsValue(item.getVirtualPartType())) {
                 List<ConvertToMBomDTO> makeChild = item.getChildNodes().stream().filter(u -> VirtualPackageTypeEnum.MAKING_PACKAGE.equalsValue(u.getVirtualPartType())).collect(Collectors.toList());
@@ -231,7 +231,7 @@ public class ConvertToMBom {
             recursionHandlerChild1020(item, directDeliveryPackage);
         }
         //处理制作包无下级的情况
-        handEmptyMakePackage();
+        handEmptyMakePackage(childBomTree);
 
     }