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/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceRespVO.java      |   10 
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java                                           |    5 
 docs/sql/erp_purchase_invoice_order_20261104.sql                                                                                   |   34 +++
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java             |   65 +++++
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderPageReqVO.java       |    9 
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInvoiceOrderMapper.java                   |   46 ++++
 docs/erp_purchase_invoice_multi_order_integration.md                                                                               |  107 +++++++++
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceSaveReqVO.java   |    9 
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceService.java                         |   34 +++
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java                          |   11 
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceOrderRespVO.java |   29 ++
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java               |    9 
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java                     |  200 +++++++++++++++---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceOrderReqVO.java  |   21 +
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInvoiceMapper.java                        |   16 -
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInvoiceOrderDO.java                  |   54 ++++
 16 files changed, 600 insertions(+), 59 deletions(-)

diff --git a/docs/erp_purchase_invoice_multi_order_integration.md b/docs/erp_purchase_invoice_multi_order_integration.md
new file mode 100644
index 0000000..8f467ba
--- /dev/null
+++ b/docs/erp_purchase_invoice_multi_order_integration.md
@@ -0,0 +1,107 @@
+# 閲囪喘鏉ョエ鍏宠仈澶氬紶閲囪喘璁㈠崟锛堝垎鎽婏級 - 鍓嶇鑱旇皟鏂规
+
+## 鑳屾櫙
+
+瀹佸涓囬�氶渶姹傦細閲囪喘鏉ョエ涓殑銆岄噰璐鍗曘�嶇敱鍗曢�夋敼涓哄閫夛紝璇嗗埆褰曞叆鍚屾牱鏀寔銆備竴寮犳潵绁ㄥ彲浠ュ垎鎽婂埌澶氬紶閲囪喘璁㈠崟涓婏紝姣忓紶璁㈠崟璁板綍鏈鍒嗘憡閲戦锛岃鍗曠殑銆屾湭寮�绁ㄩ噾棰濄�嶆寜鍒嗘憡鏄庣粏绱銆�
+
+## 娑夊強椤甸潰
+
+- 閲囪喘绠$悊 - 閲囪喘鏉ョエ锛堟柊澧� / 缂栬緫 / 璇︽儏寮圭獥銆佸垪琛級
+- 閲囪喘绠$悊 - 閲囪喘鏉ョエ璇嗗埆褰曞叆锛堣瘑鍒粨鏋滆繘鍏ュ悓涓�涓柊澧炲脊绐楋級
+- 閲囪喘绠$悊 - 閲囪喘璁㈠崟锛堝垪琛ㄣ�屾湭寮�绁ㄩ噾棰濄�嶅垪銆佸彲鏉ョエ鐧昏绛涢�夛級
+- 閲囪喘绠$悊 - 浠樻鍗曪紙鎸夐噰璐鍗曢�夋嫨鏉ョエ鏃讹紝璧板垎鎽婃槑缁嗭級
+
+## 涓氬姟娴佺▼涓庢暟鎹甫鍏�
+
+1. 鏂板鏉ョエ锛氶�夋嫨閲囪喘璁㈠崟锛堝彲澶氶�夛紝浠呭凡瀹℃牳閫氳繃銆佹湭寮�绁ㄩ噾棰濆ぇ浜� 0銆佷笖涓庨寮犺鍗曞悓涓�渚涘簲鍟嗙殑璁㈠崟锛�-> 绯荤粺鎸夋墍閫夎鍗曠殑鏈紑绁ㄩ噾棰濊嚜鍔ㄥ垎鎽婃潵绁ㄩ噾棰濓紝鍙墜宸ヨ皟鏁淬��
+2. 鏉ョエ閲戦鍙樺寲 -> 宸查�夎鍗曟寜椤哄簭閲嶆柊鑷姩鍒嗘憡锛堟瘡寮犲厛濉弧鏈紑绁ㄩ噾棰濓紝鍓╀綑椤哄欢涓嬩竴寮狅級銆�
+3. 璇嗗埆褰曞叆锛圤CR锛�-> 璇嗗埆鍑虹殑閲戦甯﹀叆鏉ョエ閲戦锛屼粛闇�浜哄伐閫夋嫨閲囪喘璁㈠崟骞跺垎鎽娿��
+4. 淇濆瓨鍚� -> 閲囪喘璁㈠崟鐨勩�屾湭寮�绁ㄩ噾棰濄��= 璁㈠崟閲戦 鈭� 璇ヨ鍗曟墍鏈夋潵绁ㄥ垎鎽婂悎璁★紱鍒嗘憡瀹岀殑璁㈠崟涓嶅啀鍑虹幇鍦ㄥ彲閫夊垪琛ㄣ��
+
+## API
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| POST | /erp/purchase-invoice/create | 鏂板鏉ョエ锛屾敼涓轰紶鍒嗘憡鏄庣粏 orderAllocations |
+| PUT | /erp/purchase-invoice/update | 淇敼鏉ョエ锛屽彲鏇存崲璁㈠崟銆侀噸璁惧垎鎽� |
+| GET | /erp/purchase-invoice/get | 璇︽儏锛岃繑鍥炲垎鎽婃槑缁嗗強姣忓紶璁㈠崟鐨勬湭寮�绁ㄩ噾棰� |
+| GET | /erp/purchase-invoice/page | 鍒楄〃锛屾敮鎸佹寜 purchaseOrderId 杩囨护锛岃繑鍥炶鍗曞彿姹囨�� |
+| GET | /erp/purchase-order/page | 閲囪喘璁㈠崟鍒楄〃锛宺emainInvoicePrice 鏀逛负鎸夊垎鎽婃槑缁嗚绠楋紝remainPriceEnable 鍚屾锛涙柊澧� invoiceId 鍙傛暟 |
+
+**create / update 璇锋眰鍙傛暟锛堝彉鍖栭儴鍒嗭級锛�**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|------|------|------|------|
+| orderAllocations | Array | 鏄� | 閲囪喘璁㈠崟鍒嗘憡鏄庣粏锛岃嚦灏戜竴琛� |
+| orderAllocations[].purchaseOrderId | Long | 鏄� | 閲囪喘璁㈠崟缂栧彿 |
+| orderAllocations[].price | BigDecimal | 鏄� | 鏈紶鏉ョエ鍒嗘憡鍒拌璁㈠崟鐨勯噾棰濓紝涓嶈兘灏忎簬 0 |
+| purchaseOrderId | Long | 鍚� | **涓嶅啀鐢卞墠绔紶**锛屽悗绔彇鍒嗘憡鏄庣粏绗竴琛屽洖濉� |
+| supplierId | Long | 鍚� | **涓嶅啀鐢卞墠绔紶**锛屽悗绔彇绗竴寮犺鍗曠殑渚涘簲鍟嗗洖濉� |
+| price | BigDecimal | 鏄� | 鏉ョエ閲戦锛屽繀椤荤瓑浜庡悇琛屽垎鎽婇噾棰濅箣鍜� |
+
+**page 璇锋眰鍙傛暟鏂板锛�**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|------|------|------|------|
+| purchaseOrderId | Long | 鍚� | 鎸夐噰璐鍗曡繃婊ゆ潵绁紙鍛戒腑鍒嗘憡鏄庣粏锛� |
+| invoiceId | Long | 鍚� | 缂栬緫鏉ョエ鏃朵紶鏈紶鏉ョエ缂栧彿锛氭湭寮�绁ㄩ噾棰濅笌 remainPriceEnable 璁$畻鏃跺墧闄よ鏉ョエ鑷韩鐨勫垎鎽婏紝鐩稿綋浜庢妸瀹冨凡鍒嗘憡鐨勯噾棰濋��鍥炶鍗曪紙閲囪喘鏉ョエ閫夎鍗曞脊绐椾娇鐢級 |
+
+**create / update 鍝嶅簲锛�** `{ "code": 0, "data": 1 }`锛堟潵绁ㄧ紪鍙凤級
+
+**page / get 鍝嶅簲鏂板瀛楁锛�**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| orderNos | String | 鍏宠仈閲囪喘璁㈠崟鍙凤紝澶氬紶浠ャ�屻�併�嶆嫾鎺ワ紙鍒楄〃灞曠ず锛� |
+| orderCount | Integer | 鍏宠仈閲囪喘璁㈠崟鏁伴噺 |
+| orderAllocations | Array | 鍒嗘憡鏄庣粏锛屽瓧娈佃涓嬭〃 |
+
+**orderAllocations 瀛楁锛�**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| purchaseOrderId | Long | 閲囪喘璁㈠崟缂栧彿 |
+| orderNo | String | 閲囪喘璁㈠崟鍙� |
+| supplierId / supplierName | Long / String | 璁㈠崟渚涘簲鍟� |
+| orderTotalPrice | BigDecimal | 璁㈠崟閲戦锛堝惈绋庯級 |
+| invoicedPrice | BigDecimal | 璇ヨ鍗�**鍏朵粬**鏉ョエ宸插崰鐢ㄩ噾棰濓紙涓嶅惈鏈紶鏉ョエ锛� |
+| remainPrice | BigDecimal | 璇ヨ鍗曟湭寮�绁ㄩ噾棰濓紙涓嶅惈鏈紶鏉ョエ锛夛紝鍗虫湰娆℃渶澶氬彲鍒嗘憡閲戦 |
+| price | BigDecimal | 鏈紶鏉ョエ鍒嗘憡鍒拌璁㈠崟鐨勯噾棰� |
+
+**閲囪喘璁㈠崟鍒楄〃锛�/erp/purchase-order/page锛夊瓧娈靛彛寰勫彉鍖栵細**
+
+| 瀛楁 | 璇存槑 |
+|------|------|
+| remainInvoicePrice | 璁㈠崟閲戦 鈭� 璇ヨ鍗曟墍鏈夋潵绁ㄥ垎鎽婂悎璁★紙鍘熶负璁㈠崟閲戦 鈭� 鍗曞紶鏉ョエ閲戦锛� |
+| remainPriceEnable=true | 鍙繑鍥炴湭寮�绁ㄩ噾棰� > 0 鐨勮鍗曪紝鍙e緞鍚屾鏀逛负鎸夊垎鎽婃槑缁嗚绠� |
+
+## 瀛楁灞曠ず瑙勫垯
+
+| 瀛楁 | 灞曠ず浣嶇疆 | 璇存槑 |
+|------|----------|------|
+| 閲囪喘璁㈠崟 | 鏉ョエ鏂板/缂栬緫寮圭獥 | 澶氶�夊脊绐楋紙宸插鏍� + 鏈紑绁ㄩ噾棰濆ぇ浜� 0锛夛紝琛ㄦ牸鍒楋細璁㈠崟鍙枫�佷緵搴斿晢銆佽鍗曢噾棰濄�佹湭寮�绁ㄩ噾棰濄�佹湰娆″垎鎽婇噾棰濓紙鍙紪杈戯級銆佺Щ闄� |
+| 鍒嗘憡鍚堣 / 寰呭垎鎽婂樊棰� | 鍒嗘憡琛ㄦ牸涓嬫柟 | 瀹炴椂鏄剧ず锛屽樊棰濅笉涓� 0 鏃朵繚瀛樿鎷︽埅 |
+| 渚涘簲鍟� | 鏉ョエ琛ㄥ崟 | 鐢辨墍閫夎鍗曚緵搴斿晢甯﹀嚭锛堝悓涓�渚涘簲鍟嗭級锛屽彧璇� |
+| 閲囪喘璁㈠崟缂栧彿 | 鏉ョエ鍒楄〃 | 灞曠ず orderNos锛涘巻鍙叉暟鎹洖閫�鍒颁富璁㈠崟鍙� |
+| 鏈紑绁ㄩ噾棰� | 閲囪喘璁㈠崟鍒楄〃 / 閫夋嫨寮圭獥 | 鎸夊垎鎽婃槑缁嗗疄鏃惰绠� |
+
+## 涓氬姟瑙勫垯璇存槑
+
+| 鍦烘櫙 | 瑙勫垯 |
+|------|------|
+| 鍒嗘憡鍚堣 | 蹇呴』绛変簬鏉ョエ閲戦锛屽惁鍒欐姤閿欏苟鍒楀嚭鏉ョエ閲戦銆佸垎鎽婂悎璁″拰宸 |
+| 鍗曡鍗曚笂闄� | 姣忚鍒嗘憡閲戦涓嶅緱瓒呰繃璇ヨ鍗曘�屾湭寮�绁ㄩ噾棰濄�嶏紙璁㈠崟閲戦 鈭� 鍏朵粬鏉ョエ宸插崰鐢級 |
+| 璁㈠崟閲嶅 | 鍚屼竴寮犳潵绁ㄥ唴鍚屼竴璁㈠崟鍙兘鍑虹幇涓�娆� |
+| 璁㈠崟鐘舵�� | 鍙湁宸插鏍搁�氳繃锛坰tatus=20锛夌殑閲囪喘璁㈠崟鎵嶈兘鐧昏鏉ョエ |
+| 渚涘簲鍟� | **蹇呴』鍚屼竴渚涘簲鍟�**锛氭墍閫夐噰璐鍗曠殑渚涘簲鍟嗕笉涓�鑷存椂淇濆瓨琚嫤鎴紝骞跺垪鍑哄悇渚涘簲鍟嗗強鍏惰鍗曞彿 |
+| 棰濆害鍗犵敤 | 鏉ョエ鍒涘缓鍚庡嵆鍗犵敤璁㈠崟鏈紑绁ㄩ搴︼紙鏃犲鏍告祦绋嬶級锛屽垹闄ゅ悗閲婃斁 |
+| 缂栬緫 | 鍏佽鏇存崲璁㈠崟銆佽皟鏁村垎鎽婏紱鏍¢獙涓庡脊绐楁湭寮�绁ㄩ噾棰濊绠楀潎鎺掗櫎鏈紶鏉ョエ鑷韩鐨勫垎鎽婏紝宸插垎鎽婇噾棰濋��鍥炶鍗� |
+| 鍒犻櫎 | 鏈夋湁鏁堜粯娆惧崟鍏宠仈鐨勬潵绁ㄤ笉鍏佽鍒犻櫎锛涘垹闄ゅ悓鏃堕噴鏀惧垎鎽婇搴� |
+
+## 娉ㄦ剰浜嬮」
+
+- 鏁版嵁搴撻渶鍏堟墽琛� `docs/sql/erp_purchase_invoice_order_20261104.sql`锛堟柊寤� `erp_purchase_invoice_order` 鍒嗘憡琛紝骞跺洖濉巻鍙叉潵绁級銆�
+- 鍘嗗彶鏉ョエ鑻ユ病鏈夊垎鎽婃槑缁嗭紝鍒楄〃/璇︽儏鎸変富璁㈠崟鍏滃簳灞曠ず锛涚紪杈戜繚瀛樺悗浼氭寜鏂拌鍒欓噸寤哄垎鎽婃槑缁嗐��
+- 浠樻鍗曟寜閲囪喘璁㈠崟閫夋嫨鏉ョエ鏃讹紝鏀逛负鎸夊垎鎽婃槑缁嗗尮閰嶈鍗曪紙涓�寮犳潵绁ㄥ彲鍛戒腑澶氬紶璁㈠崟锛夈��
+- 鍓嶇鑷姩鍒嗘憡鎸夈�屾墍閫夎鍗曠殑鍕鹃�夐『搴忋�嶄緷娆″~婊★紝璋冩暣鏌愯閲戦鍚庡樊棰濅細鑷姩椤哄欢缁欏叾浠栬鍗曪紝浠嶅彈鍚勮嚜涓婇檺绾︽潫銆�
+- 宸插紑绁ㄩ噾棰濆悎璁′笉浼氳秴杩囪鍗曢噾棰濓紙璁㈠崟鏈紑绁ㄩ噾棰濅笉浼氫负璐燂級锛涙潵绁ㄩ噾棰濆皬浜庤鍗曢噾棰濇椂锛屽樊棰濅繚鐣欏湪璇ヨ鍗曠殑鏈紑绁ㄩ噾棰濅腑锛屼笅娆″紑绁ㄤ粛鍙�夋嫨璇ヨ鍗曘��
diff --git a/docs/sql/erp_purchase_invoice_order_20261104.sql b/docs/sql/erp_purchase_invoice_order_20261104.sql
new file mode 100644
index 0000000..e488af9
--- /dev/null
+++ b/docs/sql/erp_purchase_invoice_order_20261104.sql
@@ -0,0 +1,34 @@
+-- =====================================================================
+-- 瀹佸涓囬�氶渶姹傦細閲囪喘鏉ョエ鏀寔鍏宠仈澶氬紶閲囪喘璁㈠崟锛堝垎鎽婇噾棰濓級
+-- 2026-11-04
+-- 璇存槑锛�
+--   1. 鏂板缓鏉ョエ-閲囪喘璁㈠崟鍒嗘憡琛� erp_purchase_invoice_order锛�
+--   2. 鍘嗗彶鏉ョエ鎸夈�宲urchase_order_id + price銆嶈ˉ涓�鏉″垎鎽婅褰曪紙绛変环浜庡崟璁㈠崟锛夛紱
+--   3. erp_purchase_invoice.purchase_order_id 淇濈暀锛屽瓨鍒嗘憡鏄庣粏鐨勭涓�寮犺鍗曪紙涓昏鍗曪級銆�
+-- 鑴氭湰鍙噸澶嶆墽琛屻��
+-- =====================================================================
+
+-- 1. 鍒嗘憡琛�
+CREATE TABLE IF NOT EXISTS `erp_purchase_invoice_order` (
+    `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+    `invoice_id` bigint NOT NULL COMMENT '鏉ョエ缂栧彿锛屽叧鑱� erp_purchase_invoice.id',
+    `purchase_order_id` bigint NOT NULL COMMENT '閲囪喘璁㈠崟缂栧彿锛屽叧鑱� erp_purchase_order.id',
+    `price` decimal(24, 6) NOT NULL DEFAULT 0 COMMENT '鏈鍒嗘憡鍒版潵绁ㄧ殑閲戦锛屽崟浣嶏細鍏�',
+    `sort` int NOT NULL DEFAULT 0 COMMENT '鎺掑簭',
+    `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+    `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+    `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+    `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+    `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+    PRIMARY KEY (`id`),
+    KEY `idx_invoice_id` (`invoice_id`),
+    KEY `idx_purchase_order_id` (`purchase_order_id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT ='ERP 閲囪喘鏉ョエ-閲囪喘璁㈠崟鍒嗘憡';
+
+-- 2. 鍘嗗彶鏁版嵁鍥炲~锛氭瘡寮犺�佹潵绁ㄨˉ涓�鏉″垎鎽婅褰曪紙宸插洖濉殑涓嶉噸澶嶆彃鍏ワ級
+INSERT INTO `erp_purchase_invoice_order` (`invoice_id`, `purchase_order_id`, `price`, `sort`, `creator`, `updater`)
+SELECT i.`id`, i.`purchase_order_id`, i.`price`, 0, i.`creator`, i.`updater`
+FROM `erp_purchase_invoice` i
+WHERE i.`deleted` = 0
+  AND i.`purchase_order_id` IS NOT NULL
+  AND NOT EXISTS (SELECT 1 FROM `erp_purchase_invoice_order` a WHERE a.`invoice_id` = i.`id`);
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java
index 28c882a..3f26dad 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.erp.controller.admin.purchase;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -9,11 +10,13 @@
 import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceOrderRespVO;
 import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoicePageReqVO;
 import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceRespVO;
 import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceSaveReqVO;
 import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderRespVO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInvoiceDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInvoiceOrderDO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
 import cn.iocoder.yudao.module.erp.service.finance.ErpFinancePaymentService;
 import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseInvoiceService;
@@ -38,14 +41,17 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.pojo.PageParam.PAGE_SIZE_NONE;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
 import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
 
@@ -138,10 +144,33 @@
         Map<Long, SrmSupplierRespDTO> supplierMap = srmSupplierApi.getSupplierList(
                 convertSet(invoiceList, ErpPurchaseInvoiceDO::getSupplierId)).getCheckedData().stream()
                 .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, v -> v, (a, b) -> a));
-        // 1.2 鑾峰彇閲囪喘璁㈠崟鍒楄〃
+        // 1.2 鑾峰彇閲囪喘璁㈠崟鍒嗘憡鏄庣粏锛堜竴寮犳潵绁ㄥ彲鍏宠仈澶氬紶璁㈠崟锛�
+        Map<Long, List<ErpPurchaseInvoiceOrderDO>> allocationMap = convertMultiMap(
+                invoiceService.getPurchaseInvoiceOrderListByInvoiceIds(
+                        convertSet(invoiceList, ErpPurchaseInvoiceDO::getId)),
+                ErpPurchaseInvoiceOrderDO::getInvoiceId);
+        // 1.2.1 鍏煎鍘嗗彶鏁版嵁锛氭病鏈夊垎鎽婃槑缁嗙殑鏉ョエ锛屾寜涓昏鍗� + 鏉ョエ閲戦瑙嗕负涓�鏉″垎鎽�
+        for (ErpPurchaseInvoiceDO invoice : invoiceList) {
+            if (!allocationMap.containsKey(invoice.getId()) && invoice.getPurchaseOrderId() != null) {
+                allocationMap.put(invoice.getId(), Collections.singletonList(
+                        ErpPurchaseInvoiceOrderDO.builder().invoiceId(invoice.getId())
+                                .purchaseOrderId(invoice.getPurchaseOrderId()).price(invoice.getPrice()).sort(0).build()));
+            }
+        }
+        // 1.2.2 杩欎簺璁㈠崟鐨勫叏閮ㄥ垎鎽婃槑缁嗭紝鐢ㄤ簬璁$畻姣忓紶璁㈠崟銆屽叾浠栨潵绁ㄥ凡鍗犵敤閲戦銆�
+        Set<Long> orderIds = convertSet(allocationMap.values().stream().flatMap(List::stream).toList(),
+                ErpPurchaseInvoiceOrderDO::getPurchaseOrderId);
+        List<ErpPurchaseInvoiceOrderDO> orderAllocations = invoiceService.getPurchaseInvoiceOrderListByPurchaseOrderIds(orderIds);
+        // 1.2.3 鑾峰彇閲囪喘璁㈠崟鍒楄〃锛堝惈涓昏鍗曪紝鍏煎鍘嗗彶鏁版嵁锛�
+        Set<Long> orderIdsAll = new HashSet<>(orderIds);
+        invoiceList.stream().map(ErpPurchaseInvoiceDO::getPurchaseOrderId)
+                .filter(java.util.Objects::nonNull).forEach(orderIdsAll::add);
         Map<Long, ErpPurchaseOrderDO> orderMap = convertMap(
-                purchaseOrderService.getPurchaseOrderList(convertList(invoiceList, ErpPurchaseInvoiceDO::getPurchaseOrderId)),
-                ErpPurchaseOrderDO::getId);
+                purchaseOrderService.getPurchaseOrderList(new ArrayList<>(orderIdsAll)), ErpPurchaseOrderDO::getId);
+        // 1.2.4 鑾峰彇鍒嗘憡璁㈠崟鐨勪緵搴斿晢鍒楄〃锛堜竴寮犳潵绁ㄥ彲鑳芥秹鍙婂涓緵搴斿晢锛�
+        Map<Long, SrmSupplierRespDTO> orderSupplierMap = srmSupplierApi.getSupplierList(
+                        convertSet(orderMap.values(), ErpPurchaseOrderDO::getSupplierId)).getCheckedData().stream()
+                .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, v -> v, (a, b) -> a));
         // 1.3 鑾峰彇鍒涘缓浜哄垪琛�
         Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
                 convertSet(invoiceList, invoice -> NumberUtils.parseLong(invoice.getCreator())));
@@ -152,9 +181,37 @@
         return BeanUtils.toBean(invoiceList, ErpPurchaseInvoiceRespVO.class, (invoiceVO) -> {
             // 2.1 鎷兼帴渚涘簲鍟嗗悕绉�
             findAndThen(supplierMap, invoiceVO.getSupplierId(), supplier -> invoiceVO.setSupplierName(supplier.getName()));
-            // 2.2 鎷兼帴閲囪喘璁㈠崟淇℃伅
+            // 2.2 鎷兼帴閲囪喘璁㈠崟淇℃伅锛堜富璁㈠崟锛�
             findAndThen(orderMap, invoiceVO.getPurchaseOrderId(), order ->
                     invoiceVO.setOrder(BeanUtils.toBean(order, ErpPurchaseOrderRespVO.class)));
+            // 2.2.1 鎷兼帴閲囪喘璁㈠崟鍒嗘憡鏄庣粏
+            List<ErpPurchaseInvoiceOrderDO> rows = allocationMap.getOrDefault(invoiceVO.getId(), Collections.emptyList());
+            List<ErpPurchaseInvoiceOrderRespVO> allocationVOs = new ArrayList<>(rows.size());
+            for (ErpPurchaseInvoiceOrderDO row : rows) {
+                ErpPurchaseInvoiceOrderRespVO allocationVO = new ErpPurchaseInvoiceOrderRespVO()
+                        .setPurchaseOrderId(row.getPurchaseOrderId()).setPrice(row.getPrice());
+                ErpPurchaseOrderDO order = orderMap.get(row.getPurchaseOrderId());
+                if (order != null) {
+                    allocationVO.setOrderNo(order.getNo()).setSupplierId(order.getSupplierId())
+                            .setOrderTotalPrice(order.getTotalPrice());
+                    findAndThen(orderSupplierMap, order.getSupplierId(),
+                            supplier -> allocationVO.setSupplierName(supplier.getName()));
+                }
+                // 璇ヨ鍗曞叾浠栨潵绁ㄥ凡鍗犵敤閲戦 = 鍏ㄩ儴鍒嗘憡 - 鏈紶鏉ョエ鐨勫垎鎽�
+                BigDecimal otherInvoicedPrice = orderAllocations.stream()
+                        .filter(other -> ObjectUtil.equal(other.getPurchaseOrderId(), row.getPurchaseOrderId())
+                                && !ObjectUtil.equal(other.getInvoiceId(), invoiceVO.getId()))
+                        .map(ErpPurchaseInvoiceOrderDO::getPrice)
+                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+                allocationVO.setInvoicedPrice(otherInvoicedPrice);
+                if (order != null) {
+                    allocationVO.setRemainPrice(order.getTotalPrice().subtract(otherInvoicedPrice));
+                }
+                allocationVOs.add(allocationVO);
+            }
+            invoiceVO.setOrderAllocations(allocationVOs);
+            invoiceVO.setOrderCount(allocationVOs.size());
+            invoiceVO.setOrderNos(CollUtil.join(allocationVOs, "銆�", ErpPurchaseInvoiceOrderRespVO::getOrderNo));
             // 2.3 鎷兼帴鍒涘缓浜哄悕绉�
             MapUtils.findAndThen(userMap, NumberUtils.parseLong(invoiceVO.getCreator()),
                     user -> invoiceVO.setCreatorName(user.getNickname()));
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
index ccebe86..af26750 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
@@ -157,7 +157,7 @@
     @PreAuthorize("@ss.hasPermission('erp:purchase-order:query')")
     public CommonResult<PageResult<ErpPurchaseOrderRespVO>> getPurchaseOrderPage(@Valid ErpPurchaseOrderPageReqVO pageReqVO) {
         PageResult<ErpPurchaseOrderDO> pageResult = purchaseOrderService.getPurchaseOrderPage(pageReqVO);
-        return success(buildPurchaseOrderVOPageResult(pageResult));
+        return success(buildPurchaseOrderVOPageResult(pageResult, pageReqVO.getInvoiceId()));
     }
 
     @GetMapping("/export-excel")
@@ -167,7 +167,7 @@
     public void exportPurchaseOrderExcel(@Valid ErpPurchaseOrderPageReqVO pageReqVO,
                                     HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<ErpPurchaseOrderRespVO> list = buildPurchaseOrderVOPageResult(purchaseOrderService.getPurchaseOrderPage(pageReqVO)).getList();
+        List<ErpPurchaseOrderRespVO> list = buildPurchaseOrderVOPageResult(purchaseOrderService.getPurchaseOrderPage(pageReqVO), null).getList();
         // 瀵煎嚭 Excel
         ExcelUtils.write(response, "閲囪喘璁㈠崟.xls", "鏁版嵁", ErpPurchaseOrderRespVO.class, list);
     }
@@ -220,7 +220,8 @@
         return success(true);
     }
 
-    private PageResult<ErpPurchaseOrderRespVO> buildPurchaseOrderVOPageResult(PageResult<ErpPurchaseOrderDO> pageResult) {
+    private PageResult<ErpPurchaseOrderRespVO> buildPurchaseOrderVOPageResult(PageResult<ErpPurchaseOrderDO> pageResult,
+                                                                                  Long excludeInvoiceId) {
         if (CollUtil.isEmpty(pageResult.getList())) {
             return PageResult.empty(pageResult.getTotal());
         }
@@ -243,7 +244,7 @@
                 convertSet(purchaseOrderItemList, ErpPurchaseOrderItemDO::getProductUnitId));
         // 1.6 宸叉潵绁ㄩ噾棰濓細鎸夐噰璐鍗曠粺璁★紝鐢ㄤ簬璁$畻鍓╀綑鍙紑绁ㄩ噾棰�
         Map<Long, BigDecimal> invoicePriceSumMap = purchaseInvoiceService
-                .getPurchaseInvoicePriceSumMapByOrderIds(convertSet(pageResult.getList(), ErpPurchaseOrderDO::getId));
+                .getPurchaseInvoicePriceSumMapByOrderIds(convertSet(pageResult.getList(), ErpPurchaseOrderDO::getId), excludeInvoiceId);
         // 2. 寮�濮嬫嫾鎺�
         return BeanUtils.toBean(pageResult, ErpPurchaseOrderRespVO.class, purchaseOrder -> {
             purchaseOrder.setItems(BeanUtils.toBean(
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceOrderReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceOrderReqVO.java
new file mode 100644
index 0000000..d3a933f
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceOrderReqVO.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "绠$悊鍚庡彴 - ERP 閲囪喘鏉ョエ鐨勯噰璐鍗曞垎鎽� Request VO")
+@Data
+public class ErpPurchaseInvoiceOrderReqVO {
+
+    @Schema(description = "閲囪喘璁㈠崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
+    @NotNull(message = "閲囪喘璁㈠崟缂栧彿涓嶈兘涓虹┖")
+    private Long purchaseOrderId;
+
+    @Schema(description = "鏈鍒嗘憡鍒扮殑鏉ョエ閲戦锛屽崟浣嶏細鍏�", requiredMode = Schema.RequiredMode.REQUIRED, example = "9000")
+    @NotNull(message = "鍒嗘憡閲戦涓嶈兘涓虹┖")
+    private BigDecimal price;
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceOrderRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceOrderRespVO.java
new file mode 100644
index 0000000..4c8c759
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceOrderRespVO.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "绠$悊鍚庡彴 - ERP 閲囪喘鏉ョエ鐨勯噰璐鍗曞垎鎽� Response VO")
+@Data
+public class ErpPurchaseInvoiceOrderRespVO {
+
+    @Schema(description = "閲囪喘璁㈠崟缂栧彿", example = "17386")
+    private Long purchaseOrderId;
+    @Schema(description = "閲囪喘璁㈠崟鍙�", example = "CGDD20260101001")
+    private String orderNo;
+    @Schema(description = "渚涘簲鍟嗙紪鍙�", example = "29399")
+    private Long supplierId;
+    @Schema(description = "渚涘簲鍟嗗悕绉�", example = "灏忕暘鑼勫叕鍙�")
+    private String supplierName;
+    @Schema(description = "閲囪喘璁㈠崟閲戦锛屽崟浣嶏細鍏�", example = "20000.00")
+    private BigDecimal orderTotalPrice;
+    @Schema(description = "璇ヨ鍗曞叾浠栨潵绁ㄥ凡鍗犵敤閲戦锛屽崟浣嶏細鍏�", example = "8000.00")
+    private BigDecimal invoicedPrice;
+    @Schema(description = "璇ヨ鍗曞墿浣欐湭寮�绁ㄩ噾棰濓紝鍗曚綅锛氬厓", example = "12000.00")
+    private BigDecimal remainPrice;
+    @Schema(description = "鏈紶鏉ョエ鏈鍒嗘憡鍒拌璁㈠崟鐨勯噾棰濓紝鍗曚綅锛氬厓", example = "9000.00")
+    private BigDecimal price;
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceRespVO.java
index e2cd5db..f92866d 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceRespVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceRespVO.java
@@ -30,12 +30,20 @@
     @ExcelProperty("渚涘簲鍟嗗悕绉�")
     private String supplierName;
 
-    @Schema(description = "閲囪喘璁㈠崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
+    @Schema(description = "閲囪喘璁㈠崟缂栧彿锛堜富璁㈠崟锛屽嵆鍒嗘憡鏄庣粏绗竴寮狅級", example = "17386")
     @ExcelProperty("閲囪喘璁㈠崟缂栧彿")
     private Long purchaseOrderId;
     @Schema(description = "閲囪喘璁㈠崟淇℃伅")
     private ErpPurchaseOrderRespVO order;
 
+    @Schema(description = "鍏宠仈閲囪喘璁㈠崟鍙凤紙澶氬紶鏃朵互 銆� 鎷兼帴锛�", example = "CGDD20260101001銆丆GDD20260101002")
+    @ExcelProperty("閲囪喘璁㈠崟鍙�")
+    private String orderNos;
+    @Schema(description = "鍏宠仈閲囪喘璁㈠崟鏁伴噺", example = "2")
+    private Integer orderCount;
+    @Schema(description = "閲囪喘璁㈠崟鍒嗘憡鏄庣粏")
+    private List<ErpPurchaseInvoiceOrderRespVO> orderAllocations;
+
     @Schema(description = "鍙戠エ鍙风爜", example = "02564178")
     @ExcelProperty("鍙戠エ鍙风爜")
     private String invoiceNo;
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceSaveReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceSaveReqVO.java
index cf68266..d77d8a2 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceSaveReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceSaveReqVO.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -21,10 +22,14 @@
     @Schema(description = "渚涘簲鍟嗙紪鍙�", example = "29399")
     private Long supplierId; // 璇ュ瓧娈典笉閫氳繃鍓嶇浼犻�掞紝鑰屾槸 purchaseOrderId 鏌ヨ鍑烘潵璁剧疆杩涘幓
 
-    @Schema(description = "閲囪喘璁㈠崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
-    @NotNull(message = "閲囪喘璁㈠崟缂栧彿涓嶈兘涓虹┖")
+    @Schema(description = "閲囪喘璁㈠崟缂栧彿锛堜富璁㈠崟锛屽彇鍒嗘憡鏄庣粏涓殑绗竴寮狅紝鐢卞悗绔洖濉級", example = "17386")
     private Long purchaseOrderId;
 
+    @Schema(description = "閲囪喘璁㈠崟鍒嗘憡鏄庣粏锛氫竴寮犳潵绁ㄥ彲鍏宠仈澶氬紶閲囪喘璁㈠崟锛屽垎鎽婇噾棰濆悎璁″繀椤荤瓑浜庢潵绁ㄩ噾棰�",
+            requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "璇疯嚦灏戦�夋嫨涓�寮犻噰璐鍗�")
+    private List<ErpPurchaseInvoiceOrderReqVO> orderAllocations;
+
     @Schema(description = "鍙戠エ鍙风爜", example = "02564178")
     private String invoiceNo;
 
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderPageReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderPageReqVO.java
index 6fead6b..77313b6 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderPageReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderPageReqVO.java
@@ -86,4 +86,13 @@
     @Schema(description = "鏄惁浠呰繑鍥炲墿浣欏彲寮�绁ㄩ噾棰濆ぇ浜� 0 鐨勮鍗曪紙閲囪喘鏉ョエ鐧昏浣跨敤锛�", example = "true")
     private Boolean remainPriceEnable;
 
+    /**
+     * 闇�鎺掗櫎鐨勬潵绁ㄧ紪鍙凤紙缂栬緫鏉ョエ鏃朵紶鍏ワ級
+     *
+     * 缂栬緫鏉ョエ閲嶆柊閫夋嫨閲囪喘璁㈠崟鏃讹紝鎶婃湰寮犳潵绁ㄥ凡鍒嗘憡鐨勯噾棰濋��鍥炶鍗曪紝鏈紑绁ㄩ噾棰濇寜銆岃鍗曢噾棰� - 鍏朵粬鏉ョエ宸插垎鎽娿�嶈绠楋紝
+     * 閬垮厤鎶婃湰寮犳潵绁ㄨ嚜韬殑鍒嗘憡褰撴垚宸插崰鐢ㄩ搴︼紝瀵艰嚧閲嶆柊鍒嗘憡鏃堕搴﹁鍑┖鎵e噺銆�
+     */
+    @Schema(description = "鎺掗櫎鐨勬潵绁ㄧ紪鍙凤紙缂栬緫鏉ョエ鏃朵紶锛岃绠楁湭寮�绁ㄩ噾棰濇椂鍓旈櫎璇ユ潵绁ㄨ嚜韬殑鍒嗘憡锛�", example = "1024")
+    private Long invoiceId;
+
 }
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInvoiceOrderDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInvoiceOrderDO.java
new file mode 100644
index 0000000..3613fec
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInvoiceOrderDO.java
@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.erp.dal.dataobject.purchase;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+/**
+ * ERP 閲囪喘鏉ョエ-閲囪喘璁㈠崟鍒嗘憡 DO
+ *
+ * 涓�寮犳潵绁ㄥ彲浠ュ叧鑱斿寮犻噰璐鍗曪紝鏈〃璁板綍姣忓紶璁㈠崟鏈鍒嗘憡鍒扮殑鏉ョエ閲戦銆�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("erp_purchase_invoice_order")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ErpPurchaseInvoiceOrderDO extends BaseDO {
+
+    /**
+     * 缂栧彿
+     */
+    @TableId
+    private Long id;
+    /**
+     * 鏉ョエ缂栧彿
+     *
+     * 鍏宠仈 {@link ErpPurchaseInvoiceDO#getId()}
+     */
+    private Long invoiceId;
+    /**
+     * 閲囪喘璁㈠崟缂栧彿
+     *
+     * 鍏宠仈 {@link ErpPurchaseOrderDO#getId()}
+     */
+    private Long purchaseOrderId;
+    /**
+     * 鏈鍒嗘憡鍒版潵绁ㄧ殑閲戦锛屽崟浣嶏細鍏�
+     *
+     * 鍚屼竴寮犳潵绁ㄤ笅鎵�鏈夊垎鎽婇噾棰濅箣鍜� = 鏉ョエ閲戦
+     */
+    private BigDecimal price;
+    /**
+     * 鎺掑簭
+     */
+    private Integer sort;
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInvoiceMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInvoiceMapper.java
index 33bbae2..286a9bd 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInvoiceMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInvoiceMapper.java
@@ -7,7 +7,6 @@
 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInvoiceDO;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -26,23 +25,16 @@
         return selectPage(reqVO, new LambdaQueryWrapperX<ErpPurchaseInvoiceDO>()
                 .likeIfPresent(ErpPurchaseInvoiceDO::getNo, reqVO.getNo())
                 .eqIfPresent(ErpPurchaseInvoiceDO::getSupplierId, reqVO.getSupplierId())
-                .eqIfPresent(ErpPurchaseInvoiceDO::getPurchaseOrderId, reqVO.getPurchaseOrderId())
+                // 鎸夐噰璐鍗曡繃婊わ細涓�寮犳潵绁ㄥ彲鍒嗘憡鍒板寮犺鍗曪紝闇�鏌ュ垎鎽婃槑缁�
+                .apply(reqVO.getPurchaseOrderId() != null,
+                        "erp_purchase_invoice.id IN (SELECT a.invoice_id FROM erp_purchase_invoice_order a "
+                                + "WHERE a.purchase_order_id = {0} AND a.deleted = 0)", reqVO.getPurchaseOrderId())
                 .orderByDesc(ErpPurchaseInvoiceDO::getId));
-    }
-
-    default List<ErpPurchaseInvoiceDO> selectListByOrderId(Long orderId) {
-        return selectList(new LambdaQueryWrapperX<ErpPurchaseInvoiceDO>()
-                .eq(ErpPurchaseInvoiceDO::getPurchaseOrderId, orderId));
     }
 
     default List<ErpPurchaseInvoiceDO> selectListBySupplierId(Long supplierId) {
         return selectList(new LambdaQueryWrapperX<ErpPurchaseInvoiceDO>()
                 .eq(ErpPurchaseInvoiceDO::getSupplierId, supplierId));
-    }
-
-    default List<ErpPurchaseInvoiceDO> selectListByOrderIds(Collection<Long> orderIds) {
-        return selectList(new LambdaQueryWrapperX<ErpPurchaseInvoiceDO>()
-                .in(ErpPurchaseInvoiceDO::getPurchaseOrderId, orderIds));
     }
 
 }
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInvoiceOrderMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInvoiceOrderMapper.java
new file mode 100644
index 0000000..2e2aeb5
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInvoiceOrderMapper.java
@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.module.erp.dal.mysql.purchase;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInvoiceOrderDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * ERP 閲囪喘鏉ョエ-閲囪喘璁㈠崟鍒嗘憡 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface ErpPurchaseInvoiceOrderMapper extends BaseMapperX<ErpPurchaseInvoiceOrderDO> {
+
+    default List<ErpPurchaseInvoiceOrderDO> selectListByInvoiceId(Long invoiceId) {
+        return selectList(new LambdaQueryWrapperX<ErpPurchaseInvoiceOrderDO>()
+                .eq(ErpPurchaseInvoiceOrderDO::getInvoiceId, invoiceId)
+                .orderByAsc(ErpPurchaseInvoiceOrderDO::getSort));
+    }
+
+    default List<ErpPurchaseInvoiceOrderDO> selectListByInvoiceIds(Collection<Long> invoiceIds) {
+        return selectList(new LambdaQueryWrapperX<ErpPurchaseInvoiceOrderDO>()
+                .in(ErpPurchaseInvoiceOrderDO::getInvoiceId, invoiceIds)
+                .orderByAsc(ErpPurchaseInvoiceOrderDO::getSort));
+    }
+
+    default List<ErpPurchaseInvoiceOrderDO> selectListByPurchaseOrderId(Long purchaseOrderId) {
+        return selectList(new LambdaQueryWrapperX<ErpPurchaseInvoiceOrderDO>()
+                .eq(ErpPurchaseInvoiceOrderDO::getPurchaseOrderId, purchaseOrderId));
+    }
+
+    default List<ErpPurchaseInvoiceOrderDO> selectListByPurchaseOrderIds(Collection<Long> purchaseOrderIds) {
+        return selectList(new LambdaQueryWrapperX<ErpPurchaseInvoiceOrderDO>()
+                .in(ErpPurchaseInvoiceOrderDO::getPurchaseOrderId, purchaseOrderIds));
+    }
+
+    default int deleteByInvoiceId(Long invoiceId) {
+        return delete(new LambdaQueryWrapperX<ErpPurchaseInvoiceOrderDO>()
+                .eq(ErpPurchaseInvoiceOrderDO::getInvoiceId, invoiceId));
+    }
+
+}
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)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
index d7fb9d3..058e140 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
@@ -62,6 +62,11 @@
     ErrorCode PURCHASE_INVOICE_CREATE_FAIL_ORDER_NOT_APPROVE = new ErrorCode(1_030_105_006, "鍒涘缓鏉ョエ澶辫触锛屽師鍥狅細閲囪喘璁㈠崟涓嶆槸瀹℃牳閫氳繃鐘舵��");
     ErrorCode PURCHASE_INVOICE_CREATE_FAIL_SUPPLIER_MISMATCH = new ErrorCode(1_030_105_007, "鍒涘缓鏉ョエ澶辫触锛屽師鍥狅細鏉ョエ渚涘簲鍟嗕笌閲囪喘璁㈠崟涓嶄竴鑷�");
     ErrorCode PURCHASE_INVOICE_CREATE_FAIL_PRICE_EXCEEDS_LIMIT = new ErrorCode(1_030_105_008, "鍒涘缓鏉ョエ澶辫触锛屽師鍥狅細鏉ョエ閲戦瓒呭嚭閲囪喘璁㈠崟閲戦锛岀洰鍓嶅彲寮�绁細{} 鍏�");
+    ErrorCode PURCHASE_INVOICE_ALLOCATION_EMPTY = new ErrorCode(1_030_105_009, "璇疯嚦灏戦�夋嫨涓�寮犻噰璐鍗曪紝骞舵妸鏉ョエ閲戦鍒嗘憡鍒拌鍗曚笂");
+    ErrorCode PURCHASE_INVOICE_ALLOCATION_ORDER_DUPLICATE = new ErrorCode(1_030_105_010, "鍚屼竴寮犳潵绁ㄥ唴鐨勯噰璐鍗曚笉鑳介噸澶嶉�夋嫨");
+    ErrorCode PURCHASE_INVOICE_ALLOCATION_PRICE_INVALID = new ErrorCode(1_030_105_011, "鍒嗘憡閲戦蹇呴』濉啓涓斾笉鑳藉皬浜� 0");
+    ErrorCode PURCHASE_INVOICE_ALLOCATION_SUM_MISMATCH = new ErrorCode(1_030_105_012, "鍚勯噰璐鍗曠殑鍒嗘憡閲戦鍚堣蹇呴』绛変簬鏉ョエ閲戦");
+    ErrorCode PURCHASE_INVOICE_ALLOCATION_SUPPLIER_MISMATCH = new ErrorCode(1_030_105_013, "鍚屼竴寮犳潵绁ㄥ彧鑳藉叧鑱斿悓涓�渚涘簲鍟嗙殑閲囪喘璁㈠崟");
 
     // ========== ERP 閲囪喘閫�璐э紙1-030-103-000锛� ==========
     ErrorCode PURCHASE_RETURN_NOT_EXISTS = new ErrorCode(1_030_103_000, "閲囪喘閫�璐у崟涓嶅瓨鍦�");
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceService.java
index b7f95d2..90ecb66 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceService.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceService.java
@@ -4,6 +4,7 @@
 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.ErpPurchaseInvoiceOrderDO;
 import jakarta.validation.Valid;
 
 import java.math.BigDecimal;
@@ -98,6 +99,37 @@
      * @param orderIds 閲囪喘璁㈠崟缂栧彿鍒楄〃
      * @return Map<閲囪喘璁㈠崟缂栧彿, 鏉ョエ閲戦鍚堣>
      */
-    Map<Long, BigDecimal> getPurchaseInvoicePriceSumMapByOrderIds(Collection<Long> orderIds);
+    /**
+     * 鑾峰緱閲囪喘璁㈠崟鐨勫凡鏉ョエ閲戦鍚堣
+     *
+     * @param orderIds          閲囪喘璁㈠崟缂栧彿闆嗗悎
+     * @param excludeInvoiceId  闇�鎺掗櫎鐨勬潵绁ㄧ紪鍙凤紙缂栬緫鏉ョエ鏃朵负璇ユ潵绁ㄨ嚜韬紝鍙负绌猴級
+     * @return 閲囪喘璁㈠崟缂栧彿 -> 宸叉潵绁ㄩ噾棰�
+     */
+    Map<Long, BigDecimal> getPurchaseInvoicePriceSumMapByOrderIds(Collection<Long> orderIds, Long excludeInvoiceId);
+
+    /**
+     * 鑾峰緱鏉ョエ鐨勯噰璐鍗曞垎鎽婃槑缁�
+     *
+     * @param invoiceId 鏉ョエ缂栧彿
+     * @return 鍒嗘憡鏄庣粏鍒楄〃
+     */
+    List<ErpPurchaseInvoiceOrderDO> getPurchaseInvoiceOrderListByInvoiceId(Long invoiceId);
+
+    /**
+     * 鑾峰緱鏉ョエ鐨勯噰璐鍗曞垎鎽婃槑缁嗭紙鎵归噺锛�
+     *
+     * @param invoiceIds 鏉ョエ缂栧彿鍒楄〃
+     * @return 鍒嗘憡鏄庣粏鍒楄〃
+     */
+    List<ErpPurchaseInvoiceOrderDO> getPurchaseInvoiceOrderListByInvoiceIds(Collection<Long> invoiceIds);
+
+    /**
+     * 鑾峰緱閲囪喘璁㈠崟鐨勫垎鎽婃槑缁嗭紙鎵归噺锛岀敤浜庣粺璁¤鍗曞凡鏉ョエ閲戦锛�
+     *
+     * @param purchaseOrderIds 閲囪喘璁㈠崟缂栧彿鍒楄〃
+     * @return 鍒嗘憡鏄庣粏鍒楄〃
+     */
+    List<ErpPurchaseInvoiceOrderDO> getPurchaseInvoiceOrderListByPurchaseOrderIds(Collection<Long> purchaseOrderIds);
 
 }
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 d0465be..016d052 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
@@ -4,15 +4,21 @@
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceOrderReqVO;
 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.ErpPurchaseInvoiceOrderDO;
 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.mysql.purchase.ErpPurchaseInvoiceOrderMapper;
 import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
 import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -20,11 +26,16 @@
 import org.springframework.validation.annotation.Validated;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.getSumValue;
@@ -48,6 +59,9 @@
     private ErpPurchaseInvoiceMapper invoiceMapper;
 
     @Resource
+    private ErpPurchaseInvoiceOrderMapper invoiceOrderMapper;
+
+    @Resource
     private ErpFinancePaymentMapper financePaymentMapper;
 
     @Resource
@@ -57,15 +71,18 @@
     private ErpPurchaseOrderService purchaseOrderService;
 
     @Resource
+    private SrmSupplierApi srmSupplierApi;
+
+    @Resource
     private StorageAttachmentApi storageAttachmentApi;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createPurchaseInvoice(ErpPurchaseInvoiceSaveReqVO createReqVO) {
-        // 1.1 鏍¢獙鍏宠仈鏁版嵁瀛樺湪
-        validateRelationDataExists(createReqVO);
-        // 1.2 鏍¢獙鍙紑绁ㄩ噾棰濊秴杩囦笂闄�
-        validatePurchaseInvoicePriceExceedsLimit(createReqVO);
+        // 1.1 鏍¢獙閲囪喘璁㈠崟銆佸垎鎽婃槑缁嗭紙鍒嗘憡鍚堣 = 鏉ョエ閲戦锛�
+        List<ErpPurchaseOrderDO> orders = validateOrderAllocations(createReqVO);
+        // 1.2 鏍¢獙姣忓紶璁㈠崟鐨勫垎鎽婇噾棰濅笉瓒呰繃璇ヨ鍗曞墿浣欐湭寮�绁ㄩ噾棰�
+        validateAllocationPriceExceedsLimit(createReqVO, orders);
         // 1.3 纭畾鏉ョエ缂栧彿锛堝墠绔~鍐欏垯鐢ㄨ嚜瀹氫箟鍗曞彿锛岀暀绌哄垯鑷姩鐢熸垚锛夛紝骞舵牎楠屽敮涓�鎬�
         String customNo = StrUtil.trim(createReqVO.getNo());
         String no = StrUtil.isNotBlank(customNo) ? customNo
@@ -74,40 +91,122 @@
             throw exception(PURCHASE_INVOICE_NO_EXISTS);
         }
 
-        // 2.1 鎻掑叆鏉ョエ锛堝垱寤哄悗鍗充负鏈夋晥鐘舵�侊紝鏃犻渶瀹℃牳锛�
+        // 2.1 鎻掑叆鏉ョエ锛堝垱寤哄悗鍗充负鏈夋晥鐘舵�侊紝鏃犻渶瀹℃牳锛夛紱涓昏鍗曘�佷緵搴斿晢鍙栧垎鎽婃槑缁嗙涓�寮�
         ErpPurchaseInvoiceDO invoice = BeanUtils.toBean(createReqVO, ErpPurchaseInvoiceDO.class).setNo(no);
         invoiceMapper.insert(invoice);
 
-        // 2.2 缁戝畾鍙戠エ闄勪欢
+        // 2.2 鎻掑叆閲囪喘璁㈠崟鍒嗘憡鏄庣粏
+        insertOrderAllocations(invoice.getId(), createReqVO);
+
+        // 2.3 缁戝畾鍙戠エ闄勪欢
         if (CollUtil.isNotEmpty(createReqVO.getBlobIds())) {
             storageAttachmentApi.bindAttachments("file", PURCHASE_INVOICE_RECORD_TYPE, invoice.getId(), createReqVO.getBlobIds());
         }
         return invoice.getId();
     }
 
-    private void validateRelationDataExists(ErpPurchaseInvoiceSaveReqVO reqVO) {
-        // 鏍¢獙閲囪喘璁㈠崟锛屽繀椤诲鏍搁�氳繃
-        ErpPurchaseOrderDO purchaseOrder = purchaseOrderService.validatePurchaseOrder(reqVO.getPurchaseOrderId());
-        // 鏍¢獙渚涘簲鍟嗕笌閲囪喘璁㈠崟涓�鑷达紙闃插尽鑴忔暟鎹細鏉ョエ蹇呴』灞炰簬璇ラ噰璐鍗曠殑渚涘簲鍟嗭級
-        if (reqVO.getSupplierId() != null && ObjectUtil.notEqual(purchaseOrder.getSupplierId(), reqVO.getSupplierId())) {
-            throw exception(PURCHASE_INVOICE_CREATE_FAIL_SUPPLIER_MISMATCH);
+    /**
+     * 鏍¢獙閲囪喘璁㈠崟鍒嗘憡鏄庣粏锛屽苟鎶婁富璁㈠崟銆佷緵搴斿晢鍥炲啓鍒� reqVO 涓�
+     *
+     * @return 鍒嗘憡鏄庣粏涓殑閲囪喘璁㈠崟鍒楄〃锛堥『搴忎笌鏄庣粏涓�鑷达級
+     */
+    private List<ErpPurchaseOrderDO> validateOrderAllocations(ErpPurchaseInvoiceSaveReqVO reqVO) {
+        List<ErpPurchaseInvoiceOrderReqVO> allocations = reqVO.getOrderAllocations();
+        if (CollUtil.isEmpty(allocations)) {
+            throw exception(PURCHASE_INVOICE_ALLOCATION_EMPTY);
         }
-        reqVO.setSupplierId(purchaseOrder.getSupplierId()); // 渚涘簲鍟嗕互閲囪喘璁㈠崟涓哄噯
+        // 1. 鏍¢獙璁㈠崟涓嶉噸澶嶃�佸繀椤诲鏍搁�氳繃
+        Set<Long> orderIds = new HashSet<>();
+        List<ErpPurchaseOrderDO> orders = new ArrayList<>();
+        for (int i = 0; i < allocations.size(); i++) {
+            ErpPurchaseInvoiceOrderReqVO allocation = allocations.get(i);
+            if (!orderIds.add(allocation.getPurchaseOrderId())) {
+                throw new ServiceException(PURCHASE_INVOICE_ALLOCATION_ORDER_DUPLICATE.getCode(),
+                        StrUtil.format("绗� {} 琛岀殑閲囪喘璁㈠崟閲嶅閫夋嫨锛屽悓涓�寮犳潵绁ㄥ唴姣忓紶閲囪喘璁㈠崟鍙兘鍑虹幇涓�娆★紝璇峰垹闄ら噸澶嶈鍚庨噸璇�", i + 1));
+            }
+            if (allocation.getPrice() == null || allocation.getPrice().compareTo(BigDecimal.ZERO) < 0) {
+                throw new ServiceException(PURCHASE_INVOICE_ALLOCATION_PRICE_INVALID.getCode(),
+                        StrUtil.format("绗� {} 琛岀殑鍒嗘憡閲戦涓嶈兘涓虹┖涓斾笉鑳藉皬浜� 0锛岃濉啓璇ヨ鍗曟湰娆″垎鎽婂埌鐨勬潵绁ㄩ噾棰�", i + 1));
+            }
+            orders.add(purchaseOrderService.validatePurchaseOrder(allocation.getPurchaseOrderId()));
+        }
+        // 1.2 鏍¢獙鎵�鏈夐噰璐鍗曞繀椤绘槸鍚屼竴渚涘簲鍟嗭紙鏉ョエ瀵瑰簲涓�涓緵搴斿晢锛�
+        validateSameSupplier(orders);
+        // 2. 鏍¢獙鍒嗘憡鍚堣 = 鏉ョエ閲戦
+        BigDecimal allocationTotal = allocations.stream().map(ErpPurchaseInvoiceOrderReqVO::getPrice)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        if (allocationTotal.compareTo(reqVO.getPrice()) != 0) {
+            BigDecimal diff = reqVO.getPrice().subtract(allocationTotal);
+            String detail = diff.compareTo(BigDecimal.ZERO) > 0
+                    ? StrUtil.format("杩樻湁 {} 鍏冩湭鍒嗘憡鍒拌鍗曪紝璇蜂负璁㈠崟濉啓鍒嗘憡閲戦鎴栨敼閫夎鍗�", diff.stripTrailingZeros().toPlainString())
+                    : StrUtil.format("鍒嗘憡鍚堣姣旀潵绁ㄩ噾棰濆 {} 鍏冿紝璇峰噺灏戝垎鎽婇噾棰�", diff.negate().stripTrailingZeros().toPlainString());
+            throw new ServiceException(PURCHASE_INVOICE_ALLOCATION_SUM_MISMATCH.getCode(),
+                    StrUtil.format("鏉ョエ閲戦 {} 鍏冿紝鍚勮鍗曞垎鎽婂悎璁� {} 鍏冿紝涓よ�呭繀椤荤浉绛夛紙宸锛歿}锛夈��",
+                            reqVO.getPrice().stripTrailingZeros().toPlainString(),
+                            allocationTotal.stripTrailingZeros().toPlainString(), detail));
+        }
+        // 3. 涓昏鍗曘�佷緵搴斿晢鍙栧垎鎽婃槑缁嗙涓�寮狅紙涓�寮犳潵绁ㄦ秹鍙婂涓緵搴斿晢鏃讹紝鍒楄〃/浠樻娌跨敤绗竴瀹讹級
+        reqVO.setPurchaseOrderId(allocations.get(0).getPurchaseOrderId());
+        reqVO.setSupplierId(orders.get(0).getSupplierId());
+        return orders;
     }
 
-    private void validatePurchaseInvoicePriceExceedsLimit(ErpPurchaseInvoiceSaveReqVO reqVO) {
-        // 1. 璁$畻鍓╀綑鍙紑绁ㄩ噾棰濓紝涓嶅寘鎷� reqVO 鑷韩锛堟墍鏈夋湁鏁堟潵绁ㄩ兘鍗犵敤棰濆害锛岄槻姝㈢疮璁℃潵绁ㄨ秴杩囬噰璐鍗曢噾棰濓級
-        ErpPurchaseOrderDO purchaseOrder = purchaseOrderService.getPurchaseOrder(reqVO.getPurchaseOrderId());
-        List<ErpPurchaseInvoiceDO> invoices = invoiceMapper.selectListByOrderId(reqVO.getPurchaseOrderId());
-        if (reqVO.getId() != null) {
-            invoices.removeIf(invoice -> ObjectUtil.equal(invoice.getId(), reqVO.getId()));
+    /**
+     * 鏍¢獙鍒嗘憡鏄庣粏涓殑閲囪喘璁㈠崟鏄惁灞炰簬鍚屼竴渚涘簲鍟嗭細鏉ョエ鍙兘瀵瑰簲涓�涓緵搴斿晢
+     */
+    private void validateSameSupplier(List<ErpPurchaseOrderDO> orders) {
+        ErpPurchaseOrderDO firstOrder = orders.get(0);
+        for (int i = 1; i < orders.size(); i++) {
+            ErpPurchaseOrderDO order = orders.get(i);
+            if (ObjectUtil.notEqual(order.getSupplierId(), firstOrder.getSupplierId())) {
+                throw new ServiceException(PURCHASE_INVOICE_ALLOCATION_SUPPLIER_MISMATCH.getCode(),
+                        StrUtil.format("绗� {} 琛岀殑閲囪喘璁㈠崟[{}]渚涘簲鍟嗕负[{}]锛屼笌绗� 1 琛岄噰璐鍗昜{}]鐨勪緵搴斿晢[{}]涓嶄竴鑷淬��"
+                                        + "涓�寮犳潵绁ㄥ彧鑳藉叧鑱斿悓涓�渚涘簲鍟嗙殑閲囪喘璁㈠崟锛岃绉婚櫎璇ヨ鍗曪紝鎴栨敼閫夎渚涘簲鍟嗙殑鍏朵粬閲囪喘璁㈠崟鍚庨噸璇曘��",
+                                i + 1, order.getNo(), getSupplierName(order.getSupplierId()),
+                                firstOrder.getNo(), getSupplierName(firstOrder.getSupplierId())));
+            }
         }
-        BigDecimal remainPrice = purchaseOrder.getTotalPrice().subtract(
-                getSumValue(invoices, ErpPurchaseInvoiceDO::getPrice, BigDecimal::add, BigDecimal.ZERO));
-        // 2. 鏍¢獙閲戦鏄惁瓒呰繃
-        if (reqVO.getPrice().compareTo(remainPrice) > 0) {
-            throw exception(PURCHASE_INVOICE_CREATE_FAIL_PRICE_EXCEEDS_LIMIT, remainPrice);
+    }
+
+    private String getSupplierName(Long supplierId) {
+        SrmSupplierRespDTO supplier = srmSupplierApi.getSupplier(supplierId).getCheckedData();
+        return supplier == null ? "ID=" + supplierId : supplier.getName();
+    }
+
+    private void validateAllocationPriceExceedsLimit(ErpPurchaseInvoiceSaveReqVO reqVO, List<ErpPurchaseOrderDO> orders) {
+        List<ErpPurchaseInvoiceOrderReqVO> allocations = reqVO.getOrderAllocations();
+        for (int i = 0; i < allocations.size(); i++) {
+            ErpPurchaseInvoiceOrderReqVO allocation = allocations.get(i);
+            ErpPurchaseOrderDO order = orders.get(i);
+            // 1. 璇ヨ鍗曞叾浠栨潵绁ㄥ凡鍗犵敤鐨勯噾棰濓紙缂栬緫鏃舵帓闄ゆ湰寮犳潵绁ㄨ嚜韬殑鍒嗘憡锛�
+            List<ErpPurchaseInvoiceOrderDO> existed = invoiceOrderMapper.selectListByPurchaseOrderId(order.getId());
+            if (reqVO.getId() != null) {
+                existed.removeIf(row -> ObjectUtil.equal(row.getInvoiceId(), reqVO.getId()));
+            }
+            BigDecimal invoicedPrice = getSumValue(existed, ErpPurchaseInvoiceOrderDO::getPrice, BigDecimal::add, BigDecimal.ZERO);
+            BigDecimal remainPrice = order.getTotalPrice().subtract(invoicedPrice);
+            // 2. 鏍¢獙閲戦鏄惁瓒呰繃
+            if (allocation.getPrice().compareTo(remainPrice) > 0) {
+                throw new ServiceException(PURCHASE_INVOICE_CREATE_FAIL_PRICE_EXCEEDS_LIMIT.getCode(),
+                        StrUtil.format("閲囪喘璁㈠崟[{}]鐨勫垎鎽婇噾棰濊秴鍑鸿璁㈠崟鏈紑绁ㄩ噾棰濓細璁㈠崟閲戦 {} 鍏冿紝鍏朵粬鏉ョエ宸插崰鐢� {} 鍏冿紝"
+                                        + "鍓╀綑鏈紑绁� {} 鍏冿紝鏈鍒嗘憡 {} 鍏冦�傝璋冩暣璇ヨ鍗曠殑鍒嗘憡閲戦锛屾垨鏀归�夊叾浠栭噰璐鍗曞悗閲嶈瘯銆�",
+                                order.getNo(), order.getTotalPrice().stripTrailingZeros().toPlainString(),
+                                invoicedPrice.stripTrailingZeros().toPlainString(),
+                                remainPrice.stripTrailingZeros().toPlainString(),
+                                allocation.getPrice().stripTrailingZeros().toPlainString()));
+            }
         }
+    }
+
+    private void insertOrderAllocations(Long invoiceId, ErpPurchaseInvoiceSaveReqVO reqVO) {
+        List<ErpPurchaseInvoiceOrderDO> rows = new ArrayList<>();
+        for (int i = 0; i < reqVO.getOrderAllocations().size(); i++) {
+            ErpPurchaseInvoiceOrderReqVO allocation = reqVO.getOrderAllocations().get(i);
+            rows.add(ErpPurchaseInvoiceOrderDO.builder().invoiceId(invoiceId)
+                    .purchaseOrderId(allocation.getPurchaseOrderId())
+                    .price(allocation.getPrice()).sort(i).build());
+        }
+        rows.forEach(invoiceOrderMapper::insert);
     }
 
     @Override
@@ -116,15 +215,19 @@
         Assert.notNull(updateReqVO.getId(), "鏉ョエ缂栧彿涓嶈兘涓虹┖");
         // 1.1 鏍¢獙瀛樺湪
         validatePurchaseInvoiceExists(updateReqVO.getId());
-        // 1.2 鏍¢獙鍏宠仈鏁版嵁 + 鍙紑绁ㄩ噾棰�
-        validateRelationDataExists(updateReqVO);
-        validatePurchaseInvoicePriceExceedsLimit(updateReqVO);
+        // 1.2 鏍¢獙閲囪喘璁㈠崟銆佸垎鎽婃槑缁嗐�侀噾棰濅笂闄�
+        List<ErpPurchaseOrderDO> orders = validateOrderAllocations(updateReqVO);
+        validateAllocationPriceExceedsLimit(updateReqVO, orders);
 
         // 2. 鏇存柊鏉ョエ
         ErpPurchaseInvoiceDO updateObj = BeanUtils.toBean(updateReqVO, ErpPurchaseInvoiceDO.class);
         invoiceMapper.updateById(updateObj);
 
-        // 3. 澧為噺鏇存柊鍙戠エ闄勪欢
+        // 3. 閲嶅缓閲囪喘璁㈠崟鍒嗘憡鏄庣粏
+        invoiceOrderMapper.deleteByInvoiceId(updateReqVO.getId());
+        insertOrderAllocations(updateReqVO.getId(), updateReqVO);
+
+        // 4. 澧為噺鏇存柊鍙戠エ闄勪欢
         storageAttachmentApi.updateAttachments("file", PURCHASE_INVOICE_RECORD_TYPE, updateReqVO.getId(), updateReqVO.getBlobIds());
     }
 
@@ -143,6 +246,8 @@
         storageAttachmentApi.deleteAttachmentsByRecord(PURCHASE_INVOICE_RECORD_TYPE, id);
         // 2.2 鍒犻櫎鏉ョエ
         invoiceMapper.deleteById(id);
+        // 2.3 鍒犻櫎閲囪喘璁㈠崟鍒嗘憡鏄庣粏锛堥噴鏀捐鍗曠殑宸叉潵绁ㄩ噾棰濓級
+        invoiceOrderMapper.deleteByInvoiceId(id);
     }
 
     private ErpPurchaseInvoiceDO validatePurchaseInvoiceExists(Long id) {
@@ -173,7 +278,11 @@
 
     @Override
     public List<ErpPurchaseInvoiceDO> getPurchaseInvoiceListByOrderId(Long orderId) {
-        return invoiceMapper.selectListByOrderId(orderId);
+        List<ErpPurchaseInvoiceOrderDO> allocations = invoiceOrderMapper.selectListByPurchaseOrderId(orderId);
+        if (CollUtil.isEmpty(allocations)) {
+            return Collections.emptyList();
+        }
+        return invoiceMapper.selectByIds(convertSet(allocations, ErpPurchaseInvoiceOrderDO::getInvoiceId));
     }
 
     @Override
@@ -182,13 +291,38 @@
     }
 
     @Override
-    public Map<Long, BigDecimal> getPurchaseInvoicePriceSumMapByOrderIds(Collection<Long> orderIds) {
+    public Map<Long, BigDecimal> getPurchaseInvoicePriceSumMapByOrderIds(Collection<Long> orderIds, Long excludeInvoiceId) {
         if (CollUtil.isEmpty(orderIds)) {
             return Collections.emptyMap();
         }
-        List<ErpPurchaseInvoiceDO> invoices = invoiceMapper.selectListByOrderIds(orderIds);
-        return invoices.stream().collect(Collectors.groupingBy(ErpPurchaseInvoiceDO::getPurchaseOrderId,
-                Collectors.mapping(ErpPurchaseInvoiceDO::getPrice, Collectors.reducing(BigDecimal.ZERO, BigDecimal::add))));
+        List<ErpPurchaseInvoiceOrderDO> allocations = invoiceOrderMapper.selectListByPurchaseOrderIds(orderIds);
+        if (excludeInvoiceId != null) {
+            // 缂栬緫鏉ョエ鏃舵妸鏈紶鏉ョエ宸插垎鎽婄殑閲戦閫�鍥炶鍗�
+            allocations.removeIf(row -> ObjectUtil.equal(row.getInvoiceId(), excludeInvoiceId));
+        }
+        return allocations.stream().collect(Collectors.groupingBy(ErpPurchaseInvoiceOrderDO::getPurchaseOrderId,
+                Collectors.mapping(ErpPurchaseInvoiceOrderDO::getPrice, Collectors.reducing(BigDecimal.ZERO, BigDecimal::add))));
+    }
+
+    @Override
+    public List<ErpPurchaseInvoiceOrderDO> getPurchaseInvoiceOrderListByInvoiceId(Long invoiceId) {
+        return invoiceOrderMapper.selectListByInvoiceId(invoiceId);
+    }
+
+    @Override
+    public List<ErpPurchaseInvoiceOrderDO> getPurchaseInvoiceOrderListByInvoiceIds(Collection<Long> invoiceIds) {
+        if (CollUtil.isEmpty(invoiceIds)) {
+            return Collections.emptyList();
+        }
+        return invoiceOrderMapper.selectListByInvoiceIds(invoiceIds);
+    }
+
+    @Override
+    public List<ErpPurchaseInvoiceOrderDO> getPurchaseInvoiceOrderListByPurchaseOrderIds(Collection<Long> purchaseOrderIds) {
+        if (CollUtil.isEmpty(purchaseOrderIds)) {
+            return Collections.emptyList();
+        }
+        return invoiceOrderMapper.selectListByPurchaseOrderIds(purchaseOrderIds);
     }
 
 }

--
Gitblit v1.9.3