From 2eadf3769b41e74c56364f3a6509a728a652af51 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 16 十月 2026 10:44:48 +0800
Subject: [PATCH] feat(erp): 付款单付款账户、关联来票、付款明细改为非必填
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java | 43 ++++++++++++++++++-------------------------
1 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
index 408d6d6..64dd7b2 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
@@ -20,7 +20,6 @@
import cn.iocoder.yudao.module.erp.dal.mysql.finance.ErpFinancePaymentMapper;
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.ErpPurchaseInvoiceAuditStatusEnum;
import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseInvoiceService;
import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseInvoiceServiceImpl;
import cn.iocoder.yudao.module.erp.service.purchase.ErpSupplierService;
@@ -66,8 +65,6 @@
@Resource
private ErpSupplierService supplierService;
@Resource
- private ErpAccountService accountService;
- @Resource
private ErpPurchaseInvoiceService invoiceService;
@Resource
@@ -91,17 +88,13 @@
createReqVO.getSupplierId(), createReqVO.getItems());
// 1.2 鏍￠獙渚涘簲鍟�
supplierService.validateSupplier(createReqVO.getSupplierId());
- // 1.3 鏍￠獙缁撶畻璐︽埛
- if (createReqVO.getAccountId() != null) {
- accountService.validateAccount(createReqVO.getAccountId());
- }
- // 1.4 鏍￠獙璐㈠姟浜哄憳
+ // 1.3 鏍￠獙璐㈠姟浜哄憳
if (createReqVO.getFinanceUserId() != null) {
adminUserApi.validateUser(createReqVO.getFinanceUserId());
}
- // 1.5 鏍￠獙鍏宠仈鏉ョエ
+ // 1.4 鏍￠獙鍏宠仈鏉ョエ
validateInvoiceForPayment(createReqVO.getInvoiceId(), createReqVO.getSupplierId());
- // 1.6 鏍￠獙浠樻閲戦涓嶈秴杩囪鏉ョエ鍓╀綑鍙粯閲戦
+ // 1.5 鏍￠獙浠樻閲戦涓嶈秴杩囪鏉ョエ鍓╀綑鍙粯閲戦
validatePaymentPriceExceedsInvoiceRemaining(createReqVO.getInvoiceId(),
getSumValue(paymentItems, ErpFinancePaymentItemDO::getPaymentPrice, BigDecimal::add, BigDecimal.ZERO)
.subtract(createReqVO.getDiscountPrice()), null);
@@ -142,20 +135,16 @@
}
// 1.2 鏍￠獙渚涘簲鍟�
supplierService.validateSupplier(updateReqVO.getSupplierId());
- // 1.3 鏍￠獙缁撶畻璐︽埛
- if (updateReqVO.getAccountId() != null) {
- accountService.validateAccount(updateReqVO.getAccountId());
- }
- // 1.4 鏍￠獙璐㈠姟浜哄憳
+ // 1.3 鏍￠獙璐㈠姟浜哄憳
if (updateReqVO.getFinanceUserId() != null) {
adminUserApi.validateUser(updateReqVO.getFinanceUserId());
}
- // 1.5 鏍￠獙浠樻鍗曢」鐨勬湁鏁堟��
+ // 1.4 鏍￠獙浠樻鍗曢」鐨勬湁鏁堟��
List<ErpFinancePaymentItemDO> paymentItems = validateFinancePaymentItems(
updateReqVO.getSupplierId(), updateReqVO.getItems());
- // 1.6 鏍￠獙鍏宠仈鏉ョエ
+ // 1.5 鏍￠獙鍏宠仈鏉ョエ
validateInvoiceForPayment(updateReqVO.getInvoiceId(), updateReqVO.getSupplierId());
- // 1.7 鏍￠獙浠樻閲戦涓嶈秴杩囪鏉ョエ鍓╀綑鍙粯閲戦锛堟帓闄よ浠樻鍗曡嚜韬綋鍓嶅凡浠橀噾棰濓級
+ // 1.6 鏍￠獙浠樻閲戦涓嶈秴杩囪鏉ョエ鍓╀綑鍙粯閲戦锛堟帓闄よ浠樻鍗曡嚜韬綋鍓嶅凡浠橀噾棰濓級
validatePaymentPriceExceedsInvoiceRemaining(updateReqVO.getInvoiceId(),
getSumValue(paymentItems, ErpFinancePaymentItemDO::getPaymentPrice, BigDecimal::add, BigDecimal.ZERO)
.subtract(updateReqVO.getDiscountPrice()), payment.getPaymentPrice());
@@ -354,27 +343,27 @@
}
/**
- * 鏍￠獙浠樻鍗曞叧鑱旂殑鏉ョエ锛氬瓨鍦ㄣ�佸鎵归�氳繃銆佸凡涓婁紶鍙戠エ闄勪欢銆佷緵搴斿晢涓庢潵绁ㄤ竴鑷�
+ * 鏍￠獙浠樻鍗曞叧鑱旂殑鏉ョエ锛氬瓨鍦ㄣ�佸凡涓婁紶鍙戠エ闄勪欢銆佷緵搴斿晢涓庢潵绁ㄤ竴鑷�
*
* @param invoiceId 鏉ョエ缂栧彿
* @param supplierId 渚涘簲鍟嗙紪鍙�
*/
private void validateInvoiceForPayment(Long invoiceId, Long supplierId) {
+ // 鏈叧鑱旀潵绁ㄦ椂璺宠繃鏍￠獙锛堜粯娆惧崟鍏佽涓嶅叧鑱旀潵绁級
+ if (invoiceId == null) {
+ return;
+ }
// 1. 鏍￠獙鏉ョエ瀛樺湪
ErpPurchaseInvoiceDO invoice = invoiceService.getPurchaseInvoice(invoiceId);
if (invoice == null) {
throw exception(FINANCE_PAYMENT_CREATE_FAIL_INVOICE_NOT_EXISTS);
}
- // 2. 鏍￠獙鏉ョエ瀹℃壒閫氳繃
- if (ObjectUtil.notEqual(invoice.getAuditStatus(), ErpPurchaseInvoiceAuditStatusEnum.APPROVE.getStatus())) {
- throw exception(FINANCE_PAYMENT_CREATE_FAIL_INVOICE_NOT_APPROVE);
- }
- // 3. 鏍￠獙宸蹭笂浼犲彂绁ㄩ檮浠�
+ // 2. 鏍￠獙宸蹭笂浼犲彂绁ㄩ檮浠�
if (CollUtil.isEmpty(storageAttachmentApi.listAttachments(
ErpPurchaseInvoiceServiceImpl.PURCHASE_INVOICE_RECORD_TYPE, invoiceId))) {
throw exception(FINANCE_PAYMENT_CREATE_FAIL_INVOICE_NOT_ATTACHMENT);
}
- // 4. 鏍￠獙渚涘簲鍟嗕笌鏉ョエ涓�鑷达紙闃茶剰鏁版嵁锛�
+ // 3. 鏍￠獙渚涘簲鍟嗕笌鏉ョエ涓�鑷达紙闃茶剰鏁版嵁锛�
if (ObjectUtil.notEqual(invoice.getSupplierId(), supplierId)) {
throw exception(FINANCE_PAYMENT_CREATE_FAIL_INVOICE_SUPPLIER_MISMATCH);
}
@@ -388,6 +377,10 @@
* @param oldPaymentPrice 鏇存柊鍦烘櫙涓嬶紝璇ヤ粯娆惧崟鑷韩褰撳墠鐨勪粯娆鹃噾棰濓紙鐢ㄤ簬鎺掗櫎鑷韩锛夛紝鍒涘缓鍦烘櫙浼� null
*/
private void validatePaymentPriceExceedsInvoiceRemaining(Long invoiceId, BigDecimal paymentPrice, BigDecimal oldPaymentPrice) {
+ // 鏈叧鑱旀潵绁ㄦ椂鏃犲墿浣欏彲浠橀噾棰濆彲鏍￠獙
+ if (invoiceId == null) {
+ return;
+ }
ErpPurchaseInvoiceDO invoice = invoiceService.getPurchaseInvoice(invoiceId);
BigDecimal paidPrice = financePaymentMapper.selectPaymentPriceMapByInvoiceId(List.of(invoiceId))
.getOrDefault(invoiceId, BigDecimal.ZERO);
--
Gitblit v1.9.3