云
7 天以前 cccbfadcb6e96c23a33c40c0687a27c2f6efa1db
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
@@ -44,6 +44,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -142,7 +143,10 @@
    @Transactional(rollbackFor = Exception.class)
    public void submitSalesNotice(Long id, String processDefinitionKey, Long userId) {
        // 1.1 校验存在 + 草稿状态
        MesWmSalesNoticeDO notice = validateSalesNoticeExistsAndDraft(id);
        MesWmSalesNoticeDO notice = validateSalesNoticeExists(id);
        if (ObjUtil.notEqual(PREPARE.getStatus(), notice.getStatus())) {
            throw exception(WM_SALES_NOTICE_STATUS_NOT_ALLOW_SUBMIT);
        }
        // 1.2 检查是否有行项目
        List<MesWmSalesNoticeLineDO> lines = salesNoticeLineService.getSalesNoticeLineListByNoticeId(id);
        if (CollUtil.isEmpty(lines)) {
@@ -163,13 +167,22 @@
        }
        validateSalesNoticeApproveCategoryAndProcessDefinition();
        ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
        // 区分「Key 不存在/已停用」与「流程存在但不属于发货审批分类」,分别给出可执行的提示
        if (processDefinition == null) {
            throw exception(WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
            throw exception(WM_SALES_NOTICE_BPM_PROCESS_KEY_INVALID, processDefinitionKey);
        }
        boolean inDeliveryCategory = bpmProcessDefinitionService
                .getProcessDefinitionInfoListByCategory(SALES_DELIVERY_APPROVE_CATEGORY_CODE).stream()
                .anyMatch(info -> Objects.equals(info.getProcessDefinitionId(), processDefinition.getId()));
        if (!inDeliveryCategory) {
            throw exception(WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_IN_CATEGORY,
                    StrUtil.blankToDefault(processDefinition.getName(), processDefinitionKey));
        }
        // 4. 创建审批流程实例,进入审批中
        String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
                .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id)));
                .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id))
                .setVariables(Map.of("businessNo", notice.getCode())));
        salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
                .setId(id).setProcessInstanceId(processInstanceId).setStatus(APPROVING.getStatus()));
    }