From ee982b85c9ff09fbf6a6eb7c133b1e6f5fb160ba Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 14 八月 2026 14:56:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java | 109 ++++++++++--------------------------------------------
1 files changed, 20 insertions(+), 89 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java
index b9a9a1c..ab24aed 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java
@@ -5,19 +5,15 @@
import cn.hutool.core.util.ObjectUtil;
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.enums.task.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoicePageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInvoiceDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.finance.ErpFinancePaymentMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseInvoiceMapper;
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
-import cn.iocoder.yudao.module.erp.enums.ErpPurchaseInvoiceAuditStatusEnum;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -25,6 +21,7 @@
import java.math.BigDecimal;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.getSumValue;
@@ -37,13 +34,7 @@
*/
@Service
@Validated
-@Slf4j
public class ErpPurchaseInvoiceServiceImpl implements ErpPurchaseInvoiceService {
-
- /**
- * BPM 鏉ョエ瀹℃壒娴佺▼鏍囪瘑
- */
- public static final String BPM_PROCESS_DEFINITION_KEY = "erp-purchase-invoice-audit";
/**
* 鏉ョエ闄勪欢鐨勪笟鍔¤褰曠被鍨嬶紝瀵瑰簲 {@link cn.iocoder.yudao.module.system.enums.storage.StorageRecordTypeEnum#ERP_PURCHASE_INVOICE}
@@ -54,13 +45,14 @@
private ErpPurchaseInvoiceMapper invoiceMapper;
@Resource
+ private ErpFinancePaymentMapper financePaymentMapper;
+
+ @Resource
private ErpNoRedisDAO noRedisDAO;
@Resource
private ErpPurchaseOrderService purchaseOrderService;
- @Resource
- private BpmProcessInstanceApi bpmProcessInstanceApi;
@Resource
private StorageAttachmentApi storageAttachmentApi;
@@ -77,9 +69,8 @@
throw exception(PURCHASE_INVOICE_NO_EXISTS);
}
- // 2.1 鎻掑叆鏉ョエ
- ErpPurchaseInvoiceDO invoice = BeanUtils.toBean(createReqVO, ErpPurchaseInvoiceDO.class)
- .setNo(no).setAuditStatus(ErpPurchaseInvoiceAuditStatusEnum.DRAFT.getStatus());
+ // 2.1 鎻掑叆鏉ョエ锛堝垱寤哄悗鍗充负鏈夋晥鐘舵�侊紝鏃犻渶瀹℃牳锛�
+ ErpPurchaseInvoiceDO invoice = BeanUtils.toBean(createReqVO, ErpPurchaseInvoiceDO.class).setNo(no);
invoiceMapper.insert(invoice);
// 2.2 缁戝畾鍙戠エ闄勪欢
@@ -100,12 +91,9 @@
}
private void validatePurchaseInvoicePriceExceedsLimit(ErpPurchaseInvoiceSaveReqVO reqVO) {
- // 1. 璁＄畻鍓╀綑鍙紑绁ㄩ噾棰濓紝涓嶅寘鎷� reqVO 鑷韩锛堝鎵逛腑涔熷崰鐢ㄩ搴︼紝闃叉绱鏉ョエ瓒呰繃閲囪喘璁㈠崟閲戦锛�
+ // 1. 璁＄畻鍓╀綑鍙紑绁ㄩ噾棰濓紝涓嶅寘鎷� reqVO 鑷韩锛堟墍鏈夋湁鏁堟潵绁ㄩ兘鍗犵敤棰濆害锛岄槻姝㈢疮璁℃潵绁ㄨ秴杩囬噰璐鍗曢噾棰濓級
ErpPurchaseOrderDO purchaseOrder = purchaseOrderService.getPurchaseOrder(reqVO.getPurchaseOrderId());
- List<ErpPurchaseInvoiceDO> invoices = invoiceMapper.selectListByOrderIdAndStatus(reqVO.getPurchaseOrderId(),
- List.of(ErpPurchaseInvoiceAuditStatusEnum.DRAFT.getStatus(),
- ErpPurchaseInvoiceAuditStatusEnum.PROCESS.getStatus(),
- ErpPurchaseInvoiceAuditStatusEnum.APPROVE.getStatus()));
+ List<ErpPurchaseInvoiceDO> invoices = invoiceMapper.selectListByOrderId(reqVO.getPurchaseOrderId());
if (reqVO.getId() != null) {
invoices.removeIf(invoice -> ObjectUtil.equal(invoice.getId(), reqVO.getId()));
}
@@ -122,12 +110,8 @@
public void updatePurchaseInvoice(ErpPurchaseInvoiceSaveReqVO updateReqVO) {
Assert.notNull(updateReqVO.getId(), "鏉ョエ缂栧彿涓嶈兘涓虹┖");
// 1.1 鏍￠獙瀛樺湪
- ErpPurchaseInvoiceDO oldInvoice = validatePurchaseInvoiceExists(updateReqVO.getId());
- // 1.2 鍙湁鑽夌鍙互缂栬緫
- if (ObjectUtil.notEqual(oldInvoice.getAuditStatus(), ErpPurchaseInvoiceAuditStatusEnum.DRAFT.getStatus())) {
- throw exception(PURCHASE_INVOICE_UPDATE_FAIL_EDITING_PROHIBITED, oldInvoice.getNo());
- }
- // 1.3 鏍￠獙鍏宠仈鏁版嵁 + 鍙紑绁ㄩ噾棰�
+ validatePurchaseInvoiceExists(updateReqVO.getId());
+ // 1.2 鏍￠獙鍏宠仈鏁版嵁 + 鍙紑绁ㄩ噾棰�
validateRelationDataExists(updateReqVO);
validatePurchaseInvoicePriceExceedsLimit(updateReqVO);
@@ -143,65 +127,17 @@
@Transactional(rollbackFor = Exception.class)
public void deletePurchaseInvoice(Long id) {
// 1.1 鏍￠獙瀛樺湪
- ErpPurchaseInvoiceDO invoice = validatePurchaseInvoiceExists(id);
- // 1.2 瀹℃壒閫氳繃鏃讹紝涓嶅厑璁稿垹闄�
- if (ObjectUtil.equal(invoice.getAuditStatus(), ErpPurchaseInvoiceAuditStatusEnum.APPROVE.getStatus())) {
- throw exception(PURCHASE_INVOICE_DELETE_FAIL_IS_APPROVE);
+ validatePurchaseInvoiceExists(id);
+ // 1.2 宸叉湁鏈夋晥浠樻鍗曞叧鑱旂殑鏉ョエ锛屼笉鍏佽鍒犻櫎锛堜繚鎸佹潵绁ㄤ笌浠樻鐨勫叧鑱斿畬鏁存�э級
+ Map<Long, BigDecimal> paidMap = financePaymentMapper.selectPaymentPriceMapByInvoiceId(List.of(id));
+ if (paidMap.getOrDefault(id, BigDecimal.ZERO).compareTo(BigDecimal.ZERO) > 0) {
+ throw exception(PURCHASE_INVOICE_DELETE_FAIL_HAS_PAYMENT);
}
// 2.1 鍒犻櫎鍙戠エ闄勪欢
storageAttachmentApi.deleteAttachmentsByRecord(PURCHASE_INVOICE_RECORD_TYPE, id);
// 2.2 鍒犻櫎鏉ョエ
invoiceMapper.deleteById(id);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void submitPurchaseInvoice(Long id, Long userId) {
- // 1. 鏍￠獙鏉ョエ鏄惁鍦ㄥ鎵�
- ErpPurchaseInvoiceDO invoice = validatePurchaseInvoiceExists(id);
- if (ObjectUtil.notEqual(invoice.getAuditStatus(), ErpPurchaseInvoiceAuditStatusEnum.DRAFT.getStatus())) {
- throw exception(PURCHASE_INVOICE_SUBMIT_FAIL_NOT_DRAFT);
- }
-
- // 1.1 閲嶆柊鏍￠獙鍙紑绁ㄩ噾棰濓紝闃叉绱鏉ョエ瓒呰繃閲囪喘璁㈠崟閲戦锛堣崏绋挎湡鍚庡彲鑳芥湁鍏朵粬鍗曡繘鍏ュ鎵逛腑锛�
- validatePurchaseInvoicePriceExceedsLimit(new ErpPurchaseInvoiceSaveReqVO()
- .setId(invoice.getId()).setPurchaseOrderId(invoice.getPurchaseOrderId())
- .setSupplierId(invoice.getSupplierId()).setPrice(invoice.getPrice()));
-
- // 2. 鍒涘缓鏉ョエ瀹℃壒娴佺▼瀹炰緥
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(BPM_PROCESS_DEFINITION_KEY).setBusinessKey(String.valueOf(id)));
-
- // 3. 鏇存柊鏉ョエ宸ヤ綔娴佺紪鍙�
- invoiceMapper.updateById(new ErpPurchaseInvoiceDO().setId(id).setProcessInstanceId(processInstanceId)
- .setAuditStatus(ErpPurchaseInvoiceAuditStatusEnum.PROCESS.getStatus()));
- }
-
- @Override
- public void updatePurchaseInvoiceAuditStatus(Long id, Integer bpmResult) {
- // 1. 鏍￠獙瀛樺湪 + 瀹℃壒涓姸鎬�
- ErpPurchaseInvoiceDO invoice = validatePurchaseInvoiceExists(id);
- if (ObjectUtil.notEqual(invoice.getAuditStatus(), ErpPurchaseInvoiceAuditStatusEnum.PROCESS.getStatus())) {
- log.warn("[updatePurchaseInvoiceAuditStatus][鏉ョエ({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]", id, bpmResult);
- return;
- }
- // 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
- Integer auditStatus = convertBpmResultToAuditStatus(bpmResult);
- if (auditStatus != null) {
- invoiceMapper.updateById(new ErpPurchaseInvoiceDO().setId(id).setAuditStatus(auditStatus));
- }
- }
-
- private Integer convertBpmResultToAuditStatus(Integer bpmResult) {
- if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
- return ErpPurchaseInvoiceAuditStatusEnum.APPROVE.getStatus();
- } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
- return ErpPurchaseInvoiceAuditStatusEnum.REJECT.getStatus();
- } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
- return ErpPurchaseInvoiceAuditStatusEnum.CANCEL.getStatus();
- }
- return null;
}
private ErpPurchaseInvoiceDO validatePurchaseInvoiceExists(Long id) {
@@ -231,18 +167,13 @@
}
@Override
- public List<ErpPurchaseInvoiceDO> getPurchaseInvoiceListByOrderIdAndStatus(Long orderId, Collection<Integer> auditStatuses) {
- return invoiceMapper.selectListByOrderIdAndStatus(orderId, auditStatuses);
+ public List<ErpPurchaseInvoiceDO> getPurchaseInvoiceListByOrderId(Long orderId) {
+ return invoiceMapper.selectListByOrderId(orderId);
}
@Override
- public List<ErpPurchaseInvoiceDO> getPurchaseInvoiceListBySupplierIdAndStatus(Long supplierId, Collection<Integer> auditStatuses) {
- return invoiceMapper.selectListBySupplierIdAndStatus(supplierId, auditStatuses);
- }
-
- @Override
- public Long getAuditInvoiceCount() {
- return invoiceMapper.selectCountByAudit();
+ public List<ErpPurchaseInvoiceDO> getPurchaseInvoiceListBySupplierId(Long supplierId) {
+ return invoiceMapper.selectListBySupplierId(supplierId);
}
}
--
Gitblit v1.9.3