From 94d8c82d5049766b06038b8825233573cefcf00f Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Tue, 27 Feb 2024 16:34:21 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E3=80=91=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=97=B6=E7=89=88=E6=9C=AC=E5=8F=B7+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/processbom/ProcessBomServiceImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java index 1c7edb50..d8317517 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java @@ -54,7 +54,8 @@ public class ProcessBomServiceImpl implements ProcessBomService { // 校验存在 validateProcessBomExists(updateReqVO.getId()); // 提交的时候 明细不容许为空 - if(OperateTypeEnum.valueOf(updateReqVO.getActive()) == OperateTypeEnum.SUBMIT){ + OperateTypeEnum operateTypeEnum = OperateTypeEnum.valueOf(updateReqVO.getActive()); + if(operateTypeEnum == OperateTypeEnum.SUBMIT){ if(updateReqVO.getProcessBomDetails() == null || updateReqVO.getProcessBomDetails().isEmpty()){ throw exception(PROCESS_BOM_DETAIL_NOT_EXISTS); } @@ -62,9 +63,15 @@ public class ProcessBomServiceImpl implements ProcessBomService { // 更新 ProcessBomDO updateObj = BeanUtils.toBean(updateReqVO, ProcessBomDO.class); - if(!updateObj.canOperate(OperateTypeEnum.valueOf(updateReqVO.getActive()))){ + if(!updateObj.canOperate(operateTypeEnum)){ throw exception(INVALID_OPERATE); } + + // 如提交版本+1 + if(operateTypeEnum == OperateTypeEnum.SUBMIT){ + updateObj.setVersion(updateObj.getVersion()+1); + } + updateObj.setBomStatus(ProcessBomStatusEnum.valueOf(updateReqVO.getActive()).getCode()); processBomMapper.updateById(updateObj);