From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java | 131 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 126 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
index 0c03975..7745b64 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
@@ -2,8 +2,15 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.MesWmSalesNoticePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.MesWmSalesNoticeSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
@@ -15,6 +22,7 @@
import cn.iocoder.yudao.module.mes.dal.mysql.wm.salesnotice.MesWmSalesNoticeMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.salesnotice.MesWmSalesNoticeLineMapper;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmOutStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmSalesNoticeStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductSalesStatusEnum;
import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
@@ -24,14 +32,19 @@
import cn.iocoder.yudao.module.erp.api.sale.enums.ErpSaleOrderOutStatusEnum;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.repository.ProcessDefinition;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -44,6 +57,11 @@
@Validated
@Slf4j
public class MesWmSalesNoticeServiceImpl implements MesWmSalesNoticeService {
+
+ /**
+ * BPM 鍙戣揣瀹℃壒鍒嗙被缂栫爜锛堝鎵逛汉榛樿涓虹墿娴侊級
+ */
+ private static final String SALES_DELIVERY_APPROVE_CATEGORY_CODE = "sales_delivery_approve";
@Resource
private MesWmSalesNoticeMapper salesNoticeMapper;
@@ -65,6 +83,13 @@
@Resource
private MesWmSalesNoticeLineMapper salesNoticeLineMapper;
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
+ @Resource
+ private BpmCategoryService bpmCategoryService;
+ @Resource
+ private BpmProcessDefinitionService bpmProcessDefinitionService;
+
@Override
public Long createSalesNotice(MesWmSalesNoticeSaveReqVO createReqVO) {
// 鏍￠獙鏁版嵁
@@ -73,6 +98,8 @@
// 鎻掑叆
MesWmSalesNoticeDO notice = BeanUtils.toBean(createReqVO, MesWmSalesNoticeDO.class);
notice.setStatus(PREPARE.getStatus()); // 鑽夌鐘舵��
+ notice.setExpressFee(notice.getExpressFee() == null ? BigDecimal.ZERO : notice.getExpressFee());
+ notice.setInvoiceStatus(notice.getInvoiceStatus() == null ? 0 : notice.getInvoiceStatus());
salesNoticeMapper.insert(notice);
return notice.getId();
}
@@ -113,7 +140,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void submitSalesNotice(Long id) {
+ public void submitSalesNotice(Long id, String processDefinitionKey, Long userId) {
// 1.1 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
MesWmSalesNoticeDO notice = validateSalesNoticeExistsAndDraft(id);
// 1.2 妫�鏌ユ槸鍚︽湁琛岄」鐩�
@@ -122,17 +149,111 @@
throw exception(WM_SALES_NOTICE_LINE_EMPTY);
}
- // 2. 鏇存柊鐘舵�侊細鑽夌 鈫� 寰呭嚭搴�
- salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
- .setId(id).setStatus(APPROVED.getStatus()));
+ // 2. 鍏ㄥ眬鍏嶅鎵癸細鐩存帴杩涘叆寰呭嚭搴�
+ if (bpmProcessInstanceApi.isGlobalAutoApprove()) {
+ salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
+ .setId(id).setProcessInstanceId("").setStatus(APPROVED.getStatus()));
+ reserveSaleOrderOutStatus(notice);
+ return;
+ }
- // 3. 鍥炲啓 ERP 閿�鍞鍗曞嚭搴撶姸鎬佷负"宸查鐣�"
+ // 3. 蹇呴』閫夋嫨娴佺▼锛屼笖鍒嗙被涓嬪瓨鍦ㄦ縺娲荤殑娴佺▼瀹氫箟
+ if (StrUtil.isBlank(processDefinitionKey)) {
+ throw exception(WM_SALES_NOTICE_SUBMIT_PROCESS_KEY_REQUIRED);
+ }
+ validateSalesNoticeApproveCategoryAndProcessDefinition();
+ ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
+ if (processDefinition == null) {
+ throw exception(WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+
+ // 4. 鍒涘缓瀹℃壒娴佺▼瀹炰緥锛岃繘鍏ュ鎵逛腑
+ String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id)));
+ salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
+ .setId(id).setProcessInstanceId(processInstanceId).setStatus(APPROVING.getStatus()));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateSalesNoticeAuditStatus(Long id, Integer bpmResult) {
+ MesWmSalesNoticeDO notice = validateSalesNoticeExists(id);
+ if (ObjUtil.notEqual(APPROVING.getStatus(), notice.getStatus())) {
+ MesWmSalesNoticeStatusEnum current = MesWmSalesNoticeStatusEnum.getByStatus(notice.getStatus());
+ log.error("[updateSalesNoticeAuditStatus][鍙戣揣鍗�({}) 涓嶅浜庡鎵逛腑锛屽綋鍓嶇姸鎬�({})锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]",
+ id, current != null ? current.getName() : notice.getStatus(), bpmResult);
+ throw exception(WM_SALES_NOTICE_UPDATE_AUDIT_STATUS_FAIL_NOT_APPROVING, notice.getCode(),
+ current != null ? current.getName() : String.valueOf(notice.getStatus()));
+ }
+ if (ObjUtil.equal(bpmResult, BpmProcessInstanceStatusEnum.APPROVE.getStatus())) {
+ // 瀹℃壒閫氳繃锛氳繘鍏ュ緟鍑哄簱锛屽苟鍥炲啓閿�鍞鍗曞嚭搴撶姸鎬�
+ salesNoticeMapper.updateById(new MesWmSalesNoticeDO().setId(id).setStatus(APPROVED.getStatus()));
+ reserveSaleOrderOutStatus(notice);
+ } else if (ObjUtil.equal(bpmResult, BpmProcessInstanceStatusEnum.REJECT.getStatus())
+ || ObjUtil.equal(bpmResult, BpmProcessInstanceStatusEnum.CANCEL.getStatus())) {
+ // 椹冲洖/鍙栨秷锛氶��鍥炶崏绋匡紝鍏佽淇敼鍚庨噸鏂版彁浜�
+ salesNoticeMapper.updateById(new MesWmSalesNoticeDO().setId(id).setStatus(PREPARE.getStatus()));
+ } else {
+ log.warn("[updateSalesNoticeAuditStatus][鍙戣揣鍗�({}) 鏀跺埌鏈煡瀹℃壒缁撴灉({})锛屽拷鐣", id, bpmResult);
+ }
+ }
+
+ @Override
+ public List<Map<String, Object>> getSalesNoticeApproveProcessDefinitionList() {
+ validateSalesNoticeApproveCategoryAndProcessDefinition();
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(SALES_DELIVERY_APPROVE_CATEGORY_CODE);
+ Set<String> processDefinitionIds = cn.iocoder.yudao.framework.common.util.collection.CollectionUtils
+ .convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
+ List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
+ Map<String, ProcessDefinition> latestVersionMap = new HashMap<>();
+ for (ProcessDefinition pd : processDefinitions) {
+ if (pd.isSuspended()) {
+ continue;
+ }
+ ProcessDefinition existing = latestVersionMap.get(pd.getKey());
+ if (existing == null || pd.getVersion() > existing.getVersion()) {
+ latestVersionMap.put(pd.getKey(), pd);
+ }
+ }
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (ProcessDefinition pd : latestVersionMap.values()) {
+ Map<String, Object> item = new HashMap<>();
+ item.put("id", pd.getId());
+ item.put("key", pd.getKey());
+ item.put("name", pd.getName());
+ item.put("version", pd.getVersion());
+ result.add(item);
+ }
+ return result;
+ }
+
+ private void reserveSaleOrderOutStatus(MesWmSalesNoticeDO notice) {
if (notice.getSaleOrderId() != null) {
saleOrderApi.updateOrderOutStatusTo(notice.getSaleOrderId(),
ErpSaleOrderOutStatusEnum.RESERVED.getStatus());
}
}
+ private void validateSalesNoticeApproveCategoryAndProcessDefinition() {
+ List<String> codes = Collections.singletonList(SALES_DELIVERY_APPROVE_CATEGORY_CODE);
+ Map<String, ?> categoryMap = bpmCategoryService.getCategoryMap(codes);
+ if (!categoryMap.containsKey(SALES_DELIVERY_APPROVE_CATEGORY_CODE)) {
+ throw exception(WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(SALES_DELIVERY_APPROVE_CATEGORY_CODE);
+ if (CollUtil.isEmpty(definitionInfoList)) {
+ throw exception(WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ Set<String> processDefinitionIds = cn.iocoder.yudao.framework.common.util.collection.CollectionUtils
+ .convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
+ List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
+ if (processDefinitions.stream().noneMatch(pd -> !pd.isSuspended())) {
+ throw exception(WM_SALES_NOTICE_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ }
+
@Override
public List<MesWmSalesNoticeDO> getSalesNoticeList(Collection<Long> ids) {
if (CollUtil.isEmpty(ids)) {
--
Gitblit v1.9.3