From db7a3752bd7745a998b1ad9fe85d1a6f16a73e49 Mon Sep 17 00:00:00 2001
From: luolm <470431449@qq.com>
Date: Tue, 5 Nov 2024 22:31:11 +0800
Subject: [PATCH] =?UTF-8?q?Pbom-=E5=8F=96=E6=B6=88T=E9=A1=B9=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/product/bomnew/api/user/PBomApi.java     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
index 6f062199..2166d439 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
@@ -12,9 +12,7 @@ import com.google.common.collect.Sets;
 import com.mzt.logapi.context.LogRecordContext;
 import com.mzt.logapi.starter.annotation.LogRecord;
 import com.nflg.product.base.core.api.BaseApi;
-import com.nflg.product.bomnew.constant.EBomConstant;
-import com.nflg.product.bomnew.constant.PBomEditStatusEnum;
-import com.nflg.product.bomnew.constant.PBomStatusEnum;
+import com.nflg.product.bomnew.constant.*;
 import com.nflg.product.bomnew.pojo.dto.*;
 import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO;
 import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity;
@@ -190,10 +188,11 @@ public class PBomApi extends BaseApi {
     @LogRecord(success = "PBom-编辑-提交,物料编码：{{#bom.materialNo}}-版本：{{#bom.currentVersion}},操作结果:{{#_ret}}", bizNo = "{{#param.bomRowId}}",type = "PBom-编辑-提交")
     public ResultVO<Boolean> editSubmit(@Valid @RequestBody EditPBomParamDTO param){
         if (CollUtil.isNotEmpty(param.getChildList())) {
-            //检查物料编码是否存在
-            bomNewPbomParentService.checkMaterialNo(param.getChildList());
+            //检查物料编码是否存在 （排除T项）
+            List<BomNewPbomParentVO> noTBom = param.getChildList().stream().filter(u -> !BomConstant.PROJECT_TYPE_TEMPORARY.equals(u.getProjectType())).collect(Collectors.toList());
+            bomNewPbomParentService.checkMaterialNo(noTBom);
             //检查物料是否被冻结
-            materialMainService.checkMaterialFreeze(param.getChildList());
+            materialMainService.checkMaterialFreeze(noTBom);
         }
         bomNewPbomParentService.editSave(param, PBomEditStatusEnum.HANDLER_FINISHED);
         return ResultVO.success(true);