From 3688f07fd292812994dbf3c84bde18a440d8275c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 04 十一月 2026 16:52:29 +0800
Subject: [PATCH] feat(erp): 采购来票支持关联多张采购订单并按订单分摊金额
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java
index 9576e9b..183cda7 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java
@@ -59,8 +59,15 @@
}
// 鍙潵绁ㄧ櫥璁帮紙鍓╀綑鍙紑绁ㄩ噾棰� > 0锛夛細閲戦宸插紑瀹岀殑璁㈠崟涓嶅睍绀�
if (Boolean.TRUE.equals(reqVO.getRemainPriceEnable())) {
- query.apply("t.total_price > (SELECT IFNULL(SUM(i.price), 0) FROM erp_purchase_invoice i "
- + "WHERE i.purchase_order_id = t.id AND i.deleted = 0)");
+ // 缂栬緫鏉ョエ鏃讹紙invoiceId 闈炵┖锛夊墧闄ゆ湰寮犳潵绁ㄨ嚜韬殑鍒嗘憡锛岀浉褰撲簬鎶婂畠宸插垎鎽婄殑閲戦閫�鍥炶鍗�
+ String sql = "t.total_price > (SELECT IFNULL(SUM(a.price), 0) FROM erp_purchase_invoice_order a "
+ + "INNER JOIN erp_purchase_invoice i ON i.id = a.invoice_id AND i.deleted = 0 "
+ + "WHERE a.purchase_order_id = t.id AND a.deleted = 0";
+ if (reqVO.getInvoiceId() != null) {
+ query.apply(sql + " AND a.invoice_id <> {0})", reqVO.getInvoiceId());
+ } else {
+ query.apply(sql + ")");
+ }
}
if (reqVO.getProductId() != null) {
query.leftJoin(ErpPurchaseOrderItemDO.class, ErpPurchaseOrderItemDO::getOrderId, ErpPurchaseOrderDO::getId)
--
Gitblit v1.9.3