From 25a40b9c4e6a1b650610b8b13088d486699532ce Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 20:23:21 +0800
Subject: [PATCH] 采购申请批量提交、订单导入重复校验;修复考勤异常申请字段不匹配
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java | 3
docs/project-business/data/flows.json | 6
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportDuplicateVO.java | 30 ++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java | 13
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java | 225 ++++++++++++++-
docs/project-business/mermaid/03-purchase-flow.mmd | 7
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestService.java | 14 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java | 217 +++++++++++++++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java | 12
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportRespVO.java | 3
docs/purchase_order_duplicate_and_batch_submit_integration.md | 123 ++++++++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSubmitBatchRespVO.java | 24 +
yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java | 1
docs/sql/hrm_audit_status_dict.sql | 30 ++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java | 9
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderService.java | 4
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceExceptionPageReqVO.java | 5
docs/project-business/index.html | 12
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java | 5
docs/sql/erp_purchase_request_submit_menu.sql | 35 ++
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java | 20 +
21 files changed, 749 insertions(+), 49 deletions(-)
diff --git a/docs/project-business/data/flows.json b/docs/project-business/data/flows.json
index 0d57d0c..e2945ef 100644
--- a/docs/project-business/data/flows.json
+++ b/docs/project-business/data/flows.json
@@ -10,11 +10,11 @@
{"stage": "浜や粯", "action": "鍙戣揣閫氱煡瀹℃牳(鍗犵敤)鈫� 閿�鍞嚭搴� OQC 鈫� 鍙戣繍 鈫� 鍑哄簱鍥炲啓閮ㄥ垎/鍏ㄩ儴鍑哄簱", "roles": ["浠撶", "璐ㄦ"]},
{"stage": "鍥炴", "action": "寮�绁� BPM(绱鈮ゅ悎鍚岄) 鈫� 鍥炴寮哄埗鍏堝紑绁�(绱鈮ゅ悎鍚屽墿浣欎笌寮�绁ㄥ墿浣�)", "roles": ["璐㈠姟", "閿�鍞�"]}]},
{"id": "purchase", "name": "閲囪喘娴佺▼", "mermaid": "mermaid/03-purchase-flow.mmd", "color": "#5fc79e",
- "summary": "SRM 鍑嗗叆/瀹氭爣渚涙簮 鈫� 閲囪喘鐢宠 BPM 鈫� 閲囪喘璁㈠崟 BPM 鈫� 纭鏀惰揣鐢熸垚 MES 鍒拌揣閫氱煡 鈫� IQC(鍚堟牸/鐗归噰鍏ュ簱路閫�璐�/鎶ュ簾) 鈫� 閲囪喘鍏ュ簱鍥炲啓璁㈠崟涓庣敵璇� 鈫� 鏉ョエ(AI OCR) 鈫� 浠樻鍗� BPM銆�",
+ "summary": "SRM 鍑嗗叆/瀹氭爣渚涙簮 鈫� 閲囪喘鐢宠 BPM(鏀寔鍗曞紶/鎵归噺鎻愪氦) 鈫� 閲囪喘璁㈠崟瀵煎叆(閲嶅妫�娴�+寮规瑕嗙洊) 鎴� BPM 鈫� 纭鏀惰揣鐢熸垚 MES 鍒拌揣閫氱煡 鈫� IQC(鍚堟牸/鐗归噰鍏ュ簱路閫�璐�/鎶ュ簾) 鈫� 閲囪喘鍏ュ簱鍥炲啓璁㈠崟涓庣敵璇� 鈫� 鏉ョエ(AI OCR) 鈫� 浠樻鍗� BPM銆�",
"steps": [
{"stage": "瀵绘簮", "action": "渚涘簲鍟嗗噯鍏�(BPM)寤烘。锛涙嫑鏍囧畬鏁寸増鎴栫畝鏄撴瘮浠凤紝瀹氭爣瀹℃壒閫氳繃鑷姩鐢熸垚閲囪喘璁㈠崟", "roles": ["閲囪喘寮�鍙�"]},
- {"stage": "鐢宠", "action": "閲囪喘鐢宠(CGSQ)鎻愪氦 BPM锛岄┏鍥炲彲閲嶇疆鍥炶崏绋匡紱閫氳繃涓旀湁渚涘簲鍟嗚嚜鍔ㄧ敓鎴愯鍗�", "roles": ["閲囪喘鍛�", "瀹℃壒浜�"]},
- {"stage": "涓嬪崟", "action": "閲囪喘璁㈠崟(CGDD)鑷姩鎻愪氦 BPM(15鈫�20)", "roles": ["閲囪喘鍛�"]},
+ {"stage": "鐢宠", "action": "閲囪喘鐢宠(CGSQ)鍗曞紶鎴栧嬀閫夊寮犳壒閲忔彁浜� BPM(浠呮湭鎻愪氦/椹冲洖鍙彁浜わ紝閫愬崟鐙珛浜嬪姟锛屽け璐ラ」鍗曠嫭鎻愮ず)锛岄┏鍥炲彲閲嶇疆鍥炶崏绋匡紱閫氳繃涓旀湁渚涘簲鍟嗘椂锛屽厛鎸夆�滀緵搴斿晢+鏄庣粏(鐗╂枡/鏁伴噺/鍗曚环/绋庣巼)鈥濆尮閰嶅凡瀹℃牳璁㈠崟锛屽尮閰嶅埌鍒欏叧鑱旂敵璇枫�佷笉閲嶅鐢熸垚锛屾湭鍖归厤鎵嶈嚜鍔ㄧ敓鎴�", "roles": ["閲囪喘鍛�", "瀹℃壒浜�"]},
+ {"stage": "涓嬪崟", "action": "閲囪喘璁㈠崟(CGDD)鍙� Excel 瀵煎叆(鍕鹃�夊鏍哥洿鎺ョ疆 20)鎴栬嚜鍔ㄦ彁浜� BPM(15鈫�20)锛涘鍏ユ椂鎸夊崟鍙锋垨鈥滀緵搴斿晢+鏄庣粏鈥濊瘑鍒噸澶嶏紝閲嶅椤归粯璁や笉瀵煎叆骞跺脊妗嗘彁绀猴紝鐢ㄦ埛纭鍚庢墠瑕嗙洊宸叉湁璁㈠崟锛涘凡鍏ュ簱/宸查��璐�/宸插叧鑱斿彂绁ㄦ垨閲囪喘鐢宠鐨勮鍗曠姝㈣鐩�", "roles": ["閲囪喘鍛�"]},
{"stage": "鏀惰揣", "action": "纭鏀惰揣鐢熸垚鍒拌揣閫氱煡(0鈫掑緟璐ㄦ2/寰呭叆搴�3鈫�4)锛涢渶妫�鐗╂枡鑷姩鍒涘缓 IQC", "roles": ["浠撶", "IQC 璐ㄦ鍛�"]},
{"stage": "鍏ュ簱", "action": "IQC 鍚堟牸/鐗归噰鈫掗噰璐叆搴�(寰呬笂鏋垛啋寰呮墽琛屸啋瀹屾垚)搴撳瓨+锛屽洖鍐欒鍗� inCount/inStatus 涓庣敵璇锋槑缁�", "roles": ["浠撶"]},
{"stage": "閫�璐�", "action": "IQC 涓嶅悎鏍奸��璐р啋渚涘簲鍟嗛��璐у嚭搴�(閫夋枡閿佸畾鍒拌鍗曡)锛涙姤搴熻蛋 NCR", "roles": ["浠撶"]},
diff --git a/docs/project-business/index.html b/docs/project-business/index.html
index 2f6a60b..c42d452 100644
--- a/docs/project-business/index.html
+++ b/docs/project-business/index.html
@@ -357,7 +357,7 @@
{"key": "erp", "name": "杩涢攢瀛樹笌璐㈠姟", "color": "#5fc79e", "tag": "ERP", "flow": "purchase",
"positioning": "鍟嗚锤涓庤祫閲戝崟鎹腑鏋紝鍚� MES 鍙戣捣瀹炵墿鏀跺彂",
"problem": "閲囪喘閿�鍞崟鎹鎵广�佹潵绁ㄤ粯娆炬帶鍒躲�佽鍗曟墽琛岃繘搴﹀洖鍐�",
- "features": ["閲囪喘鐢宠(BPM)鈫掕鍗�(鑷姩/鎵嬪姩鐢熸垚)", "纭鏀惰揣鈫扢ES鍒拌揣閫氱煡", "鍏ュ簱/閫�璐ф暟閲忕姸鎬佸洖鍐�", "閲囪喘鏉ョエ(閲戦鈮よ鍗�)", "浠樻鍗�(蹇呴』鍏宠仈鏉ョエ路BPM)", "閿�鍞鍗�(BPM路瀹℃壒閫氳繃鑷姩寤篗PS)", "鍑哄簱鐘舵�佸洖鍐�", "鏀舵鍗�(鍏宠仈CRM瀹㈡埛)", "缁撶畻璐︽埛", "AI鍙戠エOCR"],
+ "features": ["閲囪喘鐢宠(BPM路鏀寔鎵归噺鎻愪氦)鈫掕鍗�(鑷姩/鎵嬪姩鐢熸垚路鐩稿悓鏄庣粏涓嶉噸澶嶇敓鎴�)", "閲囪喘璁㈠崟瀵煎叆(閲嶅妫�娴嬄峰脊妗嗙‘璁よ鐩�)", "纭鏀惰揣鈫扢ES鍒拌揣閫氱煡", "鍏ュ簱/閫�璐ф暟閲忕姸鎬佸洖鍐�", "閲囪喘鏉ョエ(閲戦鈮よ鍗�)", "浠樻鍗�(蹇呴』鍏宠仈鏉ョエ路BPM)", "閿�鍞鍗�(BPM路瀹℃壒閫氳繃鑷姩寤篗PS)", "鍑哄簱鐘舵�佸洖鍐�", "鏀舵鍗�(鍏宠仈CRM瀹㈡埛)", "缁撶畻璐︽埛", "AI鍙戠エOCR"],
"objects": ["閲囪喘鐢宠", "閲囪喘璁㈠崟", "閲囪喘鏉ョエ", "浠樻鍗�", "閿�鍞鍗�", "鏀舵鍗�", "缁撶畻璐︽埛"],
"roles": ["閲囪喘鍛�", "閿�鍞憳", "鍑虹撼", "浼氳"],
"upstream": ["CRM(鍚堝悓)", "SRM(瀹氭爣)", "涓绘暟鎹�"], "downstream": ["鐢熶骇(MPS)", "浠撳偍(鏀跺彂)"],
@@ -457,8 +457,8 @@
{"name": "渚涘簲鍟�", "module": "渚涘簲鍟嗙鐞�", "table": "srm_supplier", "doc": "渚涘簲鍟嗘。妗堬細鎵х収/绋庡彿/閾惰/鑱旂郴浜猴紝ERP 涓� MES 鍏辩敤", "upstream": ["鍑嗗叆鐢宠"], "downstream": ["閲囪喘璁㈠崟", "鍒拌揣閫氱煡", "渚涘簲鍟嗛��璐�", "缁╂晥璇勪环"], "keywords": "渚涘簲鍟� supplier vendor"},
{"name": "鍑嗗叆鐢宠", "module": "渚涘簲鍟嗙鐞�", "table": "srm_supplier_apply", "doc": "AP缂栧彿锛孊PM 瀹℃壒(閲囪喘/璐ㄩ噺/璐㈠姟)锛岄�氳繃鑷姩寤轰緵搴斿晢妗f", "upstream": [], "downstream": ["渚涘簲鍟�"], "keywords": "鍑嗗叆 渚涘簲鍟嗙敵璇� apply"},
{"name": "鎷涙爣椤圭洰", "module": "渚涘簲鍟嗙鐞�", "table": "srm_tender_project", "doc": "瀹屾暣鐗�(鍙戝竷鈫掓姇鏍団啋寮�鏍団啋璇勬爣鈫掑畾鏍�)涓庣畝鏄撴瘮浠蜂袱绉嶆ā寮�", "upstream": [], "downstream": ["瀹氭爣鈫掗噰璐鍗�"], "keywords": "鎷涙爣 鎶曟爣 姣斾环 瀹氭爣 tender 瀵绘簮"},
- {"name": "閲囪喘鐢宠", "module": "杩涢攢瀛�", "table": "erp_purchase_request", "doc": "CGSQ缂栧彿锛孊PM 瀹℃壒锛岄�氳繃鍚庢湁渚涘簲鍟嗚嚜鍔ㄧ敓鎴愯鍗�", "upstream": ["鐢熶骇缂哄彛(浜哄伐)"], "downstream": ["閲囪喘璁㈠崟"], "keywords": "閲囪喘鐢宠 璇疯喘 request"},
- {"name": "閲囪喘璁㈠崟", "module": "杩涢攢瀛�", "table": "erp_purchase_order", "doc": "CGDD缂栧彿锛孊PM 瀹℃壒(15瀹℃壒涓�/20宸插鏍�)锛屽叆搴撶姸鎬�:鏈�0閮ㄥ垎1鍏ㄩ儴2", "upstream": ["閲囪喘鐢宠", "瀹氭爣"], "downstream": ["鍒拌揣閫氱煡", "閲囪喘鏉ョエ", "渚涘簲鍟嗛��璐�(绾︽潫鐗╂枡)"], "keywords": "閲囪喘璁㈠崟 purchase"},
+ {"name": "閲囪喘鐢宠", "module": "杩涢攢瀛�", "table": "erp_purchase_request", "doc": "CGSQ缂栧彿锛孊PM 瀹℃壒(鏀寔鎵归噺鎻愪氦)锛岄�氳繃鍚庢湁渚涘簲鍟嗘椂鍏堝尮閰嶇浉鍚屾槑缁嗙殑宸插鏍歌鍗曪紝鍖归厤涓嶅埌鎵嶈嚜鍔ㄧ敓鎴�", "upstream": ["鐢熶骇缂哄彛(浜哄伐)"], "downstream": ["閲囪喘璁㈠崟"], "keywords": "閲囪喘鐢宠 璇疯喘 request"},
+ {"name": "閲囪喘璁㈠崟", "module": "杩涢攢瀛�", "table": "erp_purchase_order", "doc": "CGDD缂栧彿锛孊PM 瀹℃壒(15瀹℃壒涓�/20宸插鏍�)鎴� Excel 瀵煎叆锛屽鍏ラ噸澶嶆椂寮规纭瑕嗙洊锛涘叆搴撶姸鎬�:鏈�0閮ㄥ垎1鍏ㄩ儴2", "upstream": ["閲囪喘鐢宠", "瀹氭爣"], "downstream": ["鍒拌揣閫氱煡", "閲囪喘鏉ョエ", "渚涘簲鍟嗛��璐�(绾︽潫鐗╂枡)"], "keywords": "閲囪喘璁㈠崟 purchase"},
{"name": "閲囪喘鏉ョエ", "module": "杩涢攢瀛�", "table": "erp_purchase_invoice", "doc": "FPD缂栧彿锛孉I OCR 棰勫~锛岀疮璁♀墹璁㈠崟鎬讳环锛屼粯娆惧崟鐨勫墠缃�", "upstream": ["閲囪喘璁㈠崟"], "downstream": ["浠樻鍗�"], "keywords": "鏉ョエ 鍙戠エ 閲囪喘鍙戠エ"},
{"name": "浠樻鍗�", "module": "璐㈠姟", "table": "erp_finance_payment", "doc": "FKD缂栧彿锛屽繀椤诲叧鑱旀潵绁�+闄勪欢锛岀疮璁♀墹鏉ョエ閲戦锛孊PM 瀹℃壒", "upstream": ["閲囪喘鏉ョエ"], "downstream": ["缁撶畻璐︽埛"], "keywords": "浠樻 搴斾粯 payment"},
{"name": "鏀舵鍗�", "module": "璐㈠姟", "table": "erp_finance_receipt", "doc": "SKD缂栧彿锛屽叧鑱� CRM 瀹㈡埛鏍¢獙锛屾棤 BPM(鎵嬪姩瀹℃牳)", "upstream": ["閿�鍞�(寮卞叧鑱�)"], "downstream": ["缁撶畻璐︽埛"], "keywords": "鏀舵 搴旀敹 receipt"},
@@ -505,11 +505,11 @@
{"stage": "浜や粯", "action": "鍙戣揣閫氱煡瀹℃牳(鍗犵敤)鈫� 閿�鍞嚭搴� OQC 鈫� 鍙戣繍 鈫� 鍑哄簱鍥炲啓閮ㄥ垎/鍏ㄩ儴鍑哄簱", "roles": ["浠撶", "璐ㄦ"]},
{"stage": "鍥炴", "action": "寮�绁� BPM(绱鈮ゅ悎鍚岄) 鈫� 鍥炴寮哄埗鍏堝紑绁�(绱鈮ゅ悎鍚屽墿浣欎笌寮�绁ㄥ墿浣�)", "roles": ["璐㈠姟", "閿�鍞�"]}]},
{"id": "purchase", "name": "閲囪喘娴佺▼", "mermaid": "mermaid/03-purchase-flow.mmd", "color": "#5fc79e",
- "summary": "SRM 鍑嗗叆/瀹氭爣渚涙簮 鈫� 閲囪喘鐢宠 BPM 鈫� 閲囪喘璁㈠崟 BPM 鈫� 纭鏀惰揣鐢熸垚 MES 鍒拌揣閫氱煡 鈫� IQC(鍚堟牸/鐗归噰鍏ュ簱路閫�璐�/鎶ュ簾) 鈫� 閲囪喘鍏ュ簱鍥炲啓璁㈠崟涓庣敵璇� 鈫� 鏉ョエ(AI OCR) 鈫� 浠樻鍗� BPM銆�",
+ "summary": "SRM 鍑嗗叆/瀹氭爣渚涙簮 鈫� 閲囪喘鐢宠 BPM(鏀寔鍗曞紶/鎵归噺鎻愪氦) 鈫� 閲囪喘璁㈠崟瀵煎叆(閲嶅妫�娴�+寮规瑕嗙洊) 鎴� BPM 鈫� 纭鏀惰揣鐢熸垚 MES 鍒拌揣閫氱煡 鈫� IQC(鍚堟牸/鐗归噰鍏ュ簱路閫�璐�/鎶ュ簾) 鈫� 閲囪喘鍏ュ簱鍥炲啓璁㈠崟涓庣敵璇� 鈫� 鏉ョエ(AI OCR) 鈫� 浠樻鍗� BPM銆�",
"steps": [
{"stage": "瀵绘簮", "action": "渚涘簲鍟嗗噯鍏�(BPM)寤烘。锛涙嫑鏍囧畬鏁寸増鎴栫畝鏄撴瘮浠凤紝瀹氭爣瀹℃壒閫氳繃鑷姩鐢熸垚閲囪喘璁㈠崟", "roles": ["閲囪喘寮�鍙�"]},
- {"stage": "鐢宠", "action": "閲囪喘鐢宠(CGSQ)鎻愪氦 BPM锛岄┏鍥炲彲閲嶇疆鍥炶崏绋匡紱閫氳繃涓旀湁渚涘簲鍟嗚嚜鍔ㄧ敓鎴愯鍗�", "roles": ["閲囪喘鍛�", "瀹℃壒浜�"]},
- {"stage": "涓嬪崟", "action": "閲囪喘璁㈠崟(CGDD)鑷姩鎻愪氦 BPM(15鈫�20)", "roles": ["閲囪喘鍛�"]},
+ {"stage": "鐢宠", "action": "閲囪喘鐢宠(CGSQ)鍗曞紶鎴栧嬀閫夊寮犳壒閲忔彁浜� BPM(浠呮湭鎻愪氦/椹冲洖鍙彁浜わ紝閫愬崟鐙珛浜嬪姟锛屽け璐ラ」鍗曠嫭鎻愮ず)锛岄┏鍥炲彲閲嶇疆鍥炶崏绋匡紱閫氳繃涓旀湁渚涘簲鍟嗘椂锛屽厛鎸夆�滀緵搴斿晢+鏄庣粏(鐗╂枡/鏁伴噺/鍗曚环/绋庣巼)鈥濆尮閰嶅凡瀹℃牳璁㈠崟锛屽尮閰嶅埌鍒欏叧鑱旂敵璇枫�佷笉閲嶅鐢熸垚锛屾湭鍖归厤鎵嶈嚜鍔ㄧ敓鎴�", "roles": ["閲囪喘鍛�", "瀹℃壒浜�"]},
+ {"stage": "涓嬪崟", "action": "閲囪喘璁㈠崟(CGDD)鍙� Excel 瀵煎叆(鍕鹃�夊鏍哥洿鎺ョ疆 20)鎴栬嚜鍔ㄦ彁浜� BPM(15鈫�20)锛涘鍏ユ椂鎸夊崟鍙锋垨鈥滀緵搴斿晢+鏄庣粏鈥濊瘑鍒噸澶嶏紝閲嶅椤归粯璁や笉瀵煎叆骞跺脊妗嗘彁绀猴紝鐢ㄦ埛纭鍚庢墠瑕嗙洊宸叉湁璁㈠崟锛涘凡鍏ュ簱/宸查��璐�/宸插叧鑱斿彂绁ㄦ垨閲囪喘鐢宠鐨勮鍗曠姝㈣鐩�", "roles": ["閲囪喘鍛�"]},
{"stage": "鏀惰揣", "action": "纭鏀惰揣鐢熸垚鍒拌揣閫氱煡(0鈫掑緟璐ㄦ2/寰呭叆搴�3鈫�4)锛涢渶妫�鐗╂枡鑷姩鍒涘缓 IQC", "roles": ["浠撶", "IQC 璐ㄦ鍛�"]},
{"stage": "鍏ュ簱", "action": "IQC 鍚堟牸/鐗归噰鈫掗噰璐叆搴�(寰呬笂鏋垛啋寰呮墽琛屸啋瀹屾垚)搴撳瓨+锛屽洖鍐欒鍗� inCount/inStatus 涓庣敵璇锋槑缁�", "roles": ["浠撶"]},
{"stage": "閫�璐�", "action": "IQC 涓嶅悎鏍奸��璐р啋渚涘簲鍟嗛��璐у嚭搴�(閫夋枡閿佸畾鍒拌鍗曡)锛涙姤搴熻蛋 NCR", "roles": ["浠撶"]},
diff --git a/docs/project-business/mermaid/03-purchase-flow.mmd b/docs/project-business/mermaid/03-purchase-flow.mmd
index 44bdfdb..7c73fbd 100644
--- a/docs/project-business/mermaid/03-purchase-flow.mmd
+++ b/docs/project-business/mermaid/03-purchase-flow.mmd
@@ -3,9 +3,12 @@
S1 --> S2[璧勮川璇佷功绠$悊]
S1 --> S3[缁╂晥璇勪环路璐ㄩ噺浜や粯浠锋牸鏈嶅姟鍥涚淮]
S4[SRM 鎷涙爣姣斾环路鍙戝竷鈫掓姇鏍団啋寮�鏍団啋璇勬爣鈫掑畾鏍嘳 -->|瀹氭爣瀹℃壒閫氳繃鐢熸垚璁㈠崟| C3
- C1[閲囪喘鐢宠 CGSQ路鑽夌0鈫掑鎵逛腑10] -->|鎻愪氦BPM| C2{瀹℃壒}
+ C1[閲囪喘鐢宠 CGSQ路鑽夌0鈫掑鎵逛腑10] -->|鍗曞紶鎻愪氦鎴栨壒閲忔彁浜PM| C2{瀹℃壒}
C2 -->|椹冲洖30鈫掑彲閲嶇疆鍥炶崏绋縷 C1
- C2 -->|閫氳繃20涓旀湁渚涘簲鍟喡疯嚜鍔ㄧ敓鎴恷 C3[閲囪喘璁㈠崟 CGDD路瀹℃壒涓�15鈫掑凡瀹℃牳20]
+ C2 -->|閫氳繃20涓旀湁渚涘簲鍟喡峰厛鎸変緵搴斿晢+鏄庣粏鍖归厤宸插鏍歌鍗晐 C2a{鏄惁宸叉湁鐩稿悓璁㈠崟}
+ C2a -->|鏈壜峰叧鑱旂敵璇蜂笉閲嶅鐢熸垚| C3[閲囪喘璁㈠崟 CGDD路瀹℃壒涓�15鈫掑凡瀹℃牳20]
+ C2a -->|鏃犅疯嚜鍔ㄧ敓鎴恷 C3
+ C0[閲囪喘璁㈠崟瀵煎叆 Excel路鍕鹃�夊鏍哥洿鎺�20] -->|鍗曞彿鎴栦緵搴斿晢+鏄庣粏閲嶅鏃跺脊妗嗙‘璁よ鐩東 C3
C2 -->|閫氳繃20鏃犱緵搴斿晢| C4[鎵嬪姩鎸囧畾渚涘簲鍟嗙敓鎴愯鍗昡
C4 --> C3
C3 -->|纭鏀惰揣| C5[鍒拌揣閫氱煡鍗暵疯崏绋�0鈫掑緟璐ㄦ2鈫掑緟鍏ュ簱3鈫掑畬鎴�4]
diff --git a/docs/purchase_order_duplicate_and_batch_submit_integration.md b/docs/purchase_order_duplicate_and_batch_submit_integration.md
new file mode 100644
index 0000000..ac97b5f
--- /dev/null
+++ b/docs/purchase_order_duplicate_and_batch_submit_integration.md
@@ -0,0 +1,123 @@
+# 閲囪喘璁㈠崟瀵煎叆閲嶅妫�娴嬩笌閲囪喘鐢宠鎵归噺鎻愪氦 - 鍓嶇鑱旇皟鏂规
+
+## 娑夊強椤甸潰
+
+- ERP 鈫� 閲囪喘绠$悊 鈫� 閲囪喘璁㈠崟 鈫� 瀵煎叆寮圭獥
+- ERP 鈫� 閲囪喘绠$悊 鈫� 閲囪喘鐢宠 鈫� 鍒楄〃宸ュ叿鏍忋�佹彁浜ゅ鎵规祦绋嬪脊绐�
+
+## 涓氬姟娴佺▼涓庢暟鎹甫鍏�
+
+1. 閲囪喘鐢宠鍒楄〃鍕鹃�夊寮犲崟鎹� 鈫� 鐐瑰嚮銆屾壒閲忔彁浜ゃ�嶁啋 鍓嶇杩囨护鍑衡�滄湭鎻愪氦(0)/瀹℃壒涓嶉�氳繃(30)鈥濈殑鐢宠 鈫� 閫夋嫨瀹℃壒娴佺▼ 鈫� 鎸夋瘡鎵� 50 寮犺皟鐢ㄦ壒閲忔彁浜ゆ帴鍙c��
+2. 鎵归噺鎻愪氦閫愬紶鍒涘缓 BPM 娴佺▼瀹炰緥骞跺洖鍐欑敵璇风姸鎬佷负鈥滃鎵逛腑(10)鈥濓紝鍗曞紶澶辫触涓嶅奖鍝嶅叾瀹冪敵璇凤紝澶辫触鍘熷洜鎸夌敵璇峰崟鍙疯繑鍥炪��
+3. 閲囪喘鐢宠瀹℃壒閫氳繃涓斿凡濉緵搴斿晢鏃讹紝鍚庣鍏堟寜鈥滀緵搴斿晢 + 鏄庣粏锛堢墿鏂欍�佹暟閲忋�佸崟浠枫�佺◣鐜囷級鈥濆尮閰嶇郴缁熷唴宸插鏍镐笖灏氭湭鍏ュ簱/閫�璐х殑閲囪喘璁㈠崟锛�
+ - 鍖归厤鍒帮細鎶婄敵璇峰叧鑱斿埌璇ヨ鍗曪紝骞跺洖濉鍗曟槑缁嗙殑鐢宠鏄庣粏缂栧彿锛屼笉鍐嶇敓鎴愭柊璁㈠崟锛�
+ - 鍖归厤涓嶅埌锛氫繚鎸佸師鏈夐�昏緫鑷姩鐢熸垚涓�寮犲凡瀹℃牳閲囪喘璁㈠崟銆�
+4. 閲囪喘璁㈠崟瀵煎叆鏃讹紝鍚庣鎸変互涓嬮『搴忚瘑鍒噸澶嶏細
+ - 鏂囦欢涓殑鈥滈噰璐崟缂栧彿鈥濆湪绯荤粺鍐呭凡瀛樺湪锛�
+ - 鏂囦欢涓殑鈥滈噰璐崟缂栧彿鈥濈暀绌猴紙鐢辩郴缁熻嚜鍔ㄧ敓鎴愮紪鍙凤級涓斾緵搴斿晢銆佹槑缁嗐�佹暟閲忋�佸崟浠枫�佺◣鐜囦笌绯荤粺鍐呭凡鏈夎鍗曞畬鍏ㄤ竴鑷淬��
+5. 鍙戠幇閲嶅涓旀湭寮�鍚鐩栨椂锛岄噸澶嶈鍗曚笉钀藉簱锛岃繑鍥� `duplicateList`锛涘墠绔脊妗嗘彁绀猴紝鐢ㄦ埛纭瑕嗙洊鍚庝互 `overwrite=true` 閲嶆柊瀵煎叆銆�
+6. 宸插叆搴撱�佸凡閫�璐с�佸凡鍏宠仈鍙戠エ鎴栧凡鍏宠仈閲囪喘鐢宠銆佸凡鎻愪氦瀹℃壒娴佺▼鐨勮鍗曠姝㈣鐩栵紝瑕嗙洊澶辫触鍘熷洜杩涘叆 `failureList`銆�
+
+## API
+
+| 鏂规硶 | 璺緞 | 璇存槑 |
+|------|------|------|
+| POST | /erp/purchase-order/import | 瀵煎叆閲囪喘璁㈠崟锛堟柊澧� `overwrite` 鍙傛暟銆佸搷搴旀柊澧� `duplicateList`锛� |
+| PUT | /erp/purchase-request/submit-batch | 鎵归噺鎻愪氦閲囪喘鐢宠瀹℃壒锛堟柊澧烇級 |
+
+### 1. 瀵煎叆閲囪喘璁㈠崟
+
+**璇锋眰鍙傛暟锛坢ultipart/form-data锛夛細**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|------|------|------|------|
+| file | File | 鏄� | xls/xlsx 鏂囦欢 |
+| directApprove | Boolean | 鍚� | 鏄惁鐩存帴灏嗗鍏ヨ鍗曠疆涓衡�滃凡瀹℃牳(20)鈥濓紝榛樿 false |
+| overwrite | Boolean | 鍚� | 鏄惁瑕嗙洊閲嶅璁㈠崟锛岄粯璁� false锛沠alse 鏃堕噸澶嶉」鍙繑鍥炰笉钀藉簱 |
+
+**鍝嶅簲鏂板瀛楁锛�**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| duplicateList | Array | 妫�娴嬪埌鐨勯噸澶嶈鍗曪紱鏈紑鍚鐩栨椂杩欎簺璁㈠崟鏈鍏� |
+| duplicateList[].key | String | 瀵煎叆鏂囦欢涓殑閲囪喘鍗曠紪鍙凤紱缂栧彿涓虹┖鏃朵负鈥滅 N 琛屸�� |
+| duplicateList[].existingNo | String | 绯荤粺鍐呭凡瀛樺湪鐨勯噰璐鍗曠紪鍙� |
+| duplicateList[].existingId | Number | 绯荤粺鍐呭凡瀛樺湪鐨勯噰璐鍗曠紪鍙� |
+| duplicateList[].reason | String | 閲嶅鍘熷洜锛氶噰璐崟缂栧彿宸插瓨鍦� / 渚涘簲鍟嗐�佹槑缁嗐�佹暟閲忋�佸崟浠枫�侀噾棰濅笌宸叉湁璁㈠崟涓�鑷� |
+
+**鍝嶅簲绀轰緥锛�**
+
+```json
+{
+ "code": 0,
+ "data": {
+ "createList": ["CGDD20261105000001"],
+ "updateList": [],
+ "failureList": {},
+ "duplicateList": [
+ {
+ "key": "绗� 2 琛�",
+ "existingNo": "CGDD20261014000006",
+ "existingId": 2106,
+ "reason": "渚涘簲鍟嗐�佹槑缁嗐�佹暟閲忋�佸崟浠枫�侀噾棰濅笌宸叉湁璁㈠崟涓�鑷�"
+ }
+ ]
+ }
+}
+```
+
+### 2. 鎵归噺鎻愪氦閲囪喘鐢宠
+
+**璇锋眰鍙傛暟锛坬uery锛夛細**
+
+| 鍙傛暟 | 绫诲瀷 | 蹇呭~ | 璇存槑 |
+|------|------|------|------|
+| ids | String | 鏄� | 閲囪喘鐢宠缂栧彿锛屽涓敤鑻辨枃閫楀彿鍒嗛殧 |
+| processDefinitionKey | String | 鏄� | BPM 瀹℃壒娴佺▼瀹氫箟 Key |
+
+**鍝嶅簲瀛楁锛�**
+
+| 瀛楁 | 绫诲瀷 | 璇存槑 |
+|------|------|------|
+| successIds | Number[] | 鎻愪氦鎴愬姛鐨勯噰璐敵璇风紪鍙� |
+| failureMap | Object | 鎻愪氦澶辫触闆嗗悎锛沰ey 涓洪噰璐敵璇峰崟鍙凤紙鍙栦笉鍒板崟鍙锋椂涓衡�滅紪鍙� xxx鈥濓級锛寁alue 涓哄け璐ュ師鍥� |
+
+**鍝嶅簲绀轰緥锛�**
+
+```json
+{
+ "code": 0,
+ "data": {
+ "successIds": [2195, 2196],
+ "failureMap": {
+ "CGSQ20261105000003": "鎻愪氦澶辫触锛岄噰璐敵璇峰崟(CGSQ20261105000003)娌℃湁鏄庣粏锛岃鍏堟坊鍔犳槑缁嗗悗鍐嶆彁浜�"
+ }
+ }
+}
+```
+
+## 瀛楁灞曠ず瑙勫垯
+
+| 瀛楁 | 灞曠ず浣嶇疆 | 璇存槑 |
+|------|----------|------|
+| duplicateList | 瀵煎叆缁撴灉鍖恒�侀噸澶嶇‘璁ゅ脊妗� | 灞曠ず瀵煎叆鏂囦欢鏍囪瘑 鈫� 宸插瓨鍦ㄨ鍗曠紪鍙� + 閲嶅鍘熷洜 |
+| updateList | 瀵煎叆缁撴灉鍖� | 瑕嗙洊妯″紡涓嬪睍绀鸿鏇存柊璁㈠崟缂栧彿 |
+| failureMap | 鎵归噺鎻愪氦缁撴灉寮规 | 閫愭潯灞曠ず鈥滅敵璇峰崟鍙凤細澶辫触鍘熷洜鈥� |
+
+## 涓氬姟瑙勫垯璇存槑
+
+| 鍦烘櫙 | 瑙勫垯 |
+|------|------|
+| 鎵归噺鎻愪氦鑼冨洿 | 浠呪�滄湭鎻愪氦(0)鈥濆拰鈥滃鎵逛笉閫氳繃(30)鈥濈殑鐢宠鍙彁浜わ紱鍏跺畠鐘舵�佽嚜鍔ㄨ烦杩囧苟鎻愮ず |
+| 鎵归噺鎻愪氦浜嬪姟 | 姣忓紶鐢宠鐙珛浜嬪姟锛屽崟寮犲け璐ヤ笉鍥炴粴鍏跺畠鐢宠 |
+| 瀵煎叆閲嶅-鍗曞彿 | 鏂囦欢濉啓浜嗏�滈噰璐崟缂栧彿鈥濅笖绯荤粺宸插瓨鍦紝鍒ゅ畾閲嶅 |
+| 瀵煎叆閲嶅-鏃犲崟鍙� | 鏂囦欢鏈~鈥滈噰璐崟缂栧彿鈥濇椂锛屾墠鎸夆�滀緵搴斿晢 + 鏄庣粏鈥濇寚绾瑰垽瀹氶噸澶嶏紱濉啓浜嗘槑纭崟鍙风殑姝e父閲嶅閲囪喘涓嶄細琚寚绾规嫤鎴� |
+| 瑕嗙洊闄愬埗 | 宸插叆搴撱�佸凡閫�璐с�佸凡鍏宠仈鍙戠エ銆佸凡鍏宠仈閲囪喘鐢宠銆佸凡鎻愪氦瀹℃壒娴佺▼鐨勮鍗曚笉鍙鐩� |
+| 瀹℃壒鑷姩鐢熸垚 | 鍖归厤鍒扮浉鍚屽凡瀹℃牳璁㈠崟鏃跺彧寤虹珛鍏宠仈锛屼笉閲嶅鐢熸垚璁㈠崟锛涘尮閰嶄笉鍒版墠鏂板 |
+
+## 娉ㄦ剰浜嬮」
+
+- 瀵煎叆閲嶅寮规鎻愪緵鈥滆鐩栭噸澶嶈鍗曗�濆拰鈥滀笉瑕嗙洊鈥濅袱涓�夐」锛涢�夋嫨涓嶈鐩栨椂锛岄噸澶嶉」淇濈暀鍦ㄧ粨鏋滃尯锛屽彲鍐嶆鐐瑰嚮鈥滆鐩栭噸澶嶈鍗曗�濄��
+- 鑻ョ‘璁ゆ槸姝e父鐨勬柊閲囪喘鑰岄潪閲嶅涓婁紶锛岄渶鍦ㄦ枃浠朵腑濉啓涓�涓郴缁熶腑涓嶅瓨鍦ㄧ殑閲囪喘鍗曠紪鍙峰悗閲嶆柊瀵煎叆銆�
+- 鎵归噺鎻愪氦寤鸿鎸� 50 寮犱竴鎵硅皟鐢紝閬垮厤涓�娆℃彁浜よ繃澶氬鑷磋姹傝秴鏃躲��
+- `overwrite=true` 浼氶噸鏂板鐞嗘暣涓枃浠讹紝鍖呭惈棣栨宸叉垚鍔熸柊澧炵殑闈為噸澶嶉」锛屽洜姝� `updateList` 鍙兘鍖呭惈杩欎簺璁㈠崟缂栧彿銆�
diff --git a/docs/sql/erp_purchase_request_submit_menu.sql b/docs/sql/erp_purchase_request_submit_menu.sql
new file mode 100644
index 0000000..4a01131
--- /dev/null
+++ b/docs/sql/erp_purchase_request_submit_menu.sql
@@ -0,0 +1,35 @@
+-- 閲囪喘鐢宠銆屾壒閲忔彁浜ゃ�嶆寜閽潈闄�
+-- 褰卞搷椤甸潰锛欵RP -> 閲囪喘绠$悊 -> 閲囪喘鐢宠
+--
+-- 鑳屾櫙锛氶噰璐敵璇锋彁浜ゆ帴鍙o紙PUT /erp/purchase-request/submit銆�/submit-batch锛変娇鐢�
+-- 鏉冮檺鐮� erp:purchase-request:submit锛屼絾 system_menu 涓粠鏈淮鎶よ鏉冮檺鎸夐挳锛�
+-- 瀵艰嚧鍓嶇宸ュ叿鏍忋�屾壒閲忔彁浜ゃ�嶆寜閽鏉冮檺杩囨护闅愯棌锛屾櫘閫氳鑹茶皟鐢ㄦ帴鍙d細 403銆�
+--
+-- 鏈剼鏈箓绛夛紝鍙噸澶嶆墽琛屻�傛墽琛屽悗闇�娓呯悊鏉冮檺缂撳瓨锛堥噸鍚悗绔垨鍒犻櫎
+-- redis 涓殑 permission_menu_ids:erp:purchase-request:submit 涓庣浉鍏� role_menu_ids:*锛夛紝
+-- 鍓嶇閲嶆柊鐧诲綍/鍒锋柊鍚庣敓鏁堛��
+
+-- 1. 琛ユ寜閽彍鍗曪紙鎸傚湪鈥滈噰璐敵璇封�濊彍鍗曚笅锛�
+INSERT INTO system_menu (name, permission, type, sort, parent_id, status, icon, creator, updater)
+SELECT '鎵归噺鎻愪氦瀹℃壒', 'erp:purchase-request:submit', 3, 9, p.id, 0, '#', '1', '1'
+FROM system_menu p
+WHERE p.component = 'erp/purchase/request/index'
+ AND p.type = 2
+ AND p.deleted = b'0'
+ AND NOT EXISTS (
+ SELECT 1 FROM system_menu m
+ WHERE m.permission = 'erp:purchase-request:submit' AND m.deleted = b'0'
+ );
+
+-- 2. 鎺堜簣宸叉嫢鏈夆�滈噰璐敵璇封�濊彍鍗曠殑瑙掕壊
+INSERT INTO system_role_menu (role_id, menu_id, creator, updater)
+SELECT DISTINCT rm.role_id, m.id, '1', '1'
+FROM system_role_menu rm
+JOIN system_menu p ON p.component = 'erp/purchase/request/index' AND p.type = 2 AND p.deleted = b'0'
+JOIN system_menu m ON m.permission = 'erp:purchase-request:submit' AND m.deleted = b'0'
+WHERE rm.menu_id = p.id
+ AND rm.deleted = b'0'
+ AND NOT EXISTS (
+ SELECT 1 FROM system_role_menu x
+ WHERE x.role_id = rm.role_id AND x.menu_id = m.id AND x.deleted = b'0'
+ );
diff --git a/docs/sql/hrm_audit_status_dict.sql b/docs/sql/hrm_audit_status_dict.sql
new file mode 100644
index 0000000..ca1eba5
--- /dev/null
+++ b/docs/sql/hrm_audit_status_dict.sql
@@ -0,0 +1,30 @@
+-- HRM 瀹℃壒鐘舵�佸瓧鍏�
+-- 褰卞搷椤甸潰锛氫汉鍔涜祫婧愭ā鍧椾腑鎵�鏈変娇鐢� hrm_audit_status 瀛楀吀鐨勫崟鎹垪琛�/璇︽儏锛堣�冨嫟寮傚父鐢宠銆佽鍋囥�佺鑱屻�佽皟宀楃瓑锛�
+--
+-- 鑳屾櫙锛氫唬鐮佷腑澶ч噺浣跨敤 @DictFormat("hrm_audit_status") 涓庡墠绔� DICT_TYPE.HRM_AUDIT_STATUS锛�
+-- 浣� system_dict_type / system_dict_data 涓己灏戣瀛楀吀锛屽鑷寸姸鎬佸垪鏄剧ず涓虹┖銆佸鍑烘棤涓枃鍚嶃��
+--
+-- 鏈剼鏈箓绛夛紝鍙噸澶嶆墽琛屻�傛墽琛屽悗娓呯悊瀛楀吀缂撳瓨锛堥噸鍚悗绔紝鎴栧垹闄� Redis 涓殑 dict_data:* 鐩稿叧閿級锛�
+-- 鍓嶇閲嶆柊鐧诲綍/鍒锋柊鍚庣敓鏁堛��
+
+-- 1. 瀛楀吀绫诲瀷
+INSERT INTO system_dict_type (name, type, status, remark, creator, updater)
+SELECT 'HRM 瀹℃壒鐘舵��', 'hrm_audit_status', 0, '浜哄姏妯″潡鍗曟嵁瀹℃壒鐘舵��', '1', '1'
+WHERE NOT EXISTS (
+ SELECT 1 FROM system_dict_type WHERE type = 'hrm_audit_status' AND deleted = b'0'
+);
+
+-- 2. 瀛楀吀鏁版嵁锛堜笌 HrmAuditStatusEnum 淇濇寔涓�鑷达級
+INSERT INTO system_dict_data (sort, label, value, dict_type, status, color_type, css_class, remark, creator, updater)
+SELECT s.sort, s.label, s.value, 'hrm_audit_status', 0, s.color_type, '', '', '1', '1'
+FROM (
+ SELECT 0 AS sort, '鑽夌' AS label, '0' AS value, 'info' AS color_type
+ UNION ALL SELECT 10, '瀹℃壒涓�', '10', 'default'
+ UNION ALL SELECT 20, '瀹℃壒閫氳繃', '20', 'success'
+ UNION ALL SELECT 30, '瀹℃壒椹冲洖', '30', 'danger'
+ UNION ALL SELECT 40, '宸叉挙閿�', '40', 'warning'
+) s
+WHERE NOT EXISTS (
+ SELECT 1 FROM system_dict_data d
+ WHERE d.dict_type = 'hrm_audit_status' AND d.value = s.value AND d.deleted = b'0'
+);
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 af26750..edafc8f 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
@@ -190,9 +190,10 @@
@PreAuthorize("@ss.hasPermission('erp:purchase-order:import')")
public CommonResult<ErpPurchaseOrderImportRespVO> importPurchaseOrderExcel(
@RequestParam("file") MultipartFile file,
- @RequestParam(value = "directApprove", required = false, defaultValue = "false") Boolean directApprove) throws Exception {
+ @RequestParam(value = "directApprove", required = false, defaultValue = "false") Boolean directApprove,
+ @RequestParam(value = "overwrite", required = false, defaultValue = "false") Boolean overwrite) throws Exception {
List<ErpPurchaseOrderImportExcelVO> list = ExcelUtils.read(file, ErpPurchaseOrderImportExcelVO.class);
- return success(purchaseOrderService.importPurchaseOrderList(list, directApprove));
+ return success(purchaseOrderService.importPurchaseOrderList(list, directApprove, overwrite));
}
@PostMapping("/confirm-receipt")
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
index 0175677..0de0525 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
@@ -13,6 +13,7 @@
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSaveReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportExcelVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSubmitBatchRespVO;
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.srm.api.supplier.SrmSupplierApi;
@@ -173,6 +174,17 @@
return success(true);
}
+ @PutMapping("/submit-batch")
+ @Operation(summary = "鎵归噺鎻愪氦閲囪喘鐢宠瀹℃壒")
+ @Parameter(name = "ids", description = "閲囪喘鐢宠缂栧彿鏁扮粍", required = true)
+ @PreAuthorize("@ss.hasPermission('erp:purchase-request:submit')")
+ public CommonResult<ErpPurchaseRequestSubmitBatchRespVO> submitPurchaseRequestBatch(
+ @RequestParam("ids") List<Long> ids,
+ @RequestParam("processDefinitionKey") String processDefinitionKey) {
+ Long userId = getLoginUserId();
+ return success(purchaseRequestService.submitPurchaseRequestBatch(ids, processDefinitionKey, userId));
+ }
+
@PutMapping("/reset-status")
@Operation(summary = "閲嶇疆閲囪喘鐢宠鐘舵�侊紙椹冲洖鈫掕崏绋匡級")
@PreAuthorize("@ss.hasPermission('erp:purchase-request:update')")
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportDuplicateVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportDuplicateVO.java
new file mode 100644
index 0000000..92270b6
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportDuplicateVO.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * 绠$悊鍚庡彴 - 閲囪喘璁㈠崟瀵煎叆閲嶅椤� VO
+ *
+ * 瀵煎叆鏃跺鏋滃彂鐜扮郴缁熷唴宸叉湁鐩稿悓閲囪喘鍗曠紪鍙凤紝鎴栦緵搴斿晢銆佹槑缁嗐�侀噾棰濆畬鍏ㄤ竴鑷寸殑璁㈠崟锛�
+ * 涓嶇洿鎺ュ垱寤烘柊璁㈠崟锛岃�屾槸杩斿洖缁欏墠绔脊妗嗘彁绀猴紝鐢辩敤鎴峰喅瀹氭槸鍚﹁鐩栥��
+ */
+@Schema(description = "绠$悊鍚庡彴 - 閲囪喘璁㈠崟瀵煎叆閲嶅椤� VO")
+@Data
+@Builder
+public class ErpPurchaseOrderImportDuplicateVO {
+
+ @Schema(description = "瀵煎叆鏂囦欢涓殑閲囪喘鍗曠紪鍙凤紱缂栧彿涓虹┖鏃朵娇鐢ㄨ鍙�", example = "CGDD20260101000001")
+ private String key;
+
+ @Schema(description = "绯荤粺鍐呭凡瀛樺湪鐨勯噰璐鍗曠紪鍙�", example = "CGDD20260101000001")
+ private String existingNo;
+
+ @Schema(description = "绯荤粺鍐呭凡瀛樺湪鐨勯噰璐鍗曠紪鍙�")
+ private Long existingId;
+
+ @Schema(description = "閲嶅鍘熷洜", example = "閲囪喘鍗曠紪鍙峰凡瀛樺湪")
+ private String reason;
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportRespVO.java
index e1dc7f9..f5d6dd2 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportRespVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportRespVO.java
@@ -26,4 +26,7 @@
@Schema(description = "瀵煎叆澶辫触闆嗗悎锛宬ey 涓洪噰璐崟缂栧彿鎴栬鍙凤紝value 涓哄け璐ュ師鍥�")
private Map<String, String> failureList;
+ @Schema(description = "妫�娴嬪埌鐨勯噸澶嶉噰璐鍗曪紱鏈紑鍚鐩栨椂杩欎簺璁㈠崟涓嶄細瀵煎叆锛岀敱鍓嶇寮规鎻愮ず鐢ㄦ埛")
+ private List<ErpPurchaseOrderImportDuplicateVO> duplicateList;
+
}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSubmitBatchRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSubmitBatchRespVO.java
new file mode 100644
index 0000000..a70f75c
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSubmitBatchRespVO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 绠$悊鍚庡彴 - 閲囪喘鐢宠鎵归噺鎻愪氦 Response VO
+ */
+@Schema(description = "绠$悊鍚庡彴 - 閲囪喘鐢宠鎵归噺鎻愪氦 Response VO")
+@Data
+@Builder
+public class ErpPurchaseRequestSubmitBatchRespVO {
+
+ @Schema(description = "鎻愪氦鎴愬姛鐨勯噰璐敵璇风紪鍙锋暟缁�")
+ private List<Long> successIds;
+
+ @Schema(description = "鎻愪氦澶辫触鐨勯噰璐敵璇烽泦鍚堬紝key 涓洪噰璐敵璇峰崟鍙凤紙鍙栦笉鍒板崟鍙锋椂涓虹紪鍙凤級锛寁alue 涓哄け璐ュ師鍥�")
+ private Map<String, String> failureMap;
+
+}
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 183cda7..9cfb5e0 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
@@ -86,6 +86,15 @@
return selectOne(ErpPurchaseOrderDO::getNo, no);
}
+ /**
+ * 鎸夌紪鍙锋煡璇㈠苟鍔犺閿侊紝鐢ㄤ簬閲囪喘鐢宠瀹℃壒閫氳繃鏃跺鐢ㄥ凡鏈夎鍗曪紝閬垮厤骞跺彂閲嶅鍗犵敤
+ */
+ default ErpPurchaseOrderDO selectByIdForUpdate(Long id) {
+ return selectOne(new LambdaQueryWrapperX<ErpPurchaseOrderDO>()
+ .eq(ErpPurchaseOrderDO::getId, id)
+ .last("FOR UPDATE"));
+ }
+
default ErpPurchaseOrderDO selectByProcessInstanceId(String processInstanceId) {
return selectOne(ErpPurchaseOrderDO::getProcessInstanceId, processInstanceId);
}
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 c63c613..3995555 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
@@ -46,7 +46,7 @@
ErrorCode PURCHASE_REQUEST_NOT_EXISTS = new ErrorCode(1_030_104_000, "閲囪喘鐢宠鍗曚笉瀛樺湪");
ErrorCode PURCHASE_REQUEST_DELETE_FAIL_NOT_DRAFT = new ErrorCode(1_030_104_001, "閲囪喘鐢宠鍗�({})涓嶆槸鑽夌鐘舵�侊紝鏃犳硶鍒犻櫎");
ErrorCode PURCHASE_REQUEST_UPDATE_FAIL_NOT_DRAFT = new ErrorCode(1_030_104_002, "閲囪喘鐢宠鍗�({})涓嶆槸鑽夌鐘舵�侊紝鏃犳硶淇敼");
- ErrorCode PURCHASE_REQUEST_SUBMIT_FAIL_NOT_DRAFT = new ErrorCode(1_030_104_003, "鎻愪氦澶辫触锛屽彧鏈夎崏绋跨姸鎬佺殑鐢宠鍗曟墠鑳芥彁浜�");
+ ErrorCode PURCHASE_REQUEST_SUBMIT_FAIL_NOT_DRAFT = new ErrorCode(1_030_104_003, "鎻愪氦澶辫触锛岄噰璐敵璇峰崟({})涓嶆槸鑽夌鎴栭┏鍥炵姸鎬侊紝鏃犳硶鎻愪氦");
ErrorCode PURCHASE_REQUEST_NO_EXISTS = new ErrorCode(1_030_104_004, "鐢熸垚鐢宠鍗曞彿澶辫触锛岃閲嶆柊鎻愪氦");
ErrorCode PURCHASE_REQUEST_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS = new ErrorCode(1_030_104_005, "鏇存柊瀹℃壒鐘舵�佸け璐ワ紝鍙湁瀹℃壒涓殑鐢宠鍗曟墠鑳芥洿鏂�");
ErrorCode PURCHASE_REQUEST_NOT_APPROVE = new ErrorCode(1_030_104_006, "閲囪喘鐢宠鍗曟湭瀹℃牳閫氳繃锛屾棤娉曟搷浣�");
@@ -54,6 +54,7 @@
ErrorCode PURCHASE_REQUEST_BPM_CATEGORY_NOT_EXISTS = new ErrorCode(1_030_104_008, "閲囪喘鐢宠瀹℃壒鍒嗙被涓嶅瓨鍦紝璇峰厛鍦˙PM妯″潡鍒涘缓閲囪喘鐢宠瀹℃壒娴佺▼鍒嗙被");
ErrorCode PURCHASE_REQUEST_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_030_104_009, "閲囪喘鐢宠瀹℃壒鍒嗙被涓嬫病鏈夊彲鐢ㄧ殑娴佺▼妯″瀷锛岃鍏堝垱寤哄苟鍙戝竷娴佺▼");
ErrorCode PURCHASE_REQUEST_RESET_FAIL_NOT_REJECT = new ErrorCode(1_030_104_010, "閲嶇疆澶辫触锛屽彧鏈夐┏鍥炵姸鎬佺殑閲囪喘鐢宠鍗曟墠鑳介噸缃�");
+ ErrorCode PURCHASE_REQUEST_ITEM_EMPTY = new ErrorCode(1_030_104_011, "鎻愪氦澶辫触锛岄噰璐敵璇峰崟({})娌℃湁鏄庣粏锛岃鍏堟坊鍔犳槑缁嗗悗鍐嶆彁浜�");
// ========== ERP 閲囪喘鏉ョエ锛�1-030-105-000锛� ==========
ErrorCode PURCHASE_INVOICE_NOT_EXISTS = new ErrorCode(1_030_105_000, "鏉ョエ涓嶅瓨鍦�");
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderService.java
index 1bfd1ce..02e817f 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderService.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderService.java
@@ -34,9 +34,11 @@
*
* @param importList 瀵煎叆鏁版嵁锛堟瘡涓�琛� = 涓�鏉℃槑缁嗭紝鐩稿悓閲囪喘鍗曠紪鍙峰悎骞朵负涓�寮犺鍗曪級
* @param directApprove 鏄惁灏嗗鍏ョ殑璁㈠崟鐩存帴缃负鈥滃凡瀹℃牳鈥濓細true=宸插鏍�(20)锛宖alse=鏈鏍�(10)
+ * @param overwrite 鏄惁瑕嗙洊绯荤粺鍐呭凡鏈夌殑閲嶅璁㈠崟锛歠alse 鏃跺彧杩斿洖閲嶅椤逛緵鍓嶇鎻愮ず锛宼rue 鏃舵洿鏂板凡鏈夎鍗�
* @return 瀵煎叆缁撴灉
*/
- ErpPurchaseOrderImportRespVO importPurchaseOrderList(List<ErpPurchaseOrderImportExcelVO> importList, Boolean directApprove);
+ ErpPurchaseOrderImportRespVO importPurchaseOrderList(List<ErpPurchaseOrderImportExcelVO> importList,
+ Boolean directApprove, Boolean overwrite);
/**
* 鏇存柊閲囪喘璁㈠崟
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
index 24f455b..c2ab475 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
@@ -16,12 +16,14 @@
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderSaveReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportDuplicateVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportExcelVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportRespVO;
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.ErpPurchaseInvoiceOrderMapper;
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;
@@ -49,6 +51,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
@@ -78,6 +81,8 @@
private ErpPurchaseOrderMapper purchaseOrderMapper;
@Resource
private ErpPurchaseOrderItemMapper purchaseOrderItemMapper;
+ @Resource
+ private ErpPurchaseInvoiceOrderMapper invoiceOrderMapper;
@Resource
private ErpNoRedisDAO noRedisDAO;
@@ -180,11 +185,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public ErpPurchaseOrderImportRespVO importPurchaseOrderList(List<ErpPurchaseOrderImportExcelVO> importList,
- Boolean directApprove) {
+ Boolean directApprove, Boolean overwrite) {
ErpPurchaseOrderImportRespVO respVO = ErpPurchaseOrderImportRespVO.builder()
.createList(new ArrayList<>())
.updateList(new ArrayList<>())
.failureList(new LinkedHashMap<>())
+ .duplicateList(new ArrayList<>())
.build();
if (CollUtil.isEmpty(importList)) {
return respVO;
@@ -204,7 +210,27 @@
});
}
- // 2. 鎸夆�滈噰璐崟缂栧彿鈥濆垎缁勶細鍚岀紪鍙峰琛� = 涓�寮犺鍗曠殑澶氭潯鏄庣粏锛涚紪鍙蜂负绌哄垯姣忚鐙珛鎴愬崟
+ // 2. 棰勭儹绯荤粺鍐呮湁鏁堥噰璐鍗曪細鎸夊崟鍙枫�佹寜鈥滀緵搴斿晢 + 鏄庣粏鈥濇寚绾瑰缓绱㈠紩锛岀敤浜庤瘑鍒噸澶嶅鍏�
+ List<ErpPurchaseOrderDO> existingOrders = purchaseOrderMapper.selectList();
+ Map<Long, List<ErpPurchaseOrderItemDO>> existingItemsMap = new HashMap<>();
+ if (CollUtil.isNotEmpty(existingOrders)) {
+ purchaseOrderItemMapper.selectListByOrderIds(
+ existingOrders.stream().map(ErpPurchaseOrderDO::getId).toList())
+ .forEach(item -> existingItemsMap.computeIfAbsent(item.getOrderId(), k -> new ArrayList<>()).add(item));
+ }
+ Map<String, ErpPurchaseOrderDO> existingNoMap = new HashMap<>();
+ Map<String, List<ErpPurchaseOrderDO>> existingFingerprintMap = new HashMap<>();
+ for (ErpPurchaseOrderDO order : existingOrders) {
+ if (StrUtil.isNotBlank(order.getNo())) {
+ existingNoMap.put(order.getNo(), order);
+ }
+ String fingerprint = buildOrderFingerprint(order.getSupplierId(), existingItemsMap.get(order.getId()));
+ if (fingerprint != null) {
+ existingFingerprintMap.computeIfAbsent(fingerprint, k -> new ArrayList<>()).add(order);
+ }
+ }
+
+ // 3. 鎸夆�滈噰璐崟缂栧彿鈥濆垎缁勶細鍚岀紪鍙峰琛� = 涓�寮犺鍗曠殑澶氭潯鏄庣粏锛涚紪鍙蜂负绌哄垯姣忚鐙珛鎴愬崟
Map<String, List<ErpPurchaseOrderImportExcelVO>> orderGroups = new LinkedHashMap<>();
for (int i = 0; i < importList.size(); i++) {
ErpPurchaseOrderImportExcelVO row = importList.get(i);
@@ -216,14 +242,50 @@
orderGroups.computeIfAbsent(key, k -> new ArrayList<>()).add(row);
}
- // 3. 閫愪釜璁㈠崟瀵煎叆锛堝崟寮犺鍗曞け璐ヤ笉褰卞搷鍏跺畠锛�
+ // 4. 閫愪釜璁㈠崟瀵煎叆锛堝崟寮犺鍗曞け璐ヤ笉褰卞搷鍏跺畠锛�
for (Map.Entry<String, List<ErpPurchaseOrderImportExcelVO>> entry : orderGroups.entrySet()) {
List<ErpPurchaseOrderImportExcelVO> rows = entry.getValue();
String label = StrUtil.isNotBlank(rows.get(0).getNo()) ? rows.get(0).getNo().trim()
: "绗� " + entry.getKey().substring("__row_".length()) + " 琛�";
try {
- ErpPurchaseOrderDO purchaseOrder = createPurchaseOrderByImport(rows, supplierIdMap, directApprove);
- respVO.getCreateList().add(purchaseOrder.getNo());
+ ImportOrderData importData = prepareImportOrder(rows, supplierIdMap);
+
+ // 4.1 鍏堟寜鍗曞彿鎵撅紱鍙湁鈥滃崟鍙蜂负绌恒�佺敱绯荤粺鐢熸垚缂栧彿鈥濈殑琛屾墠鎸夆�滀緵搴斿晢 + 瀹屾暣鏄庣粏鈥濇寚绾规壘銆�
+ // 鏂囦欢閲屽啓浜嗘槑纭崟鍙风殑锛岃涓虹敤鎴锋槑纭鏂板璇ュ崟鍙凤紝鎸囩汗鐩稿悓涔熶笉鎷︽埅锛岄伩鍏嶆甯哥殑閲嶅閲囪喘琚鍒ゃ��
+ ErpPurchaseOrderDO existing = importData.order.getNo() == null ? null
+ : existingNoMap.get(importData.order.getNo());
+ String duplicateReason = existing != null ? "閲囪喘鍗曠紪鍙峰凡瀛樺湪" : null;
+ boolean matchedByFingerprint = false;
+ List<ErpPurchaseOrderDO> fingerprintCandidates = null;
+ if (existing == null && importData.generatedNo && importData.fingerprint != null) {
+ fingerprintCandidates = existingFingerprintMap.get(importData.fingerprint);
+ if (CollUtil.isNotEmpty(fingerprintCandidates)) {
+ existing = fingerprintCandidates.get(0);
+ matchedByFingerprint = true;
+ duplicateReason = "渚涘簲鍟嗐�佹槑缁嗐�佹暟閲忋�佸崟浠枫�侀噾棰濅笌宸叉湁璁㈠崟涓�鑷�";
+ }
+ }
+
+ // 4.2 鍙戠幇閲嶅锛氶粯璁や笉瀵煎叆锛岃繑鍥炵粰鍓嶇寮规鎻愮ず锛涘嬀閫夎鐩栧悗鎵嶆洿鏂板凡鏈夎鍗�
+ if (existing != null) {
+ if (!Boolean.TRUE.equals(overwrite)) {
+ respVO.getDuplicateList().add(buildImportDuplicate(label, existing, duplicateReason));
+ continue;
+ }
+ if (matchedByFingerprint && fingerprintCandidates.size() > 1) {
+ String nos = fingerprintCandidates.stream().map(ErpPurchaseOrderDO::getNo)
+ .collect(Collectors.joining("銆�"));
+ throw new IllegalArgumentException("鎵惧埌澶氬紶鐩稿悓璁㈠崟锛�" + nos
+ + "锛夛紝鏃犳硶鑷姩瑕嗙洊锛岃鍏堜繚鐣欎竴寮犲悗鍐嶅鍏�");
+ }
+ updatePurchaseOrderByImport(existing, importData, directApprove);
+ respVO.getUpdateList().add(existing.getNo());
+ continue;
+ }
+
+ // 4.3 娌℃湁閲嶅锛屾甯告柊澧�
+ createPurchaseOrderByImport(importData, directApprove);
+ respVO.getCreateList().add(importData.order.getNo());
} catch (Exception ex) {
respVO.getFailureList().put(label, resolveImportErrorMessage(ex));
}
@@ -232,13 +294,10 @@
}
/**
- * 渚濇嵁瀵煎叆鏁版嵁鍒涘缓涓�寮犻噰璐鍗曪紙鍚槑缁嗭級銆�
- *
- * 娉ㄦ剰锛氭澶勪笉璋冪敤 submitPurchaseOrder锛屽洜姝や笉浼氬垱寤� BPM 宸ヤ綔娴侊紱璁㈠崟鐘舵�佺敱 directApprove 鐩存帴鍐冲畾锛�
- * 鍕鹃�夆�滄槸鍚﹀鏍糕�� => 宸插鏍�(20)锛屾湭鍕鹃�� => 鏈鏍�(10)銆�
+ * 鏍¢獙骞剁粍瑁呬竴寮犲鍏ヨ鍗曪紙涓嶈惤搴擄級銆�
*/
- private ErpPurchaseOrderDO createPurchaseOrderByImport(List<ErpPurchaseOrderImportExcelVO> rows,
- Map<String, Long> supplierIdMap, Boolean directApprove) {
+ private ImportOrderData prepareImportOrder(List<ErpPurchaseOrderImportExcelVO> rows,
+ Map<String, Long> supplierIdMap) {
// 1. 渚涘簲鍟嗭紙鍙栬缁勯琛岋級
ErpPurchaseOrderImportExcelVO head = rows.get(0);
if (StrUtil.isBlank(head.getSupplierName())) {
@@ -278,31 +337,145 @@
items.add(itemVO);
}
- // 3. 鍗曞彿锛氬~浜嗗氨鐢紙鏍¢獙鍞竴锛夛紝娌″~鑷姩鐢熸垚
- String no = StrUtil.isNotBlank(head.getNo()) ? head.getNo().trim()
- : noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX);
- if (purchaseOrderMapper.selectByNo(no) != null) {
- throw new IllegalArgumentException("閲囪喘鍗曠紪鍙峰凡瀛樺湪锛�" + no);
- }
+ // 3. 鍗曞彿锛氬~浜嗗氨鐢紱鐣欑┖鏃跺厛涓嶇敓鎴愶紝绛夌‘璁よ鏂板鏃跺啀鐢熸垚锛岄伩鍏嶉噸澶嶈琚烦杩囦篃娑堣�楁祦姘村彿
+ boolean generatedNo = StrUtil.isBlank(head.getNo());
- // 4. 缁勮涓昏〃锛氬嬀閫夆�滄槸鍚﹀鏍糕�� => 宸插鏍�(20)锛屽惁鍒欐湭瀹℃牳(10)
+ // 4. 缁勮涓昏〃锛堢姸鎬佺敱璋冪敤鏂瑰喅瀹氾級
ErpPurchaseOrderDO purchaseOrder = new ErpPurchaseOrderDO();
- purchaseOrder.setNo(no);
+ purchaseOrder.setNo(generatedNo ? null : head.getNo().trim());
purchaseOrder.setSupplierId(supplierId);
purchaseOrder.setOrderTime(parseImportOrderTime(head.getOrderTime()));
purchaseOrder.setRemark(head.getRemark());
- purchaseOrder.setStatus(Boolean.TRUE.equals(directApprove)
- ? ErpAuditStatus.APPROVE.getStatus() : ErpAuditStatus.PROCESS.getStatus());
purchaseOrder.setDepositPrice(BigDecimal.ZERO); // deposit_price 涓� NOT NULL 涓旀棤榛樿鍊硷紝蹇呴』鏄惧紡璧嬪��
- purchaseOrder.setInCount(BigDecimal.ZERO);
- purchaseOrder.setInStatus(ErpPurchaseOrderInStatusEnum.NOT_IN.getStatus());
List<ErpPurchaseOrderItemDO> itemDOs = validatePurchaseOrderItems(items);
calculateTotalPrice(purchaseOrder, itemDOs);
+ return new ImportOrderData(purchaseOrder, itemDOs,
+ buildOrderFingerprint(supplierId, itemDOs), generatedNo,
+ StrUtil.isNotBlank(head.getOrderTime()));
+ }
+
+ /**
+ * 鏂板瀵煎叆璁㈠崟锛堝惈鏄庣粏锛夈��
+ */
+ private void createPurchaseOrderByImport(ImportOrderData importData, Boolean directApprove) {
+ ErpPurchaseOrderDO purchaseOrder = importData.order;
+ if (StrUtil.isBlank(purchaseOrder.getNo())) {
+ purchaseOrder.setNo(noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX));
+ }
+ purchaseOrder.setStatus(Boolean.TRUE.equals(directApprove)
+ ? ErpAuditStatus.APPROVE.getStatus() : ErpAuditStatus.PROCESS.getStatus());
+ purchaseOrder.setInCount(BigDecimal.ZERO);
+ purchaseOrder.setInStatus(ErpPurchaseOrderInStatusEnum.NOT_IN.getStatus());
purchaseOrderMapper.insert(purchaseOrder);
- itemDOs.forEach(item -> item.setOrderId(purchaseOrder.getId()));
- purchaseOrderItemMapper.insertBatch(itemDOs);
- return purchaseOrder;
+ importData.items.forEach(item -> item.setOrderId(purchaseOrder.getId()));
+ purchaseOrderItemMapper.insertBatch(importData.items);
+ }
+
+ /**
+ * 瑕嗙洊宸叉湁瀵煎叆璁㈠崟锛堝惈鏄庣粏锛夈��
+ */
+ private void updatePurchaseOrderByImport(ErpPurchaseOrderDO existing, ImportOrderData importData,
+ Boolean directApprove) {
+ // 1. 鏈変笅娓稿崟鎹殑璁㈠崟涓嶅厑璁歌鐩栵紝閬垮厤鎶婂凡鍏ュ簱/宸插紑绁ㄧ殑鏁版嵁鏀规帀
+ if (existing.getInCount() != null && existing.getInCount().compareTo(BigDecimal.ZERO) > 0) {
+ throw new IllegalArgumentException("閲囪喘璁㈠崟[" + existing.getNo() + "]宸插叆搴擄紙宸插叆搴撴暟閲� "
+ + normalizeNumber(existing.getInCount()) + "锛夛紝涓嶈兘瑕嗙洊锛涜鍏堝垹闄ゅ搴斿叆搴撹褰曞悗鍐嶅鍏�");
+ }
+ if (existing.getReturnCount() != null && existing.getReturnCount().compareTo(BigDecimal.ZERO) > 0) {
+ throw new IllegalArgumentException("閲囪喘璁㈠崟[" + existing.getNo() + "]宸查��璐э紙宸查��璐ф暟閲� "
+ + normalizeNumber(existing.getReturnCount()) + "锛夛紝涓嶈兘瑕嗙洊锛涜鍏堝垹闄ゅ搴旈��璐ц褰曞悗鍐嶅鍏�");
+ }
+ if (CollUtil.isNotEmpty(invoiceOrderMapper.selectListByPurchaseOrderId(existing.getId()))) {
+ throw new IllegalArgumentException("閲囪喘璁㈠崟[" + existing.getNo()
+ + "]宸插叧鑱斿彂绁紝涓嶈兘瑕嗙洊锛涜鍏堣В闄ゅ彂绁ㄥ叧鑱斿悗鍐嶅鍏�");
+ }
+ if (StrUtil.isNotBlank(existing.getProcessInstanceId())) {
+ throw new IllegalArgumentException("閲囪喘璁㈠崟[" + existing.getNo()
+ + "]宸叉彁浜ゅ鎵规祦绋嬶紝涓嶈兘瑕嗙洊锛涜鍏堝湪鍗忓悓鍔炲叕鎾ゅ洖鎴栦綔搴熻瀹℃壒鍚庡啀瀵煎叆");
+ }
+ List<ErpPurchaseOrderItemDO> oldItems = purchaseOrderItemMapper.selectListByOrderId(existing.getId());
+ boolean linkedRequest = oldItems.stream().anyMatch(item -> item.getRequestItemId() != null);
+ if (linkedRequest) {
+ throw new IllegalArgumentException("閲囪喘璁㈠崟[" + existing.getNo()
+ + "]宸插叧鑱旈噰璐敵璇凤紝涓嶈兘瑕嗙洊锛涜鍏堝湪閲囪喘鐢宠涓挙閿�鎴栧垹闄ゅ搴旂敵璇峰悗鍐嶅鍏�");
+ }
+
+ // 2. 鏇存柊涓昏〃锛堜繚鐣欏師鍗曞彿銆佸師鍏ュ簱鐘舵�侊級
+ ErpPurchaseOrderDO updateObj = importData.order;
+ updateObj.setId(existing.getId());
+ updateObj.setNo(existing.getNo());
+ // 鏂囦欢娌″~閲囪喘鏃堕棿鏃朵繚鐣欏師璁㈠崟鏃堕棿锛岄伩鍏嶈鐩栨椂鎶婃棩鏈熸敼鎴愬綋鍓嶆椂闂�
+ if (!importData.orderTimeProvided) {
+ updateObj.setOrderTime(existing.getOrderTime());
+ }
+ updateObj.setStatus(Boolean.TRUE.equals(directApprove)
+ ? ErpAuditStatus.APPROVE.getStatus() : ErpAuditStatus.PROCESS.getStatus());
+ updateObj.setInCount(existing.getInCount() == null ? BigDecimal.ZERO : existing.getInCount());
+ updateObj.setInStatus(existing.getInStatus());
+ purchaseOrderMapper.updateById(updateObj);
+
+ // 3. 鏄庣粏鏁寸粍鏇挎崲
+ purchaseOrderItemMapper.deleteByOrderId(existing.getId());
+ importData.items.forEach(item -> item.setOrderId(existing.getId()));
+ purchaseOrderItemMapper.insertBatch(importData.items);
+ }
+
+ private ErpPurchaseOrderImportDuplicateVO buildImportDuplicate(String label, ErpPurchaseOrderDO existing,
+ String reason) {
+ return ErpPurchaseOrderImportDuplicateVO.builder()
+ .key(label)
+ .existingNo(existing.getNo())
+ .existingId(existing.getId())
+ .reason(reason)
+ .build();
+ }
+
+ /**
+ * 鐢熸垚鈥滀緵搴斿晢 + 瀹屾暣鏄庣粏鈥濈殑璁㈠崟鎸囩汗锛岀敤浜庤瘑鍒噸澶嶅鍏ャ��
+ * 鏄庣粏鎸夌墿鏂欍�佹暟閲忋�佸崟浠枫�佺◣鐜囨帓搴忓悗姣旇緝锛屼笉鍙楄椤哄簭褰卞搷銆�
+ */
+ private String buildOrderFingerprint(Long supplierId, List<ErpPurchaseOrderItemDO> items) {
+ if (supplierId == null || CollUtil.isEmpty(items)) {
+ return null;
+ }
+ List<String> parts = items.stream()
+ .map(item -> String.join(":",
+ String.valueOf(item.getProductId()),
+ normalizeNumber(item.getCount()),
+ normalizeNumber(item.getProductPrice()),
+ normalizeNumber(item.getTaxPercent())))
+ .sorted()
+ .toList();
+ return supplierId + "|" + String.join(",", parts);
+ }
+
+ private String normalizeNumber(BigDecimal value) {
+ return value == null ? "" : value.stripTrailingZeros().toPlainString();
+ }
+
+ private static class ImportOrderData {
+
+ private final ErpPurchaseOrderDO order;
+ private final List<ErpPurchaseOrderItemDO> items;
+ private final String fingerprint;
+ /**
+ * 閲囪喘鍗曠紪鍙锋槸鍚︾敱绯荤粺鑷姩鐢熸垚锛堟枃浠堕噷鐣欑┖锛�
+ */
+ private final boolean generatedNo;
+ /**
+ * 鏂囦欢閲屾槸鍚﹀~鍐欎簡閲囪喘鏃堕棿
+ */
+ private final boolean orderTimeProvided;
+
+ private ImportOrderData(ErpPurchaseOrderDO order, List<ErpPurchaseOrderItemDO> items, String fingerprint,
+ boolean generatedNo, boolean orderTimeProvided) {
+ this.order = order;
+ this.items = items;
+ this.fingerprint = fingerprint;
+ this.generatedNo = generatedNo;
+ this.orderTimeProvided = orderTimeProvided;
+ }
}
/**
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestService.java
index 6f4cc7b..cf04753 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestService.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestService.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSaveReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportExcelVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSubmitBatchRespVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestItemDO;
import jakarta.validation.Valid;
@@ -90,6 +91,19 @@
void submitPurchaseRequest(Long id, String processDefinitionKey, Long userId);
/**
+ * 鎵归噺鎻愪氦閲囪喘鐢宠瀹℃壒
+ *
+ * 閫愬崟鎻愪氦锛屽崟寮犲け璐ヤ笉褰卞搷鍏跺畠鐢宠锛涙瘡寮犵敵璇风嫭绔嬩簨鍔°��
+ *
+ * @param ids 閲囪喘鐢宠缂栧彿鏁扮粍
+ * @param processDefinitionKey 娴佺▼瀹氫箟 Key
+ * @param userId 鐢ㄦ埛缂栧彿
+ * @return 鎵归噺鎻愪氦缁撴灉锛堟垚鍔熺紪鍙� + 澶辫触鍘熷洜锛�
+ */
+ ErpPurchaseRequestSubmitBatchRespVO submitPurchaseRequestBatch(List<Long> ids, String processDefinitionKey,
+ Long userId);
+
+ /**
* 鑾峰彇閲囪喘鐢宠瀹℃壒娴佺▼鍒楄〃
*
* @return 娴佺▼瀹氫箟鍒楄〃
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 314951b..fef7597 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
@@ -17,6 +17,7 @@
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSaveReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportExcelVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSubmitBatchRespVO;
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;
@@ -39,6 +40,8 @@
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -100,6 +103,13 @@
private DeptApi deptApi;
@Resource
private StorageAttachmentApi storageAttachmentApi;
+
+ /**
+ * 鑷韩浠g悊锛氭壒閲忔彁浜ゆ椂閫愬崟璋冪敤 {@link #submitPurchaseRequest}锛屼繚璇佹瘡寮犵敵璇风嫭绔嬩簨鍔�
+ */
+ @Autowired
+ @Lazy
+ private ErpPurchaseRequestService self;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -450,13 +460,17 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void submitPurchaseRequest(Long id, String processDefinitionKey, Long userId) {
- // 1. 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
- ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestCanModify(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_DRAFT, purchaseRequest.getNo());
+ }
// 2. 鏍¢獙鏄惁鏈夋槑缁�
List<ErpPurchaseRequestItemDO> items = purchaseRequestItemMapper.selectListByRequestId(id);
if (CollUtil.isEmpty(items)) {
- throw exception(PURCHASE_REQUEST_NOT_EXISTS); // TODO: 娣诲姞鏄庣粏涓虹┖鐨勯敊璇爜
+ throw exception(PURCHASE_REQUEST_ITEM_EMPTY, purchaseRequest.getNo());
}
// 3. 鍒涘缓 BPM 娴佺▼瀹炰緥
@@ -470,6 +484,52 @@
.setId(id)
.setStatus(ErpPurchaseRequestStatusEnum.PROCESS.getStatus())
.setProcessInstanceId(processInstanceId));
+ }
+
+ @Override
+ public ErpPurchaseRequestSubmitBatchRespVO submitPurchaseRequestBatch(List<Long> ids,
+ String processDefinitionKey,
+ Long userId) {
+ ErpPurchaseRequestSubmitBatchRespVO respVO = ErpPurchaseRequestSubmitBatchRespVO.builder()
+ .successIds(new ArrayList<>())
+ .failureMap(new LinkedHashMap<>())
+ .build();
+ if (CollUtil.isEmpty(ids)) {
+ return respVO;
+ }
+ List<Long> distinctIds = ids.stream().filter(Objects::nonNull).distinct().toList();
+ if (CollUtil.isEmpty(distinctIds)) {
+ return respVO;
+ }
+
+ // 1. 棰勭儹鐢宠鍗曞彿锛屽け璐ユ椂鍓嶇鍙洿鎺ョ湅鍒版槸鍝紶鐢宠鍗�
+ Map<Long, String> noMap = purchaseRequestMapper.selectRequestListByIds(distinctIds).stream()
+ .filter(request -> request.getId() != null && StrUtil.isNotBlank(request.getNo()))
+ .collect(java.util.stream.Collectors.toMap(ErpPurchaseRequestDO::getId, ErpPurchaseRequestDO::getNo,
+ (a, b) -> a));
+
+ // 2. 閫愬崟鎻愪氦锛氬崟寮犲け璐ヤ笉褰卞搷鍏跺畠鐢宠锛岄�氳繃 self 浠g悊淇濊瘉姣忓紶鐙珛浜嬪姟
+ for (Long id : distinctIds) {
+ String label = noMap.getOrDefault(id, "缂栧彿 " + id);
+ try {
+ self.submitPurchaseRequest(id, processDefinitionKey, userId);
+ respVO.getSuccessIds().add(id);
+ } catch (Exception ex) {
+ String reason = resolveSubmitErrorMessage(ex);
+ if (respVO.getFailureMap().containsKey(label)) {
+ label = label + "锛堢紪鍙� " + id + "锛�";
+ }
+ respVO.getFailureMap().put(label, reason);
+ }
+ }
+ return respVO;
+ }
+
+ private String resolveSubmitErrorMessage(Exception ex) {
+ if (ex instanceof cn.iocoder.yudao.framework.common.exception.ServiceException serviceException) {
+ return serviceException.getMessage();
+ }
+ return StrUtil.blankToDefault(ex.getMessage(), "鎻愪氦澶辫触");
}
@Override
@@ -572,10 +632,20 @@
// 1. 鑾峰彇鐢宠鏄庣粏
List<ErpPurchaseRequestItemDO> requestItems = purchaseRequestItemMapper.selectListByRequestId(id);
if (CollUtil.isEmpty(requestItems)) {
- throw exception(PURCHASE_REQUEST_NOT_EXISTS);
+ throw exception(PURCHASE_REQUEST_ITEM_EMPTY, purchaseRequest.getNo());
}
- // 2. 鐢熸垚閲囪喘璁㈠崟鍙�
+ // 2. 鍏堝皾璇曞鐢ㄧ郴缁熷唴宸插瓨鍦ㄤ笖渚涘簲鍟嗐�佹槑缁嗗畬鍏ㄤ竴鑷寸殑宸插鏍搁噰璐鍗曪紙閫氬父鏉ヨ嚜閲囪喘璁㈠崟瀵煎叆锛夛紝
+ // 閬垮厤瀹℃壒閫氳繃鍚庡張鐢熸垚涓�寮犻噸澶嶈鍗�
+ ErpPurchaseOrderDO reusableOrder = findReusablePurchaseOrder(purchaseRequest, requestItems);
+ if (reusableOrder != null) {
+ linkPurchaseRequestToOrder(purchaseRequest, requestItems, reusableOrder);
+ log.info("[doGeneratePurchaseOrder] 閲囪喘鐢宠({}) 澶嶇敤宸叉湁閲囪喘璁㈠崟({})锛屾湭閲嶅鐢熸垚",
+ id, reusableOrder.getNo());
+ return reusableOrder.getId();
+ }
+
+ // 3. 鐢熸垚閲囪喘璁㈠崟鍙�
String orderNo = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX);
if (purchaseOrderMapper.selectByNo(orderNo) != null) {
throw exception(PURCHASE_ORDER_NO_EXISTS);
@@ -628,6 +698,143 @@
}
/**
+ * 鏌ユ壘鍙鐢ㄧ殑閲囪喘璁㈠崟锛氫緵搴斿晢鐩稿悓锛屼笖鏄庣粏锛堢墿鏂欍�佹暟閲忋�佸崟浠枫�佺◣鐜囷級涓庣敵璇峰畬鍏ㄤ竴鑷淬��
+ *
+ * 鍙尮閰嶅凡瀹℃牳璁㈠崟锛岄伩鍏嶆妸鐢宠鎸傚埌灏氭湭瀹℃牳鐨勮鍗曚笂锛涗紭鍏堥�夋嫨灏氭湭鍏宠仈閲囪喘鐢宠鐨勫鍏ヨ鍗曪紝
+ * 鍏舵閫夋嫨缂栧彿鏈�灏忕殑璁㈠崟銆傚尮閰嶅埌鐨勮鍗曚細鍔犺閿侊紝闃叉骞跺彂瀹℃壒鏃朵袱寮犵敵璇峰悓鏃跺崰鐢ㄥ悓涓�寮犺鍗曘��
+ */
+ private ErpPurchaseOrderDO findReusablePurchaseOrder(ErpPurchaseRequestDO purchaseRequest,
+ List<ErpPurchaseRequestItemDO> requestItems) {
+ if (purchaseRequest.getSupplierId() == null || CollUtil.isEmpty(requestItems)) {
+ return null;
+ }
+ String targetFingerprint = buildRequestFingerprint(purchaseRequest.getSupplierId(), requestItems);
+ if (targetFingerprint == null) {
+ return null;
+ }
+
+ // 1. 鏌ヨ鍚屼緵搴斿晢鐨勫凡瀹℃牳璁㈠崟锛屾寜鎸囩汗绛涢�夊畬鍏ㄤ竴鑷寸殑
+ List<ErpPurchaseOrderDO> orders = purchaseOrderMapper.selectList(
+ purchaseRequest.getSupplierId(), ErpAuditStatus.APPROVE.getStatus());
+ if (CollUtil.isEmpty(orders)) {
+ return null;
+ }
+ Map<Long, List<ErpPurchaseOrderItemDO>> orderItemMap = purchaseOrderItemMapper.selectListByOrderIds(
+ orders.stream().map(ErpPurchaseOrderDO::getId).toList()).stream()
+ .collect(java.util.stream.Collectors.groupingBy(ErpPurchaseOrderItemDO::getOrderId));
+ List<ErpPurchaseOrderDO> candidates = orders.stream()
+ .filter(order -> targetFingerprint.equals(
+ buildOrderFingerprint(order.getSupplierId(), orderItemMap.get(order.getId()))))
+ // 宸插叆搴�/宸查��璐х殑璁㈠崟璇存槑杩欑瑪閲囪喘宸茬粡鎵ц杩囷紝涓嶈兘鎷挎潵椤舵柊鐢宠锛屽惁鍒欐柊闇�姹備細琚�滃悆鎺夆��
+ .filter(order -> order.getInCount() == null
+ || order.getInCount().compareTo(BigDecimal.ZERO) == 0)
+ .filter(order -> order.getReturnCount() == null
+ || order.getReturnCount().compareTo(BigDecimal.ZERO) == 0)
+ .sorted(Comparator
+ .comparing((ErpPurchaseOrderDO order) ->
+ hasLinkedRequestItem(orderItemMap.get(order.getId())) ? 1 : 0)
+ .thenComparing(ErpPurchaseOrderDO::getId))
+ .toList();
+ if (CollUtil.isEmpty(candidates)) {
+ return null;
+ }
+ if (candidates.size() > 1) {
+ log.warn("[findReusablePurchaseOrder] 閲囪喘鐢宠({}) 鍖归厤鍒� {} 寮犵浉鍚岃鍗曪細{}锛屽皢澶嶇敤鏈�鏃╃殑涓�寮�",
+ purchaseRequest.getId(), candidates.size(),
+ candidates.stream().map(ErpPurchaseOrderDO::getNo).toList());
+ }
+
+ // 2. 鍔犺閿佸悗閲嶆柊鍔犺浇锛岄伩鍏嶅苟鍙戝鎵归噸澶嶅崰鐢�
+ ErpPurchaseOrderDO candidate = purchaseOrderMapper.selectByIdForUpdate(candidates.get(0).getId());
+ if (candidate == null || !ErpAuditStatus.APPROVE.getStatus().equals(candidate.getStatus())) {
+ return null;
+ }
+ return candidate;
+ }
+
+ /**
+ * 灏嗛噰璐敵璇峰叧鑱斿埌宸插瓨鍦ㄧ殑閲囪喘璁㈠崟锛屽苟鎶婅鍗曟槑缁嗗洖濉敵璇锋槑缁嗙紪鍙枫��
+ * 宸茶鍏跺畠鐢宠鍏宠仈杩囩殑鏄庣粏涓嶉噸澶嶅洖濉紝鍙缓绔嬬敵璇峰崟涓庤鍗曠殑鍏宠仈銆�
+ */
+ private void linkPurchaseRequestToOrder(ErpPurchaseRequestDO purchaseRequest,
+ List<ErpPurchaseRequestItemDO> requestItems,
+ ErpPurchaseOrderDO purchaseOrder) {
+ List<ErpPurchaseOrderItemDO> orderItems = purchaseOrderItemMapper.selectListByOrderId(purchaseOrder.getId());
+ List<ErpPurchaseOrderItemDO> remaining = new ArrayList<>(orderItems);
+ List<ErpPurchaseOrderItemDO> updates = new ArrayList<>();
+ for (ErpPurchaseRequestItemDO requestItem : requestItems) {
+ ErpPurchaseOrderItemDO match = remaining.stream()
+ .filter(orderItem -> orderItem.getRequestItemId() == null)
+ .filter(orderItem -> Objects.equals(orderItem.getProductId(), requestItem.getProductId())
+ && numberEquals(orderItem.getCount(), requestItem.getCount())
+ && numberEquals(orderItem.getProductPrice(), requestItem.getProductPrice())
+ && numberEquals(orderItem.getTaxPercent(), requestItem.getTaxPercent()))
+ .findFirst().orElse(null);
+ if (match != null) {
+ match.setRequestItemId(requestItem.getId());
+ updates.add(match);
+ remaining.remove(match);
+ }
+ }
+ if (CollUtil.isNotEmpty(updates)) {
+ purchaseOrderItemMapper.updateBatch(updates);
+ }
+
+ purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
+ .setId(purchaseRequest.getId())
+ .setOrderId(purchaseOrder.getId())
+ .setOrderNo(purchaseOrder.getNo()));
+ log.info("[linkPurchaseRequestToOrder] 閲囪喘鐢宠({}) 鍏宠仈閲囪喘璁㈠崟({})锛屽洖濉槑缁� {} 鏉�",
+ purchaseRequest.getId(), purchaseOrder.getNo(), updates.size());
+ }
+
+ private String buildRequestFingerprint(Long supplierId, List<ErpPurchaseRequestItemDO> items) {
+ if (supplierId == null || CollUtil.isEmpty(items)) {
+ return null;
+ }
+ return buildFingerprint(supplierId, items.stream()
+ .map(item -> fingerprintPart(item.getProductId(), item.getCount(),
+ item.getProductPrice(), item.getTaxPercent()))
+ .toList());
+ }
+
+ private String buildOrderFingerprint(Long supplierId, List<ErpPurchaseOrderItemDO> items) {
+ if (supplierId == null || CollUtil.isEmpty(items)) {
+ return null;
+ }
+ return buildFingerprint(supplierId, items.stream()
+ .map(item -> fingerprintPart(item.getProductId(), item.getCount(),
+ item.getProductPrice(), item.getTaxPercent()))
+ .toList());
+ }
+
+ private String buildFingerprint(Long supplierId, List<String> parts) {
+ return supplierId + "|" + parts.stream().sorted().collect(java.util.stream.Collectors.joining(","));
+ }
+
+ private String fingerprintPart(Long productId, BigDecimal count, BigDecimal productPrice,
+ BigDecimal taxPercent) {
+ return String.join(":", String.valueOf(productId), normalizeNumber(count),
+ normalizeNumber(productPrice), normalizeNumber(taxPercent));
+ }
+
+ private String normalizeNumber(BigDecimal value) {
+ return value == null ? "" : value.stripTrailingZeros().toPlainString();
+ }
+
+ private boolean numberEquals(BigDecimal left, BigDecimal right) {
+ if (left == null) {
+ return right == null;
+ }
+ return right != null && left.compareTo(right) == 0;
+ }
+
+ private boolean hasLinkedRequestItem(List<ErpPurchaseOrderItemDO> orderItems) {
+ return CollUtil.isNotEmpty(orderItems)
+ && orderItems.stream().anyMatch(item -> item.getRequestItemId() != null);
+ }
+
+ /**
* 鏍¢獙閲囪喘鐢宠瀹℃壒鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦�
*/
private void validatePurchaseRequestApproveCategoryAndProcessDefinition() {
diff --git a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
index f2fe5d7..478fe3f 100644
--- a/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
+++ b/yudao-module-hrm-api/src/main/java/cn/iocoder/yudao/module/hrm/enums/ErrorCodeConstants.java
@@ -94,6 +94,7 @@
ErrorCode ATTENDANCE_EXCEPTION_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_030_004_015, "鑰冨嫟寮傚父瀹℃壒娴佺▼涓嶅瓨鍦�");
ErrorCode ATTENDANCE_CLOCK_ALREADY_CLOCKED = new ErrorCode(1_030_004_016, "宸叉墦杩囧崱锛岃鍕块噸澶嶆墦鍗�");
ErrorCode ATTENDANCE_HOLIDAY_DATE_RANGE_INVALID = new ErrorCode(1_030_004_017, "缁撴潫鏃ユ湡銆恵}銆戜笉鑳芥棭浜庡紑濮嬫棩鏈熴�恵}銆戯紝鏃犳硶淇濆瓨銆傝閲嶆柊閫夋嫨姝g‘鐨勬棩鏈熷尯闂�");
+ ErrorCode ATTENDANCE_EXCEPTION_EMPLOYEE_NOT_EXISTS = new ErrorCode(1_030_004_018, "鏂板鑰冨嫟寮傚父鐢宠澶辫触锛屽綋鍓嶇櫥褰曡处鍙凤紙{}锛夋湭鍏宠仈鍛樺伐妗f锛屾棤娉曠‘瀹氱敵璇蜂汉鍜岄儴闂ㄣ�傝浣跨敤宸插叧鑱斿憳宸ユ。妗堢殑璐﹀彿鐧诲綍锛屾垨鍏堝湪銆屽憳宸ユ。妗堛�嶄腑缁存姢褰撳墠璐﹀彿鍚庡啀鎻愪氦");
// ========== 钖叕绠$悊 1-030-005-000 ==========
ErrorCode SALARY_STRUCTURE_NOT_EXISTS = new ErrorCode(1_030_005_000, "钖叕缁撴瀯涓嶅瓨鍦�");
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceExceptionPageReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceExceptionPageReqVO.java
index db5db32..225c1dc 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceExceptionPageReqVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceExceptionPageReqVO.java
@@ -6,6 +6,8 @@
import lombok.EqualsAndHashCode;
import lombok.ToString;
+import java.time.LocalDate;
+
@Schema(description = "绠$悊鍚庡彴 - 鑰冨嫟寮傚父鐢宠鍒嗛〉 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@@ -27,4 +29,7 @@
@Schema(description = "鐘舵��", example = "0")
private Integer status;
+ @Schema(description = "寮傚父鏃ユ湡鍖洪棿锛屼紶 [寮�濮嬫棩鏈�, 缁撴潫鏃ユ湡]", example = "[\"2026-01-01\", \"2026-12-31\"]")
+ private LocalDate[] date;
+
}
\ No newline at end of file
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java
index 7cc071c..6441617 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/attendance/HrmAttendanceExceptionMapper.java
@@ -7,6 +7,8 @@
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceExceptionDO;
import org.apache.ibatis.annotations.Mapper;
+import java.time.LocalDate;
+
/**
* 鑰冨嫟寮傚父鐢宠 Mapper
*
@@ -16,13 +18,18 @@
public interface HrmAttendanceExceptionMapper extends BaseMapperX<HrmAttendanceExceptionDO> {
default PageResult<HrmAttendanceExceptionDO> selectPage(HrmAttendanceExceptionPageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<HrmAttendanceExceptionDO>()
+ LambdaQueryWrapperX<HrmAttendanceExceptionDO> query = new LambdaQueryWrapperX<HrmAttendanceExceptionDO>()
.likeIfPresent(HrmAttendanceExceptionDO::getNo, reqVO.getNo())
.eqIfPresent(HrmAttendanceExceptionDO::getUserId, reqVO.getUserId())
.eqIfPresent(HrmAttendanceExceptionDO::getDeptId, reqVO.getDeptId())
.eqIfPresent(HrmAttendanceExceptionDO::getType, reqVO.getType())
- .eqIfPresent(HrmAttendanceExceptionDO::getStatus, reqVO.getStatus())
- .orderByDesc(HrmAttendanceExceptionDO::getId));
+ .eqIfPresent(HrmAttendanceExceptionDO::getStatus, reqVO.getStatus());
+ // 寮傚父鏃ユ湡鍖洪棿绛涢��
+ LocalDate[] dateRange = reqVO.getDate();
+ if (dateRange != null && dateRange.length >= 2 && dateRange[0] != null && dateRange[1] != null) {
+ query.between(HrmAttendanceExceptionDO::getExceptionDate, dateRange[0], dateRange[1]);
+ }
+ return selectPage(reqVO, query.orderByDesc(HrmAttendanceExceptionDO::getId));
}
default HrmAttendanceExceptionDO selectByNo(String no) {
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java
index 625be8e..08474c4 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java
@@ -8,8 +8,12 @@
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceExceptionPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceExceptionSaveReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceExceptionDO;
+import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
import cn.iocoder.yudao.module.hrm.dal.mysql.attendance.HrmAttendanceExceptionMapper;
+import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
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 cn.iocoder.yudao.module.hrm.dal.redis.HrmNoRedisDAO;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import jakarta.annotation.Resource;
@@ -36,6 +40,10 @@
@Resource
private HrmAttendanceExceptionMapper attendanceExceptionMapper;
@Resource
+ private HrmEmployeeService employeeService;
+ @Resource
+ private AdminUserApi adminUserApi;
+ @Resource
private HrmNoRedisDAO noRedisDAO;
@Resource
private BpmProcessInstanceApi bpmProcessInstanceApi;
@@ -48,6 +56,18 @@
public Long createAttendanceException(HrmAttendanceExceptionSaveReqVO createReqVO) {
HrmAttendanceExceptionDO attendanceException = BeanUtils.toBean(createReqVO, HrmAttendanceExceptionDO.class);
attendanceException.setNo(generateNo());
+ // 鐢宠浜洪粯璁や负褰撳墠鐧诲綍鐢ㄦ埛瀵瑰簲鐨勫憳宸ワ紝鍓嶇琛ㄥ崟涓嶉�夋嫨鐢宠浜�
+ Long loginUserId = cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId();
+ HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
+ if (employee == null) {
+ AdminUserRespDTO loginUser = adminUserApi.getUser(loginUserId);
+ throw exception(ATTENDANCE_EXCEPTION_EMPLOYEE_NOT_EXISTS,
+ loginUser != null ? loginUser.getNickname() : String.valueOf(loginUserId));
+ }
+ attendanceException.setUserId(employee.getId());
+ if (attendanceException.getDeptId() == null) {
+ attendanceException.setDeptId(employee.getDeptId());
+ }
attendanceException.setStatus(HrmAuditStatusEnum.DRAFT.getStatus());
attendanceExceptionMapper.insert(attendanceException);
storageAttachmentApi.bindAttachments("file", "hrm_attendance_exception",
--
Gitblit v1.9.3