rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pbom-取消T项检查

This commit is contained in:
luolm 2024-11-05 22:31:11 +08:00
parent 37c9612a84
commit db7a3752bd
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
View File

@ -12,9 +12,7 @@ import com.google.common.collect.Sets;
import com.mzt.logapi.context.LogRecordContext; import com.mzt.logapi.context.LogRecordContext;
import com.mzt.logapi.starter.annotation.LogRecord; import com.mzt.logapi.starter.annotation.LogRecord;
import com.nflg.product.base.core.api.BaseApi; import com.nflg.product.base.core.api.BaseApi;
import com.nflg.product.bomnew.constant.EBomConstant; import com.nflg.product.bomnew.constant.*;
import com.nflg.product.bomnew.constant.PBomEditStatusEnum;
import com.nflg.product.bomnew.constant.PBomStatusEnum;
import com.nflg.product.bomnew.pojo.dto.*; import com.nflg.product.bomnew.pojo.dto.*;
import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO; import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO;
import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity; 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-编辑-提交") @LogRecord(success = "PBom-编辑-提交,物料编码：{{#bom.materialNo}}-版本：{{#bom.currentVersion}},操作结果:{{#_ret}}", bizNo = "{{#param.bomRowId}}",type = "PBom-编辑-提交")
public ResultVO<Boolean> editSubmit(@Valid @RequestBody EditPBomParamDTO param){ public ResultVO<Boolean> editSubmit(@Valid @RequestBody EditPBomParamDTO param){
if (CollUtil.isNotEmpty(param.getChildList())) { if (CollUtil.isNotEmpty(param.getChildList())) {
//检查物料编码是否存在 //检查物料编码是否存在 （排除T项）
bomNewPbomParentService.checkMaterialNo(param.getChildList()); 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); bomNewPbomParentService.editSave(param, PBomEditStatusEnum.HANDLER_FINISHED);
return ResultVO.success(true); return ResultVO.success(true);