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-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationServiceImpl.java | 190 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 178 insertions(+), 12 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationServiceImpl.java
index 123f0c4..cba49d1 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationServiceImpl.java
@@ -1,9 +1,17 @@
package cn.iocoder.yudao.module.crm.service.quotation;
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.number.MoneyUtils;
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.crm.controller.admin.contract.vo.contract.CrmContractSaveReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.quotation.vo.CrmSaleQuotationPageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.quotation.vo.CrmSaleQuotationSaveReqVO;
@@ -26,8 +34,10 @@
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
@@ -42,12 +52,17 @@
/**
* CRM 閿�鍞姤浠峰崟 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@Slf4j
public class CrmSaleQuotationServiceImpl implements CrmSaleQuotationService {
+
+ /**
+ * BPM 閿�鍞姤浠峰鎵瑰垎绫荤紪鐮�
+ */
+ private static final String SALE_QUOTATION_APPROVE_CATEGORY_CODE = "sale_quotation_approve";
@Resource
private CrmSaleQuotationMapper saleQuotationMapper;
@@ -75,16 +90,23 @@
@Resource
private CrmContractService contractService;
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
+ @Resource
+ private BpmCategoryService bpmCategoryService;
+ @Resource
+ private BpmProcessDefinitionService bpmProcessDefinitionService;
+
@Override
@Transactional(rollbackFor = Exception.class)
public Long createSaleQuotation(CrmSaleQuotationSaveReqVO createReqVO, Long userId) {
// 1.1 鏍￠獙鐗╂枡椤圭殑鏈夋晥鎬�
List<CrmSaleQuotationProductDO> quotationProducts = validateQuotationItems(createReqVO.getItems());
- // 1.2 鐢熸垚鎶ヤ环鍗曞彿锛屽苟鏍￠獙鍞竴鎬�
- String no = noRedisDAO.generate(CrmNoRedisDAO.SALE_QUOTATION_NO_PREFIX);
- if (saleQuotationMapper.selectByNo(no) != null) {
- throw exception(SALE_QUOTATION_NO_EXISTS);
- }
+ // 1.2 纭畾鎶ヤ环鍗曞彿锛堝墠绔～鍐欏垯鐢ㄨ嚜瀹氫箟鍗曞彿锛岀暀绌哄垯鑷姩鐢熸垚锛夛紝骞舵牎楠屽敮涓�鎬�
+ String customNo = StrUtil.trim(createReqVO.getNo());
+ String no = StrUtil.isBlank(customNo)
+ ? noRedisDAO.generate(CrmNoRedisDAO.SALE_QUOTATION_NO_PREFIX) : customNo;
+ validateQuotationNoUnique(no, null);
// 1.3 鏍￠獙鍏宠仈瀛楁
validateRelationDataExists(createReqVO);
@@ -122,8 +144,15 @@
// 1.4 鏍￠獙鍏宠仈瀛楁
validateRelationDataExists(updateReqVO);
- // 2.1 鏇存柊鎶ヤ环鍗�
+ // 2.1 鏇存柊鎶ヤ环鍗曪紙鎶ヤ环鍗曞彿鐣欑┖琛ㄧず淇濇寔鍘熷�硷紝濉啓鍒欐牎楠屽敮涓�鎬у悗鏇挎崲锛�
CrmSaleQuotationDO updateObj = BeanUtils.toBean(updateReqVO, CrmSaleQuotationDO.class);
+ String no = StrUtil.trim(updateReqVO.getNo());
+ if (StrUtil.isBlank(no)) {
+ updateObj.setNo(saleQuotation.getNo());
+ } else {
+ validateQuotationNoUnique(no, saleQuotation.getId());
+ updateObj.setNo(no);
+ }
calculateTotalPrice(updateObj, quotationProducts);
saleQuotationMapper.updateById(updateObj);
// 2.2 鏇存柊鎶ヤ环鏄庣粏
@@ -158,12 +187,136 @@
});
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void submitSaleQuotation(Long id, String processDefinitionKey, Long userId) {
+ // 1. 鏍￠獙鎶ヤ环鍗曞瓨鍦ㄤ笖涓鸿崏绋跨姸鎬�
+ CrmSaleQuotationDO saleQuotation = validateSaleQuotationExists(id);
+ if (ObjUtil.notEqual(saleQuotation.getStatus(), CrmSaleQuotationStatusEnum.DRAFT.getStatus())) {
+ throw exception(SALE_QUOTATION_SUBMIT_FAIL_NOT_DRAFT, saleQuotation.getNo());
+ }
+
+ // 2. 鍏ㄥ眬鍏嶅鎵癸細鐩存帴缃负瀹℃壒閫氳繃锛屾棤闇�娴佺▼妯″瀷
+ if (bpmProcessInstanceApi.isGlobalAutoApprove()) {
+ saleQuotationMapper.updateById(new CrmSaleQuotationDO().setId(id).setProcessInstanceId("")
+ .setStatus(CrmSaleQuotationStatusEnum.PROCESS.getStatus()));
+ updateSaleQuotationAuditStatus(id, BpmProcessInstanceStatusEnum.APPROVE.getStatus());
+ return;
+ }
+
+ // 3. 鏍￠獙瀹℃壒鍒嗙被鍜屾祦绋嬪畾涔�
+ validateSaleQuotationApproveCategoryAndProcessDefinition();
+ ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
+ if (processDefinition == null) {
+ throw exception(SALE_QUOTATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+
+ // 4. 鍒涘缓瀹℃壒娴佺▼瀹炰緥
+ String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id)));
+
+ // 5. 鏇存柊娴佺▼瀹炰緥缂栧彿鍜岀姸鎬�
+ saleQuotationMapper.updateById(new CrmSaleQuotationDO().setId(id).setProcessInstanceId(processInstanceId)
+ .setStatus(CrmSaleQuotationStatusEnum.PROCESS.getStatus()));
+ }
+
+ @Override
+ public void updateSaleQuotationAuditStatus(Long id, Integer bpmResult) {
+ // 1.1 鏍￠獙鎶ヤ环鍗曟槸鍚﹀瓨鍦�
+ CrmSaleQuotationDO saleQuotation = validateSaleQuotationExists(id);
+ // 1.2 鍙湁瀹℃壒涓紝鎵嶅彲浠ユ洿鏂板鎵圭粨鏋�
+ if (ObjUtil.notEqual(saleQuotation.getStatus(), CrmSaleQuotationStatusEnum.PROCESS.getStatus())) {
+ log.error("[updateSaleQuotationAuditStatus][鎶ヤ环鍗�({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]",
+ saleQuotation.getNo(), bpmResult);
+ throw exception(SALE_QUOTATION_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS, saleQuotation.getNo());
+ }
+
+ // 2. 杞崲 BPM 瀹℃壒缁撴灉骞舵洿鏂�
+ Integer status;
+ if (ObjUtil.equal(bpmResult, BpmProcessInstanceStatusEnum.APPROVE.getStatus())) {
+ status = CrmSaleQuotationStatusEnum.APPROVE.getStatus();
+ } else if (ObjUtil.equal(bpmResult, BpmProcessInstanceStatusEnum.REJECT.getStatus())) {
+ status = CrmSaleQuotationStatusEnum.REJECT.getStatus();
+ } else if (ObjUtil.equal(bpmResult, BpmProcessInstanceStatusEnum.CANCEL.getStatus())) {
+ status = CrmSaleQuotationStatusEnum.CANCEL.getStatus();
+ } else {
+ log.warn("[updateSaleQuotationAuditStatus][鎶ヤ环鍗�({}) 鏀跺埌鏈煡瀹℃壒缁撴灉({})锛屽拷鐣", id, bpmResult);
+ return;
+ }
+ saleQuotationMapper.updateById(new CrmSaleQuotationDO().setId(id).setStatus(status));
+ }
+
+ @Override
+ public List<Map<String, Object>> getSaleQuotationApproveProcessDefinitionList() {
+ validateSaleQuotationApproveCategoryAndProcessDefinition();
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(SALE_QUOTATION_APPROVE_CATEGORY_CODE);
+ Set<String> processDefinitionIds = convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
+ List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
+ // 鍙繚鐣欐縺娲荤姸鎬侊紝涓旂浉鍚� key 鍙繚鐣欐渶鏂扮増鏈�
+ 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;
+ }
+
+ /**
+ * 鏍￠獙 BPM 閿�鍞姤浠峰鎵瑰垎绫诲拰娴佺▼瀹氫箟鏄惁瀛樺湪
+ */
+ private void validateSaleQuotationApproveCategoryAndProcessDefinition() {
+ List<String> codes = Collections.singletonList(SALE_QUOTATION_APPROVE_CATEGORY_CODE);
+ Map<String, ?> categoryMap = bpmCategoryService.getCategoryMap(codes);
+ if (!categoryMap.containsKey(SALE_QUOTATION_APPROVE_CATEGORY_CODE)) {
+ throw exception(SALE_QUOTATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(SALE_QUOTATION_APPROVE_CATEGORY_CODE);
+ if (CollUtil.isEmpty(definitionInfoList)) {
+ throw exception(SALE_QUOTATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ Set<String> processDefinitionIds = convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
+ List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
+ boolean hasActiveDefinition = processDefinitions.stream().anyMatch(pd -> !pd.isSuspended());
+ if (!hasActiveDefinition) {
+ throw exception(SALE_QUOTATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ }
+
private CrmSaleQuotationDO validateSaleQuotationExists(Long id) {
CrmSaleQuotationDO saleQuotation = saleQuotationMapper.selectById(id);
if (saleQuotation == null) {
throw exception(SALE_QUOTATION_NOT_EXISTS);
}
return saleQuotation;
+ }
+
+ /**
+ * 鏍￠獙鎶ヤ环鍗曞彿鍞竴锛堝惈宸查�昏緫鍒犻櫎鐨勬姤浠峰崟锛屽洜 uk_no 鍞竴绱㈠紩瑕嗙洊宸插垹闄よ锛�
+ *
+ * @param no 鎶ヤ环鍗曞彿
+ * @param selfId 鑷韩缂栧彿锛堜慨鏀规椂鎺掗櫎鑷繁锛屾柊澧炰紶 null锛�
+ */
+ private void validateQuotationNoUnique(String no, Long selfId) {
+ CrmSaleQuotationDO exists = saleQuotationMapper.selectAnyByNo(no);
+ if (exists != null && !exists.getId().equals(selfId)) {
+ throw exception(SALE_QUOTATION_NO_EXISTS, no);
+ }
}
private List<CrmSaleQuotationProductDO> validateQuotationItems(List<CrmSaleQuotationSaveReqVO.Item> list) {
@@ -271,10 +424,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long convertToContract(Long id, Long userId) {
- // 1. 鏍￠獙鎶ヤ环鍗曞瓨鍦ㄤ笖涓鸿崏绋跨姸鎬�
+ // 1. 鏍￠獙鎶ヤ环鍗曞瓨鍦紝涓斾负鑽夌鎴栧鎵归�氳繃鐘舵��
CrmSaleQuotationDO saleQuotation = validateSaleQuotationExists(id);
- if (!CrmSaleQuotationStatusEnum.DRAFT.getStatus().equals(saleQuotation.getStatus())) {
- throw exception(SALE_QUOTATION_CONVERT_FAIL_NOT_DRAFT, saleQuotation.getNo());
+ if (!CrmSaleQuotationStatusEnum.DRAFT.getStatus().equals(saleQuotation.getStatus())
+ && !CrmSaleQuotationStatusEnum.APPROVE.getStatus().equals(saleQuotation.getStatus())) {
+ CrmSaleQuotationStatusEnum current = CrmSaleQuotationStatusEnum.getByStatus(saleQuotation.getStatus());
+ throw exception(SALE_QUOTATION_CONVERT_FAIL_NOT_DRAFT, saleQuotation.getNo(),
+ current != null ? current.getName() : String.valueOf(saleQuotation.getStatus()));
}
// 鏍￠獙鏄惁宸茶浆鍚堝悓
if (saleQuotation.getContractId() != null) {
@@ -299,7 +455,7 @@
product.setItemId(qp.getItemId());
product.setItemPrice(qp.getItemPrice());
product.setContractPrice(qp.getQuotationPrice());
- product.setCount(qp.getCount().intValue());
+ product.setCount(qp.getCount());
return product;
});
contractVO.setProducts(contractProducts);
@@ -318,4 +474,14 @@
return contractId;
}
-}
\ No newline at end of file
+ @Override
+ public CrmSaleQuotationDO getByContractId(Long id) {
+ return saleQuotationMapper.selectOne(new LambdaQueryWrapper<CrmSaleQuotationDO>().eq(CrmSaleQuotationDO::getContractId,id));
+ }
+
+ @Override
+ public void clearContractReference(Long quotationId) {
+ saleQuotationMapper.clearContractReference(quotationId);
+ }
+
+}
--
Gitblit v1.9.3