From 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:05:40 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java | 489 ++++++++++++++++++++++++++++-------------------------
1 files changed, 257 insertions(+), 232 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
index 88778f1..b8eb017 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
@@ -1,28 +1,30 @@
package cn.iocoder.yudao.module.erp.service.purchase;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
+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.BpmTaskStatusEnum;
-import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
-import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
-import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderSaveReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderItemDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestItemDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderItemMapper;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseRequestItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseRequestMapper;
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
+import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
import cn.iocoder.yudao.module.erp.enums.ErpPurchaseRequestStatusEnum;
+import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
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;
@@ -32,12 +34,11 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
/**
* ERP 閲囪喘鐢宠 Service 瀹炵幇绫�
- *
- * @author 鑺嬮亾婧愮爜
*/
@Service
@Validated
@@ -45,14 +46,19 @@
public class ErpPurchaseRequestServiceImpl implements ErpPurchaseRequestService {
/**
- * 閲囪喘鐢宠 BPM 鍒嗙被缂栫爜
+ * 閫氱敤瀹℃壒閰嶇疆鐨勪笟鍔＄被鍨嬬紪鐮侊紙瀵瑰簲 system_approval_config.biz_type锛�
*/
- private static final String PURCHASE_REQUEST_APPROVE_CATEGORY_CODE = "purchase_request_approve";
+ private static final String PURCHASE_REQUEST_APPROVE_BIZ_TYPE = "purchase_request_approve";
@Resource
private ErpPurchaseRequestMapper purchaseRequestMapper;
@Resource
private ErpPurchaseRequestItemMapper purchaseRequestItemMapper;
+
+ @Resource
+ private ErpPurchaseOrderMapper purchaseOrderMapper;
+ @Resource
+ private ErpPurchaseOrderItemMapper purchaseOrderItemMapper;
@Resource
private ErpNoRedisDAO noRedisDAO;
@@ -61,96 +67,93 @@
private ErpSupplierService supplierService;
@Resource
- private BpmCategoryService bpmCategoryService;
- @Resource
- private BpmProcessDefinitionService bpmProcessDefinitionService;
- @Resource
- private BpmProcessInstanceApi bpmProcessInstanceApi;
+ private ApprovalConfigApi approvalConfigApi;
@Resource
- private ErpPurchaseOrderService purchaseOrderService;
+ private AdminUserApi adminUserApi;
+ @Resource
+ private DeptApi deptApi;
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
@Override
@Transactional(rollbackFor = Exception.class)
- public Long createPurchaseRequest(ErpPurchaseRequestSaveReqVO createReqVO, Long userId, Long deptId) {
- // 1.1 鏍￠獙璁㈠崟椤圭殑鏈夋晥鎬�
- List<ErpPurchaseRequestItemDO> purchaseRequestItems = validatePurchaseRequestItems(createReqVO.getItems());
- // 1.2 鐢熸垚鐢宠鍗曞彿锛屽苟鏍￠獙鍞竴鎬�
+ public Long createPurchaseRequest(ErpPurchaseRequestSaveReqVO createReqVO) {
+ // 1. 鏍￠獙璁㈠崟椤圭殑鏈夋晥鎬�
+ List<ErpPurchaseRequestItemDO> requestItems = validatePurchaseRequestItems(createReqVO.getItems());
+ // 2. 鏍￠獙渚涘簲鍟嗭紙濡傛灉鎸囧畾锛�
+ if (createReqVO.getSupplierId() != null) {
+ supplierService.validateSupplier(createReqVO.getSupplierId());
+ }
+ // 3. 鐢熸垚鐢宠鍗曞彿
String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_REQUEST_NO_PREFIX);
if (purchaseRequestMapper.selectByNo(no) != null) {
throw exception(PURCHASE_REQUEST_NO_EXISTS);
}
- // 鏃ュ織锛氭鏌ラ儴闂ㄥ拰鐢ㄦ埛淇℃伅
- log.info("[createPurchaseRequest] 鍒涘缓閲囪喘鐢宠锛寀serId={}, deptId={}", userId, deptId);
+ // 4. 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
+ Long userId = Long.parseLong(getCurrentUserId());
+ AdminUserRespDTO user = adminUserApi.getUser(userId);
+ Long deptId = user != null ? user.getDeptId() : null;
- // 2.1 鎻掑叆鐢宠鍗�
+ // 5. 鎻掑叆鐢宠鍗�
ErpPurchaseRequestDO purchaseRequest = BeanUtils.toBean(createReqVO, ErpPurchaseRequestDO.class, req -> req
.setNo(no)
.setStatus(ErpPurchaseRequestStatusEnum.DRAFT.getStatus())
.setRequestUserId(userId)
.setRequestDeptId(deptId));
- calculateTotalPrice(purchaseRequest, purchaseRequestItems);
+ calculateTotalPrice(purchaseRequest, requestItems);
purchaseRequestMapper.insert(purchaseRequest);
- // 2.2 鎻掑叆鐢宠鏄庣粏
- purchaseRequestItems.forEach(o -> o.setRequestId(purchaseRequest.getId()));
- purchaseRequestItemMapper.insertBatch(purchaseRequestItems);
+
+ // 6. 缁戝畾闄勪欢
+ storageAttachmentApi.bindAttachments("file", "erp_purchase_request",
+ purchaseRequest.getId(), createReqVO.getBlobIds());
+
+ // 7. 鎻掑叆鐢宠鏄庣粏
+ requestItems.forEach(o -> o.setRequestId(purchaseRequest.getId()));
+ purchaseRequestItemMapper.insertBatch(requestItems);
+
return purchaseRequest.getId();
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updatePurchaseRequest(ErpPurchaseRequestSaveReqVO updateReqVO) {
- // 1.1 鏍￠獙瀛樺湪
- ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExists(updateReqVO.getId());
- // 1.2 鏍￠獙鐘舵�侊紝鍙湁鑽夌鐘舵�佹墠鑳戒慨鏀�
- if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(purchaseRequest.getStatus())) {
- throw exception(PURCHASE_REQUEST_UPDATE_FAIL_NOT_DRAFT, purchaseRequest.getNo());
+ // 1. 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
+ ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestCanModify(updateReqVO.getId());
+ // 2. 鏍￠獙渚涘簲鍟嗭紙濡傛灉鎸囧畾锛�
+ if (updateReqVO.getSupplierId() != null) {
+ supplierService.validateSupplier(updateReqVO.getSupplierId());
}
- // 1.3 鏍￠獙璁㈠崟椤圭殑鏈夋晥鎬�
- List<ErpPurchaseRequestItemDO> purchaseRequestItems = validatePurchaseRequestItems(updateReqVO.getItems());
+ // 3. 鏍￠獙璁㈠崟椤圭殑鏈夋晥鎬�
+ List<ErpPurchaseRequestItemDO> requestItems = validatePurchaseRequestItems(updateReqVO.getItems());
- // 2.1 鏇存柊鐢宠鍗�
+ // 4. 鏇存柊鐢宠鍗�
ErpPurchaseRequestDO updateObj = BeanUtils.toBean(updateReqVO, ErpPurchaseRequestDO.class);
- calculateTotalPrice(updateObj, purchaseRequestItems);
+ calculateTotalPrice(updateObj, requestItems);
purchaseRequestMapper.updateById(updateObj);
- // 2.2 鏇存柊鐢宠鏄庣粏
- updatePurchaseRequestItemList(updateReqVO.getId(), purchaseRequestItems);
+
+ // 5. 鏇存柊鐢宠鏄庣粏
+ updatePurchaseRequestItemList(updateReqVO.getId(), requestItems);
+
+ // 6. 鏇存柊闄勪欢
+ storageAttachmentApi.updateAttachments("file", "erp_purchase_request", updateReqVO.getId(), updateReqVO.getBlobIds());
}
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deletePurchaseRequest(List<Long> ids) {
- // 1. 鏍￠獙涓嶅浜庨潪鑽夌鐘舵��
- List<ErpPurchaseRequestDO> purchaseRequests = purchaseRequestMapper.selectByIds(ids);
- if (CollUtil.isEmpty(purchaseRequests)) {
- return;
+ private void calculateTotalPrice(ErpPurchaseRequestDO purchaseRequest, List<ErpPurchaseRequestItemDO> requestItems) {
+ purchaseRequest.setTotalCount(getSumValue(requestItems, ErpPurchaseRequestItemDO::getCount, BigDecimal::add));
+ purchaseRequest.setTotalProductPrice(getSumValue(requestItems, ErpPurchaseRequestItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO));
+ purchaseRequest.setTotalTaxPrice(getSumValue(requestItems, ErpPurchaseRequestItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO));
+ purchaseRequest.setTotalPrice(purchaseRequest.getTotalProductPrice().add(purchaseRequest.getTotalTaxPrice()));
+ // 璁＄畻浼樻儬浠锋牸
+ if (purchaseRequest.getDiscountPercent() == null) {
+ purchaseRequest.setDiscountPercent(BigDecimal.ZERO);
}
- purchaseRequests.forEach(purchaseRequest -> {
- if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(purchaseRequest.getStatus())) {
- throw exception(PURCHASE_REQUEST_DELETE_FAIL_NOT_DRAFT, purchaseRequest.getNo());
- }
- });
-
- // 2. 閬嶅巻鍒犻櫎
- purchaseRequests.forEach(purchaseRequest -> {
- // 2.1 鍒犻櫎鐢宠鍗�
- purchaseRequestMapper.deleteById(purchaseRequest.getId());
- // 2.2 鍒犻櫎鐢宠鏄庣粏
- purchaseRequestItemMapper.deleteByRequestId(purchaseRequest.getId());
- });
- }
-
- private ErpPurchaseRequestDO validatePurchaseRequestExists(Long id) {
- ErpPurchaseRequestDO purchaseRequest = purchaseRequestMapper.selectById(id);
- if (purchaseRequest == null) {
- throw exception(PURCHASE_REQUEST_NOT_EXISTS);
- }
- return purchaseRequest;
+ purchaseRequest.setDiscountPrice(MoneyUtils.priceMultiplyPercent(purchaseRequest.getTotalPrice(), purchaseRequest.getDiscountPercent()));
+ purchaseRequest.setTotalPrice(purchaseRequest.getTotalPrice().subtract(purchaseRequest.getDiscountPrice()));
}
private List<ErpPurchaseRequestItemDO> validatePurchaseRequestItems(List<ErpPurchaseRequestSaveReqVO.Item> list) {
- // 杞寲涓� ErpPurchaseRequestItemDO 鍒楄〃锛堜骇鍝侀獙璇佸凡绉婚櫎锛屼娇鐢� MDM 鐗╂枡锛�
return convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseRequestItemDO.class, item -> {
if (item.getProductPrice() != null && item.getCount() != null) {
item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
@@ -162,12 +165,10 @@
}
private void updatePurchaseRequestItemList(Long id, List<ErpPurchaseRequestItemDO> newList) {
- // 绗竴姝ワ紝瀵规瘮鏂拌�佹暟鎹紝鑾峰緱娣诲姞銆佷慨鏀广�佸垹闄ょ殑鍒楄〃
List<ErpPurchaseRequestItemDO> oldList = purchaseRequestItemMapper.selectListByRequestId(id);
List<List<ErpPurchaseRequestItemDO>> diffList = diffList(oldList, newList,
(oldVal, newVal) -> oldVal.getId().equals(newVal.getId()));
- // 绗簩姝ワ紝鎵归噺娣诲姞銆佷慨鏀广�佸垹闄�
if (CollUtil.isNotEmpty(diffList.get(0))) {
diffList.get(0).forEach(o -> o.setRequestId(id));
purchaseRequestItemMapper.insertBatch(diffList.get(0));
@@ -180,17 +181,26 @@
}
}
- private void calculateTotalPrice(ErpPurchaseRequestDO purchaseRequest, List<ErpPurchaseRequestItemDO> items) {
- purchaseRequest.setTotalCount(getSumValue(items, ErpPurchaseRequestItemDO::getCount, BigDecimal::add));
- purchaseRequest.setTotalProductPrice(getSumValue(items, ErpPurchaseRequestItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO));
- purchaseRequest.setTotalTaxPrice(getSumValue(items, ErpPurchaseRequestItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO));
- purchaseRequest.setTotalPrice(purchaseRequest.getTotalProductPrice().add(purchaseRequest.getTotalTaxPrice()));
- // 璁＄畻浼樻儬浠锋牸
- if (purchaseRequest.getDiscountPercent() == null) {
- purchaseRequest.setDiscountPercent(BigDecimal.ZERO);
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deletePurchaseRequest(List<Long> ids) {
+ List<ErpPurchaseRequestDO> purchaseRequests = purchaseRequestMapper.selectRequestListByIds(ids);
+ if (CollUtil.isEmpty(purchaseRequests)) {
+ return;
}
- purchaseRequest.setDiscountPrice(MoneyUtils.priceMultiplyPercent(purchaseRequest.getTotalPrice(), purchaseRequest.getDiscountPercent()));
- purchaseRequest.setTotalPrice(purchaseRequest.getTotalPrice().subtract(purchaseRequest.getDiscountPrice()));
+ purchaseRequests.forEach(purchaseRequest -> {
+ Integer status = purchaseRequest.getStatus();
+ if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(status)
+ && !ErpPurchaseRequestStatusEnum.REJECT.getStatus().equals(status)) {
+ throw exception(PURCHASE_REQUEST_DELETE_FAIL_NOT_DRAFT, purchaseRequest.getNo());
+ }
+ });
+
+ purchaseRequests.forEach(purchaseRequest -> {
+ storageAttachmentApi.deleteAttachmentsByRecord("erp_purchase_request", purchaseRequest.getId());
+ purchaseRequestMapper.deleteById(purchaseRequest.getId());
+ purchaseRequestItemMapper.deleteByRequestId(purchaseRequest.getId());
+ });
}
@Override
@@ -217,185 +227,200 @@
}
@Override
- @Transactional(rollbackFor = Exception.class)
- public void submitPurchaseRequest(Long id, String processDefinitionKey, Long userId) {
- // 1. 鏍￠獙鐢宠鍗曞瓨鍦ㄤ笖涓鸿崏绋跨姸鎬�
- ErpPurchaseRequestDO request = validatePurchaseRequestExists(id);
- if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(request.getStatus())) {
- throw exception(PURCHASE_REQUEST_SUBMIT_FAIL_NOT_DRAFT);
+ public List<ErpPurchaseRequestDO> getPurchaseRequestList(List<Long> ids) {
+ if (CollUtil.isEmpty(ids)) {
+ return Collections.emptyList();
}
-
- // 2. 鏍￠獙鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦�
- validatePurchaseRequestApproveCategoryAndProcessDefinition();
-
- // 3. 鏍￠獙浼犲叆鐨勬祦绋嬪畾涔� Key 鏄惁灞炰簬璇ュ垎绫讳笖澶勪簬婵�娲荤姸鎬�
- ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
- if (processDefinition == null) {
- throw exception(PURCHASE_REQUEST_BPM_PROCESS_DEFINITION_NOT_EXISTS);
- }
-
- // 4. 鍒涘缓娴佺▼瀹炰緥锛堜娇鐢ㄧ敤鎴烽�夋嫨鐨勬祦绋嬪畾涔� Key锛�
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId,
- new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinitionKey)
- .setBusinessKey(String.valueOf(id)));
-
- // 5. 鏇存柊鐢宠鍗曠姸鎬�
- purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
- .setId(id)
- .setProcessInstanceId(processInstanceId)
- .setStatus(ErpPurchaseRequestStatusEnum.PROCESS.getStatus()));
- }
-
- /**
- * 鏍￠獙 BPM 閲囪喘鐢宠瀹℃壒鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦�
- */
- private void validatePurchaseRequestApproveCategoryAndProcessDefinition() {
- // 1. 鏍￠獙鍒嗙被鏄惁瀛樺湪
- List<String> codes = Collections.singletonList(PURCHASE_REQUEST_APPROVE_CATEGORY_CODE);
- Map<String, ?> categoryMap = bpmCategoryService.getCategoryMap(codes);
- if (!categoryMap.containsKey(PURCHASE_REQUEST_APPROVE_CATEGORY_CODE)) {
- throw exception(PURCHASE_REQUEST_BPM_CATEGORY_NOT_EXISTS);
- }
-
- // 2. 鏍￠獙鍒嗙被涓嬫槸鍚︽湁鍙敤鐨勬祦绋嬪畾涔�
- List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
- .getProcessDefinitionInfoListByCategory(PURCHASE_REQUEST_APPROVE_CATEGORY_CODE);
- if (CollUtil.isEmpty(definitionInfoList)) {
- throw exception(PURCHASE_REQUEST_BPM_PROCESS_DEFINITION_NOT_EXISTS);
- }
-
- // 3. 鏍￠獙鏄惁鏈夋縺娲荤姸鎬佺殑娴佺▼瀹氫箟
- 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(PURCHASE_REQUEST_BPM_PROCESS_DEFINITION_NOT_EXISTS);
- }
- }
-
- @Override
- public void updatePurchaseRequestAuditStatus(Long id, Integer bpmResult) {
- // 1. 鏍￠獙鐢宠鍗曞瓨鍦ㄤ笖涓哄鎵逛腑鐘舵��
- ErpPurchaseRequestDO request = validatePurchaseRequestExists(id);
- if (!ErpPurchaseRequestStatusEnum.PROCESS.getStatus().equals(request.getStatus())) {
- log.error("[updatePurchaseRequestAuditStatus] 鐢宠鍗�({}) 涓嶅浜庡鎵逛腑", id);
- throw exception(PURCHASE_REQUEST_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
- }
-
- // 2. 杞崲瀹℃壒缁撴灉
- Integer auditStatus = convertBpmResultToAuditStatus(bpmResult);
- purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
- .setId(id)
- .setStatus(auditStatus));
- }
-
- /**
- * BPM 瀹℃壒缁撴灉杞崲
- */
- private Integer convertBpmResultToAuditStatus(Integer bpmResult) {
- Integer auditStatus = BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)
- ? ErpPurchaseRequestStatusEnum.APPROVE.getStatus()
- : BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)
- ? ErpPurchaseRequestStatusEnum.REJECT.getStatus()
- : BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)
- ? ErpPurchaseRequestStatusEnum.CANCEL.getStatus() : null;
- Assert.notNull(auditStatus, "BPM 瀹℃壒缁撴灉({}) 杞崲澶辫触", bpmResult);
- return auditStatus;
+ return purchaseRequestMapper.selectRequestListByIds(ids);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Long generatePurchaseOrder(Long id, Long supplierId, Long userId) {
- // 1. 鏍￠獙鐢宠鍗曞瓨鍦ㄤ笖宸插鎵归�氳繃
- ErpPurchaseRequestDO request = validatePurchaseRequestExists(id);
- if (!ErpPurchaseRequestStatusEnum.APPROVE.getStatus().equals(request.getStatus())) {
+ public void submitPurchaseRequest(Long id) {
+ // 1. 鏍￠獙瀛樺湪 + 鍙彁浜ょ姸鎬侊紙鏈彁浜� / 瀹℃牳涓嶉�氳繃锛�
+ ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExists(id);
+ if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(purchaseRequest.getStatus())
+ && !ErpPurchaseRequestStatusEnum.REJECT.getStatus().equals(purchaseRequest.getStatus())) {
+ throw exception(PURCHASE_REQUEST_SUBMIT_FAIL_NOT_ALLOWED);
+ }
+ // 2. 鏍￠獙鏄惁鏈夋槑缁�
+ List<ErpPurchaseRequestItemDO> items = purchaseRequestItemMapper.selectListByRequestId(id);
+ if (CollUtil.isEmpty(items)) {
+ throw exception(PURCHASE_REQUEST_ITEM_EMPTY);
+ }
+ // 3. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(PURCHASE_REQUEST_APPROVE_BIZ_TYPE);
+ // 4. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
+ purchaseRequestMapper.submitAndResetAuditInfo(id, ErpPurchaseRequestStatusEnum.PROCESS.getStatus());
+ }
+
+ @Override
+ public Set<Long> getPurchaseRequestApproverUserIds() {
+ return approvalConfigApi.getApproverUserIds(PURCHASE_REQUEST_APPROVE_BIZ_TYPE);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void auditPurchaseRequest(Long id, Boolean pass, String reviewRemark) {
+ // 1. 鏍￠獙瀛樺湪
+ ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExists(id);
+ // 2. 鏍￠獙澶勪簬瀹℃壒涓姸鎬�
+ if (!ErpPurchaseRequestStatusEnum.PROCESS.getStatus().equals(purchaseRequest.getStatus())) {
+ throw exception(PURCHASE_REQUEST_AUDIT_FAIL_NOT_PROCESS);
+ }
+ // 3. 鏍￠獙褰撳墠鐧诲綍鐢ㄦ埛鏄涓氬姟绫诲瀷鐨勫鎵逛汉锛堟垨绛撅細浠讳竴浜哄潎鍙鏍革級
+ Long userId = getLoginUserId();
+ approvalConfigApi.validateApprover(PURCHASE_REQUEST_APPROVE_BIZ_TYPE, userId);
+ // 4. 瀹℃牳涓嶉�氳繃锛氬繀椤诲～鍐欏師鍥狅紝閫�鍥炵敵璇蜂汉淇敼鍚庡彲閲嶆柊鎻愪氦
+ if (!Boolean.TRUE.equals(pass)) {
+ if (StrUtil.isBlank(reviewRemark)) {
+ throw exception(PURCHASE_REQUEST_AUDIT_REJECT_REASON_REQUIRED);
+ }
+ purchaseRequestMapper.auditPurchaseRequest(id, ErpPurchaseRequestStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ return;
+ }
+ // 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙�
+ purchaseRequestMapper.auditPurchaseRequest(id, ErpPurchaseRequestStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ // 6. 瀹℃牳閫氳繃涓旀湁渚涘簲鍟嗐�佹湭鐢熸垚璁㈠崟鏃讹紝鑷姩鐢熸垚閲囪喘璁㈠崟
+ if (purchaseRequest.getSupplierId() != null && purchaseRequest.getOrderId() == null) {
+ try {
+ Long orderId = doGeneratePurchaseOrder(purchaseRequest);
+ log.info("[auditPurchaseRequest] 閲囪喘鐢宠({}) 鑷姩鐢熸垚閲囪喘璁㈠崟({})", id, orderId);
+ } catch (Exception e) {
+ // 涓嶆姏鍑哄紓甯革紝閬垮厤褰卞搷瀹℃牳缁撴灉钀藉簱锛涚敓鎴愬け璐ュ彲鐢辩敤鎴锋墜鍔ㄨЕ鍙�
+ log.error("[auditPurchaseRequest] 閲囪喘鐢宠({}) 鑷姩鐢熸垚閲囪喘璁㈠崟澶辫触", id, e);
+ }
+ }
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鏄电О
+ *
+ * @param userId 鐢ㄦ埛缂栧彿
+ * @return 鏄电О锛岀敤鎴蜂笉瀛樺湪鏃惰繑鍥� null
+ */
+ private String getUserNickname(Long userId) {
+ if (userId == null) {
+ return null;
+ }
+ AdminUserRespDTO user = adminUserApi.getUser(userId);
+ return user == null ? null : user.getNickname();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long generatePurchaseOrder(Long id, Long supplierId) {
+ // 1. 鏍￠獙瀛樺湪 + 瀹℃牳閫氳繃鐘舵��
+ ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExists(id);
+ if (!ErpPurchaseRequestStatusEnum.APPROVE.getStatus().equals(purchaseRequest.getStatus())) {
throw exception(PURCHASE_REQUEST_NOT_APPROVE);
}
- // 鏍￠獙鏄惁宸茬敓鎴愰噰璐鍗�
- if (request.getOrderId() != null) {
+ // 2. 鏍￠獙鏄惁宸茬敓鎴愯鍗�
+ if (purchaseRequest.getOrderId() != null) {
throw exception(PURCHASE_REQUEST_ORDER_EXISTS);
}
-
- // 2. 鏍￠獙渚涘簲鍟�
+ // 3. 鏍￠獙渚涘簲鍟�
supplierService.validateSupplier(supplierId);
- // 3. 鑾峰彇鐢宠鏄庣粏
- List<ErpPurchaseRequestItemDO> requestItems = purchaseRequestItemMapper.selectListByRequestId(id);
+ // 4. 璁剧疆渚涘簲鍟嗗苟鐢熸垚璁㈠崟
+ purchaseRequest.setSupplierId(supplierId);
+ return doGeneratePurchaseOrder(purchaseRequest);
+ }
- // 4. 鏋勫缓閲囪喘璁㈠崟 VO
- ErpPurchaseOrderSaveReqVO orderVO = new ErpPurchaseOrderSaveReqVO();
- orderVO.setSupplierId(supplierId);
- orderVO.setOrderTime(java.time.LocalDateTime.now());
- orderVO.setRemark("鐢遍噰璐敵璇峰崟[" + request.getNo() + "]鐢熸垚");
- // 杞崲鏄庣粏椤�
- orderVO.setItems(convertList(requestItems, item -> {
- ErpPurchaseOrderSaveReqVO.Item orderItem = new ErpPurchaseOrderSaveReqVO.Item();
+ /**
+ * 鎵ц鐢熸垚閲囪喘璁㈠崟
+ *
+ * @param purchaseRequest 閲囪喘鐢宠锛堥渶鍖呭惈 supplierId锛�
+ * @return 閲囪喘璁㈠崟 ID
+ */
+ private Long doGeneratePurchaseOrder(ErpPurchaseRequestDO purchaseRequest) {
+ Long id = purchaseRequest.getId();
+
+ // 1. 鑾峰彇鐢宠鏄庣粏
+ List<ErpPurchaseRequestItemDO> requestItems = purchaseRequestItemMapper.selectListByRequestId(id);
+ if (CollUtil.isEmpty(requestItems)) {
+ throw exception(PURCHASE_REQUEST_NOT_EXISTS);
+ }
+ requestItems.forEach(item -> {
+ if (item.getProductPrice() == null || item.getTotalPrice() == null || item.getTaxPrice() == null) {
+ throw exception(PURCHASE_REQUEST_ITEM_PRICE_EMPTY, item.getId());
+ }
+ });
+
+ // 2. 鐢熸垚閲囪喘璁㈠崟鍙�
+ String orderNo = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX);
+ if (purchaseOrderMapper.selectByNo(orderNo) != null) {
+ throw exception(PURCHASE_ORDER_NO_EXISTS);
+ }
+
+ // 3. 鍒涘缓閲囪喘璁㈠崟
+ ErpPurchaseOrderDO purchaseOrder = new ErpPurchaseOrderDO();
+ purchaseOrder.setNo(orderNo);
+ purchaseOrder.setStatus(ErpAuditStatus.APPROVE.getStatus()); // 閲囪喘璁㈠崟鐩存帴涓哄凡瀹℃牳鐘舵��
+ purchaseOrder.setSupplierId(purchaseRequest.getSupplierId());
+ purchaseOrder.setOrderTime(purchaseRequest.getRequestTime());
+ purchaseOrder.setTotalCount(purchaseRequest.getTotalCount());
+ purchaseOrder.setTotalPrice(purchaseRequest.getTotalPrice());
+ purchaseOrder.setTotalProductPrice(purchaseRequest.getTotalProductPrice());
+ purchaseOrder.setTotalTaxPrice(purchaseRequest.getTotalTaxPrice());
+ purchaseOrder.setDiscountPercent(purchaseRequest.getDiscountPercent());
+ purchaseOrder.setDiscountPrice(purchaseRequest.getDiscountPrice());
+ purchaseOrder.setDepositPrice(purchaseRequest.getDepositPrice() != null ? purchaseRequest.getDepositPrice() : BigDecimal.ZERO);
+ purchaseOrder.setRemark(purchaseRequest.getRemark());
+ purchaseOrder.setInCount(BigDecimal.ZERO);
+ purchaseOrder.setInStatus(0);
+ purchaseOrderMapper.insert(purchaseOrder);
+
+ // 4. 鍒涘缓閲囪喘璁㈠崟鏄庣粏
+ List<ErpPurchaseOrderItemDO> orderItems = convertList(requestItems, item -> {
+ ErpPurchaseOrderItemDO orderItem = new ErpPurchaseOrderItemDO();
+ orderItem.setOrderId(purchaseOrder.getId());
+ orderItem.setRequestItemId(item.getId()); // 鍏宠仈閲囪喘鐢宠鏄庣粏
orderItem.setProductId(item.getProductId());
orderItem.setProductUnitId(item.getProductUnitId());
orderItem.setProductPrice(item.getProductPrice());
orderItem.setCount(item.getCount());
+ orderItem.setTotalPrice(item.getTotalPrice());
orderItem.setTaxPercent(item.getTaxPercent());
+ orderItem.setTaxPrice(item.getTaxPrice());
orderItem.setRemark(item.getRemark());
+ orderItem.setInCount(BigDecimal.ZERO);
+ orderItem.setQcCheckFlag(item.getQcCheckFlag() != null ? item.getQcCheckFlag() : false);
return orderItem;
- }));
+ });
+ purchaseOrderItemMapper.insertBatch(orderItems);
- // 5. 鍒涘缓閲囪喘璁㈠崟
- Long orderId = purchaseOrderService.createPurchaseOrder(orderVO);
-
- // 6. 鏇存柊鐢宠鍗曞叧鑱斾俊鎭�
+ // 5. 鏇存柊閲囪喘鐢宠鐨勮鍗曚俊鎭�
purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
.setId(id)
- .setOrderId(orderId)
- .setOrderTime(java.time.LocalDateTime.now()));
+ .setOrderId(purchaseOrder.getId())
+ .setOrderNo(orderNo));
- return orderId;
+ return purchaseOrder.getId();
}
- @Override
- public List<Map<String, Object>> getPurchaseRequestApproveProcessDefinitionList() {
- // 1. 鏍￠獙鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦�
- validatePurchaseRequestApproveCategoryAndProcessDefinition();
-
- // 2. 鑾峰彇鍒嗙被涓嬬殑娴佺▼瀹氫箟淇℃伅
- List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
- .getProcessDefinitionInfoListByCategory(PURCHASE_REQUEST_APPROVE_CATEGORY_CODE);
-
- // 3. 鑾峰彇娴佺▼瀹氫箟璇︽儏
- Set<String> processDefinitionIds = convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
- List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
-
- // 4. 杩囨护锛氬彧淇濈暀婵�娲荤姸鎬侊紝涓旂浉鍚� 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);
- }
+ private ErpPurchaseRequestDO validatePurchaseRequestExists(Long id) {
+ ErpPurchaseRequestDO purchaseRequest = purchaseRequestMapper.selectById(id);
+ if (purchaseRequest == null) {
+ throw exception(PURCHASE_REQUEST_NOT_EXISTS);
}
+ return purchaseRequest;
+ }
- // 5. 杩斿洖娴佺▼瀹氫箟鍒楄〃
- 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);
+ private ErpPurchaseRequestDO validatePurchaseRequestCanModify(Long id) {
+ ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExists(id);
+ Integer status = purchaseRequest.getStatus();
+ if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(status)
+ && !ErpPurchaseRequestStatusEnum.REJECT.getStatus().equals(status)) {
+ throw exception(PURCHASE_REQUEST_UPDATE_FAIL_NOT_DRAFT, purchaseRequest.getNo());
}
- return result;
+ return purchaseRequest;
}
- @Override
- public void updatePurchaseRequestInStatus(Long id, Integer inStatus) {
- purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
- .setId(id)
- .setInStatus(inStatus));
+ private String getCurrentUserId() {
+ return cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId().toString();
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3