From fbaeeeff5704f210bc6347454c0f16d255001822 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 04 十一月 2026 16:32:09 +0800
Subject: [PATCH] refactor(srm): 重构供应商采购域,新增询价比价与保证金管理
---
docs/project-business/data/roles.json | 2
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryPageReqVO.java | 37
docs/project-business/mermaid/08-module-relation.mmd | 4
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/bond/SrmBidBondService.java | 27
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierBankRespVO.java | 37
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquirySupplierDO.java | 36
sql/mysql/finance_module_init.sql | 24
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/statement/ErpSupplierStatementReqVO.java | 31
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/number/MoneyUtils.java | 20
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryMapper.java | 42
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/BidBondRefundStatusEnum.java | 32
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryQuoteSaveReqVO.java | 52
docs/project-business/index.html | 58
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInvoiceMapper.java | 15
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryQuoteDO.java | 52
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryItemDO.java | 57
yudao-module-srm/src/main/resources/sql/srm_test_data.sql | 101
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmBidBondDO.java | 59
sql/mysql/srm_procurement_refactor_20261103.sql | 329 +++
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/bond/vo/SrmBidBondPageReqVO.java | 43
docs/project-business/data/flows.json | 7
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java | 26
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/ErrorCodeConstants.java | 87
sql/mysql/finance_menu_init.sql | 95
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierStatementController.java | 36
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/SrmSupplierController.java | 13
sql/mysql/srm_legacy_tables_backup_20261103.sql | 351 +++
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/bond/SrmBidBondController.java | 66
yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpSupplierReferenceApi.java | 22
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java | 18
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierMapper.java | 18
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/bond/SrmBidBondServiceImpl.java | 242 ++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderService.java | 9
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryConfirmRespVO.java | 36
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/bond/vo/SrmBidBondSaveReqVO.java | 57
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/supplier/SrmSupplierService.java | 16
yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/dto/ErpPurchaseOrderCreateReqDTO.java | 9
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/InquiryStatusEnum.java | 32
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderApiImpl.java | 11
docs/project-business/mermaid/03-purchase-flow.mmd | 12
docs/project-business/data/modules.json | 18
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierPageReqVO.java | 6
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/statement/ErpSupplierStatementRespVO.java | 96 +
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryRespVO.java | 119 +
yudao-module-srm/src/main/resources/sql/srm_menu_init.sql | 118
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/SrmInquiryController.java | 117 +
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryOrderMapper.java | 29
yudao-module-srm/src/main/resources/sql/srm_init.sql | 378 +--
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryItemMapper.java | 25
yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderApi.java | 8
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpSupplierReferenceApiImpl.java | 39
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierBankSaveReqVO.java | 40
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquirySupplierMapper.java | 34
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/supplier/SrmSupplierServiceImpl.java | 231 ++
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryQuoteMapper.java | 35
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryDO.java | 53
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryOrderDO.java | 14
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryConfirmReqVO.java | 34
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierSaveReqVO.java | 7
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java | 6
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/bond/vo/SrmBidBondRespVO.java | 65
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquirySaveReqVO.java | 131 +
docs/project-business/mermaid/01-business-mindmap.mmd | 8
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryServiceImpl.java | 688 +++++++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementService.java | 17
docs/project-business/data/objects.json | 13
/dev/null | 504 -----
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementServiceImpl.java | 163 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpPurchaseOrderSourceTypeEnum.java | 3
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierBankMapper.java | 29
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierRespVO.java | 7
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmBidBondMapper.java | 33
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryService.java | 60
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierBankDO.java | 46
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java | 17
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/LogRecordConstants.java | 49
76 files changed, 4,275 insertions(+), 1,186 deletions(-)
diff --git a/docs/project-business/data/flows.json b/docs/project-business/data/flows.json
index fe8b502..5a53ac8 100644
--- a/docs/project-business/data/flows.json
+++ b/docs/project-business/data/flows.json
@@ -10,15 +10,16 @@
{"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": "渚涘簲鍟嗘。妗�(澶氳仈绯讳汉/澶氶摱琛屄峰惈閾惰琛屽彿) 鈫� 璇环姣斾环(浜у搧脳渚涘簲鍟嗘í鍚戞姤浠凤紝鎸変骇鍝侀�変腑鏍�) 鈫� 纭鍚庢寜涓爣渚涘簲鍟嗘媶閲囪喘璁㈠崟鑽夌骞惰蛋鐜版湁 BPM 鈫� 纭鏀惰揣鐢熸垚 MES 鍒拌揣閫氱煡 鈫� IQC(鍚堟牸/鐗归噰鍏ュ簱路閫�璐�/鎶ュ簾) 鈫� 閲囪喘鍏ュ簱鍥炲啓璁㈠崟涓庣敵璇� 鈫� 鏉ョエ(AI OCR) 鈫� 浠樻鍗� BPM 鈫� 渚涘簲鍟嗗線鏉ュ璐︼紱鎶曟爣淇濊瘉閲戝彴璐︾嫭绔嬭褰曚腑鏍囦笌閫�鍥炪��",
"steps": [
- {"stage": "瀵绘簮", "action": "渚涘簲鍟嗗噯鍏�(BPM)寤烘。锛涙嫑鏍囧畬鏁寸増鎴栫畝鏄撴瘮浠凤紝瀹氭爣瀹℃壒閫氳繃鑷姩鐢熸垚閲囪喘璁㈠崟", "roles": ["閲囪喘寮�鍙�"]},
+ {"stage": "瀵绘簮", "action": "渚涘簲鍟嗘。妗堢淮鎶ゅ涓仈绯讳汉涓庡涓摱琛岃处鎴�(鍚摱琛岃鍙�)锛涙柊澧炶浠峰崟鏃朵竴骞跺綍鍏ヤ骇鍝伱楀弬涓庝緵搴斿晢鎶ヤ环骞堕�夊畾姣忎釜浜у搧鐨勪腑鏍囦緵搴斿晢锛屽垪琛ㄧ洿鎺ョ‘璁ゅ悗鎸変腑鏍囦緵搴斿晢鐢熸垚閲囪喘璁㈠崟鑽夌锛涙姇鏍囦繚璇侀噾鍙拌处璁板綍鏄惁涓爣涓庨��鍥炵姸鎬�/閲戦/鏃ユ湡", "roles": ["閲囪喘鍛�", "渚涘簲鍟嗙鐞嗗憳"]},
{"stage": "鐢宠", "action": "閲囪喘鐢宠(CGSQ)鎻愪氦 BPM锛岄┏鍥炲彲閲嶇疆鍥炶崏绋匡紱閫氳繃涓旀湁渚涘簲鍟嗚嚜鍔ㄧ敓鎴愯鍗�", "roles": ["閲囪喘鍛�", "瀹℃壒浜�"]},
{"stage": "涓嬪崟", "action": "閲囪喘璁㈠崟(CGDD)鑷姩鎻愪氦 BPM(15鈫�20)", "roles": ["閲囪喘鍛�"]},
{"stage": "鏀惰揣", "action": "纭鏀惰揣鐢熸垚鍒拌揣閫氱煡(0鈫掑緟璐ㄦ2/寰呭叆搴�3鈫�4)锛涢渶妫�鐗╂枡鑷姩鍒涘缓 IQC", "roles": ["浠撶", "IQC 璐ㄦ鍛�"]},
{"stage": "鍏ュ簱", "action": "IQC 鍚堟牸/鐗归噰鈫掗噰璐叆搴�(寰呬笂鏋垛啋寰呮墽琛屸啋瀹屾垚)搴撳瓨+锛屽洖鍐欒鍗� inCount/inStatus 涓庣敵璇锋槑缁�", "roles": ["浠撶"]},
{"stage": "閫�璐�", "action": "IQC 涓嶅悎鏍奸��璐р啋渚涘簲鍟嗛��璐у嚭搴�(閫夋枡閿佸畾鍒拌鍗曡)锛涙姤搴熻蛋 NCR", "roles": ["浠撶"]},
- {"stage": "浠樻", "action": "閲囪喘鏉ョエ(FPD, AI OCR, 鈮よ鍗曟�讳环) 鈫� 浠樻鍗�(FKD 鍏宠仈鏉ョエ+闄勪欢, 鈮ゆ潵绁ㄩ噾棰�) BPM 瀹℃壒", "roles": ["璐㈠姟", "瀹℃壒浜�"]}]},
+ {"stage": "浠樻", "action": "閲囪喘鏉ョエ(FPD, AI OCR, 鈮よ鍗曟�讳环) 鈫� 浠樻鍗�(FKD 鍏宠仈鏉ョエ+闄勪欢, 鈮ゆ潵绁ㄩ噾棰�) BPM 瀹℃壒", "roles": ["璐㈠姟", "瀹℃壒浜�"]},
+ {"stage": "瀵硅处", "action": "渚涘簲鍟嗗線鏉ユ寜渚涘簲鍟嗘眹鎬伙細宸︿晶閲囪喘璁㈠崟娴佹按鍚凡寮�绁�/鏈紑绁ㄩ噾棰濓紝鍙充晶鏉ョエ娴佹按鍚紑绁ㄩ噾棰�/宸蹭粯/鍓╀綑搴斾粯骞堕檮浠樻娴佹按锛岄《閮ㄦ眹鎬荤疮璁¢噰璐�/寮�绁�/浠樻/鏈粯浣欓", "roles": ["璐㈠姟", "閲囪喘鍛�"]}]},
{"id": "production", "name": "鐢熶骇娴佺▼", "mermaid": "mermaid/04-production-flow.mmd", "color": "#e0b34f",
"summary": "閿�鍞鍗曢┍鍔� MPS 鈫� 涓嬪彂宸ュ崟 鈫� 鎸夊伐鑹鸿矾绾挎媶宸ュ簭浠诲姟 鈫� 棰嗘枡/绾胯竟澶囨枡 鈫� 鎶ュ伐(宸ュ簭椤哄簭纭牎楠�+BPM) 鈫� 鍊掑啿娑堣��/浜у嚭鍏ュ簱/IPQC 鈫� 鏈亾宸ュ簭鍥炲啓杩涘害 鈫� 鑷姩瀹屽伐 鈫� ProductionFinishedEvent 鍥炲啓閿�鍞鍗曘��",
"steps": [
diff --git a/docs/project-business/data/modules.json b/docs/project-business/data/modules.json
index fe1cf79..c580fee 100644
--- a/docs/project-business/data/modules.json
+++ b/docs/project-business/data/modules.json
@@ -17,20 +17,20 @@
"upstream": ["涓绘暟鎹�(鐗╂枡)"], "downstream": ["杩涢攢瀛�(閿�鍞鍗�)", "鍞悗(瀹㈡埛)", "AI(鎶ヤ环OCR)"],
"coreTables": ["crm_clue", "crm_customer", "crm_contact", "crm_business", "crm_sale_quotation", "crm_contract", "crm_invoice", "crm_receivable", "crm_receivable_plan", "crm_permission"]},
{"key": "srm", "name": "渚涘簲鍟嗙鐞�", "color": "#c9a86a", "tag": "SRM", "flow": "purchase",
- "positioning": "渚涘簲鍟嗗叏鐢熷懡鍛ㄦ湡锛氬噯鍏�-璧勮川-瀵绘簮-缁╂晥",
- "problem": "渚涘簲鍟嗗悎瑙勫噯鍏ャ�侀槼鍏夊婧�(鎷涙爣/姣斾环)涓庣哗鏁堥噺鍖�",
- "features": ["渚涘簲鍟嗘。妗堜笌鍒嗙被", "鍑嗗叆鐢宠(BPM 閲囪喘/璐ㄩ噺/璐㈠姟浼氱)", "璧勮川璇佷功鏈夋晥鏈�", "鎷涙爣锛氬叕寮�/閭�璇�/绔炶皥瀹屾暣鐗�+姣斾环绠�鏄撶増", "鎶曟爣路鎶ヤ环路寮�鏍嚶疯瘎鏍嚶峰畾鏍�", "瀹氭爣鑷姩鐢熸垚閲囪喘璁㈠崟", "鍥涚淮缁╂晥(璐ㄩ噺/浜や粯/浠锋牸/鏈嶅姟)"],
- "objects": ["渚涘簲鍟�", "鍑嗗叆鐢宠", "璧勮川璇佷功", "鎷涙爣椤圭洰", "鎶曟爣", "瀹氭爣", "缁╂晥璇勪环"],
- "roles": ["閲囪喘寮�鍙�", "渚涘簲鍟嗙鐞嗗憳", "璇勫涓撳"],
+ "positioning": "渚涘簲鍟嗘。妗� + 璇环姣斾环 + 鎶曟爣淇濊瘉閲�",
+ "problem": "渚涘簲鍟嗕俊鎭寮�鎴疯/澶氳仈绯讳汉缁存姢锛岄噰璐婧愭寜浜у搧妯悜姣斾环骞跺揩閫熻浆涓洪噰璐鍗�",
+ "features": ["渚涘簲鍟嗘。妗堜笌鍒嗙被", "澶氳仈绯讳汉/澶氶摱琛岃处鎴�(鍚摱琛岃鍙�)", "璇环鍗曪細鏂板鏃朵竴骞跺綍鍏ヤ骇鍝佽脳鍙備笌渚涘簲鍟嗘姤浠�", "姣忎釜浜у搧鍗曠嫭閫夊畾涓爣渚涘簲鍟�", "纭鍚庢寜涓爣渚涘簲鍟嗘媶鍒嗙敓鎴愰噰璐鍗曡崏绋�", "鎶曟爣淇濊瘉閲戝彴璐�(鏄惁涓爣/閫�鍥炵姸鎬侀噾棰濇棩鏈�)"],
+ "objects": ["渚涘簲鍟�", "璇环姣斾环", "鎶曟爣淇濊瘉閲�"],
+ "roles": ["閲囪喘鍛�", "渚涘簲鍟嗙鐞嗗憳"],
"upstream": ["涓绘暟鎹�(鐗╂枡)"], "downstream": ["杩涢攢瀛�(閲囪喘璁㈠崟)"],
- "coreTables": ["srm_supplier", "srm_supplier_apply", "srm_supplier_certificate", "srm_tender_project", "srm_tender_bid", "srm_bid_award", "srm_supplier_evaluation"]},
+ "coreTables": ["srm_supplier", "srm_supplier_contact", "srm_supplier_bank", "srm_supplier_category", "srm_inquiry", "srm_inquiry_item", "srm_inquiry_supplier", "srm_inquiry_quote", "srm_inquiry_order", "srm_bid_bond"]},
{"key": "erp", "name": "杩涢攢瀛樹笌璐㈠姟", "color": "#5fc79e", "tag": "ERP", "flow": "purchase",
"positioning": "鍟嗚锤涓庤祫閲戝崟鎹腑鏋紝鍚� MES 鍙戣捣瀹炵墿鏀跺彂",
"problem": "閲囪喘閿�鍞崟鎹鎵广�佹潵绁ㄤ粯娆炬帶鍒躲�佽鍗曟墽琛岃繘搴﹀洖鍐�",
- "features": ["閲囪喘鐢宠(BPM)鈫掕鍗�(鑷姩/鎵嬪姩鐢熸垚)", "纭鏀惰揣鈫扢ES鍒拌揣閫氱煡", "鍏ュ簱/閫�璐ф暟閲忕姸鎬佸洖鍐�", "閲囪喘鏉ョエ(閲戦鈮よ鍗�)", "浠樻鍗�(蹇呴』鍏宠仈鏉ョエ路BPM)", "閿�鍞鍗�(BPM路瀹℃壒閫氳繃鑷姩寤篗PS)", "鍑哄簱鐘舵�佸洖鍐�", "鏀舵鍗�(鍏宠仈CRM瀹㈡埛)", "缁撶畻璐︽埛", "AI鍙戠エOCR"],
- "objects": ["閲囪喘鐢宠", "閲囪喘璁㈠崟", "閲囪喘鏉ョエ", "浠樻鍗�", "閿�鍞鍗�", "鏀舵鍗�", "缁撶畻璐︽埛"],
+ "features": ["閲囪喘鐢宠(BPM)鈫掕鍗�(鑷姩/鎵嬪姩鐢熸垚)", "纭鏀惰揣鈫扢ES鍒拌揣閫氱煡", "鍏ュ簱/閫�璐ф暟閲忕姸鎬佸洖鍐�", "閲囪喘鏉ョエ(閲戦鈮よ鍗�)", "浠樻鍗�(蹇呴』鍏宠仈鏉ョエ路BPM)", "渚涘簲鍟嗗線鏉�(璁㈠崟/鏉ョエ/浠樻涓夋祦姘绰峰乏鍙冲睍绀哄紑绁ㄩ噾棰�)", "閿�鍞鍗�(BPM路瀹℃壒閫氳繃鑷姩寤篗PS)", "鍑哄簱鐘舵�佸洖鍐�", "鏀舵鍗�(鍏宠仈CRM瀹㈡埛)", "缁撶畻璐︽埛", "AI鍙戠エOCR"],
+ "objects": ["閲囪喘鐢宠", "閲囪喘璁㈠崟", "閲囪喘鏉ョエ", "浠樻鍗�", "渚涘簲鍟嗗線鏉�", "閿�鍞鍗�", "鏀舵鍗�", "缁撶畻璐︽埛"],
"roles": ["閲囪喘鍛�", "閿�鍞憳", "鍑虹撼", "浼氳"],
- "upstream": ["CRM(鍚堝悓)", "SRM(瀹氭爣)", "涓绘暟鎹�"], "downstream": ["鐢熶骇(MPS)", "浠撳偍(鏀跺彂)"],
+ "upstream": ["CRM(鍚堝悓)", "SRM(璇环纭)", "涓绘暟鎹�"], "downstream": ["鐢熶骇(MPS)", "浠撳偍(鏀跺彂)"],
"coreTables": ["erp_purchase_request", "erp_purchase_order", "erp_purchase_invoice", "erp_finance_payment", "erp_sale_order", "erp_finance_receipt", "erp_account"]},
{"key": "finance", "name": "璐㈠姟绠$悊锛堜細璁℃牳绠楋級", "color": "#3ec9a7", "tag": "FIN", "flow": "finance",
"positioning": "鐙珛鏍哥畻妯″潡锛氫細璁℃牳绠� + 璧勪骇鏍哥畻 + 璐㈠姟鎶ヨ〃鐪嬫澘锛堜笌 ERP 杩涢攢瀛樿储鍔″崟鎹垎绂伙紝yudao-module-finance锛�",
diff --git a/docs/project-business/data/objects.json b/docs/project-business/data/objects.json
index 91b5ace..8b93d33 100644
--- a/docs/project-business/data/objects.json
+++ b/docs/project-business/data/objects.json
@@ -11,13 +11,14 @@
{"name": "鍙戠エ", "module": "閿�鍞鐞�", "table": "crm_invoice", "doc": "KP缂栧彿锛堝彲鐣欑┖鑷姩鐢熸垚銆佺郴缁熷唴鍞竴锛夛紝BPM 瀹℃壒锛岀疮璁″紑绁ㄢ墹鍚堝悓棰濓紝闄勪欢蹇呬紶锛涙敮鎸� Excel 瀵煎叆锛堜粎鏂板涓嶆洿鏂帮紝鍚堝悓椤诲鏍搁�氳繃涓旀湰娆¢噾棰濃墹鍚堝悓鍓╀綑鍙紑绁ㄩ锛涘悓涓�鎵规暟鎹笉鍙噸澶嶅鍏モ�斺�斿悓鍚堝悓涓嬪彂绁ㄥ彿鐮佺浉鍚屻�佹垨鍙戠エ鍙风爜鐣欑┖鏃跺紑绁ㄩ噾棰�+鍙戠エ鎶ご+寮�绁ㄦ棩鏈熺浉鍚屽嵆鍒ら噸澶嶏紝鏂囦欢鍐呴噸澶嶈涓庡簱鍐呭凡鏈夊崟閮芥嫆璇ヨ骞跺洖鏄剧淮搴︿笌瀹為檯鍊硷級", "upstream": ["鍚堝悓"], "downstream": ["鍥炴"], "keywords": "寮�绁� 鍙戠エ invoice 瀵煎叆 鍘婚噸"},
{"name": "鍥炴", "module": "閿�鍞鐞�", "table": "crm_receivable", "doc": "HK缂栧彿锛屽垱寤哄嵆瀹℃壒涓�(鎵嬪姩瀹℃牳)锛屽己鍒跺厛寮�绁紝閲戦鍙屾牎楠�", "upstream": ["鍚堝悓", "鍙戠エ"], "downstream": ["鏀舵鍗�(鍏宠仈)"], "keywords": "鍥炴 鏀舵璁″垝 receivable"},
{"name": "閿�鍞洰鏍�", "module": "閿�鍞鐞�", "table": "crm_sales_target", "doc": "骞�/瀛�/鏈埫椾釜浜�/閮ㄩ棬/浜у搧缁村害鐨勫悎鍚屽洖娆剧瓑鐩爣", "upstream": [], "downstream": ["涓氱哗缁熻"], "keywords": "鐩爣 target 涓氱哗"},
- {"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": "srm_supplier", "doc": "渚涘簲鍟嗘。妗堬細鎵х収/绋庡彿锛涘涓仈绯讳汉(srm_supplier_contact)涓庡涓摱琛岃处鎴�(srm_supplier_bank路鍚摱琛岃鍙�)锛屼富琛ㄤ繚鐣欓粯璁よ仈绯讳汉/榛樿閾惰瀛楁锛孍RP 涓� MES 鍏辩敤", "upstream": ["鎵嬪伐寤烘。/Excel 瀵煎叆"], "downstream": ["璇环姣斾环", "鎶曟爣淇濊瘉閲�", "閲囪喘璁㈠崟", "鍒拌揣閫氱煡", "渚涘簲鍟嗛��璐�", "渚涘簲鍟嗗線鏉�"], "keywords": "渚涘簲鍟� supplier vendor 鑱旂郴浜� 寮�鎴疯 閾惰琛屽彿"},
+ {"name": "璇环姣斾环", "module": "渚涘簲鍟嗙鐞�", "table": "srm_inquiry", "doc": "XJ缂栧彿锛岃崏绋�0鈫掑凡杞鍗�20鈫掑凡鍙栨秷30(10璇环涓负鍘嗗彶鐘舵��)锛涙柊澧�/缂栬緫鏃朵竴骞跺綍鍏ヤ骇鍝佽脳鍙備笌渚涘簲鍟嗘姤浠�(srm_inquiry_quote)骞堕�夊畾姣忎釜浜у搧鐨勪腑鏍囦緵搴斿晢锛屾棤闇�鍗曠嫭鐨勬姤浠�/姣斾环姝ラ锛岀‘璁ゅ悗鎸変腑鏍囦緵搴斿晢鎷嗗垎鐢熸垚閲囪喘璁㈠崟鑽夌骞惰褰� srm_inquiry_order", "upstream": ["渚涘簲鍟�", "涓绘暟鎹�(鐗╂枡)"], "downstream": ["閲囪喘璁㈠崟(鑽夌)"], "keywords": "璇环 姣斾环 鎶ヤ环 涓爣 inquiry quote"},
+ {"name": "鎶曟爣淇濊瘉閲�", "module": "渚涘簲鍟嗙鐞�", "table": "srm_bid_bond", "doc": "BZ缂栧彿鍙拌处锛屽叧鑱斾緵搴斿晢/璇环鍗�/閲囪喘璁㈠崟锛岃褰曚繚璇侀噾閲戦銆佺即绾虫棩鏈熴�佹槸鍚︿腑鏍囥�侀��鍥炵姸鎬�(0鏈��1閮ㄥ垎2宸查��3鏃犻渶閫�)/閫�鍥為噾棰�/閫�鍥炴棩鏈�", "upstream": ["渚涘簲鍟�", "璇环姣斾环", "閲囪喘璁㈠崟"], "downstream": ["渚涘簲鍟嗗線鏉�(鍙傝��)"], "keywords": "鎶曟爣淇濊瘉閲� 涓爣 閫�鍥� bid bond"},
{"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_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_purchase_order", "doc": "CGDD缂栧彿锛孊PM 瀹℃壒(鑽夌0鈫掑鎵逛腑15鈫掑凡瀹℃牳20)锛屽叆搴撶姸鎬�:鏈�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": "鏃犵嫭绔嬭〃(鑱氬悎瑙嗗浘)", "doc": "鎸変緵搴斿晢+鏃堕棿鑼冨洿鑱氬悎閲囪喘璁㈠崟/鏉ョエ/浠樻锛氭眹鎬荤疮璁¢噰璐銆佺疮璁″紑绁ㄩ銆佺疮璁′粯娆鹃銆佹湭浠樹綑棰濓紱宸︿晶璁㈠崟琛屽惈宸插紑绁�/鏈紑绁ㄩ噾棰濓紝鍙充晶鏉ョエ琛屽惈寮�绁ㄩ噾棰�/宸蹭粯/鍓╀綑搴斾粯", "upstream": ["閲囪喘璁㈠崟", "閲囪喘鏉ョエ", "浠樻鍗�"], "downstream": [], "keywords": "渚涘簲鍟嗗線鏉� 瀵硅处 寮�绁ㄩ噾棰� 搴斾粯 statement"},
{"name": "鏀舵鍗�", "module": "璐㈠姟", "table": "erp_finance_receipt", "doc": "SKD缂栧彿锛屽叧鑱� CRM 瀹㈡埛鏍¢獙锛屾棤 BPM(鎵嬪姩瀹℃牳)", "upstream": ["閿�鍞�(寮卞叧鑱�)"], "downstream": ["缁撶畻璐︽埛"], "keywords": "鏀舵 搴旀敹 receipt"},
{"name": "浼氳绉戠洰", "module": "浼氳鏍哥畻", "table": "fin_account_subject", "doc": "绉戠洰鏍戯紝parent_id 鑷叧鑱旓紱绉戠洰绫诲瀷1璧勪骇2璐熷��3鏉冪泭4鎴愭湰5鎹熺泭锛屼綑棰濇柟鍚�1鍊�2璐凤紝鐘舵��0鍚敤1绂佺敤锛涜处琛ㄤ笌鍒嗗綍缁熶竴鎸� subject_code 鍙栨暟", "upstream": ["浼氳绉戠洰绉嶅瓙绾�68鏉′竴绾х鐩�"], "downstream": ["璁拌处鍑瘉鍒嗗綍", "鎬昏处", "鏄庣粏璐�"], "keywords": "浼氳绉戠洰 绉戠洰 subject account 璧勪骇绫� 璐熷�虹被 鎹熺泭绫�"},
{"name": "璁拌处鍑瘉", "module": "浼氳鏍哥畻", "table": "fin_voucher", "doc": "鍑瘉瀛楀彿鍙暀绌虹敱鍚庣鑷姩鐢熸垚锛涚姸鎬� 鏈繃璐�0/宸茶繃璐�10/宸蹭綔搴�20锛涘凡杩囪处涓嶅彲鏀癸紝鏈繃璐︿笌宸茶繃璐﹀潎鍙綔搴燂紝鏈繃璐︿笌宸蹭綔搴熷彲鍒犻櫎锛涢檮浠舵寜 recordType=fin_voucher 鎸傜郴缁熼檮浠朵腑蹇�", "upstream": ["浼氳绉戠洰"], "downstream": ["鎬昏处", "鏄庣粏璐�", "璐㈠姟鎶ヨ〃鐪嬫澘"], "keywords": "璁拌处鍑瘉 鍑瘉 voucher 杩囪处 浣滃簾 鍊熻捶骞宠 "},
diff --git a/docs/project-business/data/roles.json b/docs/project-business/data/roles.json
index bf74e87..8305db5 100644
--- a/docs/project-business/data/roles.json
+++ b/docs/project-business/data/roles.json
@@ -10,7 +10,7 @@
{"role": "閿�鍞唴鍕�/閿�鍞�", "modules": ["CRM", "ERP"], "operations": ["绾跨储瀹㈡埛鍟嗘満缁存姢", "鎶ヤ环涓庡悎鍚�", "閿�鍞鍗�", "璺熻繘璁板綍"], "data": ["crm_*", "erp_sale_order"], "scope": "璐熻矗浜�(owner)+鏁版嵁鏉冮檺涓夌骇锛氬彧璇�/璇诲啓/璐熻矗浜猴紱鍏捣姹犲彲棰嗗彇锛涗氦鎺ヤ汉搴斿彲閫氳繃 expandUserIds 鐪嬪埌绂昏亴浜烘暟鎹�(鎺ュ彛宸插銆佸緟鎺ュ叆)"},
{"role": "閿�鍞粡鐞�", "modules": ["CRM"], "operations": ["鍟嗘満/鍚堝悓瀹℃壒鍙備笌", "閿�鍞洰鏍囧埗瀹�", "涓氱哗鎺掑悕婕忔枟鍒嗘瀽"], "data": ["鍥㈤槦鏁版嵁(涓嬪睘鐢ㄦ埛)"], "scope": "AdminUserApi 涓嬬骇鐢ㄦ埛鎵╁睍"},
{"role": "閲囪喘鍛�", "modules": ["ERP", "SRM"], "operations": ["閲囪喘鐢宠/璁㈠崟", "纭鏀惰揣", "鏉ョエ涓庝粯娆惧彂璧�"], "data": ["erp_purchase_*", "srm_*"], "scope": "requestUserId/supplierOwner 褰掑睘"},
- {"role": "閲囪喘寮�鍙�/渚涘簲鍟嗙鐞嗗憳", "modules": ["SRM"], "operations": ["鍑嗗叆瀹℃壒娴佽浆", "鎷涙爣姣斾环缁勭粐", "缁╂晥璇勪环"], "data": ["srm_supplier_apply", "srm_tender_*"], "scope": "BPM 澶氶儴闂ㄤ細绛�(閲囪喘/璐ㄩ噺/璐㈠姟)"},
+ {"role": "閲囪喘鍛�/渚涘簲鍟嗙鐞嗗憳", "modules": ["SRM"], "operations": ["渚涘簲鍟嗘。妗堢淮鎶�", "璇环姣斾环涓庣‘璁よ浆璁㈠崟", "鎶曟爣淇濊瘉閲戝彴璐�"], "data": ["srm_supplier*", "srm_inquiry*", "srm_bid_bond"], "scope": "閲囪喘绠$悊鑿滃崟鏉冮檺锛涜浠风‘璁ょ敓鎴愮殑閲囪喘璁㈠崟鑽夌璧� ERP BPM"},
{"role": "璁″垝鍛�", "modules": ["MES"], "operations": ["MPS 涓庡伐鍗�", "宸ヨ壓璺嚎缁存姢", "AI 棰勬祴鍙傝��"], "data": ["mes_pro_*"], "scope": "杞﹂棿/閮ㄩ棬鏁版嵁鑼冨洿"},
{"role": "鎿嶄綔宸�/鐝粍闀�", "modules": ["MES"], "operations": ["浠诲姟鎺ユ敹", "鎶ュ伐鎻愪氦(鍙楀伐搴忛『搴忕害鏉�)", "瀹夌伅"], "data": ["mes_pro_feedback", "mes_pro_task"], "scope": "浠诲姟鎸囨淳浜哄彲瑙�"},
{"role": "浠撶鍛�", "modules": ["MES-WM"], "operations": ["15 绫诲嚭鍏ュ簱鍗曟嵁鎵ц", "璋冩嫧", "鐩樼偣", "鏉$爜瑁呯"], "data": ["mes_wm_*"], "scope": "浠撳簱缁村害锛沇MS 鍙寜浠撳簱閰嶇疆鍑哄叆搴�/璋冩嫧/鐩樼偣鏄惁璧� BPM"},
diff --git a/docs/project-business/index.html b/docs/project-business/index.html
index bc35438..1ec6812 100644
--- a/docs/project-business/index.html
+++ b/docs/project-business/index.html
@@ -350,13 +350,13 @@
"upstream": ["涓绘暟鎹�(鐗╂枡)"], "downstream": ["杩涢攢瀛�(閿�鍞鍗�)", "鍞悗(瀹㈡埛)", "AI(鎶ヤ环OCR)"],
"coreTables": ["crm_clue", "crm_customer", "crm_contact", "crm_business", "crm_sale_quotation", "crm_contract", "crm_invoice", "crm_receivable", "crm_receivable_plan", "crm_permission"]},
{"key": "srm", "name": "渚涘簲鍟嗙鐞�", "color": "#c9a86a", "tag": "SRM", "flow": "purchase",
- "positioning": "渚涘簲鍟嗗叏鐢熷懡鍛ㄦ湡锛氬噯鍏�-璧勮川-瀵绘簮-缁╂晥",
- "problem": "渚涘簲鍟嗗悎瑙勫噯鍏ャ�侀槼鍏夊婧�(鎷涙爣/姣斾环)涓庣哗鏁堥噺鍖�",
- "features": ["渚涘簲鍟嗘。妗堜笌鍒嗙被", "鍑嗗叆鐢宠(BPM 閲囪喘/璐ㄩ噺/璐㈠姟浼氱)", "璧勮川璇佷功鏈夋晥鏈�", "鎷涙爣锛氬叕寮�/閭�璇�/绔炶皥瀹屾暣鐗�+姣斾环绠�鏄撶増", "鎶曟爣路鎶ヤ环路寮�鏍嚶疯瘎鏍嚶峰畾鏍�", "瀹氭爣鑷姩鐢熸垚閲囪喘璁㈠崟", "鍥涚淮缁╂晥(璐ㄩ噺/浜や粯/浠锋牸/鏈嶅姟)"],
- "objects": ["渚涘簲鍟�", "鍑嗗叆鐢宠", "璧勮川璇佷功", "鎷涙爣椤圭洰", "鎶曟爣", "瀹氭爣", "缁╂晥璇勪环"],
- "roles": ["閲囪喘寮�鍙�", "渚涘簲鍟嗙鐞嗗憳", "璇勫涓撳"],
+ "positioning": "渚涘簲鍟嗘。妗� + 璇环姣斾环 + 鎶曟爣淇濊瘉閲�",
+ "problem": "渚涘簲鍟嗕俊鎭寮�鎴疯/澶氳仈绯讳汉缁存姢锛岄噰璐婧愭寜浜у搧妯悜姣斾环骞跺揩閫熻浆涓洪噰璐鍗�",
+ "features": ["渚涘簲鍟嗘。妗堜笌鍒嗙被", "澶氳仈绯讳汉/澶氶摱琛岃处鎴�(鍚摱琛岃鍙�)", "璇环鍗曪細鏂板鏃朵竴骞跺綍鍏ヤ骇鍝佽脳鍙備笌渚涘簲鍟嗘姤浠�", "姣忎釜浜у搧鍗曠嫭閫夊畾涓爣渚涘簲鍟�", "纭鍚庢寜涓爣渚涘簲鍟嗘媶鍒嗙敓鎴愰噰璐鍗曡崏绋�", "鎶曟爣淇濊瘉閲戝彴璐�(鏄惁涓爣/閫�鍥炵姸鎬侀噾棰濇棩鏈�)"],
+ "objects": ["渚涘簲鍟�", "璇环姣斾环", "鎶曟爣淇濊瘉閲�"],
+ "roles": ["閲囪喘鍛�", "渚涘簲鍟嗙鐞嗗憳"],
"upstream": ["涓绘暟鎹�(鐗╂枡)"], "downstream": ["杩涢攢瀛�(閲囪喘璁㈠崟)"],
- "coreTables": ["srm_supplier", "srm_supplier_apply", "srm_supplier_certificate", "srm_tender_project", "srm_tender_bid", "srm_bid_award", "srm_supplier_evaluation"]},
+ "coreTables": ["srm_supplier", "srm_supplier_contact", "srm_supplier_bank", "srm_supplier_category", "srm_inquiry", "srm_inquiry_item", "srm_inquiry_supplier", "srm_inquiry_quote", "srm_inquiry_order", "srm_bid_bond"]},
{"key": "erp", "name": "杩涢攢瀛樹笌璐㈠姟", "color": "#5fc79e", "tag": "ERP", "flow": "purchase",
"positioning": "鍟嗚锤涓庤祫閲戝崟鎹腑鏋紝鍚� MES 鍙戣捣瀹炵墿鏀跺彂",
"problem": "閲囪喘閿�鍞崟鎹鎵广�佹潵绁ㄤ粯娆炬帶鍒躲�佽鍗曟墽琛岃繘搴﹀洖鍐�",
@@ -465,13 +465,14 @@
{"name": "鍙戠エ", "module": "閿�鍞鐞�", "table": "crm_invoice", "doc": "KP缂栧彿锛堝彲鐣欑┖鑷姩鐢熸垚銆佺郴缁熷唴鍞竴锛夛紝BPM 瀹℃壒锛岀疮璁″紑绁ㄢ墹鍚堝悓棰濓紝闄勪欢蹇呬紶锛涙敮鎸� Excel 瀵煎叆锛堜粎鏂板涓嶆洿鏂帮紝鍚堝悓椤诲鏍搁�氳繃涓旀湰娆¢噾棰濃墹鍚堝悓鍓╀綑鍙紑绁ㄩ锛涘悓涓�鎵规暟鎹笉鍙噸澶嶅鍏モ�斺�斿悓鍚堝悓涓嬪彂绁ㄥ彿鐮佺浉鍚屻�佹垨鍙戠エ鍙风爜鐣欑┖鏃跺紑绁ㄩ噾棰�+鍙戠エ鎶ご+寮�绁ㄦ棩鏈熺浉鍚屽嵆鍒ら噸澶嶏紝鏂囦欢鍐呴噸澶嶈涓庡簱鍐呭凡鏈夊崟閮芥嫆璇ヨ骞跺洖鏄剧淮搴︿笌瀹為檯鍊硷級", "upstream": ["鍚堝悓"], "downstream": ["鍥炴"], "keywords": "寮�绁� 鍙戠エ invoice 瀵煎叆 鍘婚噸"},
{"name": "鍥炴", "module": "閿�鍞鐞�", "table": "crm_receivable", "doc": "HK缂栧彿锛屽垱寤哄嵆瀹℃壒涓�(鎵嬪姩瀹℃牳)锛屽己鍒跺厛寮�绁紝閲戦鍙屾牎楠�", "upstream": ["鍚堝悓", "鍙戠エ"], "downstream": ["鏀舵鍗�(鍏宠仈)"], "keywords": "鍥炴 鏀舵璁″垝 receivable"},
{"name": "閿�鍞洰鏍�", "module": "閿�鍞鐞�", "table": "crm_sales_target", "doc": "骞�/瀛�/鏈埫椾釜浜�/閮ㄩ棬/浜у搧缁村害鐨勫悎鍚屽洖娆剧瓑鐩爣", "upstream": [], "downstream": ["涓氱哗缁熻"], "keywords": "鐩爣 target 涓氱哗"},
- {"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": "srm_supplier", "doc": "渚涘簲鍟嗘。妗堬細鎵х収/绋庡彿锛涘涓仈绯讳汉(srm_supplier_contact)涓庡涓摱琛岃处鎴�(srm_supplier_bank路鍚摱琛岃鍙�)锛屼富琛ㄤ繚鐣欓粯璁よ仈绯讳汉/榛樿閾惰瀛楁锛孍RP 涓� MES 鍏辩敤", "upstream": ["鎵嬪伐寤烘。/Excel 瀵煎叆"], "downstream": ["璇环姣斾环", "鎶曟爣淇濊瘉閲�", "閲囪喘璁㈠崟", "鍒拌揣閫氱煡", "渚涘簲鍟嗛��璐�", "渚涘簲鍟嗗線鏉�"], "keywords": "渚涘簲鍟� supplier vendor 鑱旂郴浜� 寮�鎴疯 閾惰琛屽彿"},
+ {"name": "璇环姣斾环", "module": "渚涘簲鍟嗙鐞�", "table": "srm_inquiry", "doc": "XJ缂栧彿锛岃崏绋�0鈫掑凡杞鍗�20鈫掑凡鍙栨秷30(10璇环涓负鍘嗗彶鐘舵��)锛涙柊澧�/缂栬緫鏃朵竴骞跺綍鍏ヤ骇鍝佽脳鍙備笌渚涘簲鍟嗘姤浠�(srm_inquiry_quote)骞堕�夊畾姣忎釜浜у搧鐨勪腑鏍囦緵搴斿晢锛屾棤闇�鍗曠嫭鐨勬姤浠�/姣斾环姝ラ锛岀‘璁ゅ悗鎸変腑鏍囦緵搴斿晢鎷嗗垎鐢熸垚閲囪喘璁㈠崟鑽夌骞惰褰� srm_inquiry_order", "upstream": ["渚涘簲鍟�", "涓绘暟鎹�(鐗╂枡)"], "downstream": ["閲囪喘璁㈠崟(鑽夌)"], "keywords": "璇环 姣斾环 鎶ヤ环 涓爣 inquiry quote"},
+ {"name": "鎶曟爣淇濊瘉閲�", "module": "渚涘簲鍟嗙鐞�", "table": "srm_bid_bond", "doc": "BZ缂栧彿鍙拌处锛屽叧鑱斾緵搴斿晢/璇环鍗�/閲囪喘璁㈠崟锛岃褰曚繚璇侀噾閲戦銆佺即绾虫棩鏈熴�佹槸鍚︿腑鏍囥�侀��鍥炵姸鎬�(0鏈��1閮ㄥ垎2宸查��3鏃犻渶閫�)/閫�鍥為噾棰�/閫�鍥炴棩鏈�", "upstream": ["渚涘簲鍟�", "璇环姣斾环", "閲囪喘璁㈠崟"], "downstream": ["渚涘簲鍟嗗線鏉�(鍙傝��)"], "keywords": "鎶曟爣淇濊瘉閲� 涓爣 閫�鍥� bid bond"},
{"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_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_purchase_order", "doc": "CGDD缂栧彿锛孊PM 瀹℃壒(鑽夌0鈫掑鎵逛腑15鈫掑凡瀹℃牳20)锛屽叆搴撶姸鎬�:鏈�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": "鏃犵嫭绔嬭〃(鑱氬悎瑙嗗浘)", "doc": "鎸変緵搴斿晢+鏃堕棿鑼冨洿鑱氬悎閲囪喘璁㈠崟/鏉ョエ/浠樻锛氭眹鎬荤疮璁¢噰璐銆佺疮璁″紑绁ㄩ銆佺疮璁′粯娆鹃銆佹湭浠樹綑棰濓紱宸︿晶璁㈠崟琛屽惈宸插紑绁�/鏈紑绁ㄩ噾棰濓紝鍙充晶鏉ョエ琛屽惈寮�绁ㄩ噾棰�/宸蹭粯/鍓╀綑搴斾粯", "upstream": ["閲囪喘璁㈠崟", "閲囪喘鏉ョエ", "浠樻鍗�"], "downstream": [], "keywords": "渚涘簲鍟嗗線鏉� 瀵硅处 寮�绁ㄩ噾棰� 搴斾粯 statement"},
{"name": "鏀舵鍗�", "module": "璐㈠姟", "table": "erp_finance_receipt", "doc": "SKD缂栧彿锛屽叧鑱� CRM 瀹㈡埛鏍¢獙锛屾棤 BPM(鎵嬪姩瀹℃牳)", "upstream": ["閿�鍞�(寮卞叧鑱�)"], "downstream": ["缁撶畻璐︽埛"], "keywords": "鏀舵 搴旀敹 receipt"},
{"name": "浼氳绉戠洰", "module": "浼氳鏍哥畻", "table": "fin_account_subject", "doc": "绉戠洰鏍戯紝parent_id 鑷叧鑱旓紱绉戠洰绫诲瀷1璧勪骇2璐熷��3鏉冪泭4鎴愭湰5鎹熺泭锛屼綑棰濇柟鍚�1鍊�2璐凤紝鐘舵��0鍚敤1绂佺敤锛涜处琛ㄤ笌鍒嗗綍缁熶竴鎸� subject_code 鍙栨暟", "upstream": ["浼氳绉戠洰绉嶅瓙绾�68鏉′竴绾х鐩�"], "downstream": ["璁拌处鍑瘉鍒嗗綍", "鎬昏处", "鏄庣粏璐�"], "keywords": "浼氳绉戠洰 绉戠洰 subject account 璧勪骇绫� 璐熷�虹被 鎹熺泭绫�"},
{"name": "璁拌处鍑瘉", "module": "浼氳鏍哥畻", "table": "fin_voucher", "doc": "鍑瘉瀛楀彿鍙暀绌虹敱鍚庣鑷姩鐢熸垚锛涚姸鎬� 鏈繃璐�0/宸茶繃璐�10/宸蹭綔搴�20锛涘凡杩囪处涓嶅彲鏀癸紝鏈繃璐︿笌宸茶繃璐﹀潎鍙綔搴燂紝鏈繃璐︿笌宸蹭綔搴熷彲鍒犻櫎锛涢檮浠舵寜 recordType=fin_voucher 鎸傜郴缁熼檮浠朵腑蹇�", "upstream": ["浼氳绉戠洰"], "downstream": ["鎬昏处", "鏄庣粏璐�", "璐㈠姟鎶ヨ〃鐪嬫澘"], "keywords": "璁拌处鍑瘉 鍑瘉 voucher 杩囪处 浣滃簾 鍊熻捶骞宠 "},
@@ -521,15 +522,16 @@
{"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": "渚涘簲鍟嗘。妗�(澶氳仈绯讳汉/澶氶摱琛屄峰惈閾惰琛屽彿) 鈫� 璇环姣斾环(浜у搧脳渚涘簲鍟嗘í鍚戞姤浠凤紝鎸変骇鍝侀�変腑鏍�) 鈫� 纭鍚庢寜涓爣渚涘簲鍟嗘媶閲囪喘璁㈠崟鑽夌骞惰蛋鐜版湁 BPM 鈫� 纭鏀惰揣鐢熸垚 MES 鍒拌揣閫氱煡 鈫� IQC(鍚堟牸/鐗归噰鍏ュ簱路閫�璐�/鎶ュ簾) 鈫� 閲囪喘鍏ュ簱鍥炲啓璁㈠崟涓庣敵璇� 鈫� 鏉ョエ(AI OCR) 鈫� 浠樻鍗� BPM 鈫� 渚涘簲鍟嗗線鏉ュ璐︼紱鎶曟爣淇濊瘉閲戝彴璐︾嫭绔嬭褰曚腑鏍囦笌閫�鍥炪��",
"steps": [
- {"stage": "瀵绘簮", "action": "渚涘簲鍟嗗噯鍏�(BPM)寤烘。锛涙嫑鏍囧畬鏁寸増鎴栫畝鏄撴瘮浠凤紝瀹氭爣瀹℃壒閫氳繃鑷姩鐢熸垚閲囪喘璁㈠崟", "roles": ["閲囪喘寮�鍙�"]},
+ {"stage": "瀵绘簮", "action": "渚涘簲鍟嗘。妗堢淮鎶ゅ涓仈绯讳汉涓庡涓摱琛岃处鎴�(鍚摱琛岃鍙�)锛涙柊澧炶浠峰崟鏃朵竴骞跺綍鍏ヤ骇鍝伱楀弬涓庝緵搴斿晢鎶ヤ环骞堕�夊畾姣忎釜浜у搧鐨勪腑鏍囦緵搴斿晢锛屽垪琛ㄧ洿鎺ョ‘璁ゅ悗鎸変腑鏍囦緵搴斿晢鐢熸垚閲囪喘璁㈠崟鑽夌锛涙姇鏍囦繚璇侀噾鍙拌处璁板綍鏄惁涓爣涓庨��鍥炵姸鎬�/閲戦/鏃ユ湡", "roles": ["閲囪喘鍛�", "渚涘簲鍟嗙鐞嗗憳"]},
{"stage": "鐢宠", "action": "閲囪喘鐢宠(CGSQ)鎻愪氦 BPM锛岄┏鍥炲彲閲嶇疆鍥炶崏绋匡紱閫氳繃涓旀湁渚涘簲鍟嗚嚜鍔ㄧ敓鎴愯鍗�", "roles": ["閲囪喘鍛�", "瀹℃壒浜�"]},
{"stage": "涓嬪崟", "action": "閲囪喘璁㈠崟(CGDD)鑷姩鎻愪氦 BPM(15鈫�20)", "roles": ["閲囪喘鍛�"]},
{"stage": "鏀惰揣", "action": "纭鏀惰揣鐢熸垚鍒拌揣閫氱煡(0鈫掑緟璐ㄦ2/寰呭叆搴�3鈫�4)锛涢渶妫�鐗╂枡鑷姩鍒涘缓 IQC", "roles": ["浠撶", "IQC 璐ㄦ鍛�"]},
{"stage": "鍏ュ簱", "action": "IQC 鍚堟牸/鐗归噰鈫掗噰璐叆搴�(寰呬笂鏋垛啋寰呮墽琛屸啋瀹屾垚)搴撳瓨+锛屽洖鍐欒鍗� inCount/inStatus 涓庣敵璇锋槑缁�", "roles": ["浠撶"]},
{"stage": "閫�璐�", "action": "IQC 涓嶅悎鏍奸��璐р啋渚涘簲鍟嗛��璐у嚭搴�(閫夋枡閿佸畾鍒拌鍗曡)锛涙姤搴熻蛋 NCR", "roles": ["浠撶"]},
- {"stage": "浠樻", "action": "閲囪喘鏉ョエ(FPD, AI OCR, 鈮よ鍗曟�讳环) 鈫� 浠樻鍗�(FKD 鍏宠仈鏉ョエ+闄勪欢, 鈮ゆ潵绁ㄩ噾棰�) BPM 瀹℃壒", "roles": ["璐㈠姟", "瀹℃壒浜�"]}]},
+ {"stage": "浠樻", "action": "閲囪喘鏉ョエ(FPD, AI OCR, 鈮よ鍗曟�讳环) 鈫� 浠樻鍗�(FKD 鍏宠仈鏉ョエ+闄勪欢, 鈮ゆ潵绁ㄩ噾棰�) BPM 瀹℃壒", "roles": ["璐㈠姟", "瀹℃壒浜�"]},
+ {"stage": "瀵硅处", "action": "渚涘簲鍟嗗線鏉ユ寜渚涘簲鍟嗘眹鎬伙細宸︿晶閲囪喘璁㈠崟娴佹按鍚凡寮�绁�/鏈紑绁ㄩ噾棰濓紝鍙充晶鏉ョエ娴佹按鍚紑绁ㄩ噾棰�/宸蹭粯/鍓╀綑搴斾粯骞堕檮浠樻娴佹按锛岄《閮ㄦ眹鎬荤疮璁¢噰璐�/寮�绁�/浠樻/鏈粯浣欓", "roles": ["璐㈠姟", "閲囪喘鍛�"]}]},
{"id": "production", "name": "鐢熶骇娴佺▼", "mermaid": "mermaid/04-production-flow.mmd", "color": "#e0b34f",
"summary": "閿�鍞鍗曢┍鍔� MPS 鈫� 涓嬪彂宸ュ崟 鈫� 鎸夊伐鑹鸿矾绾挎媶宸ュ簭浠诲姟 鈫� 棰嗘枡/绾胯竟澶囨枡 鈫� 鎶ュ伐(宸ュ簭椤哄簭纭牎楠�+BPM) 鈫� 鍊掑啿娑堣��/浜у嚭鍏ュ簱/IPQC 鈫� 鏈亾宸ュ簭鍥炲啓杩涘害 鈫� 鑷姩瀹屽伐 鈫� ProductionFinishedEvent 鍥炲啓閿�鍞鍗曘��",
"steps": [
@@ -596,7 +598,7 @@
{"role": "閿�鍞唴鍕�/閿�鍞�", "modules": ["CRM", "ERP"], "operations": ["绾跨储瀹㈡埛鍟嗘満缁存姢", "鎶ヤ环涓庡悎鍚�", "閿�鍞鍗�", "璺熻繘璁板綍"], "data": ["crm_*", "erp_sale_order"], "scope": "璐熻矗浜�(owner)+鏁版嵁鏉冮檺涓夌骇锛氬彧璇�/璇诲啓/璐熻矗浜猴紱鍏捣姹犲彲棰嗗彇锛涗氦鎺ヤ汉搴斿彲閫氳繃 expandUserIds 鐪嬪埌绂昏亴浜烘暟鎹�(鎺ュ彛宸插銆佸緟鎺ュ叆)"},
{"role": "閿�鍞粡鐞�", "modules": ["CRM"], "operations": ["鍟嗘満/鍚堝悓瀹℃壒鍙備笌", "閿�鍞洰鏍囧埗瀹�", "涓氱哗鎺掑悕婕忔枟鍒嗘瀽"], "data": ["鍥㈤槦鏁版嵁(涓嬪睘鐢ㄦ埛)"], "scope": "AdminUserApi 涓嬬骇鐢ㄦ埛鎵╁睍"},
{"role": "閲囪喘鍛�", "modules": ["ERP", "SRM"], "operations": ["閲囪喘鐢宠/璁㈠崟", "纭鏀惰揣", "鏉ョエ涓庝粯娆惧彂璧�"], "data": ["erp_purchase_*", "srm_*"], "scope": "requestUserId/supplierOwner 褰掑睘"},
- {"role": "閲囪喘寮�鍙�/渚涘簲鍟嗙鐞嗗憳", "modules": ["SRM"], "operations": ["鍑嗗叆瀹℃壒娴佽浆", "鎷涙爣姣斾环缁勭粐", "缁╂晥璇勪环"], "data": ["srm_supplier_apply", "srm_tender_*"], "scope": "BPM 澶氶儴闂ㄤ細绛�(閲囪喘/璐ㄩ噺/璐㈠姟)"},
+ {"role": "閲囪喘鍛�/渚涘簲鍟嗙鐞嗗憳", "modules": ["SRM"], "operations": ["渚涘簲鍟嗘。妗堢淮鎶�", "璇环姣斾环涓庣‘璁よ浆璁㈠崟", "鎶曟爣淇濊瘉閲戝彴璐�"], "data": ["srm_supplier*", "srm_inquiry*", "srm_bid_bond"], "scope": "閲囪喘绠$悊鑿滃崟鏉冮檺锛涜浠风‘璁ょ敓鎴愮殑閲囪喘璁㈠崟鑽夌璧� ERP BPM"},
{"role": "璁″垝鍛�", "modules": ["MES"], "operations": ["MPS 涓庡伐鍗�", "宸ヨ壓璺嚎缁存姢", "AI 棰勬祴鍙傝��"], "data": ["mes_pro_*"], "scope": "杞﹂棿/閮ㄩ棬鏁版嵁鑼冨洿"},
{"role": "鎿嶄綔宸�/鐝粍闀�", "modules": ["MES"], "operations": ["浠诲姟鎺ユ敹", "鎶ュ伐鎻愪氦(鍙楀伐搴忛『搴忕害鏉�)", "瀹夌伅"], "data": ["mes_pro_feedback", "mes_pro_task"], "scope": "浠诲姟鎸囨淳浜哄彲瑙�"},
{"role": "浠撶鍛�", "modules": ["MES-WM"], "operations": ["15 绫诲嚭鍏ュ簱鍗曟嵁鎵ц", "璋冩嫧", "鐩樼偣", "鏉$爜瑁呯"], "data": ["mes_wm_*"], "scope": "浠撳簱缁村害锛沇MS 鍙寜浠撳簱閰嶇疆鍑哄叆搴�/璋冩嫧/鐩樼偣鏄惁璧� BPM"},
@@ -626,11 +628,9 @@
閿�鍞洰鏍�
鏁版嵁鏉冮檺涓庡叕娴�
渚涘簲鍟嗙鐞� SRM
- 渚涘簲鍟嗘。妗�
- 鍑嗗叆瀹℃壒
- 璧勮川璇佷功
- 鎷涙爣涓庢瘮浠�
- 缁╂晥璇勪环
+ 渚涘簲鍟嗘。妗�(澶氳仈绯讳汉/澶氶摱琛�)
+ 璇环姣斾环
+ 鎶曟爣淇濊瘉閲�
杩涢攢瀛樹笌璐㈠姟 ERP
閲囪喘鐢宠
閲囪喘璁㈠崟
@@ -743,10 +743,11 @@
</pre>
<pre style="display:none" class="mmd-src" data-mmd="03-purchase-flow">
flowchart TD
- S0[SRM 鍑嗗叆鐢宠 AP路寰呮彁浜�0鈫掑鎵逛腑10鈫掑凡閫氳繃40] --> S1[渚涘簲鍟嗘。妗� srm_supplier]
- S1 --> S2[璧勮川璇佷功绠$悊]
- S1 --> S3[缁╂晥璇勪环路璐ㄩ噺浜や粯浠锋牸鏈嶅姟鍥涚淮]
- S4[SRM 鎷涙爣姣斾环路鍙戝竷鈫掓姇鏍団啋寮�鏍団啋璇勬爣鈫掑畾鏍嘳 -->|瀹氭爣瀹℃壒閫氳繃鐢熸垚璁㈠崟| C3
+ S1[渚涘簲鍟嗘。妗� srm_supplier路澶氳仈绯讳汉/澶氶摱琛屽惈閾惰琛屽彿] --> S2[璇环姣斾环 srm_inquiry路鑽夌0鈫掑凡杞鍗�20]
+ S2 -->|鏂板鏃朵竴骞跺綍鍏ヤ骇鍝伱椾緵搴斿晢鎶ヤ环骞堕�夊畾涓爣路鍒楄〃鐩存帴纭| S3[鎸変腑鏍囦緵搴斿晢鎷嗗垎鐢熸垚閲囪喘璁㈠崟鑽夌]
+ S3 -->|鎻愪氦| C3
+ S1 -.-> S5[鎶曟爣淇濊瘉閲� srm_bid_bond路鏄惁涓爣/閫�鍥炵姸鎬乚
+ S2 -.-> S5
C1[閲囪喘鐢宠 CGSQ路鑽夌0鈫掑鎵逛腑10] -->|鎻愪氦BPM| C2{瀹℃壒}
C2 -->|椹冲洖30鈫掑彲閲嶇疆鍥炶崏绋縷 C1
C2 -->|閫氳繃20涓旀湁渚涘簲鍟喡疯嚜鍔ㄧ敓鎴恷 C3[閲囪喘璁㈠崟 CGDD路瀹℃壒涓�15鈫掑凡瀹℃牳20]
@@ -761,6 +762,9 @@
C7 -->|鍥炲啓鐢宠鏄庣粏 inCount| C1
C3 -->|璁㈠崟鎬讳环鎺у埗| C10[閲囪喘鏉ョエ FPD路绱閲戦鈮よ鍗曟�讳环]
C10 -->|浠樻鍗曞繀椤诲叧鑱旀潵绁▅ C11[浠樻鍗� FKD路瀹℃壒涓�15鈫掑凡瀹℃牳20路绱浠樻鈮ゆ潵绁ㄩ噾棰漖
+ C3 --> S6[渚涘簲鍟嗗線鏉ヂ疯鍗曟祦姘村惈宸插紑绁�/鏈紑绁╙
+ C10 --> S6
+ C11 --> S6
</pre>
<pre style="display:none" class="mmd-src" data-mmd="04-production-flow">
flowchart TD
@@ -938,7 +942,8 @@
MDM --> ERP[ERP 閲囪喘路閿�鍞疯储鍔
MDM --> CRM
CRM[CRM 绾跨储瀹㈡埛鍟嗘満鎶ヤ环鍚堝悓鍥炴] -->|鍚堝悓鐢熸垚閿�鍞鍗晐 ERP
- SRM[SRM 渚涘簲鍟嗗噯鍏ヨ祫璐ㄨ瘉涔︽嫑鏍囩哗鏁圿 -->|瀹氭爣鐢熸垚閲囪喘璁㈠崟| ERP
+ SRM[SRM 渚涘簲鍟嗘。妗埪疯浠锋瘮浠仿锋姇鏍囦繚璇侀噾] -->|璇环纭鐢熸垚閲囪喘璁㈠崟鑽夌| ERP
+ ERP -.->|渚涘簲鍟嗗線鏉ヨ鍙栦緵搴斿晢鍚嶇О| SRM
ERP -->|纭鏀惰揣鐢熸垚鍒拌揣閫氱煡| MES
ERP -->|閿�鍞鍗曞鎵圭敓鎴怣PS| MES
MES -->|鍏ュ簱鍑哄簱鍥炲啓鍗曟嵁杩涘害| ERP
@@ -949,7 +954,6 @@
HRM[HRM 鍛樺伐鍏ヨ浆璋冪浜ゆ帴鑰冨嫟钖叕] -.->|expandUserIds 鏁版嵁鍙鎬ф墿灞暵锋帴鍙e凡灏辩华寰呭悇妯″潡鎺ュ叆| CRM
BPM[BPM Flowable 瀹℃壒寮曟搸] -.->|鐘舵�佷簨浠跺洖璋兟�13涓洃鍚櫒| ERP
BPM -.-> CRM
- BPM -.-> SRM
BPM -.-> MES
BPM -.-> HRM
AI[AI 骞冲彴 閫氫箟鍗冮棶+Milvus] -.->|鍙戠エOCR| ERP
diff --git a/docs/project-business/mermaid/01-business-mindmap.mmd b/docs/project-business/mermaid/01-business-mindmap.mmd
index 399f83d..1f30645 100644
--- a/docs/project-business/mermaid/01-business-mindmap.mmd
+++ b/docs/project-business/mermaid/01-business-mindmap.mmd
@@ -15,11 +15,9 @@
閿�鍞洰鏍�
鏁版嵁鏉冮檺涓庡叕娴�
渚涘簲鍟嗙鐞� SRM
- 渚涘簲鍟嗘。妗�
- 鍑嗗叆瀹℃壒
- 璧勮川璇佷功
- 鎷涙爣涓庢瘮浠�
- 缁╂晥璇勪环
+ 渚涘簲鍟嗘。妗�(澶氳仈绯讳汉/澶氶摱琛�)
+ 璇环姣斾环
+ 鎶曟爣淇濊瘉閲�
杩涢攢瀛樹笌璐㈠姟 ERP
閲囪喘鐢宠
閲囪喘璁㈠崟
diff --git a/docs/project-business/mermaid/03-purchase-flow.mmd b/docs/project-business/mermaid/03-purchase-flow.mmd
index 44bdfdb..2305079 100644
--- a/docs/project-business/mermaid/03-purchase-flow.mmd
+++ b/docs/project-business/mermaid/03-purchase-flow.mmd
@@ -1,8 +1,9 @@
flowchart TD
- S0[SRM 鍑嗗叆鐢宠 AP路寰呮彁浜�0鈫掑鎵逛腑10鈫掑凡閫氳繃40] --> S1[渚涘簲鍟嗘。妗� srm_supplier]
- S1 --> S2[璧勮川璇佷功绠$悊]
- S1 --> S3[缁╂晥璇勪环路璐ㄩ噺浜や粯浠锋牸鏈嶅姟鍥涚淮]
- S4[SRM 鎷涙爣姣斾环路鍙戝竷鈫掓姇鏍団啋寮�鏍団啋璇勬爣鈫掑畾鏍嘳 -->|瀹氭爣瀹℃壒閫氳繃鐢熸垚璁㈠崟| C3
+ S1[渚涘簲鍟嗘。妗� srm_supplier路澶氳仈绯讳汉/澶氶摱琛屽惈閾惰琛屽彿] --> S2[璇环姣斾环 srm_inquiry路鑽夌0鈫掑凡杞鍗�20]
+ S2 -->|鏂板鏃朵竴骞跺綍鍏ヤ骇鍝伱椾緵搴斿晢鎶ヤ环骞堕�夊畾涓爣路鍒楄〃鐩存帴纭| S3[鎸変腑鏍囦緵搴斿晢鎷嗗垎鐢熸垚閲囪喘璁㈠崟鑽夌]
+ S3 -->|鎻愪氦| C3
+ S1 -.-> S5[鎶曟爣淇濊瘉閲� srm_bid_bond路鏄惁涓爣/閫�鍥炵姸鎬乚
+ S2 -.-> S5
C1[閲囪喘鐢宠 CGSQ路鑽夌0鈫掑鎵逛腑10] -->|鎻愪氦BPM| C2{瀹℃壒}
C2 -->|椹冲洖30鈫掑彲閲嶇疆鍥炶崏绋縷 C1
C2 -->|閫氳繃20涓旀湁渚涘簲鍟喡疯嚜鍔ㄧ敓鎴恷 C3[閲囪喘璁㈠崟 CGDD路瀹℃壒涓�15鈫掑凡瀹℃牳20]
@@ -17,3 +18,6 @@
C7 -->|鍥炲啓鐢宠鏄庣粏 inCount| C1
C3 -->|璁㈠崟鎬讳环鎺у埗| C10[閲囪喘鏉ョエ FPD路绱閲戦鈮よ鍗曟�讳环]
C10 -->|浠樻鍗曞繀椤诲叧鑱旀潵绁▅ C11[浠樻鍗� FKD路瀹℃壒涓�15鈫掑凡瀹℃牳20路绱浠樻鈮ゆ潵绁ㄩ噾棰漖
+ C3 --> S6[渚涘簲鍟嗗線鏉ヂ疯鍗曟祦姘村惈宸插紑绁�/鏈紑绁╙
+ C10 --> S6
+ C11 --> S6
diff --git a/docs/project-business/mermaid/08-module-relation.mmd b/docs/project-business/mermaid/08-module-relation.mmd
index 4eec809..b3adb79 100644
--- a/docs/project-business/mermaid/08-module-relation.mmd
+++ b/docs/project-business/mermaid/08-module-relation.mmd
@@ -3,7 +3,8 @@
MDM --> ERP[ERP 閲囪喘路閿�鍞疯储鍔
MDM --> CRM
CRM[CRM 绾跨储瀹㈡埛鍟嗘満鎶ヤ环鍚堝悓鍥炴] -->|鍚堝悓鐢熸垚閿�鍞鍗晐 ERP
- SRM[SRM 渚涘簲鍟嗗噯鍏ヨ祫璐ㄨ瘉涔︽嫑鏍囩哗鏁圿 -->|瀹氭爣鐢熸垚閲囪喘璁㈠崟| ERP
+ SRM[SRM 渚涘簲鍟嗘。妗埪疯浠锋瘮浠仿锋姇鏍囦繚璇侀噾] -->|璇环纭鐢熸垚閲囪喘璁㈠崟鑽夌| ERP
+ ERP -.->|渚涘簲鍟嗗線鏉ヨ鍙栦緵搴斿晢鍚嶇О| SRM
ERP -->|纭鏀惰揣鐢熸垚鍒拌揣閫氱煡| MES
ERP -->|閿�鍞鍗曞鎵圭敓鎴怣PS| MES
MES -->|鍏ュ簱鍑哄簱鍥炲啓鍗曟嵁杩涘害| ERP
@@ -14,7 +15,6 @@
HRM[HRM 鍛樺伐鍏ヨ浆璋冪浜ゆ帴鑰冨嫟钖叕] -.->|expandUserIds 鏁版嵁鍙鎬ф墿灞暵锋帴鍙e凡灏辩华寰呭悇妯″潡鎺ュ叆| CRM
BPM[BPM Flowable 瀹℃壒寮曟搸] -.->|鐘舵�佷簨浠跺洖璋兟�13涓洃鍚櫒| ERP
BPM -.-> CRM
- BPM -.-> SRM
BPM -.-> MES
BPM -.-> HRM
AI[AI 骞冲彴 閫氫箟鍗冮棶+Milvus] -.->|鍙戠エOCR| ERP
diff --git a/sql/mysql/finance_menu_init.sql b/sql/mysql/finance_menu_init.sql
index fafc754..a1cb1ce 100644
--- a/sql/mysql/finance_menu_init.sql
+++ b/sql/mysql/finance_menu_init.sql
@@ -7,66 +7,68 @@
-- 鍚庣鏉冮檺鐮侊細瑙佸悇 Controller 鐨� @PreAuthorize
--
-- 璇存槑锛�
--- 1. 鏂板缓涓�绾ц彍鍗曘�岃储鍔℃牳绠椼��(/finance-core)锛屼笉瑙︾鍘熸湁 ERP 涓嬬殑銆岃储鍔$鐞嗐��(id=2645)
--- 鍙婂叾 缁撶畻璐︽埛/浠樻鍗�/鏀舵鍗� 涓変釜鑿滃崟銆�
+-- 1. 鏂板缓涓�绾ц彍鍗曘�岃储鍔℃牳绠椼��(/finance-core)銆傚師 ERP 涓嬬殑銆岃储鍔$鐞嗐��(id=2645)
+-- 鍥犲叾鐖惰彍鍗曘�孍RP 绯荤粺銆�(id=2563) 宸插仠鐢ㄨ�屼笉鍙锛屾湰鑴氭湰鎶婂畠鎸傚埌銆岃储鍔℃牳绠椼�嶄笅锛�
+-- 鎭㈠ 缁撶畻璐︽埛/浠樻鍗�/鏀舵鍗� 涓変釜鑿滃崟锛堝師 role_menu 鎺堟潈淇濈暀锛夈��
-- 2. 椤甸潰鑿滃崟(type=2) 鍚勮嚜鎼哄甫 :query 鏉冮檺锛涘鍒犳敼/瀵煎嚭/鎶樻棫鎽婇攢绛夋搷浣滄潈闄愬缓鎴愭寜閽�(type=3)銆�
-- 3. 鎬昏处涓庢槑缁嗚处鍏辩敤 finance:ledger:query銆乫inance:ledger:export 涓や釜鏉冮檺鐮侊紝
-- 鍥犳銆屽鍑鸿处绨裤�嶆寜閽彧鎸傚湪銆屾�昏处銆嶄笅 鈥斺�� 鍚屼竴鏉冮檺鐮佸湪瑙掕壊鎺堟潈鏍戦噷鍑虹幇涓�娆″嵆鍙紝
-- 鎺堜簣鍚庛�屾槑缁嗚处銆嶇殑瀵煎嚭鎸夐挳鍚屾牱鐢熸晥銆�
--- 4. 骞傜瓑锛氬厛鍒犻櫎鏈剼鏈崰鐢ㄧ殑 id 鍖洪棿 (1075500~1075549) 鍐嶆彃鍏ワ紝鍙噸澶嶆墽琛屻��
+-- 4. 骞傜瓑锛氬厛鍒犻櫎鏈剼鏈崰鐢ㄧ殑 id 鍖洪棿 (1075600~1075649) 鍙婂搴旇鑹叉巿鏉冨啀鎻掑叆锛屽彲閲嶅鎵ц銆�
-- 娉ㄦ剰锛氳嫢涔嬪悗宸插湪銆岃鑹茬鐞嗐�嶉噷缁欒繖浜涜彍鍗曟巿鏉冿紝閲嶈窇鏈剼鏈細涓㈠け瀵瑰簲 system_role_menu 璁板綍銆�
-- 5. 涓嶅惈 tenant_id锛堟湰椤圭洰闈炲绉熸埛锛夈��
-- =============================================
-DELETE FROM system_menu WHERE id BETWEEN 1075500 AND 1075549;
+DELETE FROM system_role_menu WHERE menu_id BETWEEN 1075600 AND 1075649;
+DELETE FROM system_menu WHERE id BETWEEN 1075600 AND 1075649;
-- ---------------------------------------------------------------
-- 涓�绾ц彍鍗�
-- ---------------------------------------------------------------
INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted) VALUES
-(1075500, '璐㈠姟鏍哥畻', '', 1, 4, 0, '/finance-core', 'ep:money', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+(1075600, '璐㈠姟鏍哥畻', '', 1, 4, 0, '/finance-core', 'ep:money', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
-- ---------------------------------------------------------------
-- 椤甸潰鑿滃崟 (type=2)
-- ---------------------------------------------------------------
INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted) VALUES
-(1075501, '璁拌处鍑瘉', 'finance:voucher:query', 2, 1, 1075500, 'voucher', 'ep:document', 'erp/finance/voucher/index', 'FinVoucher', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075502, '鎬昏处', 'finance:ledger:query', 2, 2, 1075500, 'general-ledger', 'ep:notebook', 'erp/finance/ledger/general/index', 'FinGeneralLedger', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075503, '鏄庣粏璐�', 'finance:ledger:query', 2, 3, 1075500, 'detail-ledger', 'ep:list', 'erp/finance/ledger/detail/index', 'FinDetailLedger', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075504, '浼氳绉戠洰', 'finance:account-subject:query', 2, 4, 1075500, 'subject', 'ep:collection-tag', 'erp/finance/subject/index', 'FinAccountSubject', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075505, '鍥哄畾璧勪骇', 'finance:fixed-asset:query', 2, 5, 1075500, 'fixed-asset', 'ep:office-building', 'erp/finance/fixed-asset/index', 'FinFixedAsset', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075506, '鏃犲舰璧勪骇', 'finance:intangible-asset:query', 2, 6, 1075500, 'intangible-asset','ep:medal', 'erp/finance/intangible-asset/index', 'FinIntangibleAsset', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075507, '璐㈠姟鎶ヨ〃', 'finance:statistics:query', 2, 7, 1075500, 'statistics', 'ep:data-line', 'erp/finance/statistics/index', 'FinStatistics', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0');
+(1075601, '璁拌处鍑瘉', 'finance:voucher:query', 2, 1, 1075600, 'voucher', 'ep:document', 'erp/finance/voucher/index', 'FinVoucher', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075602, '鎬昏处', 'finance:ledger:query', 2, 2, 1075600, 'general-ledger', 'ep:notebook', 'erp/finance/ledger/general/index', 'FinGeneralLedger', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075603, '鏄庣粏璐�', 'finance:ledger:query', 2, 3, 1075600, 'detail-ledger', 'ep:list', 'erp/finance/ledger/detail/index', 'FinDetailLedger', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075604, '浼氳绉戠洰', 'finance:account-subject:query', 2, 4, 1075600, 'subject', 'ep:collection-tag', 'erp/finance/subject/index', 'FinAccountSubject', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075605, '鍥哄畾璧勪骇', 'finance:fixed-asset:query', 2, 5, 1075600, 'fixed-asset', 'ep:office-building', 'erp/finance/fixed-asset/index', 'FinFixedAsset', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075606, '鏃犲舰璧勪骇', 'finance:intangible-asset:query', 2, 6, 1075600, 'intangible-asset','ep:medal', 'erp/finance/intangible-asset/index', 'FinIntangibleAsset', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075607, '璐㈠姟鎶ヨ〃', 'finance:statistics:query', 2, 7, 1075600, 'statistics', 'ep:data-line', 'erp/finance/statistics/index', 'FinStatistics', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0');
-- ---------------------------------------------------------------
-- 鎸夐挳鏉冮檺 (type=3)
-- ---------------------------------------------------------------
INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted) VALUES
-- 璁拌处鍑瘉
-(1075510, '鍑瘉鏂板', 'finance:voucher:create', 3, 1, 1075501, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075511, '鍑瘉淇敼', 'finance:voucher:update', 3, 2, 1075501, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075512, '鍑瘉鍒犻櫎', 'finance:voucher:delete', 3, 3, 1075501, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075513, '鍑瘉鐘舵�佸彉鏇�', 'finance:voucher:update-status', 3, 4, 1075501, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075514, '鍑瘉瀵煎嚭', 'finance:voucher:export', 3, 5, 1075501, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075610, '鍑瘉鏂板', 'finance:voucher:create', 3, 1, 1075601, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075611, '鍑瘉淇敼', 'finance:voucher:update', 3, 2, 1075601, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075612, '鍑瘉鍒犻櫎', 'finance:voucher:delete', 3, 3, 1075601, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075613, '鍑瘉鐘舵�佸彉鏇�', 'finance:voucher:update-status', 3, 4, 1075601, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075614, '鍑瘉瀵煎嚭', 'finance:voucher:export', 3, 5, 1075601, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-- 鎬昏处 / 鏄庣粏璐︼紙涓ら〉鍏辩敤 finance:ledger:query锛屽鍑烘潈闄愬彧鍦ㄦ澶勬寕涓�娆★紝瑙佹枃浠跺ご璇存槑 3锛�
-(1075520, '璐︾翱瀵煎嚭', 'finance:ledger:export', 3, 1, 1075502, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075620, '璐︾翱瀵煎嚭', 'finance:ledger:export', 3, 1, 1075602, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-- 浼氳绉戠洰
-(1075521, '绉戠洰鏂板', 'finance:account-subject:create',3, 1, 1075504, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075522, '绉戠洰淇敼', 'finance:account-subject:update',3, 2, 1075504, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075523, '绉戠洰鍒犻櫎', 'finance:account-subject:delete',3, 3, 1075504, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075524, '绉戠洰瀵煎嚭', 'finance:account-subject:export',3, 4, 1075504, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075621, '绉戠洰鏂板', 'finance:account-subject:create',3, 1, 1075604, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075622, '绉戠洰淇敼', 'finance:account-subject:update',3, 2, 1075604, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075623, '绉戠洰鍒犻櫎', 'finance:account-subject:delete',3, 3, 1075604, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075624, '绉戠洰瀵煎嚭', 'finance:account-subject:export',3, 4, 1075604, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-- 鍥哄畾璧勪骇
-(1075530, '璧勪骇鏂板', 'finance:fixed-asset:create', 3, 1, 1075505, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075531, '璧勪骇淇敼', 'finance:fixed-asset:update', 3, 2, 1075505, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075532, '璧勪骇鍒犻櫎', 'finance:fixed-asset:delete', 3, 3, 1075505, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075533, '璁℃彁鎶樻棫', 'finance:fixed-asset:depreciate',3, 4, 1075505, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075534, '璧勪骇瀵煎嚭', 'finance:fixed-asset:export', 3, 5, 1075505, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075630, '璧勪骇鏂板', 'finance:fixed-asset:create', 3, 1, 1075605, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075631, '璧勪骇淇敼', 'finance:fixed-asset:update', 3, 2, 1075605, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075632, '璧勪骇鍒犻櫎', 'finance:fixed-asset:delete', 3, 3, 1075605, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075633, '璁℃彁鎶樻棫', 'finance:fixed-asset:depreciate',3, 4, 1075605, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075634, '璧勪骇瀵煎嚭', 'finance:fixed-asset:export', 3, 5, 1075605, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-- 鏃犲舰璧勪骇
-(1075540, '璧勪骇鏂板', 'finance:intangible-asset:create', 3, 1, 1075506, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075541, '璧勪骇淇敼', 'finance:intangible-asset:update', 3, 2, 1075506, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075542, '璧勪骇鍒犻櫎', 'finance:intangible-asset:delete', 3, 3, 1075506, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075543, '鏃犲舰璧勪骇鎽婇攢', 'finance:intangible-asset:amortize', 3, 4, 1075506, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
-(1075544, '璧勪骇瀵煎嚭', 'finance:intangible-asset:export', 3, 5, 1075506, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0');
+(1075640, '璧勪骇鏂板', 'finance:intangible-asset:create', 3, 1, 1075606, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075641, '璧勪骇淇敼', 'finance:intangible-asset:update', 3, 2, 1075606, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075642, '璧勪骇鍒犻櫎', 'finance:intangible-asset:delete', 3, 3, 1075606, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075643, '鏃犲舰璧勪骇鎽婇攢', 'finance:intangible-asset:amortize', 3, 4, 1075606, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075644, '璧勪骇瀵煎嚭', 'finance:intangible-asset:export', 3, 5, 1075606, '', '', '', '', 0, b'1', b'0', b'1', '1', NOW(), '1', NOW(), b'0');
-- ---------------------------------------------------------------
-- 瑙掕壊鎺堟潈锛堝彲閫夛級
@@ -75,11 +77,34 @@
-- 涔熷彲鐢ㄤ笅闈㈢殑璇彞鐩存帴鎺堟潈锛堟妸 <roleId> 鎹㈡垚鐩爣瑙掕壊 id锛屽弬鑰冿細163 璁惧 / 164 璐ㄩ噺 / 165 閿�鍞級锛�
--
-- INSERT INTO system_role_menu (role_id, menu_id, creator, create_time, updater, update_time, deleted)
--- SELECT 165, id, '1', NOW(), '1', NOW(), b'0' FROM system_menu WHERE id BETWEEN 1075500 AND 1075549;
+-- SELECT 165, id, '1', NOW(), '1', NOW(), b'0' FROM system_menu WHERE id BETWEEN 1075600 AND 1075649;
-- ---------------------------------------------------------------
-- ---------------------------------------------------------------
+-- 鎭㈠鍘熸湁 ERP銆岃储鍔$鐞嗐��(id=2645) 瀛愭爲
+-- 鍏剁埗鑿滃崟銆孍RP 绯荤粺銆�(id=2563) 宸插仠鐢紝瀵艰嚧 缁撶畻璐︽埛/浠樻鍗�/鏀舵鍗� 鏃犳硶鏄剧ず锛�
+-- 鐜版寕鍒般�岃储鍔℃牳绠椼�嶄笅浣滀负浜岀骇鐩綍锛堟帓搴� 8锛屾帓鍦ㄨ储鍔℃姤琛ㄤ箣鍚庯級銆�
+-- ---------------------------------------------------------------
+UPDATE system_menu SET parent_id = 1075600, sort = 8 WHERE id = 2645;
+
+-- ---------------------------------------------------------------
+-- 缁欏師鏈嫢鏈夈�岃储鍔$鐞嗐��(2645) 鐨勮鑹茶ˉ鎺堟柊澧炵殑璐㈠姟鏍哥畻鑿滃崟
+-- 锛堣秴绠$敱浠g爜鐩存帴杩斿洖鍏ㄩ儴鑿滃崟锛屼笉鍙楀奖鍝嶏級
+-- ---------------------------------------------------------------
+INSERT INTO system_role_menu (role_id, menu_id, creator, create_time, updater, update_time, deleted)
+SELECT DISTINCT rm.role_id, m.id, '1', NOW(), '1', NOW(), b'0'
+FROM system_menu m
+JOIN system_role_menu rm ON rm.menu_id = 2645 AND rm.deleted = b'0'
+WHERE m.id BETWEEN 1075600 AND 1075649
+ 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');
+
+-- ---------------------------------------------------------------
-- 鍥炴粴鑴氭湰
--- DELETE FROM system_menu WHERE id BETWEEN 1075500 AND 1075549;
--- DELETE FROM system_role_menu WHERE menu_id BETWEEN 1075500 AND 1075549;
+-- UPDATE system_menu SET parent_id = 2563, sort = 50 WHERE id = 2645;
+-- DELETE FROM system_menu WHERE id BETWEEN 1075600 AND 1075649;
+-- DELETE FROM system_role_menu WHERE menu_id BETWEEN 1075600 AND 1075649;
-- ---------------------------------------------------------------
diff --git a/sql/mysql/finance_module_init.sql b/sql/mysql/finance_module_init.sql
index 0975882..881d60c 100644
--- a/sql/mysql/finance_module_init.sql
+++ b/sql/mysql/finance_module_init.sql
@@ -110,7 +110,9 @@
`net_value` decimal(24,6) NOT NULL DEFAULT 0 COMMENT '鍑�鍊� = 鍘熷�� - 绱鎶樻棫',
`location` varchar(255) NULL DEFAULT '' COMMENT '瀛樻斁鍦扮偣',
`department` varchar(128) NULL DEFAULT '' COMMENT '浣跨敤閮ㄩ棬',
+ `department_id` bigint NULL DEFAULT NULL COMMENT '浣跨敤閮ㄩ棬缂栧彿',
`keeper` varchar(64) NULL DEFAULT '' COMMENT '淇濈浜�',
+ `keeper_id` bigint NULL DEFAULT NULL COMMENT '淇濈浜虹敤鎴风紪鍙�',
`status` tinyint NOT NULL DEFAULT 1 COMMENT '鐘舵�侊細1鍦ㄧ敤 2闂茬疆 3缁翠慨涓� 4宸叉姤搴�',
`remark` varchar(500) NULL DEFAULT '' COMMENT '澶囨敞',
`creator` varchar(64) NULL DEFAULT '' COMMENT '鍒涘缓鑰�',
@@ -155,6 +157,28 @@
) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT = '鏃犲舰璧勪骇';
-- -------------------------------------------------------------------------------------
+-- 1.6 宸插缓琛ㄧ殑琛ュ垪锛堝吋瀹规棭鏈熻剼鏈垱寤恒�佺己灏戦儴闂�/淇濈浜虹紪鍙风殑搴擄級
+-- 璇存槑锛歁ySQL 涓嶆敮鎸� ALTER TABLE ... ADD COLUMN IF NOT EXISTS锛岀敤 information_schema 鍒ゆ柇
+-- -------------------------------------------------------------------------------------
+SET @col_exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'fin_fixed_asset' AND column_name = 'department_id');
+SET @ddl = IF(@col_exists = 0,
+ 'ALTER TABLE `fin_fixed_asset` ADD COLUMN `department_id` bigint NULL DEFAULT NULL COMMENT ''浣跨敤閮ㄩ棬缂栧彿'' AFTER `department`',
+ 'SELECT 1');
+PREPARE stmt_fin_fixed_asset_department_id FROM @ddl;
+EXECUTE stmt_fin_fixed_asset_department_id;
+DEALLOCATE PREPARE stmt_fin_fixed_asset_department_id;
+
+SET @col_exists = (SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'fin_fixed_asset' AND column_name = 'keeper_id');
+SET @ddl = IF(@col_exists = 0,
+ 'ALTER TABLE `fin_fixed_asset` ADD COLUMN `keeper_id` bigint NULL DEFAULT NULL COMMENT ''淇濈浜虹敤鎴风紪鍙�'' AFTER `keeper`',
+ 'SELECT 1');
+PREPARE stmt_fin_fixed_asset_keeper_id FROM @ddl;
+EXECUTE stmt_fin_fixed_asset_keeper_id;
+DEALLOCATE PREPARE stmt_fin_fixed_asset_keeper_id;
+
+-- -------------------------------------------------------------------------------------
-- 2. 瀛楀吀
-- -------------------------------------------------------------------------------------
INSERT INTO `system_dict_type` (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
diff --git a/sql/mysql/srm_legacy_tables_backup_20261103.sql b/sql/mysql/srm_legacy_tables_backup_20261103.sql
new file mode 100644
index 0000000..613f854
--- /dev/null
+++ b/sql/mysql/srm_legacy_tables_backup_20261103.sql
@@ -0,0 +1,351 @@
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `srm_supplier_apply` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '鐢宠ID',
+ `apply_no` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '鐢宠缂栧彿',
+ `supplier_id` bigint DEFAULT NULL COMMENT '渚涘簲鍟咺D',
+ `erp_supplier_id` bigint DEFAULT NULL COMMENT '鍏宠仈ERP渚涘簲鍟咺D',
+ `supplier_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '渚涘簲鍟嗗悕绉�',
+ `supplier_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '渚涘簲鍟嗙被鍨�',
+ `company_nature` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '浼佷笟鎬ц川',
+ `registered_capital` decimal(24,6) DEFAULT NULL COMMENT '娉ㄥ唽璧勯噾锛堜竾鍏冿級',
+ `business_license_no` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '钀ヤ笟鎵х収缂栧彿',
+ `tax_no` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '绋庡彿',
+ `address` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鍏徃鍦板潃',
+ `bank_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '寮�鎴烽摱琛�',
+ `bank_account` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '閾惰璐﹀彿',
+ `contact_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鑱旂郴浜�',
+ `contact_mobile` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鑱旂郴鐢佃瘽',
+ `contact_email` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '閭',
+ `apply_user_id` bigint DEFAULT NULL COMMENT '鐢宠浜篒D',
+ `apply_user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鐢宠浜哄鍚�',
+ `apply_time` datetime DEFAULT NULL COMMENT '鐢宠鏃堕棿',
+ `apply_status` int NOT NULL DEFAULT '0' COMMENT '瀹℃牳鐘舵��',
+ `process_instance_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'BPM 娴佺▼瀹炰緥缂栧彿',
+ `purchase_reviewer_id` bigint DEFAULT NULL COMMENT '閲囪喘瀹℃牳浜篒D',
+ `purchase_review_time` datetime DEFAULT NULL COMMENT '閲囪喘瀹℃牳鏃堕棿',
+ `purchase_review_opinion` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '閲囪喘瀹℃牳鎰忚',
+ `quality_reviewer_id` bigint DEFAULT NULL COMMENT '璐ㄩ噺瀹℃牳浜篒D',
+ `quality_review_time` datetime DEFAULT NULL COMMENT '璐ㄩ噺瀹℃牳鏃堕棿',
+ `quality_review_opinion` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '璐ㄩ噺瀹℃牳鎰忚',
+ `finance_reviewer_id` bigint DEFAULT NULL COMMENT '璐㈠姟瀹℃牳浜篒D',
+ `finance_review_time` datetime DEFAULT NULL COMMENT '璐㈠姟瀹℃牳鏃堕棿',
+ `finance_review_opinion` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '璐㈠姟瀹℃牳鎰忚',
+ `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci 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`) USING BTREE,
+ UNIQUE KEY `uk_apply_no` (`apply_no`) USING BTREE,
+ KEY `idx_supplier_id` (`supplier_id`) USING BTREE,
+ KEY `idx_apply_status` (`apply_status`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='渚涘簲鍟嗗噯鍏ョ敵璇疯〃';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `srm_supplier_certificate` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '璇佷功ID',
+ `supplier_id` bigint NOT NULL COMMENT '渚涘簲鍟咺D',
+ `certificate_type` int NOT NULL COMMENT '璇佷功绫诲瀷',
+ `certificate_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '璇佷功鍚嶇О',
+ `certificate_no` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '璇佷功缂栧彿',
+ `file_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鏂囦欢鍚嶇О',
+ `file_url` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鏂囦欢鍦板潃',
+ `issuing_authority` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '棰佸彂鏈烘瀯',
+ `valid_start_date` date DEFAULT NULL COMMENT '鏈夋晥寮�濮嬫棩鏈�',
+ `valid_end_date` date DEFAULT NULL COMMENT '鏈夋晥缁撴潫鏃ユ湡',
+ `status` int NOT NULL DEFAULT '0' COMMENT '鐘舵��',
+ `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci 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`) USING BTREE,
+ KEY `idx_supplier_id` (`supplier_id`) USING BTREE,
+ KEY `idx_certificate_type` (`certificate_type`) USING BTREE,
+ KEY `idx_valid_end_date` (`valid_end_date`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='渚涘簲鍟嗚祫璐ㄨ瘉涔﹁〃';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `srm_supplier_evaluation` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '璇勪环ID',
+ `supplier_id` bigint NOT NULL COMMENT '渚涘簲鍟咺D',
+ `evaluation_period` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '璇勪环鍛ㄦ湡',
+ `quality_score` decimal(5,2) DEFAULT NULL COMMENT '璐ㄩ噺璇勫垎',
+ `quality_pass_rate` decimal(5,2) DEFAULT NULL COMMENT '鏉ユ枡鍚堟牸鐜�',
+ `quality_defect_count` int DEFAULT '0' COMMENT '涓嶈壇娆℃暟',
+ `delivery_score` decimal(5,2) DEFAULT NULL COMMENT '浜や粯璇勫垎',
+ `delivery_on_time_rate` decimal(5,2) DEFAULT NULL COMMENT '鍑嗘椂浜や粯鐜�',
+ `delivery_delay_count` int DEFAULT '0' COMMENT '寤惰繜娆℃暟',
+ `price_score` decimal(5,2) DEFAULT NULL COMMENT '浠锋牸璇勫垎',
+ `service_score` decimal(5,2) DEFAULT NULL COMMENT '鏈嶅姟璇勫垎',
+ `service_response_speed` int DEFAULT NULL COMMENT '鍝嶅簲閫熷害璇勫垎',
+ `composite_score` decimal(5,2) DEFAULT NULL COMMENT '缁煎悎璇勫垎',
+ `evaluation_level` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '璇勪环绛夌骇',
+ `evaluator_id` bigint DEFAULT NULL COMMENT '璇勪环浜篒D',
+ `evaluation_time` datetime DEFAULT NULL COMMENT '璇勪环鏃堕棿',
+ `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci 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`) USING BTREE,
+ KEY `idx_supplier_id` (`supplier_id`) USING BTREE,
+ KEY `idx_evaluation_period` (`evaluation_period`) USING BTREE,
+ KEY `idx_composite_score` (`composite_score`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='渚涘簲鍟嗙哗鏁堣瘎浠疯〃';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `srm_tender_project` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '鎷涙爣椤圭洰ID',
+ `tender_no` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '鎷涙爣缂栧彿',
+ `tender_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '鎷涙爣鍚嶇О',
+ `tender_type` int NOT NULL COMMENT '鎷涙爣绫诲瀷',
+ `purchase_org` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '閲囪喘缁勭粐',
+ `project_leader_id` bigint DEFAULT NULL COMMENT '椤圭洰璐熻矗浜篒D',
+ `project_leader_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '椤圭洰璐熻矗浜哄鍚�',
+ `tender_status` int NOT NULL DEFAULT '0' COMMENT '鎷涙爣鐘舵��',
+ `bidding_mode` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'FULL' COMMENT '鎷涙姇鏍囨ā寮�: FULL-瀹屾暣鐗�, SIMPLE-绠�鏄撶増',
+ `budget_amount` decimal(24,6) DEFAULT NULL COMMENT '棰勭畻閲戦',
+ `start_time` datetime DEFAULT NULL COMMENT '寮�濮嬫椂闂�',
+ `end_time` datetime DEFAULT NULL COMMENT '鎴鏃堕棿',
+ `bid_open_time` datetime DEFAULT NULL COMMENT '棰勮寮�鏍囨椂闂�',
+ `tender_desc` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '鎷涙爣璇存槑',
+ `qualification_requirements` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '璧勮川瑕佹眰',
+ `purchase_request_id` bigint DEFAULT NULL COMMENT '鍏宠仈閲囪喘鐢宠ID',
+ `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci 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`) USING BTREE,
+ UNIQUE KEY `uk_tender_no` (`tender_no`) USING BTREE,
+ KEY `idx_tender_status` (`tender_status`) USING BTREE,
+ KEY `idx_purchase_request_id` (`purchase_request_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='鎷涙爣椤圭洰琛�';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `srm_tender_material` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '鐗╂枡鏄庣粏ID',
+ `tender_project_id` bigint NOT NULL COMMENT '鎷涙爣椤圭洰ID',
+ `product_id` bigint DEFAULT NULL COMMENT '鐗╂枡ID',
+ `product_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鐗╂枡缂栫爜',
+ `product_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '鐗╂枡鍚嶇О',
+ `product_spec` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '瑙勬牸鍨嬪彿',
+ `quantity` decimal(24,6) NOT NULL COMMENT '鏁伴噺',
+ `unit` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '鍗曚綅',
+ `tech_requirement` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '鎶�鏈姹�',
+ `estimated_price` decimal(24,6) DEFAULT NULL COMMENT '棰勪及鍗曚环',
+ `sort` int NOT NULL DEFAULT '0' COMMENT '鎺掑簭',
+ `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci 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`) USING BTREE,
+ KEY `idx_tender_project_id` (`tender_project_id`) USING BTREE,
+ KEY `idx_product_code` (`product_code`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='鎷涙爣鐗╂枡鏄庣粏琛�';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `srm_tender_bid` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '鎶曟爣ID',
+ `tender_project_id` bigint NOT NULL COMMENT '鎷涙爣椤圭洰ID',
+ `supplier_id` bigint NOT NULL COMMENT '渚涘簲鍟咺D',
+ `bid_no` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '鎶曟爣缂栧彿',
+ `bid_status` int NOT NULL DEFAULT '0' COMMENT '鎶曟爣鐘舵��',
+ `bid_time` datetime DEFAULT NULL COMMENT '鎶曟爣鏃堕棿',
+ `bid_total_amount` decimal(24,6) DEFAULT NULL COMMENT '鎶曟爣鎬婚噾棰�',
+ `bid_file_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鎶曟爣鏂囦欢鍚嶇О',
+ `bid_file_url` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鎶曟爣鏂囦欢鍦板潃',
+ `withdraw_reason` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鎾ゆ爣鍘熷洜',
+ `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci 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`) USING BTREE,
+ UNIQUE KEY `uk_bid_no` (`bid_no`) USING BTREE,
+ KEY `idx_tender_project_id` (`tender_project_id`) USING BTREE,
+ KEY `idx_supplier_id` (`supplier_id`) USING BTREE,
+ KEY `idx_bid_status` (`bid_status`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='鎶曟爣璁板綍琛�';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `srm_supplier_quote` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '鎶ヤ环ID',
+ `tender_project_id` bigint NOT NULL COMMENT '鎷涙爣椤圭洰ID',
+ `supplier_id` bigint NOT NULL COMMENT '渚涘簲鍟咺D',
+ `bid_id` bigint DEFAULT NULL COMMENT '鎶曟爣璁板綍ID',
+ `tender_material_id` bigint NOT NULL COMMENT '鎷涙爣鐗╂枡ID',
+ `quote_price` decimal(24,6) NOT NULL COMMENT '鎶ヤ环浠锋牸',
+ `tax_rate` decimal(5,2) DEFAULT NULL COMMENT '绋庣巼(%)',
+ `delivery_cycle` int DEFAULT NULL COMMENT '浜よ揣鍛ㄦ湡锛堝ぉ锛�',
+ `payment_terms` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '浠樻鏉′欢',
+ `warranty_period` int DEFAULT NULL COMMENT '璐ㄤ繚鏈燂紙鏈堬級',
+ `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci 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`) USING BTREE,
+ KEY `idx_tender_project_id` (`tender_project_id`) USING BTREE,
+ KEY `idx_supplier_id` (`supplier_id`) USING BTREE,
+ KEY `idx_bid_id` (`bid_id`) USING BTREE,
+ KEY `idx_tender_material_id` (`tender_material_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='渚涘簲鍟嗘姤浠锋槑缁嗚〃';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `srm_bid_open` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '寮�鏍嘔D',
+ `tender_project_id` bigint NOT NULL COMMENT '鎷涙爣椤圭洰ID',
+ `open_time` datetime NOT NULL COMMENT '寮�鏍囨椂闂�',
+ `open_person_id` bigint DEFAULT NULL COMMENT '寮�鏍囦汉鍛業D',
+ `open_person_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '寮�鏍囦汉鍛樺鍚�',
+ `open_record` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '寮�鏍囪褰�',
+ `attachment_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '闄勪欢鍚嶇О',
+ `attachment_url` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '闄勪欢鍦板潃',
+ `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci 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`) USING BTREE,
+ KEY `idx_tender_project_id` (`tender_project_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='寮�鏍囪褰曡〃';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `srm_bid_evaluation` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '璇勬爣ID',
+ `tender_project_id` bigint NOT NULL COMMENT '鎷涙爣椤圭洰ID',
+ `supplier_id` bigint NOT NULL COMMENT '渚涘簲鍟咺D',
+ `bid_id` bigint NOT NULL COMMENT '鎶曟爣璁板綍ID',
+ `price_score` decimal(5,2) DEFAULT NULL COMMENT '浠锋牸璇勫垎',
+ `tech_score` decimal(5,2) DEFAULT NULL COMMENT '鎶�鏈瘎鍒�',
+ `delivery_score` decimal(5,2) DEFAULT NULL COMMENT '浜や粯璇勫垎',
+ `service_score` decimal(5,2) DEFAULT NULL COMMENT '鏈嶅姟璇勫垎',
+ `composite_score` decimal(5,2) DEFAULT NULL COMMENT '缁煎悎璇勫垎',
+ `ranking` int DEFAULT NULL COMMENT '鎺掑悕',
+ `evaluator_id` bigint DEFAULT NULL COMMENT '璇勬爣浜篒D',
+ `evaluator_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '璇勬爣浜哄鍚�',
+ `evaluation_opinion` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '璇勬爣鎰忚',
+ `evaluation_time` datetime DEFAULT NULL COMMENT '璇勬爣鏃堕棿',
+ `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci 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`) USING BTREE,
+ KEY `idx_tender_project_id` (`tender_project_id`) USING BTREE,
+ KEY `idx_supplier_id` (`supplier_id`) USING BTREE,
+ KEY `idx_bid_id` (`bid_id`) USING BTREE,
+ KEY `idx_ranking` (`ranking`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='璇勬爣璁板綍琛�';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `srm_bid_award` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '瀹氭爣ID',
+ `tender_project_id` bigint NOT NULL COMMENT '鎷涙爣椤圭洰ID',
+ `supplier_id` bigint NOT NULL COMMENT '涓爣渚涘簲鍟咺D',
+ `bid_id` bigint NOT NULL COMMENT '涓爣鎶曟爣ID',
+ `award_no` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '涓爣閫氱煡涔︾紪鍙�',
+ `award_status` int NOT NULL DEFAULT '0' COMMENT '瀹氭爣鐘舵��',
+ `award_amount` decimal(24,6) NOT NULL COMMENT '涓爣閲戦',
+ `award_time` datetime DEFAULT NULL COMMENT '瀹氭爣鏃堕棿',
+ `notice_file_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '涓爣閫氱煡涔︽枃浠跺悕',
+ `notice_file_url` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '涓爣閫氱煡涔︽枃浠跺湴鍧�',
+ `purchase_order_id` bigint DEFAULT NULL COMMENT '鍏宠仈鐢熸垚鐨勯噰璐鍗旾D',
+ `purchase_order_no` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鍏宠仈鐢熸垚鐨勯噰璐鍗曞彿',
+ `approver_id` bigint DEFAULT NULL COMMENT '瀹℃壒浜篒D',
+ `approval_time` datetime DEFAULT NULL COMMENT '瀹℃壒鏃堕棿',
+ `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci 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`) USING BTREE,
+ UNIQUE KEY `uk_award_no` (`award_no`) USING BTREE,
+ KEY `idx_tender_project_id` (`tender_project_id`) USING BTREE,
+ KEY `idx_supplier_id` (`supplier_id`) USING BTREE,
+ KEY `idx_purchase_order_id` (`purchase_order_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='瀹氭爣璁板綍琛�';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `srm_tender_config` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '閰嶇疆ID',
+ `default_bidding_mode` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'FULL' COMMENT '榛樿鎷涙姇鏍囨ā寮�: FULL-瀹屾暣鐗�, SIMPLE-绠�鏄撶増',
+ `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci 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`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='SRM鎷涙姇鏍囬厤缃〃';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `srm_delivery_plan` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '浜よ揣璁″垝ID',
+ `collaboration_id` bigint NOT NULL COMMENT '閲囪喘鍗忓悓ID',
+ `order_id` bigint NOT NULL COMMENT '閲囪喘璁㈠崟ID',
+ `order_item_id` bigint DEFAULT NULL COMMENT '閲囪喘璁㈠崟椤笽D',
+ `product_id` bigint DEFAULT NULL COMMENT '鐗╂枡ID',
+ `product_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鐗╂枡鍚嶇О',
+ `planned_quantity` decimal(24,6) NOT NULL COMMENT '璁″垝鏁伴噺',
+ `actual_quantity` decimal(24,6) DEFAULT NULL COMMENT '瀹為檯鏁伴噺',
+ `planned_delivery_date` date NOT NULL COMMENT '璁″垝浜よ揣鏃ユ湡',
+ `actual_delivery_date` date DEFAULT NULL COMMENT '瀹為檯浜よ揣鏃ユ湡',
+ `delivery_status` int NOT NULL DEFAULT '0' COMMENT '浜よ揣鐘舵��',
+ `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci 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`) USING BTREE,
+ KEY `idx_collaboration_id` (`collaboration_id`) USING BTREE,
+ KEY `idx_order_id` (`order_id`) USING BTREE,
+ KEY `idx_delivery_status` (`delivery_status`) USING BTREE,
+ KEY `idx_planned_delivery_date` (`planned_delivery_date`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='浜よ揣璁″垝琛�';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `srm_purchase_collaboration` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '鍗忓悓ID',
+ `order_id` bigint NOT NULL COMMENT '閲囪喘璁㈠崟ID',
+ `order_no` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '閲囪喘璁㈠崟鍙�',
+ `supplier_id` bigint NOT NULL COMMENT '渚涘簲鍟咺D',
+ `collaboration_status` int NOT NULL DEFAULT '0' COMMENT '鍗忓悓鐘舵��',
+ `confirm_time` datetime DEFAULT NULL COMMENT '纭鏃堕棿',
+ `confirm_user` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '纭浜�',
+ `reject_reason` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鎷掔粷鍘熷洜',
+ `planned_delivery_time` datetime DEFAULT NULL COMMENT '棰勮浜や粯鏃堕棿',
+ `actual_delivery_time` datetime DEFAULT NULL COMMENT '瀹為檯浜や粯鏃堕棿',
+ `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci 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`) USING BTREE,
+ KEY `idx_order_id` (`order_id`) USING BTREE,
+ KEY `idx_supplier_id` (`supplier_id`) USING BTREE,
+ KEY `idx_collaboration_status` (`collaboration_status`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='閲囪喘鍗忓悓璁板綍琛�';
+/*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/sql/mysql/srm_procurement_refactor_20261103.sql b/sql/mysql/srm_procurement_refactor_20261103.sql
new file mode 100644
index 0000000..f215402
--- /dev/null
+++ b/sql/mysql/srm_procurement_refactor_20261103.sql
@@ -0,0 +1,329 @@
+-- =============================================================================
+-- 閲囪喘绠$悊 / 渚涘簲鍟嗗煙閲嶆瀯杩佺Щ鑴氭湰
+-- 鏃ユ湡锛�2026-11-03
+-- 鐩爣搴擄細mom-ntsh锛�36.213.150.237:10000锛�
+--
+-- 鍐呭锛�
+-- 1. 鏂板缓渚涘簲鍟嗛摱琛岃处鎴疯〃 srm_supplier_bank
+-- 2. 鏂板缓璇环姣斾环鐩稿叧琛� srm_inquiry / srm_inquiry_item / srm_inquiry_supplier
+-- / srm_inquiry_quote / srm_inquiry_order
+-- 3. 鏂板缓鎶曟爣淇濊瘉閲戝彴璐� srm_bid_bond
+-- 4. 鏃т緵搴斿晢鎵佸钩鑱旂郴浜�/閾惰瀛楁杩佺Щ涓洪粯璁よ仈绯讳汉涓庨粯璁ら摱琛�
+-- 5. 鍒犻櫎渚涘簲鍟嗗噯鍏�/璧勮川/缁╂晥/鎷涙姇鏍�/缁熻鑿滃崟锛屾柊澧炶浠锋瘮浠�/鎶曟爣淇濊瘉閲�/渚涘簲鍟嗗線鏉ヨ彍鍗�
+-- 6. 鍚屾鏂拌彍鍗曟巿鏉冪粰宸叉嫢鏈夆�滀緵搴斿晢妗f鈥濈殑瑙掕壊
+-- 7. DROP 宸插簾寮冪殑 13 寮犵┖琛紙缁撴瀯澶囦唤瑙佸悓鐩綍
+-- srm_legacy_tables_backup_20261103.sql锛�
+--
+-- 璇存槑锛�
+-- - 鑴氭湰涓嶄娇鐢� tenant_id锛堥」鐩潪澶氱鎴凤級銆�
+-- - 寤鸿〃浣跨敤 CREATE TABLE IF NOT EXISTS锛岃彍鍗曚娇鐢ㄢ�滃厛鍒犲悗鎻掆�濓紝鍙噸澶嶆墽琛屻��
+-- - DROP 鐨� 13 寮犺〃鍦ㄦ墽琛屽墠宸茬‘璁ゅ潎涓� 0 琛岋紱鎵ц鍚庝笉鍙仮澶嶃��
+-- =============================================================================
+
+-- -----------------------------------------------------------------------------
+-- 銆囥�佽ˉ榻愪緷璧栧瓧娈碉紙渚涘簲鍟嗗線鏉ユ煡璇� erp_purchase_invoice 闇�瑕侊紝涓�
+-- 20261027_business_requirements.sql 涓殑瀹氫箟涓�鑷达紱宸插瓨鍦ㄥ垯璺宠繃锛�
+-- -----------------------------------------------------------------------------
+
+SET @has_arrival_notice_id = (
+ SELECT COUNT(*) FROM information_schema.columns
+ WHERE table_schema = DATABASE() AND table_name = 'erp_purchase_invoice'
+ AND column_name = 'arrival_notice_id'
+);
+SET @sql = IF(@has_arrival_notice_id = 0,
+ 'ALTER TABLE `erp_purchase_invoice` ADD COLUMN `arrival_notice_id` BIGINT NULL COMMENT ''鍏宠仈鍏ュ簱鍗�'' AFTER `purchase_order_id`',
+ 'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- -----------------------------------------------------------------------------
+-- 涓�銆佹柊寤鸿〃
+-- -----------------------------------------------------------------------------
+
+CREATE TABLE IF NOT EXISTS `srm_supplier_bank` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '閾惰璐︽埛ID',
+ `supplier_id` bigint NOT NULL COMMENT '渚涘簲鍟咺D',
+ `bank_name` varchar(128) NOT NULL COMMENT '寮�鎴疯',
+ `bank_account` varchar(64) NOT NULL COMMENT '閾惰璐﹀彿',
+ `bank_no` varchar(64) DEFAULT NULL COMMENT '閾惰琛屽彿',
+ `bank_address` varchar(255) DEFAULT NULL COMMENT '寮�鎴疯鍦板潃',
+ `is_default` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁榛樿閾惰璐︽埛',
+ `sort` int NOT NULL DEFAULT '0' COMMENT '鎺掑簭',
+ `remark` varchar(500) DEFAULT NULL 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`) USING BTREE,
+ KEY `idx_supplier_id` (`supplier_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='渚涘簲鍟嗛摱琛岃处鎴疯〃';
+
+CREATE TABLE IF NOT EXISTS `srm_inquiry` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '璇环鍗旾D',
+ `no` varchar(32) NOT NULL COMMENT '璇环鍗曞彿',
+ `title` varchar(128) NOT NULL COMMENT '璇环鏍囬',
+ `status` tinyint NOT NULL DEFAULT '0' COMMENT '鐘舵�侊細0鑽夌 10璇环涓� 20宸茶浆璁㈠崟 30宸插彇娑�',
+ `inquiry_date` date DEFAULT NULL COMMENT '璇环鏃ユ湡',
+ `deadline` date DEFAULT NULL COMMENT '鎶ヤ环鎴鏃ユ湡',
+ `purchaser_user_id` bigint DEFAULT NULL COMMENT '閲囪喘鍛樼敤鎴稩D',
+ `remark` varchar(500) DEFAULT NULL 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`) USING BTREE,
+ UNIQUE KEY `uk_no` (`no`) USING BTREE,
+ KEY `idx_status` (`status`) USING BTREE,
+ KEY `idx_inquiry_date` (`inquiry_date`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='SRM璇环鍗�';
+
+CREATE TABLE IF NOT EXISTS `srm_inquiry_item` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '璇环浜у搧琛孖D',
+ `inquiry_id` bigint NOT NULL COMMENT '璇环鍗旾D',
+ `product_id` bigint DEFAULT NULL COMMENT '浜у搧ID',
+ `product_unit_id` bigint DEFAULT NULL COMMENT '浜у搧鍗曚綅ID',
+ `product_code` varchar(64) DEFAULT NULL COMMENT '浜у搧缂栫爜',
+ `product_name` varchar(255) DEFAULT NULL COMMENT '浜у搧鍚嶇О',
+ `product_spec` varchar(200) DEFAULT NULL COMMENT '瑙勬牸鍨嬪彿',
+ `unit_name` varchar(50) DEFAULT NULL COMMENT '鍗曚綅鍚嶇О',
+ `quantity` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '閲囪喘鏁伴噺',
+ `estimated_price` decimal(24,6) DEFAULT NULL COMMENT '棰勪及鍗曚环',
+ `selected_supplier_id` bigint DEFAULT NULL COMMENT '涓爣渚涘簲鍟咺D',
+ `selected_quote_id` bigint DEFAULT NULL COMMENT '涓爣鎶ヤ环ID',
+ `selected_price` decimal(24,6) DEFAULT NULL COMMENT '涓爣鍗曚环',
+ `remark` varchar(500) DEFAULT NULL 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`) USING BTREE,
+ KEY `idx_inquiry_id` (`inquiry_id`) USING BTREE,
+ KEY `idx_product_id` (`product_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='SRM璇环鍗曚骇鍝佽';
+
+CREATE TABLE IF NOT EXISTS `srm_inquiry_supplier` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '璇环鍙備笌渚涘簲鍟咺D',
+ `inquiry_id` bigint NOT NULL COMMENT '璇环鍗旾D',
+ `supplier_id` bigint NOT NULL COMMENT '渚涘簲鍟咺D',
+ `quote_status` tinyint NOT NULL DEFAULT '0' COMMENT '鎶ヤ环鐘舵�侊細0鏈姤浠� 10宸叉姤浠�',
+ `quote_time` datetime DEFAULT NULL COMMENT '鏈�杩戞姤浠锋椂闂�',
+ `remark` varchar(500) DEFAULT NULL 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`) USING BTREE,
+ KEY `idx_inquiry_id` (`inquiry_id`) USING BTREE,
+ KEY `idx_supplier_id` (`supplier_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='SRM璇环鍙備笌渚涘簲鍟�';
+
+CREATE TABLE IF NOT EXISTS `srm_inquiry_quote` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '璇环鎶ヤ环ID',
+ `inquiry_id` bigint NOT NULL COMMENT '璇环鍗旾D',
+ `inquiry_item_id` bigint NOT NULL COMMENT '璇环浜у搧琛孖D',
+ `supplier_id` bigint NOT NULL COMMENT '渚涘簲鍟咺D',
+ `price` decimal(24,6) NOT NULL COMMENT '鎶ヤ环鍗曚环',
+ `tax_rate` decimal(24,6) DEFAULT NULL COMMENT '绋庣巼锛�%锛�',
+ `delivery_cycle` int DEFAULT NULL COMMENT '浜よ揣鍛ㄦ湡锛堝ぉ锛�',
+ `payment_terms` varchar(128) DEFAULT NULL COMMENT '浠樻鏉′欢',
+ `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
+ `is_selected` bit(1) NOT NULL DEFAULT b'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`) USING BTREE,
+ KEY `idx_inquiry_id` (`inquiry_id`) USING BTREE,
+ KEY `idx_inquiry_item_id` (`inquiry_item_id`) USING BTREE,
+ KEY `idx_supplier_id` (`supplier_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='SRM璇环鎶ヤ环鏄庣粏';
+
+CREATE TABLE IF NOT EXISTS `srm_inquiry_order` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '璇环杞鍗曡褰旾D',
+ `inquiry_id` bigint NOT NULL COMMENT '璇环鍗旾D',
+ `supplier_id` bigint NOT NULL COMMENT '涓爣渚涘簲鍟咺D',
+ `purchase_order_id` bigint DEFAULT NULL COMMENT '鐢熸垚鐨勯噰璐鍗旾D',
+ `purchase_order_no` varchar(64) DEFAULT NULL 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`) USING BTREE,
+ KEY `idx_inquiry_id` (`inquiry_id`) USING BTREE,
+ KEY `idx_supplier_id` (`supplier_id`) USING BTREE,
+ KEY `idx_purchase_order_id` (`purchase_order_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='SRM璇环杞噰璐鍗曡褰�';
+
+CREATE TABLE IF NOT EXISTS `srm_bid_bond` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '鎶曟爣淇濊瘉閲慖D',
+ `no` varchar(32) NOT NULL COMMENT '淇濊瘉閲戝崟鍙�',
+ `supplier_id` bigint NOT NULL COMMENT '渚涘簲鍟咺D',
+ `project_name` varchar(255) DEFAULT NULL COMMENT '椤圭洰鍚嶇О',
+ `inquiry_id` bigint DEFAULT NULL COMMENT '鍏宠仈璇环鍗旾D',
+ `purchase_order_id` bigint DEFAULT NULL COMMENT '鍏宠仈閲囪喘璁㈠崟ID',
+ `bond_amount` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '淇濊瘉閲戦噾棰�',
+ `pay_date` date DEFAULT NULL COMMENT '缂寸撼鏃ユ湡',
+ `won` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁涓爣',
+ `refund_status` tinyint NOT NULL DEFAULT '0' COMMENT '閫�鍥炵姸鎬侊細0鏈��鍥� 1閮ㄥ垎閫�鍥� 2宸查��鍥� 3鏃犻渶閫�鍥�',
+ `refund_amount` decimal(24,6) DEFAULT NULL COMMENT '閫�鍥為噾棰�',
+ `refund_date` date DEFAULT NULL COMMENT '閫�鍥炴棩鏈�',
+ `remark` varchar(500) DEFAULT NULL 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`) USING BTREE,
+ UNIQUE KEY `uk_no` (`no`) USING BTREE,
+ KEY `idx_supplier_id` (`supplier_id`) USING BTREE,
+ KEY `idx_inquiry_id` (`inquiry_id`) USING BTREE,
+ KEY `idx_refund_status` (`refund_status`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='SRM鎶曟爣淇濊瘉閲戝彴璐�';
+
+-- -----------------------------------------------------------------------------
+-- 浜屻�佹棫渚涘簲鍟嗘墎骞冲瓧娈佃縼绉讳负榛樿鑱旂郴浜� / 榛樿閾惰
+-- 浠呭湪瀵瑰簲瀛愯〃杩樻病鏈夋暟鎹椂琛ヤ竴鏉★紝閬垮厤閲嶅鎵ц浜х敓閲嶅琛屻��
+-- -----------------------------------------------------------------------------
+
+INSERT INTO `srm_supplier_contact`
+ (`supplier_id`, `name`, `mobile`, `email`, `is_default`, `sort`, `creator`, `updater`)
+SELECT s.`id`, TRIM(s.`contact_name`), s.`contact_mobile`, s.`contact_email`, b'1', 0, 'system', 'system'
+FROM `srm_supplier` s
+WHERE s.`deleted` = b'0'
+ AND s.`contact_name` IS NOT NULL
+ AND TRIM(s.`contact_name`) <> ''
+ AND NOT EXISTS (
+ SELECT 1 FROM `srm_supplier_contact` c
+ WHERE c.`supplier_id` = s.`id` AND c.`deleted` = b'0'
+ );
+
+INSERT INTO `srm_supplier_bank`
+ (`supplier_id`, `bank_name`, `bank_account`, `is_default`, `sort`, `creator`, `updater`)
+SELECT s.`id`, TRIM(s.`bank_name`), TRIM(s.`bank_account`), b'1', 0, 'system', 'system'
+FROM `srm_supplier` s
+WHERE s.`deleted` = b'0'
+ AND s.`bank_name` IS NOT NULL
+ AND TRIM(s.`bank_name`) <> ''
+ AND s.`bank_account` IS NOT NULL
+ AND TRIM(s.`bank_account`) <> ''
+ AND NOT EXISTS (
+ SELECT 1 FROM `srm_supplier_bank` b
+ WHERE b.`supplier_id` = s.`id` AND b.`deleted` = b'0'
+ );
+
+-- -----------------------------------------------------------------------------
+-- 涓夈�佽彍鍗曡皟鏁�
+-- -----------------------------------------------------------------------------
+
+-- 3.1 鍒犻櫎鏃� SRM 瀛愯彍鍗曪紙鍑嗗叆/璧勮川/缁╂晥/鎷涙姇鏍�/缁熻锛夊強鍏舵寜閽紝骞剁Щ闄� SRM 鐩綍
+-- 渚涘簲鍟嗘。妗�/璇环姣斾环/鎶曟爣淇濊瘉閲� 缁熶竴鎸傚埌閲囪喘绠$悊鏍硅彍鍗�(2602) 涓�
+DELETE FROM `system_role_menu`
+WHERE `menu_id` IN (
+ SELECT `id` FROM (
+ SELECT `id` FROM `system_menu`
+ WHERE `id` IN (602524, 602530, 602535, 602540, 602545, 602569,
+ 602612, 602613, 602614, 1080070, 1080071)
+ OR `parent_id` IN (602530, 602535, 602540, 602545, 602569,
+ 602612, 602613, 602614, 1080070, 1080071)
+ ) t
+);
+
+DELETE FROM `system_menu`
+WHERE `id` IN (
+ SELECT `id` FROM (
+ SELECT `id` FROM `system_menu`
+ WHERE `id` IN (602524, 602530, 602535, 602540, 602545, 602569,
+ 602612, 602613, 602614, 1080070, 1080071)
+ OR `parent_id` IN (602530, 602535, 602540, 602545, 602569,
+ 602612, 602613, 602614, 1080070, 1080071)
+ ) t
+);
+
+-- 3.2 鏂拌彍鍗曞厛鍒犲悗鎻掞紝淇濊瘉鍙噸澶嶆墽琛岋紙602620-602641 涓虹┖鍙锋锛�
+DELETE FROM `system_role_menu` WHERE `menu_id` BETWEEN 602620 AND 602641;
+DELETE FROM `system_menu` WHERE `id` BETWEEN 602620 AND 602641;
+
+INSERT INTO `system_menu`
+ (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`)
+VALUES
+ -- 璇环姣斾环
+ (602620, '璇环姣斾环', '', 2, 2, 2602, 'inquiry', 'ep:search', 'srm/inquiry/index', 'SrmInquiry', 0),
+ (602621, '璇环鏌ヨ', 'srm:inquiry:query', 3, 1, 602620, '', '', '', '', 0),
+ (602622, '璇环鍒涘缓', 'srm:inquiry:create', 3, 2, 602620, '', '', '', '', 0),
+ (602623, '璇环鏇存柊', 'srm:inquiry:update', 3, 3, 602620, '', '', '', '', 0),
+ (602624, '璇环鍒犻櫎', 'srm:inquiry:delete', 3, 4, 602620, '', '', '', '', 0),
+ (602625, '璇环纭杞鍗�', 'srm:inquiry:confirm', 3, 5, 602620, '', '', '', '', 0),
+ (602626, '璇环褰曞叆鎶ヤ环', 'srm:inquiry:quote', 3, 6, 602620, '', '', '', '', 0),
+ -- 鎶曟爣淇濊瘉閲�
+ (602630, '鎶曟爣淇濊瘉閲�', '', 2, 3, 2602, 'bid-bond', 'ep:money', 'srm/bidBond/index', 'SrmBidBond', 0),
+ (602631, '淇濊瘉閲戞煡璇�', 'srm:bid-bond:query', 3, 1, 602630, '', '', '', '', 0),
+ (602632, '淇濊瘉閲戝垱寤�', 'srm:bid-bond:create', 3, 2, 602630, '', '', '', '', 0),
+ (602633, '淇濊瘉閲戞洿鏂�', 'srm:bid-bond:update', 3, 3, 602630, '', '', '', '', 0),
+ (602634, '淇濊瘉閲戝垹闄�', 'srm:bid-bond:delete', 3, 4, 602630, '', '', '', '', 0),
+ -- 渚涘簲鍟嗗線鏉ワ紙鎸傚湪閲囪喘绠$悊鏍逛笅锛�
+ (602640, '渚涘簲鍟嗗線鏉�', '', 2, 8, 2602, 'supplier-statement', 'ep:wallet', 'erp/purchase/statement/index', 'ErpSupplierStatement', 0),
+ (602641, '渚涘簲鍟嗗線鏉ユ煡璇�', 'erp:supplier-statement:query', 3, 1, 602640, '', '', '', '', 0);
+
+-- 3.3 缁熶竴閲囪喘绠$悊鑿滃崟鎺掑簭锛氭。妗�/瀵绘簮/淇濊瘉閲� 鈫� 鐢宠 鈫� 璁㈠崟 鈫� 鏉ョエ 鈫� 浠樻 鈫� 寰�鏉�
+UPDATE `system_menu` SET `sort` = 1 WHERE `id` = 602525;
+UPDATE `system_menu` SET `sort` = 2 WHERE `id` = 602620;
+UPDATE `system_menu` SET `sort` = 3 WHERE `id` = 602630;
+UPDATE `system_menu` SET `sort` = 4 WHERE `id` = 602498;
+UPDATE `system_menu` SET `sort` = 5 WHERE `id` = 2666;
+UPDATE `system_menu` SET `sort` = 6 WHERE `id` = 1063110;
+UPDATE `system_menu` SET `sort` = 7 WHERE `id` = 1063116;
+UPDATE `system_menu` SET `sort` = 8 WHERE `id` = 602640;
+
+-- 3.4 鏂拌彍鍗曟巿鏉冿細鎺堜簣褰撳墠宸叉嫢鏈夆�滀緵搴斿晢妗f鈥�(602525) 鐨勮鑹�
+INSERT INTO `system_role_menu` (`role_id`, `menu_id`, `creator`, `updater`)
+SELECT r.`role_id`, m.`menu_id`, 'system', 'system'
+FROM (
+ SELECT DISTINCT `role_id` FROM `system_role_menu`
+ WHERE `menu_id` = 602525 AND `deleted` = b'0'
+) r
+CROSS JOIN (
+ SELECT 602620 AS `menu_id`
+ UNION ALL SELECT 602621
+ UNION ALL SELECT 602622
+ UNION ALL SELECT 602623
+ UNION ALL SELECT 602624
+ UNION ALL SELECT 602625
+ UNION ALL SELECT 602626
+ UNION ALL SELECT 602630
+ UNION ALL SELECT 602631
+ UNION ALL SELECT 602632
+ UNION ALL SELECT 602633
+ UNION ALL SELECT 602634
+ UNION ALL SELECT 602640
+ UNION ALL SELECT 602641
+) m
+WHERE NOT EXISTS (
+ SELECT 1 FROM `system_role_menu` rm
+ WHERE rm.`role_id` = r.`role_id` AND rm.`menu_id` = m.`menu_id` AND rm.`deleted` = b'0'
+);
+
+-- -----------------------------------------------------------------------------
+-- 鍥涖�丏ROP 搴熷純绌鸿〃锛堟墽琛屽墠宸茬‘璁� 0 琛岋紝缁撴瀯澶囦唤瑙� srm_legacy_tables_backup_20261103.sql锛�
+-- -----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS `srm_supplier_apply`;
+DROP TABLE IF EXISTS `srm_supplier_certificate`;
+DROP TABLE IF EXISTS `srm_supplier_evaluation`;
+DROP TABLE IF EXISTS `srm_tender_project`;
+DROP TABLE IF EXISTS `srm_tender_material`;
+DROP TABLE IF EXISTS `srm_tender_bid`;
+DROP TABLE IF EXISTS `srm_supplier_quote`;
+DROP TABLE IF EXISTS `srm_bid_open`;
+DROP TABLE IF EXISTS `srm_bid_evaluation`;
+DROP TABLE IF EXISTS `srm_bid_award`;
+DROP TABLE IF EXISTS `srm_tender_config`;
+DROP TABLE IF EXISTS `srm_delivery_plan`;
+DROP TABLE IF EXISTS `srm_purchase_collaboration`;
diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/number/MoneyUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/number/MoneyUtils.java
index 7b136e3..adbc872 100644
--- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/number/MoneyUtils.java
+++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/number/MoneyUtils.java
@@ -128,4 +128,24 @@
return price.multiply(percent).divide(PERCENT_100, PRICE_SCALE, RoundingMode.HALF_UP);
}
+ /**
+ * 璁$畻鍚◣閲戦涓寘鍚殑绋庨
+ *
+ * 閫傜敤鍦烘櫙锛氬崟浠蜂负鍚◣鍗曚环鏃讹紝浠风◣鍚堣 = 鍗曚环 * 鏁伴噺锛岀◣棰� = 浠风◣鍚堣 * 绋庣巼 / (100 + 绋庣巼)銆�
+ * 渚嬪锛氬惈绋庨噾棰� 113 鍏冦�佺◣鐜� 13%锛岀◣棰濅负 13 鍏冦��
+ *
+ * 浣嶆暟锛歿@link #PRICE_SCALE}
+ *
+ * @param totalPrice 鍚◣閲戦锛堜环绋庡悎璁★級
+ * @param percent 绋庣巼锛岀櫨鍒嗘瘮
+ * @return 鍚◣閲戦涓殑绋庨
+ */
+ public static BigDecimal taxPriceIncluded(BigDecimal totalPrice, BigDecimal percent) {
+ if (totalPrice == null || percent == null || percent.compareTo(BigDecimal.ZERO) <= 0) {
+ return null;
+ }
+ return totalPrice.multiply(percent)
+ .divide(PERCENT_100.add(percent), PRICE_SCALE, RoundingMode.HALF_UP);
+ }
+
}
diff --git a/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderApi.java b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderApi.java
index 3a28a85..e157a54 100644
--- a/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderApi.java
+++ b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderApi.java
@@ -85,6 +85,14 @@
CommonResult<Long> createPurchaseOrder(ErpPurchaseOrderCreateReqDTO createReqDTO);
/**
+ * 鍒涘缓閲囪喘璁㈠崟鑽夌锛堜笉鑷姩鎻愪氦瀹℃壒锛�
+ *
+ * @param createReqDTO 鍒涘缓淇℃伅
+ * @return 璁㈠崟缂栧彿
+ */
+ CommonResult<Long> createPurchaseOrderDraft(ErpPurchaseOrderCreateReqDTO createReqDTO);
+
+ /**
* 鎸夋潵婧愭煡璇㈤噰璐鍗曟槑缁嗗垪琛紙鐢ㄤ簬杩芥函鏉ユ簮宸ュ崟鐨勯噰璐儏鍐碉級
*
* @param sourceType 鏉ユ簮绫诲瀷
diff --git a/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpSupplierReferenceApi.java b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpSupplierReferenceApi.java
new file mode 100644
index 0000000..2eb3147
--- /dev/null
+++ b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpSupplierReferenceApi.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.erp.api.purchase;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+
+import java.util.List;
+
+/**
+ * ERP 渚涘簲鍟嗗紩鐢ㄦ煡璇� API
+ */
+public interface ErpSupplierReferenceApi {
+
+ String PREFIX = "/rpc-api/erp/supplier-reference";
+
+ /**
+ * 鏌ヨ渚涘簲鍟嗚鍝簺涓氬姟琛ㄥ紩鐢�
+ *
+ * @param supplierId 渚涘簲鍟嗙紪鍙�
+ * @return 寮曠敤鏉ユ簮鍚嶇О鍒楄〃锛堝鈥滈噰璐�-閲囪喘璁㈠崟鈥濓級锛屾棤寮曠敤鏃惰繑鍥炵┖鍒楄〃
+ */
+ CommonResult<List<String>> getSupplierReferenceSources(Long supplierId);
+
+}
diff --git a/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/dto/ErpPurchaseOrderCreateReqDTO.java b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/dto/ErpPurchaseOrderCreateReqDTO.java
index fefde22..7f3460d 100644
--- a/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/dto/ErpPurchaseOrderCreateReqDTO.java
+++ b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/dto/ErpPurchaseOrderCreateReqDTO.java
@@ -26,6 +26,15 @@
@Schema(description = "瀹氶噾閲戦锛屽崟浣嶏細鍏�", example = "100")
private BigDecimal depositPrice;
+ @Schema(description = "鏉ユ簮绫诲瀷", example = "2")
+ private Integer sourceType;
+
+ @Schema(description = "鏉ユ簮鍗曞彿", example = "XJ2026110001")
+ private String sourceNo;
+
+ @Schema(description = "鏉ユ簮鍗曟嵁缂栧彿", example = "1")
+ private Long sourceId;
+
@Schema(description = "澶囨敞", example = "澶囨敞淇℃伅")
private String remark;
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderApiImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderApiImpl.java
index 3a81eae..46d3400 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderApiImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseOrderApiImpl.java
@@ -111,11 +111,20 @@
@Override
public CommonResult<Long> createPurchaseOrder(ErpPurchaseOrderCreateReqDTO createReqDTO) {
+ return success(purchaseOrderService.createPurchaseOrder(buildSaveReqVO(createReqDTO)));
+ }
+
+ @Override
+ public CommonResult<Long> createPurchaseOrderDraft(ErpPurchaseOrderCreateReqDTO createReqDTO) {
+ return success(purchaseOrderService.createPurchaseOrder(buildSaveReqVO(createReqDTO), false));
+ }
+
+ private ErpPurchaseOrderSaveReqVO buildSaveReqVO(ErpPurchaseOrderCreateReqDTO createReqDTO) {
ErpPurchaseOrderSaveReqVO saveReqVO = BeanUtils.toBean(createReqDTO, ErpPurchaseOrderSaveReqVO.class);
if (createReqDTO.getItems() != null) {
saveReqVO.setItems(BeanUtils.toBean(createReqDTO.getItems(), ErpPurchaseOrderSaveReqVO.Item.class));
}
- return success(purchaseOrderService.createPurchaseOrder(saveReqVO));
+ return saveReqVO;
}
@Override
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpSupplierReferenceApiImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpSupplierReferenceApiImpl.java
new file mode 100644
index 0000000..11286db
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpSupplierReferenceApiImpl.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.erp.api.purchase;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpSupplierMapper;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * ERP 渚涘簲鍟嗗紩鐢ㄦ煡璇� API 瀹炵幇
+ */
+@RestController
+@RequestMapping(ErpSupplierReferenceApi.PREFIX)
+@Validated
+public class ErpSupplierReferenceApiImpl implements ErpSupplierReferenceApi {
+
+ @Resource
+ private ErpSupplierMapper supplierMapper;
+
+ @Override
+ public CommonResult<List<String>> getSupplierReferenceSources(Long supplierId) {
+ if (supplierId == null) {
+ return success(Collections.emptyList());
+ }
+ List<Map<String, Object>> rows = supplierMapper.selectSupplierReferenceCount(supplierId);
+ List<String> sources = rows.stream()
+ .map(row -> String.valueOf(row.get("source")))
+ .toList();
+ return success(sources);
+ }
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierStatementController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierStatementController.java
new file mode 100644
index 0000000..51b8b73
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierStatementController.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.erp.controller.admin.purchase;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.statement.ErpSupplierStatementReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.statement.ErpSupplierStatementRespVO;
+import cn.iocoder.yudao.module.erp.service.purchase.ErpSupplierStatementService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "绠$悊鍚庡彴 - ERP 渚涘簲鍟嗗線鏉�")
+@RestController
+@RequestMapping("/erp/supplier-statement")
+@Validated
+public class ErpSupplierStatementController {
+
+ @Resource
+ private ErpSupplierStatementService supplierStatementService;
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰彇渚涘簲鍟嗗線鏉ュ璐︽暟鎹�")
+ @PreAuthorize("@ss.hasPermission('erp:supplier-statement:query')")
+ public CommonResult<ErpSupplierStatementRespVO> getSupplierStatement(
+ @Valid ErpSupplierStatementReqVO reqVO) {
+ return success(supplierStatementService.getSupplierStatement(reqVO));
+ }
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/statement/ErpSupplierStatementReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/statement/ErpSupplierStatementReqVO.java
new file mode 100644
index 0000000..bb5312f
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/statement/ErpSupplierStatementReqVO.java
@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.statement;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠$悊鍚庡彴 - 渚涘簲鍟嗗線鏉ユ煡璇� Request VO")
+@Data
+public class ErpSupplierStatementReqVO {
+
+ @Schema(description = "渚涘簲鍟嗙紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "渚涘簲鍟嗕笉鑳戒负绌�")
+ private Long supplierId;
+
+ @Schema(description = "寮�濮嬫椂闂�")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime beginTime;
+
+ @Schema(description = "缁撴潫鏃堕棿")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime endTime;
+
+ @Schema(description = "鏄惁鍖呭惈鏈鏍搁噰璐鍗�")
+ private Boolean includeUnapprovedOrder;
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/statement/ErpSupplierStatementRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/statement/ErpSupplierStatementRespVO.java
new file mode 100644
index 0000000..bedc18f
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/statement/ErpSupplierStatementRespVO.java
@@ -0,0 +1,96 @@
+package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.statement;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - 渚涘簲鍟嗗線鏉� Response VO")
+@Data
+public class ErpSupplierStatementRespVO {
+
+ @Schema(description = "渚涘簲鍟嗙紪鍙�")
+ private Long supplierId;
+
+ @Schema(description = "渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
+ @Schema(description = "姹囨��")
+ private Summary summary;
+
+ @Schema(description = "閲囪喘璁㈠崟娴佹按")
+ private List<OrderRow> orders;
+
+ @Schema(description = "鏉ョエ娴佹按")
+ private List<InvoiceRow> invoices;
+
+ @Schema(description = "浠樻娴佹按")
+ private List<PaymentRow> payments;
+
+ @Schema(description = "寰�鏉ユ眹鎬�")
+ @Data
+ public static class Summary {
+
+ @Schema(description = "绱閲囪喘棰�")
+ private BigDecimal totalPurchaseAmount;
+
+ @Schema(description = "绱寮�绁ㄩ")
+ private BigDecimal totalInvoiceAmount;
+
+ @Schema(description = "绱浠樻棰�")
+ private BigDecimal totalPaymentAmount;
+
+ @Schema(description = "鏈粯浣欓锛堝紑绁� - 浠樻锛�")
+ private BigDecimal unpaidAmount;
+
+ }
+
+ @Schema(description = "閲囪喘璁㈠崟娴佹按")
+ @Data
+ public static class OrderRow {
+
+ private Long id;
+ private String no;
+ private LocalDateTime orderTime;
+ private BigDecimal orderAmount;
+ private BigDecimal invoicedAmount;
+ private BigDecimal uninvoicedAmount;
+ private Integer status;
+ private Integer inStatus;
+
+ }
+
+ @Schema(description = "鏉ョエ娴佹按")
+ @Data
+ public static class InvoiceRow {
+
+ private Long id;
+ private String no;
+ private String invoiceNo;
+ private LocalDateTime invoiceTime;
+ private BigDecimal invoiceAmount;
+ private BigDecimal paidAmount;
+ private BigDecimal remainingPayable;
+ private Integer paymentStatus;
+ private Long purchaseOrderId;
+ private String purchaseOrderNo;
+
+ }
+
+ @Schema(description = "浠樻娴佹按")
+ @Data
+ public static class PaymentRow {
+
+ private Long id;
+ private String no;
+ private LocalDateTime paymentTime;
+ private BigDecimal paymentAmount;
+ private Integer status;
+ private Long invoiceId;
+ private String invoiceNo;
+
+ }
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java
index 0389f65..1acdac6 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java
@@ -14,6 +14,7 @@
import org.apache.ibatis.annotations.Mapper;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -84,4 +85,20 @@
return convertMap(result, obj -> (Long) obj.get("invoice_id"), obj -> (BigDecimal) obj.get("total_payment_price"));
}
+ /**
+ * 鎸変緵搴斿晢涓庝粯娆炬椂闂磋寖鍥存煡璇粯娆惧崟锛堜緵搴斿晢寰�鏉ワ級
+ */
+ default List<ErpFinancePaymentDO> selectListBySupplierIdAndPaymentTimeBetween(Long supplierId,
+ LocalDateTime beginTime,
+ LocalDateTime endTime,
+ Collection<Integer> statuses) {
+ return selectList(new LambdaQueryWrapperX<ErpFinancePaymentDO>()
+ .eq(ErpFinancePaymentDO::getSupplierId, supplierId)
+ .geIfPresent(ErpFinancePaymentDO::getPaymentTime, beginTime)
+ .leIfPresent(ErpFinancePaymentDO::getPaymentTime, endTime)
+ .inIfPresent(ErpFinancePaymentDO::getStatus, statuses)
+ .orderByAsc(ErpFinancePaymentDO::getPaymentTime)
+ .orderByAsc(ErpFinancePaymentDO::getId));
+ }
+
}
\ No newline at end of file
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..6cd508d 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,6 +7,7 @@
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInvoiceDO;
import org.apache.ibatis.annotations.Mapper;
+import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
@@ -45,4 +46,18 @@
.in(ErpPurchaseInvoiceDO::getPurchaseOrderId, orderIds));
}
+ /**
+ * 鎸変緵搴斿晢涓庡紑绁ㄦ椂闂磋寖鍥存煡璇㈡潵绁紙渚涘簲鍟嗗線鏉ワ級
+ */
+ default List<ErpPurchaseInvoiceDO> selectListBySupplierIdAndInvoiceTimeBetween(Long supplierId,
+ LocalDateTime beginTime,
+ LocalDateTime endTime) {
+ return selectList(new LambdaQueryWrapperX<ErpPurchaseInvoiceDO>()
+ .eq(ErpPurchaseInvoiceDO::getSupplierId, supplierId)
+ .geIfPresent(ErpPurchaseInvoiceDO::getInvoiceTime, beginTime)
+ .leIfPresent(ErpPurchaseInvoiceDO::getInvoiceTime, endTime)
+ .orderByAsc(ErpPurchaseInvoiceDO::getInvoiceTime)
+ .orderByAsc(ErpPurchaseInvoiceDO::getId));
+ }
+
}
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..17ff8e6 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
@@ -11,6 +11,8 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
+import java.time.LocalDateTime;
+import java.util.Collection;
import java.util.List;
import java.util.Objects;
@@ -99,4 +101,20 @@
.eq(ErpPurchaseOrderDO::getSourceId, sourceId));
}
+ /**
+ * 鎸変緵搴斿晢涓庝笅鍗曟椂闂磋寖鍥存煡璇㈤噰璐鍗曪紙渚涘簲鍟嗗線鏉ワ級
+ */
+ default List<ErpPurchaseOrderDO> selectListBySupplierIdAndOrderTimeBetween(Long supplierId,
+ LocalDateTime beginTime,
+ LocalDateTime endTime,
+ Collection<Integer> statuses) {
+ return selectList(new LambdaQueryWrapperX<ErpPurchaseOrderDO>()
+ .eq(ErpPurchaseOrderDO::getSupplierId, supplierId)
+ .geIfPresent(ErpPurchaseOrderDO::getOrderTime, beginTime)
+ .leIfPresent(ErpPurchaseOrderDO::getOrderTime, endTime)
+ .inIfPresent(ErpPurchaseOrderDO::getStatus, statuses)
+ .orderByAsc(ErpPurchaseOrderDO::getOrderTime)
+ .orderByAsc(ErpPurchaseOrderDO::getId));
+ }
+
}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpPurchaseOrderSourceTypeEnum.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpPurchaseOrderSourceTypeEnum.java
index 79d7988..4b9bfdb 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpPurchaseOrderSourceTypeEnum.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpPurchaseOrderSourceTypeEnum.java
@@ -15,7 +15,8 @@
@Getter
public enum ErpPurchaseOrderSourceTypeEnum implements ArrayValuable<Integer> {
- WORK_ORDER(1, "鐢熶骇宸ュ崟");
+ WORK_ORDER(1, "鐢熶骇宸ュ崟"),
+ SRM_INQUIRY(2, "SRM璇环");
public static final Integer[] ARRAYS = Arrays.stream(values())
.map(ErpPurchaseOrderSourceTypeEnum::getType).toArray(Integer[]::new);
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..e30e3d0 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
@@ -30,6 +30,15 @@
Long createPurchaseOrder(@Valid ErpPurchaseOrderSaveReqVO createReqVO);
/**
+ * 鍒涘缓閲囪喘璁㈠崟
+ *
+ * @param createReqVO 鍒涘缓淇℃伅
+ * @param submit 鏄惁鍒涘缓鍚庣珛鍗虫彁浜ゅ鎵癸紱false 鏃朵繚瀛樹负鑽夌
+ * @return 缂栧彿
+ */
+ Long createPurchaseOrder(@Valid ErpPurchaseOrderSaveReqVO createReqVO, boolean submit);
+
+ /**
* 瀵煎叆閲囪喘璁㈠崟
*
* @param importList 瀵煎叆鏁版嵁锛堟瘡涓�琛� = 涓�鏉℃槑缁嗭紝鐩稿悓閲囪喘鍗曠紪鍙峰悎骞朵负涓�寮犺鍗曪級
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 b756112..53da8de 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
@@ -117,6 +117,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long createPurchaseOrder(ErpPurchaseOrderSaveReqVO createReqVO) {
+ return createPurchaseOrder(createReqVO, true);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createPurchaseOrder(ErpPurchaseOrderSaveReqVO createReqVO, boolean submit) {
// 1.1 鏍¢獙璁㈠崟椤圭殑鏈夋晥鎬�
List<ErpPurchaseOrderItemDO> purchaseOrderItems = validatePurchaseOrderItems(createReqVO.getItems());
// 1.2 鏍¢獙渚涘簲鍟�
@@ -131,9 +137,9 @@
throw exception(PURCHASE_ORDER_NO_EXISTS);
}
- // 2.1 鎻掑叆璁㈠崟锛堥噰璐鍗曞垱寤哄悗涓烘湭瀹℃牳鐘舵�侊紝闇�瑕佹彁浜ゅ鎵癸級
+ // 2.1 鎻掑叆璁㈠崟锛坰ubmit=false 鏃朵繚瀛樹负鑽夌锛岀瓑寰呬笟鍔$‘璁ゅ悗鎵嬪姩鎻愪氦瀹℃壒锛�
ErpPurchaseOrderDO purchaseOrder = BeanUtils.toBean(createReqVO, ErpPurchaseOrderDO.class, in -> in
- .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())
+ .setNo(no).setStatus(submit ? ErpAuditStatus.PROCESS.getStatus() : ErpAuditStatus.DRAFT.getStatus())
.setInCount(BigDecimal.ZERO).setInStatus(ErpPurchaseOrderInStatusEnum.NOT_IN.getStatus()));
calculateTotalPrice(purchaseOrder, purchaseOrderItems);
purchaseOrderMapper.insert(purchaseOrder);
@@ -145,7 +151,9 @@
purchaseOrder.getId(), createReqVO.getBlobIds());
// 3. 鍒涘缓鍚庤嚜鍔ㄦ彁浜ゅ鎵瑰埌鍗忓悓鍔炲叕锛堝鎵瑰湪鍗忓悓鍔炲叕瀹屾垚锛屼笉鍦ㄦ湰椤甸潰瀹℃壒锛�
- submitPurchaseOrder(purchaseOrder.getId(), PURCHASE_ORDER_APPROVE_PROCESS_DEFINITION_KEY, getLoginUserId());
+ if (submit) {
+ submitPurchaseOrder(purchaseOrder.getId(), PURCHASE_ORDER_APPROVE_PROCESS_DEFINITION_KEY, getLoginUserId());
+ }
return purchaseOrder.getId();
}
@@ -351,7 +359,8 @@
purchaseOrder.setTotalCount(getSumValue(purchaseOrderItems, ErpPurchaseOrderItemDO::getCount, BigDecimal::add));
purchaseOrder.setTotalProductPrice(getSumValue(purchaseOrderItems, ErpPurchaseOrderItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO));
purchaseOrder.setTotalTaxPrice(getSumValue(purchaseOrderItems, ErpPurchaseOrderItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO));
- purchaseOrder.setTotalPrice(purchaseOrder.getTotalProductPrice().add(purchaseOrder.getTotalTaxPrice()));
+ // 鍗曚环涓哄惈绋庡崟浠凤細浠风◣鍚堣 = 鍗曚环 * 鏁伴噺锛岀◣棰濆凡鍖呭惈鍦ㄥ崟浠蜂腑锛屼笉鍐嶉澶栧姞绋�
+ purchaseOrder.setTotalPrice(purchaseOrder.getTotalProductPrice());
// 璁$畻浼樻儬浠锋牸
if (purchaseOrder.getDiscountPercent() == null) {
purchaseOrder.setDiscountPercent(BigDecimal.ZERO);
@@ -392,9 +401,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void submitPurchaseOrder(Long id, String processDefinitionKey, Long userId) {
- // 1. 鏍¢獙瀛樺湪 + 鏈鏍哥姸鎬�
+ // 1. 鏍¢獙瀛樺湪 + 鏈鏍哥姸鎬侊紙鑽夌鍜屾湭瀹℃牳鍧囧彲鎻愪氦锛�
ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrderExists(id);
- if (!ErpAuditStatus.PROCESS.getStatus().equals(purchaseOrder.getStatus())) {
+ boolean submitable = ErpAuditStatus.DRAFT.getStatus().equals(purchaseOrder.getStatus())
+ || ErpAuditStatus.PROCESS.getStatus().equals(purchaseOrder.getStatus());
+ if (!submitable) {
throw exception(PURCHASE_ORDER_SUBMIT_FAIL_STATUS);
}
@@ -510,7 +521,8 @@
return;
}
if (item.getTaxPercent() != null) {
- item.setTaxPrice(MoneyUtils.priceMultiplyPercent(item.getTotalPrice(), item.getTaxPercent()));
+ // 鍗曚环涓哄惈绋庡崟浠凤細绋庨浠庝环绋庡悎璁′腑鍙嶇畻锛岃�屼笉鏄湪鍚堣涓婂啀鍔犵◣
+ item.setTaxPrice(MoneyUtils.taxPriceIncluded(item.getTotalPrice(), item.getTaxPercent()));
}
}));
}
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 615441c..2768c47 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
@@ -360,7 +360,8 @@
purchaseRequest.setTotalCount(getSumValue(requestItems, ErpPurchaseRequestItemDO::getCount, BigDecimal::add));
purchaseRequest.setTotalProductPrice(getSumValue(requestItems, ErpPurchaseRequestItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO));
purchaseRequest.setTotalTaxPrice(getSumValue(requestItems, ErpPurchaseRequestItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO));
- purchaseRequest.setTotalPrice(purchaseRequest.getTotalProductPrice().add(purchaseRequest.getTotalTaxPrice()));
+ // 鍗曚环涓哄惈绋庡崟浠凤細浠风◣鍚堣 = 鍗曚环 * 鏁伴噺锛岀◣棰濆凡鍖呭惈鍦ㄥ崟浠蜂腑锛屼笉鍐嶉澶栧姞绋�
+ purchaseRequest.setTotalPrice(purchaseRequest.getTotalProductPrice());
// 璁$畻浼樻儬浠锋牸
if (purchaseRequest.getDiscountPercent() == null) {
purchaseRequest.setDiscountPercent(BigDecimal.ZERO);
@@ -374,7 +375,8 @@
if (item.getProductPrice() != null && item.getCount() != null) {
item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
if (item.getTaxPercent() != null) {
- item.setTaxPrice(MoneyUtils.priceMultiplyPercent(item.getTotalPrice(), item.getTaxPercent()));
+ // 鍗曚环涓哄惈绋庡崟浠凤細绋庨浠庝环绋庡悎璁′腑鍙嶇畻锛岃�屼笉鏄湪鍚堣涓婂啀鍔犵◣
+ item.setTaxPrice(MoneyUtils.taxPriceIncluded(item.getTotalPrice(), item.getTaxPercent()));
}
}
}));
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementService.java
new file mode 100644
index 0000000..2ca5059
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementService.java
@@ -0,0 +1,17 @@
+package cn.iocoder.yudao.module.erp.service.purchase;
+
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.statement.ErpSupplierStatementReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.statement.ErpSupplierStatementRespVO;
+import jakarta.validation.Valid;
+
+/**
+ * ERP 渚涘簲鍟嗗線鏉� Service 鎺ュ彛
+ */
+public interface ErpSupplierStatementService {
+
+ /**
+ * 鑾峰彇渚涘簲鍟嗗線鏉ュ璐︽暟鎹紙璁㈠崟 / 鏉ョエ / 浠樻 + 姹囨�伙級
+ */
+ ErpSupplierStatementRespVO getSupplierStatement(@Valid ErpSupplierStatementReqVO reqVO);
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementServiceImpl.java
new file mode 100644
index 0000000..ba1084c
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierStatementServiceImpl.java
@@ -0,0 +1,163 @@
+package cn.iocoder.yudao.module.erp.service.purchase;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.statement.ErpSupplierStatementReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.statement.ErpSupplierStatementRespVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinancePaymentDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInvoiceDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.finance.ErpFinancePaymentMapper;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseInvoiceMapper;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderMapper;
+import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.SUPPLIER_NOT_EXISTS;
+
+/**
+ * ERP 渚涘簲鍟嗗線鏉� Service 瀹炵幇
+ */
+@Service
+@Validated
+public class ErpSupplierStatementServiceImpl implements ErpSupplierStatementService {
+
+ @Resource
+ private ErpPurchaseOrderMapper purchaseOrderMapper;
+ @Resource
+ private ErpPurchaseInvoiceMapper purchaseInvoiceMapper;
+ @Resource
+ private ErpFinancePaymentMapper financePaymentMapper;
+ @Resource
+ private ErpPurchaseInvoiceService purchaseInvoiceService;
+ @Resource
+ private SrmSupplierApi srmSupplierApi;
+
+ @Override
+ public ErpSupplierStatementRespVO getSupplierStatement(ErpSupplierStatementReqVO reqVO) {
+ // 1. 鏍¢獙渚涘簲鍟�
+ SrmSupplierRespDTO supplier = srmSupplierApi.getSupplier(reqVO.getSupplierId()).getCheckedData();
+ if (supplier == null) {
+ throw ServiceExceptionUtil.exception(SUPPLIER_NOT_EXISTS);
+ }
+
+ // 2. 鏌ヨ璁㈠崟 / 鏉ョエ / 浠樻
+ List<Integer> orderStatuses = Boolean.TRUE.equals(reqVO.getIncludeUnapprovedOrder())
+ ? List.of(ErpAuditStatus.PROCESS.getStatus(), ErpAuditStatus.APPROVING.getStatus(),
+ ErpAuditStatus.APPROVE.getStatus())
+ : List.of(ErpAuditStatus.APPROVE.getStatus());
+ List<ErpPurchaseOrderDO> orders = purchaseOrderMapper.selectListBySupplierIdAndOrderTimeBetween(
+ reqVO.getSupplierId(), reqVO.getBeginTime(), reqVO.getEndTime(), orderStatuses);
+ List<ErpPurchaseInvoiceDO> invoices = purchaseInvoiceMapper.selectListBySupplierIdAndInvoiceTimeBetween(
+ reqVO.getSupplierId(), reqVO.getBeginTime(), reqVO.getEndTime());
+ List<Integer> paymentStatuses = List.of(ErpAuditStatus.PROCESS.getStatus(),
+ ErpAuditStatus.APPROVING.getStatus(), ErpAuditStatus.APPROVE.getStatus());
+ List<ErpFinancePaymentDO> payments = financePaymentMapper.selectListBySupplierIdAndPaymentTimeBetween(
+ reqVO.getSupplierId(), reqVO.getBeginTime(), reqVO.getEndTime(), paymentStatuses);
+
+ // 3. 璁㈠崟宸插紑绁ㄩ噾棰濓紙涓嶆寜寮�绁ㄦ棩鏈熻繃婊わ紝淇濊瘉鏈紑绁ㄩ噾棰濆噯纭級
+ Map<Long, BigDecimal> invoicedMap = CollUtil.isEmpty(orders) ? Collections.emptyMap()
+ : purchaseInvoiceService.getPurchaseInvoicePriceSumMapByOrderIds(
+ orders.stream().map(ErpPurchaseOrderDO::getId).toList());
+ // 4. 鏉ョエ宸蹭粯閲戦锛堟寜鎵�鏈夋湁鏁堜粯娆惧崟姹囨�伙級
+ Map<Long, BigDecimal> paidMap = CollUtil.isEmpty(invoices) ? Collections.emptyMap()
+ : financePaymentMapper.selectPaymentPriceMapByInvoiceId(
+ invoices.stream().map(ErpPurchaseInvoiceDO::getId).toList());
+ // 5. 鏉ョエ鍏宠仈璁㈠崟鍙�
+ Set<Long> invoiceOrderIds = invoices.stream().map(ErpPurchaseInvoiceDO::getPurchaseOrderId)
+ .filter(Objects::nonNull).collect(Collectors.toSet());
+ Map<Long, ErpPurchaseOrderDO> invoiceOrderMap = invoiceOrderIds.isEmpty() ? Collections.emptyMap()
+ : purchaseOrderMapper.selectBatchIds(invoiceOrderIds).stream()
+ .collect(Collectors.toMap(ErpPurchaseOrderDO::getId, Function.identity()));
+ // 6. 浠樻鍏宠仈鏉ョエ鍙�
+ Set<Long> paymentInvoiceIds = payments.stream().map(ErpFinancePaymentDO::getInvoiceId)
+ .filter(Objects::nonNull).collect(Collectors.toSet());
+ Map<Long, ErpPurchaseInvoiceDO> paymentInvoiceMap = paymentInvoiceIds.isEmpty() ? Collections.emptyMap()
+ : purchaseInvoiceMapper.selectBatchIds(paymentInvoiceIds).stream()
+ .collect(Collectors.toMap(ErpPurchaseInvoiceDO::getId, Function.identity()));
+
+ // 7. 缁勮
+ ErpSupplierStatementRespVO respVO = new ErpSupplierStatementRespVO();
+ respVO.setSupplierId(reqVO.getSupplierId());
+ respVO.setSupplierName(supplier.getName());
+
+ List<ErpSupplierStatementRespVO.OrderRow> orderRows = new ArrayList<>();
+ for (ErpPurchaseOrderDO order : orders) {
+ BigDecimal orderAmount = zero(order.getTotalPrice());
+ BigDecimal invoicedAmount = zero(invoicedMap.get(order.getId()));
+ ErpSupplierStatementRespVO.OrderRow row = new ErpSupplierStatementRespVO.OrderRow();
+ row.setId(order.getId());
+ row.setNo(order.getNo());
+ row.setOrderTime(order.getOrderTime());
+ row.setOrderAmount(orderAmount);
+ row.setInvoicedAmount(invoicedAmount);
+ row.setUninvoicedAmount(orderAmount.subtract(invoicedAmount));
+ row.setStatus(order.getStatus());
+ row.setInStatus(order.getInStatus());
+ orderRows.add(row);
+ }
+ respVO.setOrders(orderRows);
+
+ List<ErpSupplierStatementRespVO.InvoiceRow> invoiceRows = new ArrayList<>();
+ for (ErpPurchaseInvoiceDO invoice : invoices) {
+ BigDecimal invoiceAmount = zero(invoice.getPrice());
+ BigDecimal paidAmount = zero(paidMap.get(invoice.getId()));
+ ErpSupplierStatementRespVO.InvoiceRow row = new ErpSupplierStatementRespVO.InvoiceRow();
+ row.setId(invoice.getId());
+ row.setNo(invoice.getNo());
+ row.setInvoiceNo(invoice.getInvoiceNo());
+ row.setInvoiceTime(invoice.getInvoiceTime());
+ row.setInvoiceAmount(invoiceAmount);
+ row.setPaidAmount(paidAmount);
+ row.setRemainingPayable(invoiceAmount.subtract(paidAmount));
+ row.setPaymentStatus(paidAmount.compareTo(BigDecimal.ZERO) <= 0 ? 0
+ : paidAmount.compareTo(invoiceAmount) >= 0 ? 2 : 1);
+ row.setPurchaseOrderId(invoice.getPurchaseOrderId());
+ ErpPurchaseOrderDO order = invoiceOrderMap.get(invoice.getPurchaseOrderId());
+ row.setPurchaseOrderNo(order != null ? order.getNo() : null);
+ invoiceRows.add(row);
+ }
+ respVO.setInvoices(invoiceRows);
+
+ List<ErpSupplierStatementRespVO.PaymentRow> paymentRows = new ArrayList<>();
+ for (ErpFinancePaymentDO payment : payments) {
+ ErpSupplierStatementRespVO.PaymentRow row = new ErpSupplierStatementRespVO.PaymentRow();
+ row.setId(payment.getId());
+ row.setNo(payment.getNo());
+ row.setPaymentTime(payment.getPaymentTime());
+ row.setPaymentAmount(zero(payment.getPaymentPrice()));
+ row.setStatus(payment.getStatus());
+ row.setInvoiceId(payment.getInvoiceId());
+ ErpPurchaseInvoiceDO invoice = paymentInvoiceMap.get(payment.getInvoiceId());
+ row.setInvoiceNo(invoice != null ? invoice.getNo() : null);
+ paymentRows.add(row);
+ }
+ respVO.setPayments(paymentRows);
+
+ // 8. 姹囨��
+ ErpSupplierStatementRespVO.Summary summary = new ErpSupplierStatementRespVO.Summary();
+ summary.setTotalPurchaseAmount(orderRows.stream().map(ErpSupplierStatementRespVO.OrderRow::getOrderAmount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add));
+ summary.setTotalInvoiceAmount(invoiceRows.stream().map(ErpSupplierStatementRespVO.InvoiceRow::getInvoiceAmount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add));
+ summary.setTotalPaymentAmount(paymentRows.stream().map(ErpSupplierStatementRespVO.PaymentRow::getPaymentAmount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add));
+ summary.setUnpaidAmount(summary.getTotalInvoiceAmount().subtract(summary.getTotalPaymentAmount()));
+ respVO.setSummary(summary);
+ return respVO;
+ }
+
+ private BigDecimal zero(BigDecimal value) {
+ return value != null ? value : BigDecimal.ZERO;
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/SrmSupplierApplyController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/SrmSupplierApplyController.java
deleted file mode 100644
index bfcb565..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/SrmSupplierApplyController.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.apply;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.srm.controller.admin.apply.vo.*;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierApplyDO;
-import cn.iocoder.yudao.module.srm.service.apply.SrmSupplierApplyService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "绠$悊鍚庡彴 - SRM 渚涘簲鍟嗗噯鍏�")
-@RestController
-@RequestMapping("/srm/supplier-apply")
-@Validated
-public class SrmSupplierApplyController {
-
- @Resource
- private SrmSupplierApplyService applyService;
-
- @PostMapping("/create")
- @Operation(summary = "鍒涘缓鍑嗗叆鐢宠")
- @PreAuthorize("@ss.hasPermission('srm:supplier-apply:create')")
- public CommonResult<Long> createApply(@Valid @RequestBody SrmSupplierApplySaveReqVO createReqVO) {
- return success(applyService.createApply(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "鏇存柊鍑嗗叆鐢宠")
- @PreAuthorize("@ss.hasPermission('srm:supplier-apply:update')")
- public CommonResult<Boolean> updateApply(@Valid @RequestBody SrmSupplierApplySaveReqVO updateReqVO) {
- applyService.updateApply(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎鍑嗗叆鐢宠")
- @Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('srm:supplier-apply:delete')")
- public CommonResult<Boolean> deleteApply(@RequestParam("id") Long id) {
- applyService.deleteApply(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "鑾峰彇鍑嗗叆鐢宠璇︽儏")
- @Parameter(name = "id", description = "缂栧彿", required = true)
- public CommonResult<SrmSupplierApplyRespVO> getApply(@RequestParam("id") Long id) {
- return success(BeanUtils.toBean(applyService.getApply(id), SrmSupplierApplyRespVO.class));
- }
-
- @GetMapping("/page")
- @Operation(summary = "鑾峰彇鍑嗗叆鐢宠鍒嗛〉")
- public CommonResult<PageResult<SrmSupplierApplyRespVO>> getApplyPage(@Valid SrmSupplierApplyPageReqVO pageReqVO) {
- return success(BeanUtils.toBean(applyService.getApplyPage(pageReqVO), SrmSupplierApplyRespVO.class));
- }
-
- @PutMapping("/submit")
- @Operation(summary = "鎻愪氦鍑嗗叆鐢宠瀹℃壒锛堝惎鍔ㄥ崗鍚屽姙鍏祦绋嬶級")
- @PreAuthorize("@ss.hasPermission('srm:supplier-apply:update')")
- public CommonResult<Boolean> submitApply(@RequestParam("id") Long id,
- @RequestParam("processDefinitionKey") String processDefinitionKey) {
- applyService.submitApply(id, processDefinitionKey, getLoginUserId());
- return success(true);
- }
-
- @GetMapping("/approve-process-list")
- @Operation(summary = "鑾峰彇鍑嗗叆鐢宠瀹℃壒娴佺▼鍒楄〃")
- public CommonResult<List<Map<String, Object>>> getApproveProcessList() {
- return success(applyService.getSupplierApplyApproveProcessDefinitionList());
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyPageReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyPageReqVO.java
deleted file mode 100644
index cf346fb..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyPageReqVO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.apply.vo;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 渚涘簲鍟嗗噯鍏ョ敵璇峰垎椤垫煡璇� Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class SrmSupplierApplyPageReqVO extends PageParam {
-
- @Schema(description = "鐢宠缂栧彿", example = "AP2024010001")
- private String applyNo;
-
- @Schema(description = "渚涘簲鍟嗗悕绉�", example = "XX绉戞妧鏈夐檺鍏徃")
- private String supplierName;
-
- @Schema(description = "鐢宠鐘舵��", example = "0")
- private Integer applyStatus;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyRespVO.java
deleted file mode 100644
index eb2b6e6..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyRespVO.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.apply.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 渚涘簲鍟嗗噯鍏ョ敵璇� Response VO")
-@Data
-public class SrmSupplierApplyRespVO {
-
- @Schema(description = "鐢宠ID", example = "1")
- private Long id;
-
- @Schema(description = "鐢宠缂栧彿", example = "AP2024010001")
- private String applyNo;
-
- @Schema(description = "渚涘簲鍟咺D锛圫RM渚涘簲鍟咺D锛屽鎵归�氳繃鍚庡洖濉級", example = "1")
- private Long supplierId;
-
- @Schema(description = "渚涘簲鍟嗗悕绉�", example = "XX绉戞妧鏈夐檺鍏徃")
- private String supplierName;
-
- @Schema(description = "渚涘簲鍟嗙被鍨�", example = "1")
- private String supplierType;
-
- @Schema(description = "浼佷笟鎬ц川", example = "鏈夐檺璐d换鍏徃")
- private String companyNature;
-
- @Schema(description = "娉ㄥ唽璧勯噾锛堜竾鍏冿級", example = "1000")
- private BigDecimal registeredCapital;
-
- @Schema(description = "钀ヤ笟鎵х収缂栧彿", example = "91310000XXXXXXXXXX")
- private String businessLicenseNo;
-
- @Schema(description = "绋庡彿", example = "91310000XXXXXXXXXX")
- private String taxNo;
-
- @Schema(description = "鍏徃鍦板潃", example = "涓婃捣甯傛郸涓滄柊鍖篨X璺疿X鍙�")
- private String address;
-
- @Schema(description = "寮�鎴烽摱琛�", example = "涓浗宸ュ晢閾惰涓婃捣鍒嗚")
- private String bankName;
-
- @Schema(description = "閾惰璐﹀彿", example = "622202xxxxxxxxxxxx")
- private String bankAccount;
-
- @Schema(description = "鑱旂郴浜�", example = "寮犱笁")
- private String contactName;
-
- @Schema(description = "鑱旂郴鐢佃瘽", example = "13800138000")
- private String contactMobile;
-
- @Schema(description = "閭", example = "zhangsan@example.com")
- private String contactEmail;
-
- @Schema(description = "澶囨敞", example = "浼樺厛渚涜揣")
- private String remark;
-
- @Schema(description = "鐢宠浜篒D", example = "1")
- private Long applyUserId;
-
- @Schema(description = "鐢宠浜哄悕绉�", example = "寮犱笁")
- private String applyUserName;
-
- @Schema(description = "鐢宠鏃堕棿")
- private LocalDateTime applyTime;
-
- @Schema(description = "鐢宠鐘舵��", example = "0")
- private Integer applyStatus;
-
- @Schema(description = "BPM 娴佺▼瀹炰緥缂栧彿", example = "1a2b3c4d")
- private String processInstanceId;
-
- @Schema(description = "閲囪喘瀹℃牳浜篒D", example = "2")
- private Long purchaseReviewerId;
-
- @Schema(description = "閲囪喘瀹℃牳鏃堕棿")
- private LocalDateTime purchaseReviewTime;
-
- @Schema(description = "閲囪喘瀹℃牳鎰忚", example = "鍚屾剰")
- private String purchaseReviewOpinion;
-
- @Schema(description = "璐ㄩ噺瀹℃牳浜篒D", example = "3")
- private Long qualityReviewerId;
-
- @Schema(description = "璐ㄩ噺瀹℃牳鏃堕棿")
- private LocalDateTime qualityReviewTime;
-
- @Schema(description = "璐ㄩ噺瀹℃牳鎰忚", example = "鍚屾剰")
- private String qualityReviewOpinion;
-
- @Schema(description = "璐㈠姟瀹℃牳浜篒D", example = "4")
- private Long financeReviewerId;
-
- @Schema(description = "璐㈠姟瀹℃牳鏃堕棿")
- private LocalDateTime financeReviewTime;
-
- @Schema(description = "璐㈠姟瀹℃牳鎰忚", example = "鍚屾剰")
- private String financeReviewOpinion;
-
- @Schema(description = "鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplySaveReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplySaveReqVO.java
deleted file mode 100644
index 4f63577..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplySaveReqVO.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.apply.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 渚涘簲鍟嗗噯鍏ョ敵璇峰垱寤�/鏇存柊 Request VO")
-@Data
-public class SrmSupplierApplySaveReqVO {
-
- @Schema(description = "鐢宠ID", example = "1")
- private Long id;
-
- @Schema(description = "渚涘簲鍟咺D锛圫RM渚涘簲鍟咺D锛屽鎵归�氳繃鍚庡洖濉級", example = "1")
- private Long supplierId;
-
- @Schema(description = "渚涘簲鍟嗗悕绉�", example = "XX绉戞妧鏈夐檺鍏徃")
- private String supplierName;
-
- @Schema(description = "渚涘簲鍟嗙被鍨�", example = "1")
- private String supplierType;
-
- @Schema(description = "浼佷笟鎬ц川", example = "鏈夐檺璐d换鍏徃")
- private String companyNature;
-
- @Schema(description = "娉ㄥ唽璧勯噾锛堜竾鍏冿級", example = "1000")
- private BigDecimal registeredCapital;
-
- @Schema(description = "钀ヤ笟鎵х収缂栧彿", example = "91310000XXXXXXXXXX")
- private String businessLicenseNo;
-
- @Schema(description = "绋庡彿", example = "91310000XXXXXXXXXX")
- private String taxNo;
-
- @Schema(description = "鍏徃鍦板潃", example = "涓婃捣甯傛郸涓滄柊鍖篨X璺疿X鍙�")
- private String address;
-
- @Schema(description = "寮�鎴烽摱琛�", example = "涓浗宸ュ晢閾惰涓婃捣鍒嗚")
- private String bankName;
-
- @Schema(description = "閾惰璐﹀彿", example = "622202xxxxxxxxxxxx")
- private String bankAccount;
-
- @Schema(description = "鑱旂郴浜�", example = "寮犱笁")
- private String contactName;
-
- @Schema(description = "鑱旂郴鐢佃瘽", example = "13800138000")
- private String contactMobile;
-
- @Schema(description = "閭", example = "zhangsan@example.com")
- private String contactEmail;
-
- @Schema(description = "澶囨敞", example = "浼樺厛渚涜揣")
- private String remark;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/bond/SrmBidBondController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/bond/SrmBidBondController.java
new file mode 100644
index 0000000..f699deb
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/bond/SrmBidBondController.java
@@ -0,0 +1,66 @@
+package cn.iocoder.yudao.module.srm.controller.admin.bond;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.srm.controller.admin.bond.vo.SrmBidBondPageReqVO;
+import cn.iocoder.yudao.module.srm.controller.admin.bond.vo.SrmBidBondRespVO;
+import cn.iocoder.yudao.module.srm.controller.admin.bond.vo.SrmBidBondSaveReqVO;
+import cn.iocoder.yudao.module.srm.service.bond.SrmBidBondService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "绠$悊鍚庡彴 - SRM 鎶曟爣淇濊瘉閲�")
+@RestController
+@RequestMapping("/srm/bid-bond")
+@Validated
+public class SrmBidBondController {
+
+ @Resource
+ private SrmBidBondService bidBondService;
+
+ @PostMapping("/create")
+ @Operation(summary = "鍒涘缓鎶曟爣淇濊瘉閲戣褰�")
+ @PreAuthorize("@ss.hasPermission('srm:bid-bond:create')")
+ public CommonResult<Long> createBidBond(@Valid @RequestBody SrmBidBondSaveReqVO createReqVO) {
+ return success(bidBondService.createBidBond(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "鏇存柊鎶曟爣淇濊瘉閲戣褰�")
+ @PreAuthorize("@ss.hasPermission('srm:bid-bond:update')")
+ public CommonResult<Boolean> updateBidBond(@Valid @RequestBody SrmBidBondSaveReqVO updateReqVO) {
+ bidBondService.updateBidBond(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎鎶曟爣淇濊瘉閲戣褰�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('srm:bid-bond:delete')")
+ public CommonResult<Boolean> deleteBidBond(@RequestParam("id") Long id) {
+ bidBondService.deleteBidBond(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰彇鎶曟爣淇濊瘉閲戣褰�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ public CommonResult<SrmBidBondRespVO> getBidBond(@RequestParam("id") Long id) {
+ return success(bidBondService.getBidBondDetail(id));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鎶曟爣淇濊瘉閲戝垎椤垫煡璇�")
+ public CommonResult<PageResult<SrmBidBondRespVO>> getBidBondPage(@Valid SrmBidBondPageReqVO pageReqVO) {
+ return success(bidBondService.getBidBondPage(pageReqVO));
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/bond/vo/SrmBidBondPageReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/bond/vo/SrmBidBondPageReqVO.java
new file mode 100644
index 0000000..152a20a
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/bond/vo/SrmBidBondPageReqVO.java
@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.srm.controller.admin.bond.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "绠$悊鍚庡彴 - 鎶曟爣淇濊瘉閲戝垎椤垫煡璇� Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class SrmBidBondPageReqVO extends PageParam {
+
+ @Schema(description = "淇濊瘉閲戝崟鍙�")
+ private String no;
+
+ @Schema(description = "渚涘簲鍟嗙紪鍙�")
+ private Long supplierId;
+
+ @Schema(description = "椤圭洰鍚嶇О")
+ private String projectName;
+
+ @Schema(description = "鏄惁涓爣")
+ private Boolean won;
+
+ @Schema(description = "閫�鍥炵姸鎬侊細0 鏈��鍥炪��1 閮ㄥ垎閫�鍥炪��2 宸查��鍥炪��3 鏃犻渶閫�鍥�")
+ private Integer refundStatus;
+
+ @Schema(description = "缂寸撼鏃ユ湡寮�濮�")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ private LocalDate payDateStart;
+
+ @Schema(description = "缂寸撼鏃ユ湡缁撴潫")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ private LocalDate payDateEnd;
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/bond/vo/SrmBidBondRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/bond/vo/SrmBidBondRespVO.java
new file mode 100644
index 0000000..af5b7f8
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/bond/vo/SrmBidBondRespVO.java
@@ -0,0 +1,65 @@
+package cn.iocoder.yudao.module.srm.controller.admin.bond.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - 鎶曟爣淇濊瘉閲� Response VO")
+@Data
+public class SrmBidBondRespVO {
+
+ @Schema(description = "淇濊瘉閲戣褰旾D")
+ private Long id;
+
+ @Schema(description = "淇濊瘉閲戝崟鍙�")
+ private String no;
+
+ @Schema(description = "渚涘簲鍟嗙紪鍙�")
+ private Long supplierId;
+
+ @Schema(description = "渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
+ @Schema(description = "椤圭洰鍚嶇О")
+ private String projectName;
+
+ @Schema(description = "鍏宠仈璇环鍗曠紪鍙�")
+ private Long inquiryId;
+
+ @Schema(description = "鍏宠仈璇环鍗曞彿")
+ private String inquiryNo;
+
+ @Schema(description = "鍏宠仈閲囪喘璁㈠崟缂栧彿")
+ private Long purchaseOrderId;
+
+ @Schema(description = "鍏宠仈閲囪喘璁㈠崟鍙�")
+ private String purchaseOrderNo;
+
+ @Schema(description = "淇濊瘉閲戦噾棰�")
+ private BigDecimal bondAmount;
+
+ @Schema(description = "缂寸撼鏃ユ湡")
+ private LocalDate payDate;
+
+ @Schema(description = "鏄惁涓爣")
+ private Boolean won;
+
+ @Schema(description = "閫�鍥炵姸鎬侊細0 鏈��鍥炪��1 閮ㄥ垎閫�鍥炪��2 宸查��鍥炪��3 鏃犻渶閫�鍥�")
+ private Integer refundStatus;
+
+ @Schema(description = "閫�鍥為噾棰�")
+ private BigDecimal refundAmount;
+
+ @Schema(description = "閫�鍥炴棩鏈�")
+ private LocalDate refundDate;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/bond/vo/SrmBidBondSaveReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/bond/vo/SrmBidBondSaveReqVO.java
new file mode 100644
index 0000000..ecc103c
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/bond/vo/SrmBidBondSaveReqVO.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.srm.controller.admin.bond.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "绠$悊鍚庡彴 - 鎶曟爣淇濊瘉閲戝垱寤�/鏇存柊 Request VO")
+@Data
+public class SrmBidBondSaveReqVO {
+
+ @Schema(description = "淇濊瘉閲戣褰旾D")
+ private Long id;
+
+ @Schema(description = "渚涘簲鍟嗙紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "渚涘簲鍟嗕笉鑳戒负绌�")
+ private Long supplierId;
+
+ @Schema(description = "椤圭洰鍚嶇О")
+ private String projectName;
+
+ @Schema(description = "鍏宠仈璇环鍗曠紪鍙�")
+ private Long inquiryId;
+
+ @Schema(description = "鍏宠仈閲囪喘璁㈠崟缂栧彿")
+ private Long purchaseOrderId;
+
+ @Schema(description = "淇濊瘉閲戦噾棰�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "淇濊瘉閲戦噾棰濅笉鑳戒负绌�")
+ private BigDecimal bondAmount;
+
+ @Schema(description = "缂寸撼鏃ユ湡")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ private LocalDate payDate;
+
+ @Schema(description = "鏄惁涓爣")
+ private Boolean won;
+
+ @Schema(description = "閫�鍥炵姸鎬侊細0 鏈��鍥炪��1 閮ㄥ垎閫�鍥炪��2 宸查��鍥炪��3 鏃犻渶閫�鍥�")
+ private Integer refundStatus;
+
+ @Schema(description = "閫�鍥為噾棰�")
+ private BigDecimal refundAmount;
+
+ @Schema(description = "閫�鍥炴棩鏈�")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ private LocalDate refundDate;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/SrmSupplierCertificateController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/SrmSupplierCertificateController.java
deleted file mode 100644
index 70bd3d6..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/SrmSupplierCertificateController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.certificate;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.srm.controller.admin.certificate.vo.*;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierDO;
-import cn.iocoder.yudao.module.srm.service.certificate.SrmSupplierCertificateService;
-import cn.iocoder.yudao.module.srm.service.certificate.SrmSupplierCertificateServiceImpl;
-import cn.iocoder.yudao.module.srm.service.supplier.SrmSupplierService;
-import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "绠$悊鍚庡彴 - SRM 渚涘簲鍟嗚祫璐�")
-@RestController
-@RequestMapping("/srm/supplier-certificate")
-@Validated
-public class SrmSupplierCertificateController {
-
- @Resource
- private SrmSupplierCertificateService certificateService;
-
- @Resource
- private SrmSupplierService supplierService;
-
- @Resource
- private StorageAttachmentApi storageAttachmentApi;
-
- @PostMapping("/create")
- @Operation(summary = "鍒涘缓璧勮川璇佷功")
- @PreAuthorize("@ss.hasPermission('srm:supplier-certificate:create')")
- public CommonResult<Long> createCertificate(@Valid @RequestBody SrmSupplierCertificateSaveReqVO createReqVO) {
- return success(certificateService.createCertificate(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "鏇存柊璧勮川璇佷功")
- @PreAuthorize("@ss.hasPermission('srm:supplier-certificate:update')")
- public CommonResult<Boolean> updateCertificate(@Valid @RequestBody SrmSupplierCertificateSaveReqVO updateReqVO) {
- certificateService.updateCertificate(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎璧勮川璇佷功")
- @Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('srm:supplier-certificate:delete')")
- public CommonResult<Boolean> deleteCertificate(@RequestParam("id") Long id) {
- certificateService.deleteCertificate(id);
- return success(true);
- }
-
- @GetMapping("/page")
- @Operation(summary = "鑾峰彇璧勮川璇佷功鍒嗛〉")
- public CommonResult<PageResult<SrmSupplierCertificateRespVO>> getCertificatePage(@Valid SrmSupplierCertificatePageReqVO pageReqVO) {
- var pageResult = certificateService.getCertificatePage(pageReqVO);
- var respList = BeanUtils.toBean(pageResult.getList(), SrmSupplierCertificateRespVO.class);
- enrichSupplierNames(respList);
- enrichAttachments(respList);
- return success(new PageResult<>(respList, pageResult.getTotal()));
- }
-
- @GetMapping("/list-by-supplier")
- @Operation(summary = "鏍规嵁渚涘簲鍟咺D鑾峰彇璧勮川鍒楄〃")
- public CommonResult<List<SrmSupplierCertificateRespVO>> getListBySupplier(@RequestParam("supplierId") Long supplierId) {
- var list = BeanUtils.toBean(certificateService.getCertificateListBySupplierId(supplierId), SrmSupplierCertificateRespVO.class);
- enrichSupplierNames(list);
- enrichAttachments(list);
- return success(list);
- }
-
- @GetMapping("/expiring-list")
- @Operation(summary = "鑾峰彇鍗冲皢鍒版湡鐨勮祫璐ㄥ垪琛紙30澶╁唴锛�")
- public CommonResult<List<SrmSupplierCertificateRespVO>> getExpiringList() {
- var list = BeanUtils.toBean(certificateService.getExpiringCertificates(), SrmSupplierCertificateRespVO.class);
- enrichSupplierNames(list);
- return success(list);
- }
-
- @GetMapping("/get")
- @Operation(summary = "鑾峰彇璧勮川璇佷功璇︽儏")
- public CommonResult<SrmSupplierCertificateRespVO> getCertificate(@RequestParam("id") Long id) {
- var resp = BeanUtils.toBean(certificateService.getCertificate(id), SrmSupplierCertificateRespVO.class);
- enrichSupplierName(resp);
- enrichAttachments(List.of(resp));
- return success(resp);
- }
-
- // ========== 鍏宠仈鏁版嵁濉厖 ==========
-
- private void enrichSupplierNames(List<SrmSupplierCertificateRespVO> list) {
- if (list == null || list.isEmpty()) return;
- Set<Long> supplierIds = convertSet(list, SrmSupplierCertificateRespVO::getSupplierId);
- Map<Long, SrmSupplierDO> supplierMap = supplierService.getSupplierMap(supplierIds);
- list.forEach(vo -> {
- SrmSupplierDO supplier = supplierMap.get(vo.getSupplierId());
- if (supplier != null) {
- vo.setSupplierName(supplier.getName());
- }
- });
- }
-
- private void enrichSupplierName(SrmSupplierCertificateRespVO vo) {
- if (vo == null || vo.getSupplierId() == null) return;
- SrmSupplierDO supplier = supplierService.getSupplier(vo.getSupplierId());
- if (supplier != null) {
- vo.setSupplierName(supplier.getName());
- }
- }
-
- private void enrichAttachments(List<SrmSupplierCertificateRespVO> list) {
- if (list == null || list.isEmpty()) return;
- list.forEach(vo -> vo.setAttachmentList(storageAttachmentApi.listAttachments(
- SrmSupplierCertificateServiceImpl.CERTIFICATE_RECORD_TYPE, vo.getId())));
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/vo/SrmSupplierCertificatePageReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/vo/SrmSupplierCertificatePageReqVO.java
deleted file mode 100644
index c851b98..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/vo/SrmSupplierCertificatePageReqVO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.certificate.vo;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 渚涘簲鍟嗚祫璐ㄨ瘉涔﹀垎椤垫煡璇� Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class SrmSupplierCertificatePageReqVO extends PageParam {
-
- @Schema(description = "璧勮川璇佷功鍚嶇О", example = "钀ヤ笟鎵х収")
- private String certificateName;
-
- @Schema(description = "渚涘簲鍟咺D", example = "1")
- private Long supplierId;
-
- @Schema(description = "璇佷功绫诲瀷", example = "1")
- private Integer certificateType;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/vo/SrmSupplierCertificateRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/vo/SrmSupplierCertificateRespVO.java
deleted file mode 100644
index 0cb8443..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/vo/SrmSupplierCertificateRespVO.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.certificate.vo;
-
-import cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 渚涘簲鍟嗚祫璐ㄨ瘉涔� Response VO")
-@Data
-public class SrmSupplierCertificateRespVO {
-
- @Schema(description = "璇佷功ID", example = "1")
- private Long id;
-
- @Schema(description = "渚涘簲鍟咺D", example = "1")
- private Long supplierId;
-
- @Schema(description = "渚涘簲鍟嗗悕绉�", example = "鍗庝负鎶�鏈湁闄愬叕鍙�")
- private String supplierName;
-
- @Schema(description = "璇佷功绫诲瀷", example = "1")
- private Integer certificateType;
-
- @Schema(description = "璇佷功鍚嶇О", example = "ISO9001璐ㄩ噺绠$悊浣撶郴")
- private String certificateName;
-
- @Schema(description = "璇佷功缂栧彿", example = "ISO9001-2020-XXXX")
- private String certificateNo;
-
- @Schema(description = "鏂囦欢鍚�", example = "iso9001_cert.pdf")
- private String fileName;
-
- @Schema(description = "鏂囦欢鍦板潃", example = "https://example.com/files/xxx.pdf")
- private String fileUrl;
-
- @Schema(description = "鍙戣瘉鏈烘瀯", example = "涓浗璐ㄩ噺璁よ瘉涓績")
- private String issuingAuthority;
-
- @Schema(description = "鏈夋晥鏈熷紑濮�", example = "2024-01-01")
- private LocalDate validStartDate;
-
- @Schema(description = "鏈夋晥鏈熺粨鏉�", example = "2027-01-01")
- private LocalDate validEndDate;
-
- @Schema(description = "鐘舵��", example = "0")
- private Integer status;
-
- @Schema(description = "澶囨敞", example = "骞村害璧勮川瀹℃牳")
- private String remark;
-
- @Schema(description = "鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
-
- @Schema(description = "璇佷功闄勪欢鍒楄〃")
- private List<StorageBlobRespDTO> attachmentList;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/vo/SrmSupplierCertificateSaveReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/vo/SrmSupplierCertificateSaveReqVO.java
deleted file mode 100644
index 3938430c..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/vo/SrmSupplierCertificateSaveReqVO.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.certificate.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.time.LocalDate;
-import java.util.List;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 渚涘簲鍟嗚祫璐ㄨ瘉涔﹀垱寤�/鏇存柊 Request VO")
-@Data
-public class SrmSupplierCertificateSaveReqVO {
-
- @Schema(description = "璇佷功ID", example = "1")
- private Long id;
-
- @Schema(description = "渚涘簲鍟咺D", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "渚涘簲鍟咺D涓嶈兘涓虹┖")
- private Long supplierId;
-
- @Schema(description = "璇佷功绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "璇佷功绫诲瀷涓嶈兘涓虹┖")
- private Integer certificateType;
-
- @Schema(description = "璇佷功鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "ISO9001璐ㄩ噺绠$悊浣撶郴")
- @NotEmpty(message = "璇佷功鍚嶇О涓嶈兘涓虹┖")
- private String certificateName;
-
- @Schema(description = "璇佷功缂栧彿", example = "ISO9001-2020-XXXX")
- private String certificateNo;
-
- @Schema(description = "鏂囦欢鍚�", example = "iso9001_cert.pdf")
- private String fileName;
-
- @Schema(description = "鏂囦欢鍦板潃", example = "https://example.com/files/xxx.pdf")
- private String fileUrl;
-
- @Schema(description = "鍙戣瘉鏈烘瀯", example = "涓浗璐ㄩ噺璁よ瘉涓績")
- private String issuingAuthority;
-
- @Schema(description = "鏈夋晥鏈熷紑濮�", example = "2024-01-01")
- private LocalDate validStartDate;
-
- @Schema(description = "鏈夋晥鏈熺粨鏉�", example = "2027-01-01")
- private LocalDate validEndDate;
-
- @Schema(description = "澶囨敞", example = "骞村害璧勮川瀹℃牳")
- private String remark;
-
- @Schema(description = "璇佷功闄勪欢鏂囦欢ID鍒楄〃")
- private List<Long> blobIds;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/evaluation/SrmSupplierEvaluationController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/evaluation/SrmSupplierEvaluationController.java
deleted file mode 100644
index 145a44a..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/evaluation/SrmSupplierEvaluationController.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.evaluation;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.srm.controller.admin.evaluation.vo.*;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierDO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierEvaluationDO;
-import cn.iocoder.yudao.module.srm.service.evaluation.SrmSupplierEvaluationService;
-import cn.iocoder.yudao.module.srm.service.supplier.SrmSupplierService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-
-@Tag(name = "绠$悊鍚庡彴 - SRM 渚涘簲鍟嗙哗鏁堣瘎浠�")
-@RestController
-@RequestMapping("/srm/supplier-evaluation")
-@Validated
-public class SrmSupplierEvaluationController {
-
- @Resource
- private SrmSupplierEvaluationService evaluationService;
-
- @Resource
- private SrmSupplierService supplierService;
-
- @PostMapping("/create")
- @Operation(summary = "鍒涘缓缁╂晥璇勪环")
- @PreAuthorize("@ss.hasPermission('srm:supplier-evaluation:create')")
- public CommonResult<Long> createEvaluation(@Valid @RequestBody SrmSupplierEvaluationSaveReqVO createReqVO) {
- return success(evaluationService.createEvaluation(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "鏇存柊缁╂晥璇勪环")
- @PreAuthorize("@ss.hasPermission('srm:supplier-evaluation:update')")
- public CommonResult<Boolean> updateEvaluation(@Valid @RequestBody SrmSupplierEvaluationSaveReqVO updateReqVO) {
- evaluationService.updateEvaluation(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎缁╂晥璇勪环")
- @Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('srm:supplier-evaluation:delete')")
- public CommonResult<Boolean> deleteEvaluation(@RequestParam("id") Long id) {
- evaluationService.deleteEvaluation(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "鑾峰彇缁╂晥璇勪环璇︽儏")
- public CommonResult<SrmSupplierEvaluationRespVO> getEvaluation(@RequestParam("id") Long id) {
- SrmSupplierEvaluationDO evaluation = evaluationService.getEvaluation(id);
- SrmSupplierEvaluationRespVO resp = BeanUtils.toBean(evaluation, SrmSupplierEvaluationRespVO.class);
- enrichSupplierName(resp);
- resp.setGrade(evaluation.getEvaluationLevel());
- return success(resp);
- }
-
- @GetMapping("/page")
- @Operation(summary = "鑾峰彇缁╂晥璇勪环鍒嗛〉")
- public CommonResult<PageResult<SrmSupplierEvaluationRespVO>> getEvaluationPage(@Valid SrmSupplierEvaluationPageReqVO pageReqVO) {
- PageResult<SrmSupplierEvaluationDO> pageResult = evaluationService.getEvaluationPage(pageReqVO);
- List<SrmSupplierEvaluationRespVO> respList = BeanUtils.toBean(pageResult.getList(), SrmSupplierEvaluationRespVO.class);
- respList.forEach(vo -> vo.setGrade(vo.getEvaluationLevel()));
- enrichSupplierNames(respList);
- return success(new PageResult<>(respList, pageResult.getTotal()));
- }
-
- // ========== 鍏宠仈鏁版嵁濉厖 ==========
-
- private void enrichSupplierNames(List<SrmSupplierEvaluationRespVO> list) {
- if (list == null || list.isEmpty()) return;
- Set<Long> supplierIds = convertSet(list, SrmSupplierEvaluationRespVO::getSupplierId);
- Map<Long, SrmSupplierDO> supplierMap = supplierService.getSupplierMap(supplierIds);
- list.forEach(vo -> {
- SrmSupplierDO supplier = supplierMap.get(vo.getSupplierId());
- if (supplier != null) {
- vo.setSupplierName(supplier.getName());
- }
- });
- }
-
- private void enrichSupplierName(SrmSupplierEvaluationRespVO vo) {
- if (vo == null || vo.getSupplierId() == null) return;
- SrmSupplierDO supplier = supplierService.getSupplier(vo.getSupplierId());
- if (supplier != null) {
- vo.setSupplierName(supplier.getName());
- }
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/evaluation/vo/SrmSupplierEvaluationPageReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/evaluation/vo/SrmSupplierEvaluationPageReqVO.java
deleted file mode 100644
index 65b98d7..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/evaluation/vo/SrmSupplierEvaluationPageReqVO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.evaluation.vo;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 渚涘簲鍟嗙哗鏁堣瘎浠峰垎椤垫煡璇� Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class SrmSupplierEvaluationPageReqVO extends PageParam {
-
- @Schema(description = "渚涘簲鍟咺D", example = "1")
- private Long supplierId;
-
- @Schema(description = "璇勪环鍛ㄦ湡", example = "2024-Q1")
- private String evaluationPeriod;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/evaluation/vo/SrmSupplierEvaluationRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/evaluation/vo/SrmSupplierEvaluationRespVO.java
deleted file mode 100644
index b1d8897..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/evaluation/vo/SrmSupplierEvaluationRespVO.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.evaluation.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 渚涘簲鍟嗙哗鏁堣瘎浠� Response VO")
-@Data
-public class SrmSupplierEvaluationRespVO {
-
- @Schema(description = "璇勪环ID", example = "1")
- private Long id;
-
- @Schema(description = "渚涘簲鍟咺D", example = "1")
- private Long supplierId;
-
- @Schema(description = "渚涘簲鍟嗗悕绉�", example = "XX绉戞妧鏈夐檺鍏徃")
- private String supplierName;
-
- @Schema(description = "璇勪环鍛ㄦ湡", example = "2024-Q1")
- private String evaluationPeriod;
-
- @Schema(description = "璐ㄩ噺璇勫垎锛堢櫨鍒嗗埗锛�", example = "90")
- private BigDecimal qualityScore;
-
- @Schema(description = "璐ㄩ噺鍚堟牸鐜�", example = "98.5")
- private BigDecimal qualityPassRate;
-
- @Schema(description = "璐ㄩ噺缂洪櫡娆℃暟", example = "2")
- private Integer qualityDefectCount;
-
- @Schema(description = "浜や粯璇勫垎锛堢櫨鍒嗗埗锛�", example = "85")
- private BigDecimal deliveryScore;
-
- @Schema(description = "浜や粯鍑嗘椂鐜�", example = "95.0")
- private BigDecimal deliveryOnTimeRate;
-
- @Schema(description = "浜や粯寤惰繜娆℃暟", example = "3")
- private Integer deliveryDelayCount;
-
- @Schema(description = "浠锋牸璇勫垎锛堢櫨鍒嗗埗锛�", example = "80")
- private BigDecimal priceScore;
-
- @Schema(description = "鏈嶅姟璇勫垎锛堢櫨鍒嗗埗锛�", example = "88")
- private BigDecimal serviceScore;
-
- @Schema(description = "鏈嶅姟鍝嶅簲閫熷害锛堝皬鏃讹級", example = "2")
- private Integer serviceResponseSpeed;
-
- @Schema(description = "缁煎悎璇勫垎", example = "87.5")
- private BigDecimal compositeScore;
-
- @Schema(description = "璇勪环绛夌骇锛圓/B/C/D锛�", example = "A")
- private String evaluationLevel;
-
- @Schema(description = "璇勪环绛夌骇锛堝悓 evaluationLevel锛岄�傞厤鍓嶇锛�", example = "A")
- private String grade;
-
- @Schema(description = "璇勪环浜篒D", example = "1")
- private Long evaluatorId;
-
- @Schema(description = "璇勪环浜哄悕绉�", example = "寮犱笁")
- private String evaluatorName;
-
- @Schema(description = "璇勪环鏃堕棿")
- private LocalDateTime evaluationTime;
-
- @Schema(description = "澶囨敞", example = "鏈搴﹁〃鐜拌壇濂�")
- private String remark;
-
- @Schema(description = "鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/evaluation/vo/SrmSupplierEvaluationSaveReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/evaluation/vo/SrmSupplierEvaluationSaveReqVO.java
deleted file mode 100644
index 23a8158..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/evaluation/vo/SrmSupplierEvaluationSaveReqVO.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.evaluation.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 渚涘簲鍟嗙哗鏁堣瘎浠峰垱寤�/鏇存柊 Request VO")
-@Data
-public class SrmSupplierEvaluationSaveReqVO {
-
- @Schema(description = "璇勪环ID", example = "1")
- private Long id;
-
- @Schema(description = "渚涘簲鍟咺D", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "渚涘簲鍟咺D涓嶈兘涓虹┖")
- private Long supplierId;
-
- @Schema(description = "璇勪环鍛ㄦ湡", requiredMode = Schema.RequiredMode.REQUIRED, example = "2024-Q1")
- @NotEmpty(message = "璇勪环鍛ㄦ湡涓嶈兘涓虹┖")
- private String evaluationPeriod;
-
- @Schema(description = "璐ㄩ噺璇勫垎锛堢櫨鍒嗗埗锛�", example = "90")
- private BigDecimal qualityScore;
-
- @Schema(description = "璐ㄩ噺鍚堟牸鐜�", example = "98.5")
- private BigDecimal qualityPassRate;
-
- @Schema(description = "璐ㄩ噺缂洪櫡娆℃暟", example = "2")
- private Integer qualityDefectCount;
-
- @Schema(description = "浜や粯璇勫垎锛堢櫨鍒嗗埗锛�", example = "85")
- private BigDecimal deliveryScore;
-
- @Schema(description = "浜や粯鍑嗘椂鐜�", example = "95.0")
- private BigDecimal deliveryOnTimeRate;
-
- @Schema(description = "浜や粯寤惰繜娆℃暟", example = "3")
- private Integer deliveryDelayCount;
-
- @Schema(description = "浠锋牸璇勫垎锛堢櫨鍒嗗埗锛�", example = "80")
- private BigDecimal priceScore;
-
- @Schema(description = "鏈嶅姟璇勫垎锛堢櫨鍒嗗埗锛�", example = "88")
- private BigDecimal serviceScore;
-
- @Schema(description = "鏈嶅姟鍝嶅簲閫熷害锛堝皬鏃讹級", example = "2")
- private Integer serviceResponseSpeed;
-
- @Schema(description = "澶囨敞", example = "鏈搴﹁〃鐜拌壇濂�")
- private String remark;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/SrmInquiryController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/SrmInquiryController.java
new file mode 100644
index 0000000..ef804c8
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/SrmInquiryController.java
@@ -0,0 +1,117 @@
+package cn.iocoder.yudao.module.srm.controller.admin.inquiry;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.srm.controller.admin.inquiry.vo.*;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmInquiryDO;
+import cn.iocoder.yudao.module.srm.service.inquiry.SrmInquiryService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "绠$悊鍚庡彴 - SRM 璇环姣斾环")
+@RestController
+@RequestMapping("/srm/inquiry")
+@Validated
+public class SrmInquiryController {
+
+ @Resource
+ private SrmInquiryService inquiryService;
+
+ @PostMapping("/create")
+ @Operation(summary = "鍒涘缓璇环鍗�")
+ @PreAuthorize("@ss.hasPermission('srm:inquiry:create')")
+ public CommonResult<Long> createInquiry(@Valid @RequestBody SrmInquirySaveReqVO createReqVO) {
+ return success(inquiryService.createInquiry(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "鏇存柊璇环鍗曪紙浠呰崏绋匡級")
+ @PreAuthorize("@ss.hasPermission('srm:inquiry:update')")
+ public CommonResult<Boolean> updateInquiry(@Valid @RequestBody SrmInquirySaveReqVO updateReqVO) {
+ inquiryService.updateInquiry(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎璇环鍗曪紙浠呰崏绋匡級")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('srm:inquiry:delete')")
+ public CommonResult<Boolean> deleteInquiry(@RequestParam("id") Long id) {
+ inquiryService.deleteInquiry(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰彇璇环鍗曡鎯�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ public CommonResult<SrmInquiryRespVO> getInquiry(@RequestParam("id") Long id) {
+ return success(inquiryService.getInquiryDetail(id));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "璇环鍗曞垎椤垫煡璇�")
+ public CommonResult<PageResult<SrmInquiryRespVO>> getInquiryPage(@Valid SrmInquiryPageReqVO pageReqVO) {
+ PageResult<SrmInquiryDO> pageResult = inquiryService.getInquiryPage(pageReqVO);
+ return success(BeanUtils.toBean(pageResult, SrmInquiryRespVO.class));
+ }
+
+ @GetMapping("/simple-list")
+ @Operation(summary = "鑾峰彇璇环鍗曠簿绠�鍒楄〃锛堢敤浜庢姇鏍囦繚璇侀噾閫夋嫨锛�")
+ public CommonResult<List<SrmInquiryRespVO>> getInquirySimpleList() {
+ List<SrmInquiryDO> list = inquiryService.getInquirySimpleList();
+ return success(BeanUtils.toBean(list, SrmInquiryRespVO.class));
+ }
+
+ @PutMapping("/publish")
+ @Operation(summary = "鍙戝竷璇环鍗曪細鑽夌 -> 璇环涓�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('srm:inquiry:update')")
+ public CommonResult<Boolean> publishInquiry(@RequestParam("id") Long id) {
+ inquiryService.publishInquiry(id);
+ return success(true);
+ }
+
+ @PutMapping("/cancel")
+ @Operation(summary = "鍙栨秷璇环鍗�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('srm:inquiry:update')")
+ public CommonResult<Boolean> cancelInquiry(@RequestParam("id") Long id) {
+ inquiryService.cancelInquiry(id);
+ return success(true);
+ }
+
+ @PostMapping("/save-quotes")
+ @Operation(summary = "鎵归噺淇濆瓨渚涘簲鍟嗘姤浠�")
+ @PreAuthorize("@ss.hasPermission('srm:inquiry:quote')")
+ public CommonResult<Boolean> saveQuotes(@Valid @RequestBody SrmInquiryQuoteSaveReqVO saveReqVO) {
+ inquiryService.saveQuotes(saveReqVO);
+ return success(true);
+ }
+
+ @GetMapping("/compare")
+ @Operation(summary = "鑾峰彇璇环姣斾环瑙嗗浘锛堜骇鍝佽 x 渚涘簲鍟嗘姤浠凤級")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ public CommonResult<SrmInquiryRespVO> getCompare(@RequestParam("id") Long id) {
+ return success(inquiryService.getCompare(id));
+ }
+
+ @PostMapping("/confirm")
+ @Operation(summary = "纭涓爣骞剁敓鎴愰噰璐鍗曡崏绋�")
+ @PreAuthorize("@ss.hasPermission('srm:inquiry:confirm')")
+ public CommonResult<SrmInquiryConfirmRespVO> confirmInquiry(
+ @Valid @RequestBody SrmInquiryConfirmReqVO confirmReqVO) {
+ return success(inquiryService.confirmInquiry(confirmReqVO));
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryConfirmReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryConfirmReqVO.java
new file mode 100644
index 0000000..56324fd
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryConfirmReqVO.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.srm.controller.admin.inquiry.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - 璇环姣斾环纭杞鍗� Request VO")
+@Data
+public class SrmInquiryConfirmReqVO {
+
+ @Schema(description = "璇环鍗旾D", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇环鍗旾D涓嶈兘涓虹┖")
+ private Long id;
+
+ @Schema(description = "姣忎釜浜у搧閫変腑鐨勪腑鏍囨姤浠凤紱涓虹┖鏃朵娇鐢ㄨ浠峰崟涓凡淇濆瓨鐨勪腑鏍囬�夋嫨")
+ private List<Selection> selections;
+
+ @Schema(description = "浜у搧涓爣閫夋嫨")
+ @Data
+ public static class Selection {
+
+ @Schema(description = "璇环浜у搧琛孖D", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇环浜у搧琛孖D涓嶈兘涓虹┖")
+ private Long inquiryItemId;
+
+ @Schema(description = "涓爣鎶ヤ环ID", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "涓爣鎶ヤ环ID涓嶈兘涓虹┖")
+ private Long quoteId;
+
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryConfirmRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryConfirmRespVO.java
new file mode 100644
index 0000000..f57173c
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryConfirmRespVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.srm.controller.admin.inquiry.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - 璇环姣斾环纭杞鍗� Response VO")
+@Data
+public class SrmInquiryConfirmRespVO {
+
+ @Schema(description = "璇环鍗旾D")
+ private Long inquiryId;
+
+ @Schema(description = "鐢熸垚鐨勯噰璐鍗曡崏绋�")
+ private List<Order> orders;
+
+ @Schema(description = "鐢熸垚鐨勯噰璐鍗�")
+ @Data
+ public static class Order {
+
+ @Schema(description = "渚涘簲鍟嗙紪鍙�")
+ private Long supplierId;
+
+ @Schema(description = "渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
+ @Schema(description = "閲囪喘璁㈠崟缂栧彿")
+ private Long purchaseOrderId;
+
+ @Schema(description = "閲囪喘璁㈠崟鍙�")
+ private String purchaseOrderNo;
+
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryPageReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryPageReqVO.java
new file mode 100644
index 0000000..592151c
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryPageReqVO.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.srm.controller.admin.inquiry.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "绠$悊鍚庡彴 - 璇环姣斾环鍒嗛〉鏌ヨ Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class SrmInquiryPageReqVO extends PageParam {
+
+ @Schema(description = "璇环鍗曞彿")
+ private String no;
+
+ @Schema(description = "璇环鏍囬")
+ private String title;
+
+ @Schema(description = "鐘舵�侊細0 鑽夌銆�10 璇环涓��20 宸茶浆璁㈠崟銆�30 宸插彇娑�")
+ private Integer status;
+
+ @Schema(description = "璇环鏃ユ湡寮�濮�")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ private LocalDate inquiryDateStart;
+
+ @Schema(description = "璇环鏃ユ湡缁撴潫")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ private LocalDate inquiryDateEnd;
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryQuoteSaveReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryQuoteSaveReqVO.java
new file mode 100644
index 0000000..30cea41
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryQuoteSaveReqVO.java
@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.srm.controller.admin.inquiry.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - 璇环鎶ヤ环淇濆瓨 Request VO")
+@Data
+public class SrmInquiryQuoteSaveReqVO {
+
+ @Schema(description = "璇环鍗旾D", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇环鍗旾D涓嶈兘涓虹┖")
+ private Long inquiryId;
+
+ @Schema(description = "鎶ヤ环鍒楄〃", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotEmpty(message = "鎶ヤ环鍒楄〃涓嶈兘涓虹┖")
+ private List<Quote> quotes;
+
+ @Schema(description = "浜у搧鎶ヤ环")
+ @Data
+ public static class Quote {
+
+ @Schema(description = "璇环浜у搧琛孖D", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "璇环浜у搧琛孖D涓嶈兘涓虹┖")
+ private Long inquiryItemId;
+
+ @Schema(description = "渚涘簲鍟嗙紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "渚涘簲鍟嗕笉鑳戒负绌�")
+ private Long supplierId;
+
+ @Schema(description = "鎶ヤ环鍗曚环")
+ private BigDecimal price;
+
+ @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮")
+ private BigDecimal taxRate;
+
+ @Schema(description = "浜よ揣鍛ㄦ湡锛屽ぉ")
+ private Integer deliveryCycle;
+
+ @Schema(description = "浠樻鏉′欢")
+ private String paymentTerms;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryRespVO.java
new file mode 100644
index 0000000..ff9d82b
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryRespVO.java
@@ -0,0 +1,119 @@
+package cn.iocoder.yudao.module.srm.controller.admin.inquiry.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - 璇环姣斾环 Response VO")
+@Data
+public class SrmInquiryRespVO {
+
+ @Schema(description = "璇环鍗旾D")
+ private Long id;
+
+ @Schema(description = "璇环鍗曞彿")
+ private String no;
+
+ @Schema(description = "璇环鏍囬")
+ private String title;
+
+ @Schema(description = "鐘舵�侊細0 鑽夌銆�10 璇环涓��20 宸茶浆璁㈠崟銆�30 宸插彇娑�")
+ private Integer status;
+
+ @Schema(description = "璇环鏃ユ湡")
+ private LocalDate inquiryDate;
+
+ @Schema(description = "鎶ヤ环鎴鏃ユ湡")
+ private LocalDate deadline;
+
+ @Schema(description = "閲囪喘鍛樼敤鎴风紪鍙�")
+ private Long purchaserUserId;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+ @Schema(description = "浜у搧琛屽垪琛�")
+ private List<Item> items;
+
+ @Schema(description = "鍙備笌渚涘簲鍟嗗垪琛�")
+ private List<Supplier> suppliers;
+
+ @Schema(description = "鍏ㄩ儴鎶ヤ环")
+ private List<Quote> quotes;
+
+ @Schema(description = "宸茬敓鎴愮殑閲囪喘璁㈠崟")
+ private List<Order> orders;
+
+ @Schema(description = "璇环浜у搧琛�")
+ @Data
+ public static class Item {
+
+ private Long id;
+ private Long inquiryId;
+ private Long productId;
+ private Long productUnitId;
+ private String productCode;
+ private String productName;
+ private String productSpec;
+ private String unitName;
+ private BigDecimal quantity;
+ private BigDecimal estimatedPrice;
+ private Long selectedSupplierId;
+ private Long selectedQuoteId;
+ private BigDecimal selectedPrice;
+ private String remark;
+ private Integer sort;
+
+ }
+
+ @Schema(description = "鍙備笌渚涘簲鍟�")
+ @Data
+ public static class Supplier {
+
+ private Long id;
+ private Long supplierId;
+ private String supplierName;
+ private String supplierCode;
+ private Integer quoteStatus;
+ private LocalDateTime quoteTime;
+ private String remark;
+
+ }
+
+ @Schema(description = "浜у搧鎶ヤ环")
+ @Data
+ public static class Quote {
+
+ private Long id;
+ private Long inquiryId;
+ private Long inquiryItemId;
+ private Long supplierId;
+ private BigDecimal price;
+ private BigDecimal taxRate;
+ private Integer deliveryCycle;
+ private String paymentTerms;
+ private String remark;
+ private Boolean isSelected;
+
+ }
+
+ @Schema(description = "宸茬敓鎴愮殑閲囪喘璁㈠崟")
+ @Data
+ public static class Order {
+
+ private Long id;
+ private Long supplierId;
+ private String supplierName;
+ private Long purchaseOrderId;
+ private String purchaseOrderNo;
+
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquirySaveReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquirySaveReqVO.java
new file mode 100644
index 0000000..bc2a1a9
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquirySaveReqVO.java
@@ -0,0 +1,131 @@
+package cn.iocoder.yudao.module.srm.controller.admin.inquiry.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "绠$悊鍚庡彴 - 璇环姣斾环鍒涘缓/鏇存柊 Request VO")
+@Data
+public class SrmInquirySaveReqVO {
+
+ @Schema(description = "璇环鍗旾D")
+ private Long id;
+
+ @Schema(description = "璇环鏍囬", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotEmpty(message = "璇环鏍囬涓嶈兘涓虹┖")
+ private String title;
+
+ @Schema(description = "璇环鏃ユ湡")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ private LocalDate inquiryDate;
+
+ @Schema(description = "鎶ヤ环鎴鏃ユ湡")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+ private LocalDate deadline;
+
+ @Schema(description = "閲囪喘鍛樼敤鎴风紪鍙�")
+ private Long purchaserUserId;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "浜у搧琛屽垪琛�")
+ @NotEmpty(message = "璇疯嚦灏戞坊鍔犱竴涓浠蜂骇鍝�")
+ private List<Item> items;
+
+ @Schema(description = "鍙備笌渚涘簲鍟嗗垪琛�")
+ @NotEmpty(message = "璇疯嚦灏戞坊鍔犱竴涓弬涓庝緵搴斿晢")
+ private List<Supplier> suppliers;
+
+ @Schema(description = "璇环浜у搧琛�")
+ @Data
+ public static class Item {
+
+ @Schema(description = "璇环浜у搧琛孖D锛堢紪杈戝凡鏈夎鏃朵紶鍏ワ級")
+ private Long id;
+
+ @Schema(description = "浜у搧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "浜у搧涓嶈兘涓虹┖")
+ private Long productId;
+
+ @Schema(description = "浜у搧鍗曚綅缂栧彿")
+ private Long productUnitId;
+
+ @Schema(description = "浜у搧缂栫爜")
+ private String productCode;
+
+ @Schema(description = "浜у搧鍚嶇О")
+ private String productName;
+
+ @Schema(description = "瑙勬牸鍨嬪彿")
+ private String productSpec;
+
+ @Schema(description = "鍗曚綅鍚嶇О")
+ private String unitName;
+
+ @Schema(description = "閲囪喘鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "閲囪喘鏁伴噺涓嶈兘涓虹┖")
+ private BigDecimal quantity;
+
+ @Schema(description = "鐩爣鍗曚环")
+ private BigDecimal estimatedPrice;
+
+ @Schema(description = "涓爣渚涘簲鍟嗙紪鍙�")
+ private Long selectedSupplierId;
+
+ @Schema(description = "渚涘簲鍟嗘姤浠峰垪琛紙鍒涘缓/缂栬緫鏃朵竴骞舵彁浜わ級")
+ private List<Quote> quotes;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ }
+
+ @Schema(description = "璇环浜у搧渚涘簲鍟嗘姤浠�")
+ @Data
+ public static class Quote {
+
+ @Schema(description = "渚涘簲鍟嗙紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "鎶ヤ环渚涘簲鍟嗕笉鑳戒负绌�")
+ private Long supplierId;
+
+ @Schema(description = "鎶ヤ环鍗曚环", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "鎶ヤ环鍗曚环涓嶈兘涓虹┖")
+ private BigDecimal price;
+
+ @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮")
+ private BigDecimal taxRate;
+
+ @Schema(description = "浜よ揣鍛ㄦ湡锛屽ぉ")
+ private Integer deliveryCycle;
+
+ @Schema(description = "浠樻鏉′欢")
+ private String paymentTerms;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ }
+
+ @Schema(description = "鍙備笌渚涘簲鍟�")
+ @Data
+ public static class Supplier {
+
+ @Schema(description = "渚涘簲鍟嗙紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "渚涘簲鍟嗕笉鑳戒负绌�")
+ private Long supplierId;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/statistics/SrmStatisticsController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/statistics/SrmStatisticsController.java
deleted file mode 100644
index 327436c..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/statistics/SrmStatisticsController.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.statistics;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.srm.controller.admin.statistics.vo.SrmTenderStatisticsRespVO;
-import cn.iocoder.yudao.module.srm.service.statistics.SrmStatisticsService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "绠$悊鍚庡彴 - SRM 缁熻鍒嗘瀽")
-@RestController
-@RequestMapping("/srm/statistics")
-@Validated
-public class SrmStatisticsController {
-
- @Resource
- private SrmStatisticsService statisticsService;
-
- @GetMapping("/tender")
- @Operation(summary = "鑾峰彇鎷涙爣缁熻鏁版嵁")
- public CommonResult<SrmTenderStatisticsRespVO> getTenderStatistics(@RequestParam("year") String year) {
- return success(statisticsService.getTenderStatistics(year));
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/statistics/vo/SrmTenderStatisticsRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/statistics/vo/SrmTenderStatisticsRespVO.java
deleted file mode 100644
index 0a445f6..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/statistics/vo/SrmTenderStatisticsRespVO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.statistics.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 鎷涙爣缁熻 Response VO")
-@Data
-public class SrmTenderStatisticsRespVO {
-
- @Schema(description = "鎷涙爣鎬绘暟", example = "100")
- private Long totalTenderCount;
-
- @Schema(description = "鎷涙爣鎬婚噾棰�", example = "50000000")
- private BigDecimal totalTenderAmount;
-
- @Schema(description = "瀹氭爣鎬婚噾棰�", example = "48000000")
- private BigDecimal totalAwardAmount;
-
- @Schema(description = "鑺傜害閲戦", example = "2000000")
- private BigDecimal savedAmount;
-
- @Schema(description = "涓爣鐜�", example = "85.5")
- private BigDecimal winRate;
-
- @Schema(description = "鍙備笌渚涘簲鍘傚晢鏁�", example = "50")
- private Long supplierCount;
-
- @Schema(description = "缁熻鍛ㄦ湡", example = "2024")
- private String period;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/SrmSupplierController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/SrmSupplierController.java
index 4d414cd..2f18b8e 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/SrmSupplierController.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/SrmSupplierController.java
@@ -65,7 +65,14 @@
@Parameter(name = "id", description = "缂栧彿", required = true)
public CommonResult<SrmSupplierRespVO> getSupplier(@RequestParam("id") Long id) {
SrmSupplierDO supplier = supplierService.getSupplier(id);
- return success(BeanUtils.toBean(supplier, SrmSupplierRespVO.class));
+ SrmSupplierRespVO respVO = BeanUtils.toBean(supplier, SrmSupplierRespVO.class);
+ if (respVO != null) {
+ respVO.setContacts(BeanUtils.toBean(supplierService.getSupplierContactList(id),
+ SrmSupplierContactRespVO.class));
+ respVO.setBanks(BeanUtils.toBean(supplierService.getSupplierBankList(id),
+ SrmSupplierBankRespVO.class));
+ }
+ return success(respVO);
}
@GetMapping("/page")
@@ -76,14 +83,14 @@
}
@GetMapping("/simple-list")
- @Operation(summary = "鑾峰彇渚涘簲鍟嗙簿绠�鍒楄〃锛堜粎杩斿洖宸查�氳繃鍑嗗叆瀹℃壒鐨勪緵搴斿晢锛�")
+ @Operation(summary = "鑾峰彇渚涘簲鍟嗙簿绠�鍒楄〃锛堜粎杩斿洖鍚敤鐘舵�佺殑渚涘簲鍟嗭級")
public CommonResult<List<SrmSupplierRespVO>> getSupplierSimpleList() {
List<SrmSupplierDO> list = supplierService.getSupplierSimpleList();
return success(BeanUtils.toBean(list, SrmSupplierRespVO.class));
}
@GetMapping("/list")
- @Operation(summary = "鑾峰彇渚涘簲鍟嗘。妗堝垪琛紙涓嶈繃婊ゅ噯鍏ョ姸鎬侊級")
+ @Operation(summary = "鑾峰彇渚涘簲鍟嗘。妗堝垪琛紙鎺掗櫎鍋滅敤渚涘簲鍟嗭級")
public CommonResult<List<SrmSupplierRespVO>> getSupplierAllList() {
List<SrmSupplierDO> list = supplierService.getSupplierAllList();
return success(BeanUtils.toBean(list, SrmSupplierRespVO.class));
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierBankRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierBankRespVO.java
new file mode 100644
index 0000000..bb9f90a
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierBankRespVO.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.srm.controller.admin.supplier.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "绠$悊鍚庡彴 - 渚涘簲鍟嗛摱琛岃处鎴� Response VO")
+@Data
+public class SrmSupplierBankRespVO {
+
+ @Schema(description = "閾惰璐︽埛ID")
+ private Long id;
+
+ @Schema(description = "渚涘簲鍟咺D")
+ private Long supplierId;
+
+ @Schema(description = "寮�鎴疯")
+ private String bankName;
+
+ @Schema(description = "閾惰璐﹀彿")
+ private String bankAccount;
+
+ @Schema(description = "閾惰琛屽彿")
+ private String bankNo;
+
+ @Schema(description = "寮�鎴疯鍦板潃")
+ private String bankAddress;
+
+ @Schema(description = "鏄惁榛樿璐︽埛")
+ private Boolean isDefault;
+
+ @Schema(description = "鎺掑簭")
+ private Integer sort;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierBankSaveReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierBankSaveReqVO.java
new file mode 100644
index 0000000..44566dd
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierBankSaveReqVO.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.srm.controller.admin.supplier.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+@Schema(description = "绠$悊鍚庡彴 - 渚涘簲鍟嗛摱琛岃处鎴蜂繚瀛� Request VO")
+@Data
+public class SrmSupplierBankSaveReqVO {
+
+ @Schema(description = "閾惰璐︽埛ID")
+ private Long id;
+
+ @Schema(description = "渚涘簲鍟咺D")
+ private Long supplierId;
+
+ @Schema(description = "寮�鎴疯", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotEmpty(message = "寮�鎴疯涓嶈兘涓虹┖")
+ private String bankName;
+
+ @Schema(description = "閾惰璐﹀彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotEmpty(message = "閾惰璐﹀彿涓嶈兘涓虹┖")
+ private String bankAccount;
+
+ @Schema(description = "閾惰琛屽彿")
+ private String bankNo;
+
+ @Schema(description = "寮�鎴疯鍦板潃")
+ private String bankAddress;
+
+ @Schema(description = "鏄惁榛樿璐︽埛")
+ private Boolean isDefault;
+
+ @Schema(description = "鎺掑簭")
+ private Integer sort;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierPageReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierPageReqVO.java
index 833469d..97dea59 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierPageReqVO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierPageReqVO.java
@@ -30,10 +30,4 @@
@Schema(description = "鑱旂郴鐢佃瘽")
private String contactMobile;
- @Schema(description = "浠呮樉绀哄凡閫氳繃鍑嗗叆瀹℃壒鐨勪緵搴斿晢")
- private Boolean approved;
-
- @Schema(description = "鎺掗櫎宸查�氳繃鍑嗗叆瀹℃壒鐨勪緵搴斿晢锛堢敤浜庢柊澧炲噯鍏ユ椂閬垮厤閲嶅閫夋嫨锛�")
- private Boolean excludeApproved;
-
}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierRespVO.java
index 5b92d72..538b529 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierRespVO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierRespVO.java
@@ -5,6 +5,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
@Schema(description = "绠$悊鍚庡彴 - 渚涘簲鍟� Response VO")
@Data
@@ -70,4 +71,10 @@
@Schema(description = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
+ @Schema(description = "鑱旂郴浜哄垪琛�")
+ private List<SrmSupplierContactRespVO> contacts;
+
+ @Schema(description = "閾惰璐︽埛鍒楄〃")
+ private List<SrmSupplierBankRespVO> banks;
+
}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierSaveReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierSaveReqVO.java
index 401ed2c..23d7cca 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierSaveReqVO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierSaveReqVO.java
@@ -6,6 +6,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
@Schema(description = "绠$悊鍚庡彴 - 渚涘簲鍟嗗垱寤�/鏇存柊 Request VO")
@Data
@@ -71,4 +72,10 @@
@Schema(description = "澶囨敞")
private String remark;
+ @Schema(description = "鑱旂郴浜哄垪琛紙浼� null 琛ㄧず涓嶄慨鏀癸級")
+ private List<SrmSupplierContactSaveReqVO> contacts;
+
+ @Schema(description = "閾惰璐︽埛鍒楄〃锛堜紶 null 琛ㄧず涓嶄慨鏀癸級")
+ private List<SrmSupplierBankSaveReqVO> banks;
+
}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmBidAwardController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmBidAwardController.java
deleted file mode 100644
index 7a9bd5b..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmBidAwardController.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.*;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmBidAwardDO;
-import cn.iocoder.yudao.module.srm.service.tender.SrmBidAwardService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "绠$悊鍚庡彴 - SRM 瀹氭爣绠$悊")
-@RestController
-@RequestMapping("/srm/bid-award")
-@Validated
-public class SrmBidAwardController {
-
- @Resource
- private SrmBidAwardService bidAwardService;
-
- @PostMapping("/create")
- @Operation(summary = "鍒涘缓瀹氭爣")
- @PreAuthorize("@ss.hasPermission('srm:bid-award:create')")
- public CommonResult<Long> createAward(@Valid @RequestBody SrmBidAwardSaveReqVO createReqVO) {
- return success(bidAwardService.createAward(createReqVO));
- }
-
- @GetMapping("/get")
- @Operation(summary = "鑾峰彇瀹氭爣璇︽儏")
- public CommonResult<SrmBidAwardRespVO> getAward(@RequestParam("id") Long id) {
- return success(BeanUtils.toBean(bidAwardService.getAward(id), SrmBidAwardRespVO.class));
- }
-
- @GetMapping("/get-by-project")
- @Operation(summary = "鏍规嵁鎷涙爣椤圭洰ID鑾峰彇瀹氭爣璇︽儏")
- public CommonResult<SrmBidAwardRespVO> getAwardByProject(@RequestParam("tenderProjectId") Long tenderProjectId) {
- SrmBidAwardDO award = bidAwardService.getAwardByProjectId(tenderProjectId);
- if (award == null) {
- return success((SrmBidAwardRespVO) null);
- }
- return success(BeanUtils.toBean(award, SrmBidAwardRespVO.class));
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎瀹氭爣")
- @Parameter(name = "id", description = "瀹氭爣ID", required = true)
- @PreAuthorize("@ss.hasPermission('srm:bid-award:update')")
- public CommonResult<Boolean> deleteAward(@RequestParam("id") Long id) {
- bidAwardService.deleteAward(id);
- return success(true);
- }
-
- @PutMapping("/approve")
- @Operation(summary = "瀹℃壒瀹氭爣")
- @Parameter(name = "id", description = "瀹氭爣ID", required = true)
- @PreAuthorize("@ss.hasPermission('srm:bid-award:update')")
- public CommonResult<Boolean> approveAward(@RequestParam("id") Long id) {
- bidAwardService.approveAward(id);
- return success(true);
- }
-
- @PutMapping("/generate-purchase-order/{id}")
- @Operation(summary = "鐢熸垚閲囪喘璁㈠崟")
- @Parameter(name = "id", description = "瀹氭爣ID", required = true)
- @PreAuthorize("@ss.hasPermission('srm:bid-award:update')")
- public CommonResult<Boolean> generatePurchaseOrder(@PathVariable("id") Long id) {
- bidAwardService.generatePurchaseOrder(id);
- return success(true);
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmBidEvaluationController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmBidEvaluationController.java
deleted file mode 100644
index 0639b44..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmBidEvaluationController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.*;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierDO;
-import cn.iocoder.yudao.module.srm.service.supplier.SrmSupplierService;
-import cn.iocoder.yudao.module.srm.service.tender.SrmBidEvaluationService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "绠$悊鍚庡彴 - SRM 璇勬爣绠$悊")
-@RestController
-@RequestMapping("/srm/bid-evaluation")
-@Validated
-public class SrmBidEvaluationController {
-
- @Resource
- private SrmBidEvaluationService bidEvaluationService;
-
- @Resource
- private SrmSupplierService supplierService;
-
- @PostMapping("/create")
- @Operation(summary = "鍒涘缓璇勬爣璁板綍")
- @PreAuthorize("@ss.hasPermission('srm:bid-evaluation:create')")
- public CommonResult<Long> createEvaluation(@Valid @RequestBody SrmBidEvaluationSaveReqVO createReqVO) {
- return success(bidEvaluationService.createEvaluation(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "鏇存柊璇勬爣璁板綍")
- @PreAuthorize("@ss.hasPermission('srm:bid-evaluation:update')")
- public CommonResult<Boolean> updateEvaluation(@Valid @RequestBody SrmBidEvaluationSaveReqVO updateReqVO) {
- bidEvaluationService.updateEvaluation(updateReqVO);
- return success(true);
- }
-
- @GetMapping("/list-by-project")
- @Operation(summary = "鎸夋嫑鏍囬」鐩幏鍙栬瘎鏍囧垪琛�")
- public CommonResult<List<SrmBidEvaluationRespVO>> getEvaluationList(@RequestParam("tenderProjectId") Long tenderProjectId) {
- List<SrmBidEvaluationRespVO> list = BeanUtils.toBean(bidEvaluationService.getEvaluationList(tenderProjectId), SrmBidEvaluationRespVO.class);
- enrichEvaluationSupplierNames(list);
- return success(list);
- }
-
- private void enrichEvaluationSupplierNames(List<SrmBidEvaluationRespVO> list) {
- if (list == null || list.isEmpty()) return;
- Set<Long> supplierIds = CollectionUtils.convertSet(list, SrmBidEvaluationRespVO::getSupplierId);
- Map<Long, SrmSupplierDO> supplierMap = supplierService.getSupplierMap(supplierIds);
- list.forEach(vo -> {
- SrmSupplierDO supplier = supplierMap.get(vo.getSupplierId());
- if (supplier != null) {
- vo.setSupplierName(supplier.getName());
- }
- });
- }
-
- @PutMapping("/calculate-ranking")
- @Operation(summary = "璁$畻鎺掑悕")
- @PreAuthorize("@ss.hasPermission('srm:bid-evaluation:update')")
- public CommonResult<Boolean> calculateRanking(@RequestParam("tenderProjectId") Long tenderProjectId) {
- bidEvaluationService.calculateRanking(tenderProjectId);
- return success(true);
- }
-
- // ========== 寮�鏍� ==========
-
- @PostMapping("/bid-open/create")
- @Operation(summary = "寮�鏍�")
- @PreAuthorize("@ss.hasPermission('srm:bid-open:create')")
- public CommonResult<Long> createBidOpen(@RequestParam("tenderProjectId") Long tenderProjectId) {
- return success(bidEvaluationService.createBidOpen(tenderProjectId));
- }
-
- @GetMapping("/bid-open/get")
- @Operation(summary = "鑾峰彇寮�鏍囪褰�")
- public CommonResult<SrmBidOpenRespVO> getBidOpen(@RequestParam("id") Long id) {
- return success(BeanUtils.toBean(bidEvaluationService.getBidOpen(id), SrmBidOpenRespVO.class));
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderBidController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderBidController.java
deleted file mode 100644
index 7547ec8..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderBidController.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.*;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierDO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderMaterialDO;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmTenderMaterialMapper;
-import cn.iocoder.yudao.module.srm.service.supplier.SrmSupplierService;
-import cn.iocoder.yudao.module.srm.service.tender.SrmTenderBidService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "绠$悊鍚庡彴 - SRM 鎶曟爣绠$悊")
-@RestController
-@RequestMapping("/srm/tender-bid")
-@Validated
-public class SrmTenderBidController {
-
- @Resource
- private SrmTenderBidService tenderBidService;
-
- @Resource
- private SrmSupplierService supplierService;
-
- @Resource
- private SrmTenderMaterialMapper tenderMaterialMapper;
-
- // ========== 鎶曟爣绠$悊 ==========
-
- @PostMapping("/create")
- @Operation(summary = "鍒涘缓鎶曟爣")
- @PreAuthorize("@ss.hasPermission('srm:tender-bid:create')")
- public CommonResult<Long> createBid(@Valid @RequestBody SrmTenderBidSaveReqVO createReqVO) {
- return success(tenderBidService.createBid(createReqVO));
- }
-
- @GetMapping("/get")
- @Operation(summary = "鑾峰彇鎶曟爣璇︽儏")
- public CommonResult<SrmTenderBidRespVO> getBid(@RequestParam("id") Long id) {
- SrmTenderBidRespVO resp = BeanUtils.toBean(tenderBidService.getBid(id), SrmTenderBidRespVO.class);
- enrichSupplierName(resp);
- return success(resp);
- }
-
- @GetMapping("/list-by-project")
- @Operation(summary = "鎸夋嫑鏍囬」鐩幏鍙栨姇鏍囧垪琛�")
- public CommonResult<List<SrmTenderBidRespVO>> getBidListByProject(@RequestParam("tenderProjectId") Long tenderProjectId) {
- List<SrmTenderBidRespVO> list = BeanUtils.toBean(tenderBidService.getBidListByProject(tenderProjectId), SrmTenderBidRespVO.class);
- enrichSupplierNames(list);
- return success(list);
- }
-
- @PutMapping("/withdraw")
- @Operation(summary = "鎾ゆ爣")
- @Parameter(name = "id", description = "鎶曟爣ID", required = true)
- @PreAuthorize("@ss.hasPermission('srm:tender-bid:update')")
- public CommonResult<Boolean> withdrawBid(@RequestParam("id") Long id) {
- tenderBidService.withdrawBid(id);
- return success(true);
- }
-
- @PutMapping("/update-total")
- @Operation(summary = "鏇存柊鎶曟爣鎬婚噾棰�")
- @Parameter(name = "id", description = "鎶曟爣ID", required = true)
- @Parameter(name = "bidTotalAmount", description = "鎶曟爣鎬婚噾棰濓紙鎶ヤ环鍚堣鑷姩甯﹀嚭鍚庡彲浜哄伐璋冩暣锛�")
- @PreAuthorize("@ss.hasPermission('srm:tender-bid:update')")
- public CommonResult<Boolean> updateBidTotal(@RequestParam("id") Long id,
- @RequestParam(value = "bidTotalAmount", required = false) BigDecimal bidTotalAmount) {
- tenderBidService.updateBidTotal(id, bidTotalAmount);
- return success(true);
- }
-
- // ========== 渚涘簲鍟嗘姤浠� ==========
-
- @PostMapping("/quote/create")
- @Operation(summary = "鍒涘缓渚涘簲鍟嗘姤浠�")
- @PreAuthorize("@ss.hasPermission('srm:supplier-quote:create')")
- public CommonResult<Long> createQuote(@Valid @RequestBody SrmSupplierQuoteSaveReqVO createReqVO) {
- return success(tenderBidService.createQuote(createReqVO));
- }
-
- @PutMapping("/quote/update")
- @Operation(summary = "鏇存柊渚涘簲鍟嗘姤浠�")
- @PreAuthorize("@ss.hasPermission('srm:supplier-quote:update')")
- public CommonResult<Boolean> updateQuote(@Valid @RequestBody SrmSupplierQuoteSaveReqVO updateReqVO) {
- tenderBidService.updateQuote(updateReqVO);
- return success(true);
- }
-
- @GetMapping("/quote/list-by-bid")
- @Operation(summary = "鎸夋姇鏍囪幏鍙栨姤浠峰垪琛�")
- public CommonResult<List<SrmSupplierQuoteRespVO>> getQuoteListByBid(@RequestParam("bidId") Long bidId) {
- List<SrmSupplierQuoteRespVO> list = BeanUtils.toBean(tenderBidService.getQuoteList(bidId), SrmSupplierQuoteRespVO.class);
- enrichQuoteMaterialInfo(list);
- return success(list);
- }
-
- private void enrichQuoteMaterialInfo(List<SrmSupplierQuoteRespVO> list) {
- if (list == null || list.isEmpty()) return;
- Set<Long> materialIds = CollectionUtils.convertSet(list, SrmSupplierQuoteRespVO::getTenderMaterialId);
- Map<Long, SrmTenderMaterialDO> materialMap = tenderMaterialMapper.selectBatchIds(materialIds).stream()
- .collect(java.util.stream.Collectors.toMap(SrmTenderMaterialDO::getId, m -> m));
- list.forEach(vo -> {
- SrmTenderMaterialDO material = materialMap.get(vo.getTenderMaterialId());
- if (material != null) {
- vo.setTenderMaterialCode(material.getProductCode());
- vo.setTenderMaterialName(material.getProductName());
- vo.setMaterialName(material.getProductName());
- vo.setTenderMaterialSpec(material.getProductSpec());
- vo.setTenderMaterialUnit(material.getUnit());
- }
- });
- }
-
- // ========== 鍏宠仈鏁版嵁濉厖 ==========
-
- private void enrichSupplierNames(List<SrmTenderBidRespVO> list) {
- if (list == null || list.isEmpty()) return;
- Set<Long> supplierIds = CollectionUtils.convertSet(list, SrmTenderBidRespVO::getSupplierId);
- Map<Long, SrmSupplierDO> supplierMap = supplierService.getSupplierMap(supplierIds);
- list.forEach(vo -> {
- SrmSupplierDO supplier = supplierMap.get(vo.getSupplierId());
- if (supplier != null) {
- vo.setSupplierName(supplier.getName());
- }
- });
- }
-
- private void enrichSupplierName(SrmTenderBidRespVO vo) {
- if (vo == null || vo.getSupplierId() == null) return;
- SrmSupplierDO supplier = supplierService.getSupplier(vo.getSupplierId());
- if (supplier != null) {
- vo.setSupplierName(supplier.getName());
- }
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderConfigController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderConfigController.java
deleted file mode 100644
index 6995e2f..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderConfigController.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmTenderConfigRespVO;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmTenderConfigSaveReqVO;
-import cn.iocoder.yudao.module.srm.service.tender.SrmTenderConfigService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "绠$悊鍚庡彴 - SRM 鎷涙姇鏍囬厤缃�")
-@RestController
-@RequestMapping("/srm/tender-config")
-@Validated
-public class SrmTenderConfigController {
-
- @Resource
- private SrmTenderConfigService tenderConfigService;
-
- @GetMapping("/get")
- @Operation(summary = "鑾峰彇鎷涙姇鏍囬厤缃�")
- public CommonResult<SrmTenderConfigRespVO> getConfig() {
- return success(BeanUtils.toBean(tenderConfigService.getConfig(), SrmTenderConfigRespVO.class));
- }
-
- @PutMapping("/save")
- @Operation(summary = "淇濆瓨鎷涙姇鏍囬厤缃�")
- @PreAuthorize("@ss.hasPermission('srm:tender-config:update')")
- public CommonResult<Boolean> saveConfig(@Valid @RequestBody SrmTenderConfigSaveReqVO saveReqVO) {
- tenderConfigService.saveConfig(saveReqVO.getDefaultBiddingMode());
- return success(true);
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderProjectController.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderProjectController.java
deleted file mode 100644
index d403ada..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/SrmTenderProjectController.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.*;
-import cn.iocoder.yudao.module.srm.service.tender.SrmTenderProjectService;
-import cn.iocoder.yudao.module.srm.service.tender.SrmTenderProjectServiceImpl;
-import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "绠$悊鍚庡彴 - SRM 鎷涙爣椤圭洰")
-@RestController
-@RequestMapping("/srm/tender-project")
-@Validated
-public class SrmTenderProjectController {
-
- @Resource
- private SrmTenderProjectService tenderProjectService;
-
- @Resource
- private StorageAttachmentApi storageAttachmentApi;
-
- @PostMapping("/create")
- @Operation(summary = "鍒涘缓鎷涙爣椤圭洰")
- @PreAuthorize("@ss.hasPermission('srm:tender-project:create')")
- public CommonResult<Long> createTenderProject(@Valid @RequestBody SrmTenderProjectSaveReqVO createReqVO) {
- return success(tenderProjectService.createTenderProject(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "鏇存柊鎷涙爣椤圭洰")
- @PreAuthorize("@ss.hasPermission('srm:tender-project:update')")
- public CommonResult<Boolean> updateTenderProject(@Valid @RequestBody SrmTenderProjectSaveReqVO updateReqVO) {
- tenderProjectService.updateTenderProject(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎鎷涙爣椤圭洰")
- @PreAuthorize("@ss.hasPermission('srm:tender-project:delete')")
- public CommonResult<Boolean> deleteTenderProject(@RequestParam("id") Long id) {
- tenderProjectService.deleteTenderProject(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "鑾峰彇鎷涙爣椤圭洰璇︽儏")
- public CommonResult<SrmTenderProjectRespVO> getTenderProject(@RequestParam("id") Long id) {
- var resp = BeanUtils.toBean(tenderProjectService.getTenderProject(id), SrmTenderProjectRespVO.class);
- enrichAttachments(List.of(resp));
- return success(resp);
- }
-
- @GetMapping("/page")
- @Operation(summary = "鑾峰彇鎷涙爣椤圭洰鍒嗛〉")
- public CommonResult<PageResult<SrmTenderProjectRespVO>> getTenderProjectPage(@Valid SrmTenderProjectPageReqVO pageReqVO) {
- var pageResult = tenderProjectService.getTenderProjectPage(pageReqVO);
- var respList = BeanUtils.toBean(pageResult.getList(), SrmTenderProjectRespVO.class);
- enrichAttachments(respList);
- return success(new PageResult<>(respList, pageResult.getTotal()));
- }
-
- // ========== 鍏宠仈鏁版嵁濉厖 ==========
-
- private void enrichAttachments(List<SrmTenderProjectRespVO> list) {
- if (list == null || list.isEmpty()) return;
- list.forEach(vo -> vo.setAttachmentList(storageAttachmentApi.listAttachments(
- SrmTenderProjectServiceImpl.TENDER_PROJECT_RECORD_TYPE, vo.getId())));
- }
-
- @PutMapping("/publish")
- @Operation(summary = "鍙戝竷鎷涙爣")
- @PreAuthorize("@ss.hasPermission('srm:tender-project:update')")
- public CommonResult<Boolean> publishTender(@RequestParam("id") Long id) {
- tenderProjectService.publishTender(id);
- return success(true);
- }
-
- @PutMapping("/close")
- @Operation(summary = "鍏抽棴鎷涙爣")
- @PreAuthorize("@ss.hasPermission('srm:tender-project:update')")
- public CommonResult<Boolean> closeTender(@RequestParam("id") Long id) {
- tenderProjectService.closeTender(id);
- return success(true);
- }
-
- @PutMapping("/start-bidding")
- @Operation(summary = "寮�濮嬫姇鏍�")
- @PreAuthorize("@ss.hasPermission('srm:tender-project:update')")
- public CommonResult<Boolean> startBidding(@RequestParam("id") Long id) {
- tenderProjectService.startBidding(id);
- return success(true);
- }
-
- @PutMapping("/start-evaluation")
- @Operation(summary = "寮�濮嬭瘎鏍�")
- @PreAuthorize("@ss.hasPermission('srm:tender-project:update')")
- public CommonResult<Boolean> startEvaluation(@RequestParam("id") Long id) {
- tenderProjectService.startEvaluation(id);
- return success(true);
- }
-
- @PutMapping("/update-info")
- @Operation(summary = "閮ㄥ垎鏇存柊鎷涙爣淇℃伅锛堜粎鍙戝竷涓�/鎶曟爣涓彲缂栬緫锛氭嫑鏍囪鏄庡拰璧勮川瑕佹眰锛�")
- @PreAuthorize("@ss.hasPermission('srm:tender-project:update')")
- public CommonResult<Boolean> updateTenderProjectInfo(@Valid @RequestBody SrmTenderProjectPartialUpdateReqVO updateReqVO) {
- tenderProjectService.updateTenderProjectPartial(updateReqVO);
- return success(true);
- }
-
- // ========== 绠�鏄撴ā寮忔搷浣� ==========
-
- @PutMapping("/start-price-comparing")
- @Operation(summary = "寮�濮嬫瘮浠凤紙绠�鏄撶増锛�")
- @PreAuthorize("@ss.hasPermission('srm:tender-project:update')")
- public CommonResult<Boolean> startPriceComparing(@RequestParam("id") Long id) {
- tenderProjectService.startPriceComparing(id);
- return success(true);
- }
-
- @PutMapping("/confirm")
- @Operation(summary = "纭涓爣骞剁敓鎴愰噰璐鍗曪紙绠�鏄撶増锛�")
- @PreAuthorize("@ss.hasPermission('srm:tender-project:update')")
- public CommonResult<Boolean> confirmTenderProject(@Valid @RequestBody SrmTenderConfirmReqVO reqVO) {
- tenderProjectService.confirmTenderProject(reqVO.getId(), reqVO.getBidId());
- return success(true);
- }
-
- // ========== 鐗╂枡瀛愯〃 ==========
-
- @PostMapping("/material/create")
- @Operation(summary = "鍒涘缓鎷涙爣鐗╂枡")
- @PreAuthorize("@ss.hasPermission('srm:tender-project:create')")
- public CommonResult<Long> createMaterial(@Valid @RequestBody SrmTenderMaterialSaveReqVO createReqVO) {
- tenderProjectService.createMaterial(createReqVO);
- return success(createReqVO.getId());
- }
-
- @PutMapping("/material/update")
- @Operation(summary = "鏇存柊鎷涙爣鐗╂枡")
- @PreAuthorize("@ss.hasPermission('srm:tender-project:update')")
- public CommonResult<Boolean> updateMaterial(@Valid @RequestBody SrmTenderMaterialSaveReqVO updateReqVO) {
- tenderProjectService.updateMaterial(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/material/delete")
- @Operation(summary = "鍒犻櫎鎷涙爣鐗╂枡")
- @PreAuthorize("@ss.hasPermission('srm:tender-project:delete')")
- public CommonResult<Boolean> deleteMaterial(@RequestParam("id") Long id) {
- tenderProjectService.deleteMaterial(id);
- return success(true);
- }
-
- @GetMapping("/material/list")
- @Operation(summary = "鑾峰彇鎷涙爣鐗╂枡鍒楄〃")
- public CommonResult<List<SrmTenderMaterialRespVO>> getMaterialList(@RequestParam("tenderProjectId") Long tenderProjectId) {
- return success(BeanUtils.toBean(tenderProjectService.getMaterialList(tenderProjectId), SrmTenderMaterialRespVO.class));
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmBidAwardRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmBidAwardRespVO.java
deleted file mode 100644
index 0773f42..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmBidAwardRespVO.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 瀹氭爣 Response VO")
-@Data
-public class SrmBidAwardRespVO {
-
- @Schema(description = "瀹氭爣ID", example = "1")
- private Long id;
-
- @Schema(description = "鎷涙爣椤圭洰ID", example = "1")
- private Long tenderProjectId;
-
- @Schema(description = "渚涘簲鍟咺D", example = "1")
- private Long supplierId;
-
- @Schema(description = "鎶曟爣ID", example = "1")
- private Long bidId;
-
- @Schema(description = "瀹氭爣缂栧彿", example = "AWARD2024010001")
- private String awardNo;
-
- @Schema(description = "瀹氭爣鐘舵��", example = "0")
- private Integer awardStatus;
-
- @Schema(description = "瀹氭爣閲戦", example = "500000")
- private BigDecimal awardAmount;
-
- @Schema(description = "瀹氭爣鏃堕棿")
- private LocalDateTime awardTime;
-
- @Schema(description = "閫氱煡涔︽枃浠跺悕", example = "award_notice.pdf")
- private String noticeFileName;
-
- @Schema(description = "閫氱煡涔︽枃浠跺湴鍧�", example = "https://example.com/files/xxx.pdf")
- private String noticeFileUrl;
-
- @Schema(description = "閲囪喘璁㈠崟ID", example = "1")
- private Long purchaseOrderId;
-
- @Schema(description = "閲囪喘璁㈠崟缂栧彿", example = "PO2024010001")
- private String purchaseOrderNo;
-
- @Schema(description = "瀹℃壒浜篒D", example = "1")
- private Long approverId;
-
- @Schema(description = "瀹℃壒鏃堕棿")
- private LocalDateTime approvalTime;
-
- @Schema(description = "澶囨敞", example = "缁煎悎璇勬爣绗竴鍚�")
- private String remark;
-
- @Schema(description = "鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmBidAwardSaveReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmBidAwardSaveReqVO.java
deleted file mode 100644
index 3c09952..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmBidAwardSaveReqVO.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 瀹氭爣鍒涘缓/鏇存柊 Request VO")
-@Data
-public class SrmBidAwardSaveReqVO {
-
- @Schema(description = "瀹氭爣ID", example = "1")
- private Long id;
-
- @Schema(description = "鎷涙爣椤圭洰ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鎷涙爣椤圭洰ID涓嶈兘涓虹┖")
- private Long tenderProjectId;
-
- @Schema(description = "渚涘簲鍟咺D", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "渚涘簲鍟咺D涓嶈兘涓虹┖")
- private Long supplierId;
-
- @Schema(description = "鎶曟爣ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鎶曟爣ID涓嶈兘涓虹┖")
- private Long bidId;
-
- @Schema(description = "瀹氭爣缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "AWARD2024010001")
- @NotEmpty(message = "瀹氭爣缂栧彿涓嶈兘涓虹┖")
- private String awardNo;
-
- @Schema(description = "瀹氭爣鐘舵��", example = "0")
- private Integer awardStatus;
-
- @Schema(description = "瀹氭爣閲戦", requiredMode = Schema.RequiredMode.REQUIRED, example = "500000")
- @NotNull(message = "瀹氭爣閲戦涓嶈兘涓虹┖")
- private BigDecimal awardAmount;
-
- @Schema(description = "瀹氭爣鏃堕棿")
- private LocalDateTime awardTime;
-
- @Schema(description = "閫氱煡涔︽枃浠跺悕", example = "award_notice.pdf")
- private String noticeFileName;
-
- @Schema(description = "閫氱煡涔︽枃浠跺湴鍧�", example = "https://example.com/files/xxx.pdf")
- private String noticeFileUrl;
-
- @Schema(description = "澶囨敞", example = "缁煎悎璇勬爣绗竴鍚�")
- private String remark;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmBidEvaluationRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmBidEvaluationRespVO.java
deleted file mode 100644
index 63e932f..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmBidEvaluationRespVO.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 璇勬爣 Response VO")
-@Data
-public class SrmBidEvaluationRespVO {
-
- @Schema(description = "璇勬爣ID", example = "1")
- private Long id;
-
- @Schema(description = "鎷涙爣椤圭洰ID", example = "1")
- private Long tenderProjectId;
-
- @Schema(description = "渚涘簲鍟咺D", example = "1")
- private Long supplierId;
-
- @Schema(description = "渚涘簲鍟嗗悕绉�", example = "鍗庝负鎶�鏈�")
- private String supplierName;
-
- @Schema(description = "鎶曟爣ID", example = "1")
- private Long bidId;
-
- @Schema(description = "浠锋牸璇勫垎锛堢櫨鍒嗗埗锛�", example = "85")
- private BigDecimal priceScore;
-
- @Schema(description = "鎶�鏈瘎鍒嗭紙鐧惧垎鍒讹級", example = "90")
- private BigDecimal techScore;
-
- @Schema(description = "浜や粯璇勫垎锛堢櫨鍒嗗埗锛�", example = "80")
- private BigDecimal deliveryScore;
-
- @Schema(description = "鏈嶅姟璇勫垎锛堢櫨鍒嗗埗锛�", example = "88")
- private BigDecimal serviceScore;
-
- @Schema(description = "缁煎悎璇勫垎", example = "87.5")
- private BigDecimal compositeScore;
-
- @Schema(description = "鎺掑悕", example = "1")
- private Integer ranking;
-
- @Schema(description = "璇勫ID", example = "1")
- private Long evaluatorId;
-
- @Schema(description = "璇勫鍚嶇О", example = "鐜嬩簲")
- private String evaluatorName;
-
- @Schema(description = "璇勬爣鎰忚", example = "鎶�鏈柟妗堜紭绉�锛屼环鏍煎悎鐞�")
- private String evaluationOpinion;
-
- @Schema(description = "璇勪环鏃堕棿")
- private LocalDateTime evaluationTime;
-
- @Schema(description = "鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmBidEvaluationSaveReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmBidEvaluationSaveReqVO.java
deleted file mode 100644
index d91c9eb..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmBidEvaluationSaveReqVO.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 璇勬爣鍒涘缓/鏇存柊 Request VO")
-@Data
-public class SrmBidEvaluationSaveReqVO {
-
- @Schema(description = "璇勬爣ID", example = "1")
- private Long id;
-
- @Schema(description = "鎷涙爣椤圭洰ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鎷涙爣椤圭洰ID涓嶈兘涓虹┖")
- private Long tenderProjectId;
-
- @Schema(description = "渚涘簲鍟咺D", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "渚涘簲鍟咺D涓嶈兘涓虹┖")
- private Long supplierId;
-
- @Schema(description = "鎶曟爣ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鎶曟爣ID涓嶈兘涓虹┖")
- private Long bidId;
-
- @Schema(description = "浠锋牸璇勫垎锛堢櫨鍒嗗埗锛�", example = "85")
- private BigDecimal priceScore;
-
- @Schema(description = "鎶�鏈瘎鍒嗭紙鐧惧垎鍒讹級", example = "90")
- private BigDecimal techScore;
-
- @Schema(description = "浜や粯璇勫垎锛堢櫨鍒嗗埗锛�", example = "80")
- private BigDecimal deliveryScore;
-
- @Schema(description = "鏈嶅姟璇勫垎锛堢櫨鍒嗗埗锛�", example = "88")
- private BigDecimal serviceScore;
-
- @Schema(description = "璇勫ID", example = "1")
- private Long evaluatorId;
-
- @Schema(description = "璇勫鍚嶇О", example = "鐜嬩簲")
- private String evaluatorName;
-
- @Schema(description = "璇勬爣鎰忚", example = "鎶�鏈柟妗堜紭绉�锛屼环鏍煎悎鐞�")
- private String evaluationOpinion;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmBidOpenRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmBidOpenRespVO.java
deleted file mode 100644
index 9bd865d..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmBidOpenRespVO.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 寮�鏍� Response VO")
-@Data
-public class SrmBidOpenRespVO {
-
- @Schema(description = "寮�鏍嘔D", example = "1")
- private Long id;
-
- @Schema(description = "鎷涙爣椤圭洰ID", example = "1")
- private Long tenderProjectId;
-
- @Schema(description = "寮�鏍囨椂闂�")
- private LocalDateTime openTime;
-
- @Schema(description = "寮�鏍囦汉ID", example = "1")
- private Long openPersonId;
-
- @Schema(description = "寮�鏍囦汉鍚嶇О", example = "寮犱笁")
- private String openPersonName;
-
- @Schema(description = "寮�鏍囪褰�", example = "鍏辨湁3瀹朵緵搴斿晢鍙備笌鎶曟爣")
- private String openRecord;
-
- @Schema(description = "闄勪欢鍚嶇О", example = "open_record.pdf")
- private String attachmentName;
-
- @Schema(description = "闄勪欢鍦板潃", example = "https://example.com/files/xxx.pdf")
- private String attachmentUrl;
-
- @Schema(description = "鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmSupplierQuoteRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmSupplierQuoteRespVO.java
deleted file mode 100644
index 2e5d968..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmSupplierQuoteRespVO.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 渚涘簲鍟嗘姤浠� Response VO")
-@Data
-public class SrmSupplierQuoteRespVO {
-
- @Schema(description = "鎶ヤ环ID", example = "1")
- private Long id;
-
- @Schema(description = "鎷涙爣椤圭洰ID", example = "1")
- private Long tenderProjectId;
-
- @Schema(description = "渚涘簲鍟咺D", example = "1")
- private Long supplierId;
-
- @Schema(description = "鎶曟爣ID", example = "1")
- private Long bidId;
-
- @Schema(description = "鎷涙爣鐗╂枡ID", example = "1")
- private Long tenderMaterialId;
-
- @Schema(description = "鐗╂枡缂栫爜")
- private String tenderMaterialCode;
-
- @Schema(description = "鐗╂枡鍚嶇О")
- private String tenderMaterialName;
-
- @Schema(description = "鐗╂枡鍚嶇О锛堜笌鍓嶇 materialName 瀵瑰簲锛�")
- private String materialName;
-
- @Schema(description = "鐗╂枡瑙勬牸")
- private String tenderMaterialSpec;
-
- @Schema(description = "鐗╂枡鍗曚綅")
- private String tenderMaterialUnit;
-
- @Schema(description = "鎶ヤ环浠锋牸", example = "5000")
- private BigDecimal quotePrice;
-
- @Schema(description = "绋庣巼", example = "13")
- private BigDecimal taxRate;
-
- @Schema(description = "浜よ揣鍛ㄦ湡锛堝ぉ锛�", example = "30")
- private Integer deliveryCycle;
-
- @Schema(description = "浠樻鏉′欢", example = "璐у埌30澶╀粯娆�")
- private String paymentTerms;
-
- @Schema(description = "璐ㄤ繚鏈燂紙鏈堬級", example = "12")
- private Integer warrantyPeriod;
-
- @Schema(description = "澶囨敞", example = "鍚繍璐�")
- private String remark;
-
- @Schema(description = "鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmSupplierQuoteSaveReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmSupplierQuoteSaveReqVO.java
deleted file mode 100644
index db20fbc..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmSupplierQuoteSaveReqVO.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 渚涘簲鍟嗘姤浠峰垱寤�/鏇存柊 Request VO")
-@Data
-public class SrmSupplierQuoteSaveReqVO {
-
- @Schema(description = "鎶ヤ环ID", example = "1")
- private Long id;
-
- @Schema(description = "鎷涙爣椤圭洰ID", example = "1")
- private Long tenderProjectId;
-
- @Schema(description = "渚涘簲鍟咺D", example = "1")
- private Long supplierId;
-
- @Schema(description = "鎶曟爣ID", example = "1")
- private Long bidId;
-
- @Schema(description = "鎷涙爣鐗╂枡ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鎷涙爣鐗╂枡ID涓嶈兘涓虹┖")
- private Long tenderMaterialId;
-
- @Schema(description = "鎶ヤ环浠锋牸", requiredMode = Schema.RequiredMode.REQUIRED, example = "5000")
- @NotNull(message = "鎶ヤ环浠锋牸涓嶈兘涓虹┖")
- private BigDecimal quotePrice;
-
- @Schema(description = "绋庣巼", example = "13")
- private BigDecimal taxRate;
-
- @Schema(description = "浜よ揣鍛ㄦ湡锛堝ぉ锛�", example = "30")
- private Integer deliveryCycle;
-
- @Schema(description = "浠樻鏉′欢", example = "璐у埌30澶╀粯娆�")
- private String paymentTerms;
-
- @Schema(description = "璐ㄤ繚鏈燂紙鏈堬級", example = "12")
- private Integer warrantyPeriod;
-
- @Schema(description = "澶囨敞", example = "鍚繍璐�")
- private String remark;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderBidRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderBidRespVO.java
deleted file mode 100644
index d8bcf33..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderBidRespVO.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 鎶曟爣 Response VO")
-@Data
-public class SrmTenderBidRespVO {
-
- @Schema(description = "鎶曟爣ID", example = "1")
- private Long id;
-
- @Schema(description = "鎷涙爣椤圭洰ID", example = "1")
- private Long tenderProjectId;
-
- @Schema(description = "渚涘簲鍟咺D", example = "1")
- private Long supplierId;
-
- @Schema(description = "渚涘簲鍟嗗悕绉�", example = "xxx渚涘簲鍟�")
- private String supplierName;
-
- @Schema(description = "鎶曟爣缂栧彿", example = "BID2024010001")
- private String bidNo;
-
- @Schema(description = "鎶曟爣鐘舵��", example = "0")
- private Integer bidStatus;
-
- @Schema(description = "鎶曟爣鏃堕棿")
- private LocalDateTime bidTime;
-
- @Schema(description = "鎶曟爣鎬婚噾棰�", example = "500000")
- private BigDecimal bidTotalAmount;
-
- @Schema(description = "鎶曟爣鏂囦欢鍚�", example = "bid_file.pdf")
- private String bidFileName;
-
- @Schema(description = "鎶曟爣鏂囦欢鍦板潃", example = "https://example.com/files/xxx.pdf")
- private String bidFileUrl;
-
- @Schema(description = "鎾ゆ爣鍘熷洜", example = "鎶�鏈弬鏁板彉鏇�")
- private String withdrawReason;
-
- @Schema(description = "鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderBidSaveReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderBidSaveReqVO.java
deleted file mode 100644
index 6b9af84..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderBidSaveReqVO.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 鎶曟爣鍒涘缓/鏇存柊 Request VO")
-@Data
-public class SrmTenderBidSaveReqVO {
-
- @Schema(description = "鎶曟爣ID", example = "1")
- private Long id;
-
- @Schema(description = "鎷涙爣椤圭洰ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鎷涙爣椤圭洰ID涓嶈兘涓虹┖")
- private Long tenderProjectId;
-
- @Schema(description = "渚涘簲鍟咺D", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "渚涘簲鍟咺D涓嶈兘涓虹┖")
- private Long supplierId;
-
- @Schema(description = "鎶曟爣缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "BID2024010001")
- @NotEmpty(message = "鎶曟爣缂栧彿涓嶈兘涓虹┖")
- private String bidNo;
-
- @Schema(description = "鎶曟爣鐘舵��", example = "0")
- private Integer bidStatus;
-
- @Schema(description = "鎶曟爣鏃堕棿")
- private LocalDateTime bidTime;
-
- @Schema(description = "鎶曟爣鎬婚噾棰�", example = "500000")
- private BigDecimal bidTotalAmount;
-
- @Schema(description = "鎶曟爣鏂囦欢鍚�", example = "bid_file.pdf")
- private String bidFileName;
-
- @Schema(description = "鎶曟爣鏂囦欢鍦板潃", example = "https://example.com/files/xxx.pdf")
- private String bidFileUrl;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderConfigRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderConfigRespVO.java
deleted file mode 100644
index 0fb3a59..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderConfigRespVO.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 鎷涙姇鏍囬厤缃� Response VO")
-@Data
-public class SrmTenderConfigRespVO {
-
- @Schema(description = "閰嶇疆ID", example = "1")
- private Long id;
-
- @Schema(description = "榛樿鎷涙姇鏍囨ā寮�", example = "FULL")
- private String defaultBiddingMode;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderConfigSaveReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderConfigSaveReqVO.java
deleted file mode 100644
index 8abf699..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderConfigSaveReqVO.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import lombok.Data;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 鎷涙姇鏍囬厤缃繚瀛� Request VO")
-@Data
-public class SrmTenderConfigSaveReqVO {
-
- @Schema(description = "榛樿鎷涙姇鏍囨ā寮�", requiredMode = Schema.RequiredMode.REQUIRED, example = "FULL")
- @NotEmpty(message = "榛樿鎷涙姇鏍囨ā寮忎笉鑳戒负绌�")
- private String defaultBiddingMode;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderConfirmReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderConfirmReqVO.java
deleted file mode 100644
index ac457fd..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderConfirmReqVO.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 绠�鏄撶増纭鎺堟爣 Request VO")
-@Data
-public class SrmTenderConfirmReqVO {
-
- @Schema(description = "鎷涙爣椤圭洰ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鎷涙爣椤圭洰ID涓嶈兘涓虹┖")
- private Long id;
-
- @Schema(description = "涓爣鎶曟爣ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
- @NotNull(message = "涓爣鎶曟爣ID涓嶈兘涓虹┖")
- private Long bidId;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderMaterialRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderMaterialRespVO.java
deleted file mode 100644
index 1c6a6d1..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderMaterialRespVO.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 鎷涙爣鐗╂枡 Response VO")
-@Data
-public class SrmTenderMaterialRespVO {
-
- @Schema(description = "鐗╂枡ID", example = "1")
- private Long id;
-
- @Schema(description = "鎷涙爣椤圭洰ID", example = "1")
- private Long tenderProjectId;
-
- @Schema(description = "浜у搧ID", example = "1")
- private Long productId;
-
- @Schema(description = "浜у搧缂栧彿", example = "ITEM-0001")
- private String productCode;
-
- @Schema(description = "浜у搧鍚嶇О", example = "Q235閽㈡潗")
- private String productName;
-
- @Schema(description = "浜у搧瑙勬牸", example = "10mm")
- private String productSpec;
-
- @Schema(description = "鏁伴噺", example = "1000")
- private BigDecimal quantity;
-
- @Schema(description = "鍗曚綅", example = "鍚�")
- private String unit;
-
- @Schema(description = "鎶�鏈姹�", example = "绗﹀悎GB/T 700-2006鏍囧噯")
- private String techRequirement;
-
- @Schema(description = "棰勪及鍗曚环", example = "5000")
- private BigDecimal estimatedPrice;
-
- @Schema(description = "鎺掑簭", example = "1")
- private Integer sort;
-
- @Schema(description = "鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderMaterialSaveReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderMaterialSaveReqVO.java
deleted file mode 100644
index a3dcb07..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderMaterialSaveReqVO.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 鎷涙爣鐗╂枡鍒涘缓/鏇存柊 Request VO")
-@Data
-public class SrmTenderMaterialSaveReqVO {
-
- @Schema(description = "鐗╂枡ID", example = "1")
- private Long id;
-
- @Schema(description = "鎷涙爣椤圭洰ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鎷涙爣椤圭洰ID涓嶈兘涓虹┖")
- private Long tenderProjectId;
-
- @Schema(description = "浜у搧ID", example = "1")
- private Long productId;
-
- @Schema(description = "浜у搧缂栧彿", example = "ITEM-0001")
- private String productCode;
-
- @Schema(description = "浜у搧鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "Q235閽㈡潗")
- @NotEmpty(message = "浜у搧鍚嶇О涓嶈兘涓虹┖")
- private String productName;
-
- @Schema(description = "浜у搧瑙勬牸", example = "10mm")
- private String productSpec;
-
- @Schema(description = "鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
- @NotNull(message = "鏁伴噺涓嶈兘涓虹┖")
- private BigDecimal quantity;
-
- @Schema(description = "鍗曚綅", requiredMode = Schema.RequiredMode.REQUIRED, example = "鍚�")
- @NotEmpty(message = "鍗曚綅涓嶈兘涓虹┖")
- private String unit;
-
- @Schema(description = "鎶�鏈姹�", example = "绗﹀悎GB/T 700-2006鏍囧噯")
- private String techRequirement;
-
- @Schema(description = "棰勪及鍗曚环", example = "5000")
- private BigDecimal estimatedPrice;
-
- @Schema(description = "鎺掑簭", example = "1")
- private Integer sort;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderProjectPageReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderProjectPageReqVO.java
deleted file mode 100644
index 1f5fb9b..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderProjectPageReqVO.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 鎷涙爣椤圭洰鍒嗛〉鏌ヨ Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class SrmTenderProjectPageReqVO extends PageParam {
-
- @Schema(description = "鎷涙爣缂栧彿", example = "ZB2024010001")
- private String tenderNo;
-
- @Schema(description = "鎷涙爣鍚嶇О", example = "2024骞撮挗鏉愰噰璐嫑鏍�")
- private String tenderName;
-
- @Schema(description = "鎷涙爣绫诲瀷", example = "1")
- private Integer tenderType;
-
- @Schema(description = "鎷涙爣鐘舵��", example = "0")
- private Integer tenderStatus;
-
- @Schema(description = "鎷涙姇鏍囨ā寮�", example = "FULL")
- private String biddingMode;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderProjectPartialUpdateReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderProjectPartialUpdateReqVO.java
deleted file mode 100644
index aa7203d..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderProjectPartialUpdateReqVO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.util.List;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 鎷涙爣椤圭洰閮ㄥ垎鏇存柊 Request VO锛堝彂甯冧腑/鎶曟爣涓樁娈碉級")
-@Data
-public class SrmTenderProjectPartialUpdateReqVO {
-
- @Schema(description = "椤圭洰ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "椤圭洰ID涓嶈兘涓虹┖")
- private Long id;
-
- @Schema(description = "鎷涙爣鎻忚堪", example = "鏈鎷涙爣閲囪喘閽㈡潗涓�鎵�")
- private String tenderDesc;
-
- @Schema(description = "璧勮川瑕佹眰", example = "闇�鍏峰ISO9001璁よ瘉")
- private String qualificationRequirements;
-
- @Schema(description = "璧勮川瑕佹眰闄勪欢鏂囦欢ID鍒楄〃")
- private List<Long> blobIds;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderProjectRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderProjectRespVO.java
deleted file mode 100644
index ccaebb8..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderProjectRespVO.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 鎷涙爣椤圭洰 Response VO")
-@Data
-public class SrmTenderProjectRespVO {
-
- @Schema(description = "椤圭洰ID", example = "1")
- private Long id;
-
- @Schema(description = "鎷涙爣缂栧彿", example = "ZB2024010001")
- private String tenderNo;
-
- @Schema(description = "鎷涙爣鍚嶇О", example = "2024骞撮挗鏉愰噰璐嫑鏍�")
- private String tenderName;
-
- @Schema(description = "鎷涙爣绫诲瀷", example = "1")
- private Integer tenderType;
-
- @Schema(description = "閲囪喘缁勭粐", example = "閲囪喘閮�")
- private String purchaseOrg;
-
- @Schema(description = "椤圭洰璐熻矗浜篒D", example = "1")
- private Long projectLeaderId;
-
- @Schema(description = "椤圭洰璐熻矗浜哄悕绉�", example = "鏉庡洓")
- private String projectLeaderName;
-
- @Schema(description = "鎷涙爣鐘舵��", example = "0")
- private Integer tenderStatus;
-
- @Schema(description = "鎷涙姇鏍囨ā寮�", example = "FULL")
- private String biddingMode;
-
- @Schema(description = "棰勭畻閲戦", example = "1000000")
- private BigDecimal budgetAmount;
-
- @Schema(description = "寮�濮嬫椂闂�")
- private LocalDateTime startTime;
-
- @Schema(description = "缁撴潫鏃堕棿")
- private LocalDateTime endTime;
-
- @Schema(description = "寮�鏍囨椂闂�")
- private LocalDateTime bidOpenTime;
-
- @Schema(description = "鎷涙爣鎻忚堪", example = "鏈鎷涙爣閲囪喘閽㈡潗涓�鎵�")
- private String tenderDesc;
-
- @Schema(description = "璧勮川瑕佹眰", example = "闇�鍏峰ISO9001璁よ瘉")
- private String qualificationRequirements;
-
- @Schema(description = "璧勮川瑕佹眰闄勪欢鍒楄〃")
- private List<StorageBlobRespDTO> attachmentList;
-
- @Schema(description = "閲囪喘鐢宠ID", example = "1")
- private Long purchaseRequestId;
-
- @Schema(description = "鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
-
- @Schema(description = "瀹氭爣ID", example = "1")
- private Long awardId;
-
- @Schema(description = "閲囪喘璁㈠崟鍙�", example = "PO2024010001")
- private String purchaseOrderNo;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderProjectSaveReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderProjectSaveReqVO.java
deleted file mode 100644
index 436e1d8..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/tender/vo/SrmTenderProjectSaveReqVO.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package cn.iocoder.yudao.module.srm.controller.admin.tender.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Schema(description = "绠$悊鍚庡彴 - SRM 鎷涙爣椤圭洰鍒涘缓/鏇存柊 Request VO")
-@Data
-public class SrmTenderProjectSaveReqVO {
-
- @Schema(description = "椤圭洰ID", example = "1")
- private Long id;
-
- @Schema(description = "鎷涙爣缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZB2024010001")
- @NotEmpty(message = "鎷涙爣缂栧彿涓嶈兘涓虹┖")
- private String tenderNo;
-
- @Schema(description = "鎷涙爣鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "2024骞撮挗鏉愰噰璐嫑鏍�")
- @NotEmpty(message = "鎷涙爣鍚嶇О涓嶈兘涓虹┖")
- private String tenderName;
-
- @Schema(description = "鎷涙爣绫诲瀷", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鎷涙爣绫诲瀷涓嶈兘涓虹┖")
- private Integer tenderType;
-
- @Schema(description = "閲囪喘缁勭粐", example = "閲囪喘閮�")
- private String purchaseOrg;
-
- @Schema(description = "椤圭洰璐熻矗浜篒D", example = "1")
- private Long projectLeaderId;
-
- @Schema(description = "椤圭洰璐熻矗浜哄悕绉�", example = "鏉庡洓")
- private String projectLeaderName;
-
- @Schema(description = "鎷涙爣鐘舵��", example = "0")
- private Integer tenderStatus;
-
- @Schema(description = "鎷涙姇鏍囨ā寮�", example = "FULL")
- private String biddingMode;
-
- @Schema(description = "棰勭畻閲戦", example = "1000000")
- private BigDecimal budgetAmount;
-
- @Schema(description = "寮�濮嬫椂闂�")
- private LocalDateTime startTime;
-
- @Schema(description = "缁撴潫鏃堕棿")
- private LocalDateTime endTime;
-
- @Schema(description = "寮�鏍囨椂闂�")
- private LocalDateTime bidOpenTime;
-
- @Schema(description = "鎷涙爣鎻忚堪", example = "鏈鎷涙爣閲囪喘閽㈡潗涓�鎵�")
- private String tenderDesc;
-
- @Schema(description = "璧勮川瑕佹眰", example = "闇�鍏峰ISO9001璁よ瘉")
- private String qualificationRequirements;
-
- @Schema(description = "璧勮川瑕佹眰闄勪欢鏂囦欢ID鍒楄〃")
- private List<Long> blobIds;
-
- @Schema(description = "閲囪喘鐢宠ID", example = "1")
- private Long purchaseRequestId;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmBidAwardDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmBidAwardDO.java
deleted file mode 100644
index 86654b3..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmBidAwardDO.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.dataobject;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@TableName("srm_bid_award")
-@KeySequence("srm_bid_award_seq")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class SrmBidAwardDO extends BaseDO {
-
- @TableId
- private Long id;
-
- private Long tenderProjectId;
- private Long supplierId;
- private Long bidId;
- private String awardNo;
- private Integer awardStatus;
- private BigDecimal awardAmount;
- private LocalDateTime awardTime;
- private String noticeFileName;
- private String noticeFileUrl;
- private Long purchaseOrderId;
- private String purchaseOrderNo;
- private Long approverId;
- private LocalDateTime approvalTime;
- private String remark;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmBidBondDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmBidBondDO.java
new file mode 100644
index 0000000..aa34d62
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmBidBondDO.java
@@ -0,0 +1,59 @@
+package cn.iocoder.yudao.module.srm.dal.dataobject;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * SRM 鎶曟爣淇濊瘉閲戝彴璐� DO
+ */
+@TableName("srm_bid_bond")
+@KeySequence("srm_bid_bond_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SrmBidBondDO extends BaseDO {
+
+ @TableId
+ private Long id;
+
+ /**
+ * 淇濊瘉閲戝崟鍙�
+ */
+ private String no;
+ private Long supplierId;
+ /**
+ * 椤圭洰鍚嶇О
+ */
+ private String projectName;
+ private Long inquiryId;
+ private Long purchaseOrderId;
+ /**
+ * 淇濊瘉閲戦噾棰�
+ */
+ private BigDecimal bondAmount;
+ /**
+ * 缂寸撼鏃ユ湡
+ */
+ private LocalDate payDate;
+ /**
+ * 鏄惁涓爣
+ */
+ private Boolean won;
+ /**
+ * 閫�鍥炵姸鎬侊細0 鏈��鍥炪��1 閮ㄥ垎閫�鍥炪��2 宸查��鍥炪��3 鏃犻渶閫�鍥�
+ */
+ private Integer refundStatus;
+ private BigDecimal refundAmount;
+ private LocalDate refundDate;
+ private String remark;
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmBidEvaluationDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmBidEvaluationDO.java
deleted file mode 100644
index 53f1bd7..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmBidEvaluationDO.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.dataobject;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@TableName("srm_bid_evaluation")
-@KeySequence("srm_bid_evaluation_seq")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class SrmBidEvaluationDO extends BaseDO {
-
- @TableId
- private Long id;
-
- private Long tenderProjectId;
- private Long supplierId;
- private Long bidId;
- private BigDecimal priceScore;
- private BigDecimal techScore;
- private BigDecimal deliveryScore;
- private BigDecimal serviceScore;
- private BigDecimal compositeScore;
- private Integer ranking;
- private Long evaluatorId;
- private String evaluatorName;
- private String evaluationOpinion;
- private LocalDateTime evaluationTime;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmBidOpenDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmBidOpenDO.java
deleted file mode 100644
index 7a0162f..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmBidOpenDO.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.dataobject;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.time.LocalDateTime;
-
-@TableName("srm_bid_open")
-@KeySequence("srm_bid_open_seq")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class SrmBidOpenDO extends BaseDO {
-
- @TableId
- private Long id;
-
- private Long tenderProjectId;
- private LocalDateTime openTime;
- private Long openPersonId;
- private String openPersonName;
- private String openRecord;
- private String attachmentName;
- private String attachmentUrl;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryDO.java
new file mode 100644
index 0000000..26fd8a5
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryDO.java
@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.srm.dal.dataobject;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDate;
+
+/**
+ * SRM 璇环姣斾环鍗� DO
+ */
+@TableName("srm_inquiry")
+@KeySequence("srm_inquiry_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SrmInquiryDO extends BaseDO {
+
+ @TableId
+ private Long id;
+
+ /**
+ * 璇环鍗曞彿
+ */
+ private String no;
+ /**
+ * 璇环鏍囬
+ */
+ private String title;
+ /**
+ * 鐘舵�侊細0 鑽夌銆�10 璇环涓��20 宸茶浆璁㈠崟銆�30 宸插彇娑�
+ */
+ private Integer status;
+ /**
+ * 璇环鏃ユ湡
+ */
+ private LocalDate inquiryDate;
+ /**
+ * 鎶ヤ环鎴鏃ユ湡
+ */
+ private LocalDate deadline;
+ /**
+ * 閲囪喘鍛樼敤鎴风紪鍙�
+ */
+ private Long purchaserUserId;
+ private String remark;
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryItemDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryItemDO.java
new file mode 100644
index 0000000..8dab091
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryItemDO.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.srm.dal.dataobject;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+/**
+ * SRM 璇环浜у搧琛� DO
+ */
+@TableName("srm_inquiry_item")
+@KeySequence("srm_inquiry_item_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SrmInquiryItemDO extends BaseDO {
+
+ @TableId
+ private Long id;
+
+ private Long inquiryId;
+ private Long productId;
+ private Long productUnitId;
+ private String productCode;
+ private String productName;
+ private String productSpec;
+ private String unitName;
+ /**
+ * 閲囪喘鏁伴噺
+ */
+ private BigDecimal quantity;
+ /**
+ * 鐩爣鍗曚环
+ */
+ private BigDecimal estimatedPrice;
+ /**
+ * 閫変腑鐨勪腑鏍囦緵搴斿晢
+ */
+ private Long selectedSupplierId;
+ /**
+ * 閫変腑鐨勪腑鏍囨姤浠�
+ */
+ private Long selectedQuoteId;
+ /**
+ * 閫変腑鐨勪腑鏍囧崟浠�
+ */
+ private BigDecimal selectedPrice;
+ private String remark;
+ private Integer sort;
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmTenderConfigDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryOrderDO.java
similarity index 61%
rename from yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmTenderConfigDO.java
rename to yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryOrderDO.java
index f8aa1f8..92ee5bd 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmTenderConfigDO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryOrderDO.java
@@ -6,19 +6,25 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
-@TableName("srm_tender_config")
-@KeySequence("srm_tender_config_seq")
+/**
+ * SRM 璇环杞噰璐鍗曡褰� DO
+ */
+@TableName("srm_inquiry_order")
+@KeySequence("srm_inquiry_order_seq")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
-public class SrmTenderConfigDO extends BaseDO {
+public class SrmInquiryOrderDO extends BaseDO {
@TableId
private Long id;
- private String defaultBiddingMode;
+ private Long inquiryId;
+ private Long supplierId;
+ private Long purchaseOrderId;
+ private String purchaseOrderNo;
}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryQuoteDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryQuoteDO.java
new file mode 100644
index 0000000..0098f1e
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryQuoteDO.java
@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.srm.dal.dataobject;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+/**
+ * SRM 璇环浜у搧鎶ヤ环 DO
+ */
+@TableName("srm_inquiry_quote")
+@KeySequence("srm_inquiry_quote_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SrmInquiryQuoteDO extends BaseDO {
+
+ @TableId
+ private Long id;
+
+ private Long inquiryId;
+ private Long inquiryItemId;
+ private Long supplierId;
+ /**
+ * 鎶ヤ环鍗曚环
+ */
+ private BigDecimal price;
+ /**
+ * 绋庣巼锛岀櫨鍒嗘瘮
+ */
+ private BigDecimal taxRate;
+ /**
+ * 浜よ揣鍛ㄦ湡锛屽ぉ
+ */
+ private Integer deliveryCycle;
+ /**
+ * 浠樻鏉′欢
+ */
+ private String paymentTerms;
+ private String remark;
+ /**
+ * 鏄惁璇ヤ骇鍝佺殑涓爣鎶ヤ环
+ */
+ private Boolean isSelected;
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquirySupplierDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquirySupplierDO.java
new file mode 100644
index 0000000..8e17aca
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquirySupplierDO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.srm.dal.dataobject;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * SRM 璇环鍙備笌渚涘簲鍟� DO
+ */
+@TableName("srm_inquiry_supplier")
+@KeySequence("srm_inquiry_supplier_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SrmInquirySupplierDO extends BaseDO {
+
+ @TableId
+ private Long id;
+
+ private Long inquiryId;
+ private Long supplierId;
+ /**
+ * 鎶ヤ环鐘舵�侊細0 鏈姤浠枫��10 宸叉姤浠�
+ */
+ private Integer quoteStatus;
+ private LocalDateTime quoteTime;
+ private String remark;
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierApplyDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierApplyDO.java
deleted file mode 100644
index 169f2df..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierApplyDO.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.dataobject;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * 渚涘簲鍟嗗噯鍏ョ敵璇� DO
- */
-@TableName("srm_supplier_apply")
-@KeySequence("srm_supplier_apply_seq")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class SrmSupplierApplyDO extends BaseDO {
-
- @TableId
- private Long id;
-
- private String applyNo;
- private Long supplierId;
- private String supplierName;
- private String supplierType;
- private String companyNature;
- private BigDecimal registeredCapital;
- private String businessLicenseNo;
- private String taxNo;
- private String address;
- private String bankName;
- private String bankAccount;
- private String contactName;
- private String contactMobile;
- private String contactEmail;
- private Long applyUserId;
- private String applyUserName;
- private LocalDateTime applyTime;
- private Integer applyStatus;
- private String processInstanceId;
-
- private Long purchaseReviewerId;
- private LocalDateTime purchaseReviewTime;
- private String purchaseReviewOpinion;
-
- private Long qualityReviewerId;
- private LocalDateTime qualityReviewTime;
- private String qualityReviewOpinion;
-
- private Long financeReviewerId;
- private LocalDateTime financeReviewTime;
- private String financeReviewOpinion;
- private String remark;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierBankDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierBankDO.java
new file mode 100644
index 0000000..0f5479b
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierBankDO.java
@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.module.srm.dal.dataobject;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * 渚涘簲鍟嗛摱琛岃处鎴� DO
+ */
+@TableName("srm_supplier_bank")
+@KeySequence("srm_supplier_bank_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SrmSupplierBankDO extends BaseDO {
+
+ @TableId
+ private Long id;
+
+ private Long supplierId;
+ /**
+ * 寮�鎴疯
+ */
+ private String bankName;
+ /**
+ * 閾惰璐﹀彿
+ */
+ private String bankAccount;
+ /**
+ * 閾惰琛屽彿
+ */
+ private String bankNo;
+ /**
+ * 寮�鎴疯鍦板潃
+ */
+ private String bankAddress;
+ private Boolean isDefault;
+ private Integer sort;
+ private String remark;
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierCertificateDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierCertificateDO.java
deleted file mode 100644
index fa6f3a7..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierCertificateDO.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.dataobject;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.time.LocalDate;
-
-/**
- * 渚涘簲鍟嗚祫璐ㄨ瘉涔� DO
- */
-@TableName("srm_supplier_certificate")
-@KeySequence("srm_supplier_certificate_seq")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class SrmSupplierCertificateDO extends BaseDO {
-
- @TableId
- private Long id;
-
- private Long supplierId;
- private Integer certificateType;
- private String certificateName;
- private String certificateNo;
- private String fileName;
- private String fileUrl;
- private String issuingAuthority;
- private LocalDate validStartDate;
- private LocalDate validEndDate;
- private Integer status;
- private String remark;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierEvaluationDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierEvaluationDO.java
deleted file mode 100644
index 7cc3ab0..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierEvaluationDO.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.dataobject;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * 渚涘簲鍟嗙哗鏁堣瘎浠� DO
- */
-@TableName("srm_supplier_evaluation")
-@KeySequence("srm_supplier_evaluation_seq")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class SrmSupplierEvaluationDO extends BaseDO {
-
- @TableId
- private Long id;
-
- private Long supplierId;
- private String evaluationPeriod;
- private BigDecimal qualityScore;
- private BigDecimal qualityPassRate;
- private Integer qualityDefectCount;
- private BigDecimal deliveryScore;
- private BigDecimal deliveryOnTimeRate;
- private Integer deliveryDelayCount;
- private BigDecimal priceScore;
- private BigDecimal serviceScore;
- private Integer serviceResponseSpeed;
- private BigDecimal compositeScore;
- private String evaluationLevel;
- private Long evaluatorId;
- private LocalDateTime evaluationTime;
- private String remark;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierQuoteDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierQuoteDO.java
deleted file mode 100644
index ab6e0a0..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierQuoteDO.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.dataobject;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.math.BigDecimal;
-
-@TableName("srm_supplier_quote")
-@KeySequence("srm_supplier_quote_seq")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class SrmSupplierQuoteDO extends BaseDO {
-
- @TableId
- private Long id;
-
- private Long tenderProjectId;
- private Long supplierId;
- private Long bidId;
- private Long tenderMaterialId;
- private BigDecimal quotePrice;
- private BigDecimal taxRate;
- private Integer deliveryCycle;
- private String paymentTerms;
- private Integer warrantyPeriod;
- private String remark;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmTenderBidDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmTenderBidDO.java
deleted file mode 100644
index d4e488b..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmTenderBidDO.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.dataobject;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@TableName("srm_tender_bid")
-@KeySequence("srm_tender_bid_seq")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class SrmTenderBidDO extends BaseDO {
-
- @TableId
- private Long id;
-
- private Long tenderProjectId;
- private Long supplierId;
- private String bidNo;
- private Integer bidStatus;
- private LocalDateTime bidTime;
- private BigDecimal bidTotalAmount;
- private String bidFileName;
- private String bidFileUrl;
- private String withdrawReason;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmTenderMaterialDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmTenderMaterialDO.java
deleted file mode 100644
index fd720fd..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmTenderMaterialDO.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.dataobject;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.math.BigDecimal;
-
-@TableName("srm_tender_material")
-@KeySequence("srm_tender_material_seq")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class SrmTenderMaterialDO extends BaseDO {
-
- @TableId
- private Long id;
-
- private Long tenderProjectId;
- private Long productId;
- private String productCode;
- private String productName;
- private String productSpec;
- private BigDecimal quantity;
- private String unit;
- private String techRequirement;
- private BigDecimal estimatedPrice;
- private Integer sort;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmTenderProjectDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmTenderProjectDO.java
deleted file mode 100644
index 6defc6a..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmTenderProjectDO.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.dataobject;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@TableName("srm_tender_project")
-@KeySequence("srm_tender_project_seq")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class SrmTenderProjectDO extends BaseDO {
-
- @TableId
- private Long id;
-
- private String tenderNo;
- private String tenderName;
- private Integer tenderType;
- private String purchaseOrg;
- private Long projectLeaderId;
- private String projectLeaderName;
- private Integer tenderStatus;
- private String biddingMode;
- private BigDecimal budgetAmount;
- private LocalDateTime startTime;
- private LocalDateTime endTime;
- private LocalDateTime bidOpenTime;
- private String tenderDesc;
- private String qualificationRequirements;
- private Long purchaseRequestId;
-
- @TableField(exist = false)
- private Long awardId;
-
- @TableField(exist = false)
- private String purchaseOrderNo;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmBidAwardMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmBidAwardMapper.java
deleted file mode 100644
index aa03707..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmBidAwardMapper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.mysql;
-
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmBidAwardDO;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.Collection;
-import java.util.List;
-
-@Mapper
-public interface SrmBidAwardMapper extends BaseMapperX<SrmBidAwardDO> {
-
- default SrmBidAwardDO selectByTenderProjectId(Long tenderProjectId) {
- return selectOne(new LambdaQueryWrapperX<SrmBidAwardDO>()
- .eq(SrmBidAwardDO::getTenderProjectId, tenderProjectId));
- }
-
- default List<SrmBidAwardDO> selectListByTenderProjectIds(Collection<Long> tenderProjectIds) {
- return selectList(new LambdaQueryWrapperX<SrmBidAwardDO>()
- .in(SrmBidAwardDO::getTenderProjectId, tenderProjectIds));
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmBidBondMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmBidBondMapper.java
new file mode 100644
index 0000000..fae74b6
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmBidBondMapper.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.srm.dal.mysql;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.srm.controller.admin.bond.vo.SrmBidBondPageReqVO;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmBidBondDO;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SrmBidBondMapper extends BaseMapperX<SrmBidBondDO> {
+
+ default PageResult<SrmBidBondDO> selectPage(SrmBidBondPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SrmBidBondDO>()
+ .likeIfPresent(SrmBidBondDO::getNo, reqVO.getNo())
+ .eqIfPresent(SrmBidBondDO::getSupplierId, reqVO.getSupplierId())
+ .likeIfPresent(SrmBidBondDO::getProjectName, reqVO.getProjectName())
+ .eqIfPresent(SrmBidBondDO::getWon, reqVO.getWon())
+ .eqIfPresent(SrmBidBondDO::getRefundStatus, reqVO.getRefundStatus())
+ .geIfPresent(SrmBidBondDO::getPayDate, reqVO.getPayDateStart())
+ .leIfPresent(SrmBidBondDO::getPayDate, reqVO.getPayDateEnd())
+ .orderByDesc(SrmBidBondDO::getId));
+ }
+
+ default SrmBidBondDO selectByNo(String no) {
+ return selectOne(SrmBidBondDO::getNo, no);
+ }
+
+ default long selectCountBySupplierId(Long supplierId) {
+ return selectCount(SrmBidBondDO::getSupplierId, supplierId);
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmBidEvaluationMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmBidEvaluationMapper.java
deleted file mode 100644
index 0ae4453..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmBidEvaluationMapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.mysql;
-
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmBidEvaluationDO;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface SrmBidEvaluationMapper extends BaseMapperX<SrmBidEvaluationDO> {
-
- default List<SrmBidEvaluationDO> selectListByTenderProjectId(Long tenderProjectId) {
- return selectList(new LambdaQueryWrapperX<SrmBidEvaluationDO>()
- .eq(SrmBidEvaluationDO::getTenderProjectId, tenderProjectId)
- .orderByAsc(SrmBidEvaluationDO::getRanking));
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmBidOpenMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmBidOpenMapper.java
deleted file mode 100644
index d4e3cb8..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmBidOpenMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.mysql;
-
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmBidOpenDO;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface SrmBidOpenMapper extends BaseMapperX<SrmBidOpenDO> {
-
- default SrmBidOpenDO selectByTenderProjectId(Long tenderProjectId) {
- return selectOne(new LambdaQueryWrapperX<SrmBidOpenDO>()
- .eq(SrmBidOpenDO::getTenderProjectId, tenderProjectId));
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryItemMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryItemMapper.java
new file mode 100644
index 0000000..68ea55b
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryItemMapper.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.srm.dal.mysql;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmInquiryItemDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SrmInquiryItemMapper extends BaseMapperX<SrmInquiryItemDO> {
+
+ default List<SrmInquiryItemDO> selectListByInquiryId(Long inquiryId) {
+ return selectList(new LambdaQueryWrapperX<SrmInquiryItemDO>()
+ .eq(SrmInquiryItemDO::getInquiryId, inquiryId)
+ .orderByAsc(SrmInquiryItemDO::getSort)
+ .orderByAsc(SrmInquiryItemDO::getId));
+ }
+
+ default void deleteByInquiryId(Long inquiryId) {
+ delete(new LambdaQueryWrapperX<SrmInquiryItemDO>()
+ .eq(SrmInquiryItemDO::getInquiryId, inquiryId));
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryMapper.java
new file mode 100644
index 0000000..7273cf8
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryMapper.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.srm.dal.mysql;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.srm.controller.admin.inquiry.vo.SrmInquiryPageReqVO;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmInquiryDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SrmInquiryMapper extends BaseMapperX<SrmInquiryDO> {
+
+ default PageResult<SrmInquiryDO> selectPage(SrmInquiryPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<SrmInquiryDO>()
+ .likeIfPresent(SrmInquiryDO::getNo, reqVO.getNo())
+ .likeIfPresent(SrmInquiryDO::getTitle, reqVO.getTitle())
+ .eqIfPresent(SrmInquiryDO::getStatus, reqVO.getStatus())
+ .geIfPresent(SrmInquiryDO::getInquiryDate, reqVO.getInquiryDateStart())
+ .leIfPresent(SrmInquiryDO::getInquiryDate, reqVO.getInquiryDateEnd())
+ .orderByDesc(SrmInquiryDO::getId));
+ }
+
+ default SrmInquiryDO selectByNo(String no) {
+ return selectOne(SrmInquiryDO::getNo, no);
+ }
+
+ default List<SrmInquiryDO> selectListByStatus(Integer status) {
+ return selectList(SrmInquiryDO::getStatus, status);
+ }
+
+ /**
+ * 鎸夊綋鍓嶇姸鎬佹潯浠舵洿鏂帮紝閬垮厤骞跺彂閲嶅纭
+ */
+ default int updateByIdAndStatus(Long id, Integer whereStatus, SrmInquiryDO updateObj) {
+ return update(updateObj, new com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper<SrmInquiryDO>()
+ .eq(SrmInquiryDO::getId, id)
+ .eq(SrmInquiryDO::getStatus, whereStatus));
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryOrderMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryOrderMapper.java
new file mode 100644
index 0000000..f93ff6a
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryOrderMapper.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.srm.dal.mysql;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmInquiryOrderDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SrmInquiryOrderMapper extends BaseMapperX<SrmInquiryOrderDO> {
+
+ default List<SrmInquiryOrderDO> selectListByInquiryId(Long inquiryId) {
+ return selectList(new LambdaQueryWrapperX<SrmInquiryOrderDO>()
+ .eq(SrmInquiryOrderDO::getInquiryId, inquiryId)
+ .orderByAsc(SrmInquiryOrderDO::getId));
+ }
+
+ default SrmInquiryOrderDO selectByInquiryIdAndSupplierId(Long inquiryId, Long supplierId) {
+ return selectOne(new LambdaQueryWrapperX<SrmInquiryOrderDO>()
+ .eq(SrmInquiryOrderDO::getInquiryId, inquiryId)
+ .eq(SrmInquiryOrderDO::getSupplierId, supplierId));
+ }
+
+ default long selectCountBySupplierId(Long supplierId) {
+ return selectCount(SrmInquiryOrderDO::getSupplierId, supplierId);
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryQuoteMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryQuoteMapper.java
new file mode 100644
index 0000000..fb5815a
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquiryQuoteMapper.java
@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.srm.dal.mysql;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmInquiryQuoteDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SrmInquiryQuoteMapper extends BaseMapperX<SrmInquiryQuoteDO> {
+
+ default List<SrmInquiryQuoteDO> selectListByInquiryId(Long inquiryId) {
+ return selectList(new LambdaQueryWrapperX<SrmInquiryQuoteDO>()
+ .eq(SrmInquiryQuoteDO::getInquiryId, inquiryId)
+ .orderByAsc(SrmInquiryQuoteDO::getInquiryItemId)
+ .orderByAsc(SrmInquiryQuoteDO::getId));
+ }
+
+ default SrmInquiryQuoteDO selectByItemIdAndSupplierId(Long inquiryItemId, Long supplierId) {
+ return selectOne(new LambdaQueryWrapperX<SrmInquiryQuoteDO>()
+ .eq(SrmInquiryQuoteDO::getInquiryItemId, inquiryItemId)
+ .eq(SrmInquiryQuoteDO::getSupplierId, supplierId));
+ }
+
+ default void deleteByInquiryId(Long inquiryId) {
+ delete(new LambdaQueryWrapperX<SrmInquiryQuoteDO>()
+ .eq(SrmInquiryQuoteDO::getInquiryId, inquiryId));
+ }
+
+ default long selectCountBySupplierId(Long supplierId) {
+ return selectCount(SrmInquiryQuoteDO::getSupplierId, supplierId);
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquirySupplierMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquirySupplierMapper.java
new file mode 100644
index 0000000..bbda83d
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmInquirySupplierMapper.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.srm.dal.mysql;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmInquirySupplierDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SrmInquirySupplierMapper extends BaseMapperX<SrmInquirySupplierDO> {
+
+ default List<SrmInquirySupplierDO> selectListByInquiryId(Long inquiryId) {
+ return selectList(new LambdaQueryWrapperX<SrmInquirySupplierDO>()
+ .eq(SrmInquirySupplierDO::getInquiryId, inquiryId)
+ .orderByAsc(SrmInquirySupplierDO::getId));
+ }
+
+ default SrmInquirySupplierDO selectByInquiryIdAndSupplierId(Long inquiryId, Long supplierId) {
+ return selectOne(new LambdaQueryWrapperX<SrmInquirySupplierDO>()
+ .eq(SrmInquirySupplierDO::getInquiryId, inquiryId)
+ .eq(SrmInquirySupplierDO::getSupplierId, supplierId));
+ }
+
+ default void deleteByInquiryId(Long inquiryId) {
+ delete(new LambdaQueryWrapperX<SrmInquirySupplierDO>()
+ .eq(SrmInquirySupplierDO::getInquiryId, inquiryId));
+ }
+
+ default long selectCountBySupplierId(Long supplierId) {
+ return selectCount(SrmInquirySupplierDO::getSupplierId, supplierId);
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierApplyMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierApplyMapper.java
deleted file mode 100644
index 265c877..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierApplyMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.mysql;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.srm.controller.admin.apply.vo.SrmSupplierApplyPageReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierApplyDO;
-import cn.iocoder.yudao.module.srm.enums.SupplierApplyStatusEnum;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface SrmSupplierApplyMapper extends BaseMapperX<SrmSupplierApplyDO> {
-
- default PageResult<SrmSupplierApplyDO> selectPage(SrmSupplierApplyPageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<SrmSupplierApplyDO>()
- .likeIfPresent(SrmSupplierApplyDO::getApplyNo, reqVO.getApplyNo())
- .likeIfPresent(SrmSupplierApplyDO::getSupplierName, reqVO.getSupplierName())
- .eqIfPresent(SrmSupplierApplyDO::getApplyStatus, reqVO.getApplyStatus())
- .orderByDesc(SrmSupplierApplyDO::getId));
- }
-
- default boolean existsApprovedBySupplierId(Long supplierId) {
- return selectCount(new LambdaQueryWrapperX<SrmSupplierApplyDO>()
- .eq(SrmSupplierApplyDO::getSupplierId, supplierId)
- .eq(SrmSupplierApplyDO::getApplyStatus, SupplierApplyStatusEnum.APPROVED.getCode())) > 0;
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierBankMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierBankMapper.java
new file mode 100644
index 0000000..7ea641b
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierBankMapper.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.srm.dal.mysql;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierBankDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SrmSupplierBankMapper extends BaseMapperX<SrmSupplierBankDO> {
+
+ default List<SrmSupplierBankDO> selectListBySupplierId(Long supplierId) {
+ return selectList(new LambdaQueryWrapperX<SrmSupplierBankDO>()
+ .eq(SrmSupplierBankDO::getSupplierId, supplierId)
+ .orderByAsc(SrmSupplierBankDO::getSort)
+ .orderByAsc(SrmSupplierBankDO::getId));
+ }
+
+ default void deleteBySupplierId(Long supplierId) {
+ delete(new LambdaQueryWrapperX<SrmSupplierBankDO>()
+ .eq(SrmSupplierBankDO::getSupplierId, supplierId));
+ }
+
+ default long selectCountBySupplierId(Long supplierId) {
+ return selectCount(SrmSupplierBankDO::getSupplierId, supplierId);
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierCertificateMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierCertificateMapper.java
deleted file mode 100644
index 40f7b96..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierCertificateMapper.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.mysql;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.srm.controller.admin.certificate.vo.SrmSupplierCertificatePageReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierCertificateDO;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.time.LocalDate;
-import java.util.List;
-
-@Mapper
-public interface SrmSupplierCertificateMapper extends BaseMapperX<SrmSupplierCertificateDO> {
-
- default PageResult<SrmSupplierCertificateDO> selectPage(SrmSupplierCertificatePageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<SrmSupplierCertificateDO>()
- .likeIfPresent(SrmSupplierCertificateDO::getCertificateName, reqVO.getCertificateName())
- .eqIfPresent(SrmSupplierCertificateDO::getSupplierId, reqVO.getSupplierId())
- .eqIfPresent(SrmSupplierCertificateDO::getCertificateType, reqVO.getCertificateType())
- .orderByDesc(SrmSupplierCertificateDO::getId));
- }
-
- default List<SrmSupplierCertificateDO> selectListBySupplierId(Long supplierId) {
- return selectList(new LambdaQueryWrapperX<SrmSupplierCertificateDO>()
- .eq(SrmSupplierCertificateDO::getSupplierId, supplierId));
- }
-
- default List<SrmSupplierCertificateDO> selectExpiringList(LocalDate startDate, LocalDate endDate) {
- return selectList(new LambdaQueryWrapperX<SrmSupplierCertificateDO>()
- .between(SrmSupplierCertificateDO::getValidEndDate, startDate, endDate));
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierEvaluationMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierEvaluationMapper.java
deleted file mode 100644
index 4b021bc..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierEvaluationMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.mysql;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.srm.controller.admin.evaluation.vo.SrmSupplierEvaluationPageReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierEvaluationDO;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface SrmSupplierEvaluationMapper extends BaseMapperX<SrmSupplierEvaluationDO> {
-
- default PageResult<SrmSupplierEvaluationDO> selectPage(SrmSupplierEvaluationPageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<SrmSupplierEvaluationDO>()
- .eqIfPresent(SrmSupplierEvaluationDO::getSupplierId, reqVO.getSupplierId())
- .eqIfPresent(SrmSupplierEvaluationDO::getEvaluationPeriod, reqVO.getEvaluationPeriod())
- .orderByDesc(SrmSupplierEvaluationDO::getId));
- }
-
- default SrmSupplierEvaluationDO selectBySupplierAndPeriod(Long supplierId, String period) {
- return selectOne(new LambdaQueryWrapperX<SrmSupplierEvaluationDO>()
- .eq(SrmSupplierEvaluationDO::getSupplierId, supplierId)
- .eq(SrmSupplierEvaluationDO::getEvaluationPeriod, period));
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierMapper.java
index 398696d..2da7a33 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierMapper.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierMapper.java
@@ -6,30 +6,21 @@
import cn.iocoder.yudao.module.srm.controller.admin.supplier.vo.SrmSupplierPageReqVO;
import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierDO;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-import java.util.Collection;
import java.util.List;
@Mapper
public interface SrmSupplierMapper extends BaseMapperX<SrmSupplierDO> {
default PageResult<SrmSupplierDO> selectPage(SrmSupplierPageReqVO reqVO) {
- LambdaQueryWrapperX<SrmSupplierDO> wrapper = new LambdaQueryWrapperX<SrmSupplierDO>()
+ return selectPage(reqVO, new LambdaQueryWrapperX<SrmSupplierDO>()
.likeIfPresent(SrmSupplierDO::getCode, reqVO.getCode())
.likeIfPresent(SrmSupplierDO::getName, reqVO.getName())
.eqIfPresent(SrmSupplierDO::getType, reqVO.getType())
.eqIfPresent(SrmSupplierDO::getStatus, reqVO.getStatus())
.likeIfPresent(SrmSupplierDO::getContactName, reqVO.getContactName())
.likeIfPresent(SrmSupplierDO::getContactMobile, reqVO.getContactMobile())
- .orderByDesc(SrmSupplierDO::getId);
- if (Boolean.TRUE.equals(reqVO.getApproved())) {
- wrapper.apply("id IN (SELECT supplier_id FROM srm_supplier_apply WHERE apply_status = 40 AND supplier_id IS NOT NULL AND deleted = 0)");
- }
- if (Boolean.TRUE.equals(reqVO.getExcludeApproved())) {
- wrapper.apply("id NOT IN (SELECT supplier_id FROM srm_supplier_apply WHERE apply_status = 40 AND supplier_id IS NOT NULL AND deleted = 0)");
- }
- return selectPage(reqVO, wrapper);
+ .orderByDesc(SrmSupplierDO::getId));
}
default SrmSupplierDO selectByCode(String code) {
@@ -39,10 +30,5 @@
default List<SrmSupplierDO> selectListByStatus(Integer status) {
return selectList(SrmSupplierDO::getStatus, status);
}
-
- @Select("SELECT DISTINCT s.* FROM srm_supplier s " +
- "INNER JOIN srm_supplier_apply a ON a.supplier_id = s.id " +
- "WHERE a.apply_status = 40 AND s.status = 0 AND s.deleted = 0")
- List<SrmSupplierDO> selectApprovedList();
}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierQuoteMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierQuoteMapper.java
deleted file mode 100644
index d525010..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmSupplierQuoteMapper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.mysql;
-
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierQuoteDO;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface SrmSupplierQuoteMapper extends BaseMapperX<SrmSupplierQuoteDO> {
-
- default List<SrmSupplierQuoteDO> selectListByBidId(Long bidId) {
- return selectList(new LambdaQueryWrapperX<SrmSupplierQuoteDO>()
- .eq(SrmSupplierQuoteDO::getBidId, bidId));
- }
-
- default boolean existsByBidAndMaterial(Long bidId, Long tenderMaterialId) {
- return selectCount(new LambdaQueryWrapperX<SrmSupplierQuoteDO>()
- .eq(SrmSupplierQuoteDO::getBidId, bidId)
- .eq(SrmSupplierQuoteDO::getTenderMaterialId, tenderMaterialId)) > 0;
- }
-
- default void deleteByBidId(Long bidId) {
- delete(new LambdaQueryWrapperX<SrmSupplierQuoteDO>()
- .eq(SrmSupplierQuoteDO::getBidId, bidId));
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmTenderBidMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmTenderBidMapper.java
deleted file mode 100644
index d98ca53..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmTenderBidMapper.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.mysql;
-
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderBidDO;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface SrmTenderBidMapper extends BaseMapperX<SrmTenderBidDO> {
-
- default List<SrmTenderBidDO> selectListByTenderProjectId(Long tenderProjectId) {
- return selectList(new LambdaQueryWrapperX<SrmTenderBidDO>()
- .eq(SrmTenderBidDO::getTenderProjectId, tenderProjectId));
- }
-
- default SrmTenderBidDO selectByTenderAndSupplier(Long tenderProjectId, Long supplierId) {
- return selectOne(new LambdaQueryWrapperX<SrmTenderBidDO>()
- .eq(SrmTenderBidDO::getTenderProjectId, tenderProjectId)
- .eq(SrmTenderBidDO::getSupplierId, supplierId));
- }
-
- default boolean existsByBidNo(String bidNo) {
- return exists(new LambdaQueryWrapperX<SrmTenderBidDO>()
- .eq(SrmTenderBidDO::getBidNo, bidNo));
- }
-
- default long countByTenderProjectId(Long tenderProjectId) {
- return selectCount(new LambdaQueryWrapperX<SrmTenderBidDO>()
- .eq(SrmTenderBidDO::getTenderProjectId, tenderProjectId));
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmTenderConfigMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmTenderConfigMapper.java
deleted file mode 100644
index 3a65d73..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmTenderConfigMapper.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.mysql;
-
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderConfigDO;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface SrmTenderConfigMapper extends BaseMapperX<SrmTenderConfigDO> {
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmTenderMaterialMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmTenderMaterialMapper.java
deleted file mode 100644
index e6c255c..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmTenderMaterialMapper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.mysql;
-
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderMaterialDO;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface SrmTenderMaterialMapper extends BaseMapperX<SrmTenderMaterialDO> {
-
- default List<SrmTenderMaterialDO> selectListByTenderProjectId(Long tenderProjectId) {
- return selectList(new LambdaQueryWrapperX<SrmTenderMaterialDO>()
- .eq(SrmTenderMaterialDO::getTenderProjectId, tenderProjectId)
- .orderByAsc(SrmTenderMaterialDO::getSort));
- }
-
- default void deleteByTenderProjectId(Long tenderProjectId) {
- delete(new LambdaQueryWrapperX<SrmTenderMaterialDO>()
- .eq(SrmTenderMaterialDO::getTenderProjectId, tenderProjectId));
- }
-
- default long countByTenderProjectId(Long tenderProjectId) {
- return selectCount(new LambdaQueryWrapperX<SrmTenderMaterialDO>()
- .eq(SrmTenderMaterialDO::getTenderProjectId, tenderProjectId));
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmTenderProjectMapper.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmTenderProjectMapper.java
deleted file mode 100644
index f47c880..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/mysql/SrmTenderProjectMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cn.iocoder.yudao.module.srm.dal.mysql;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmTenderProjectPageReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderProjectDO;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface SrmTenderProjectMapper extends BaseMapperX<SrmTenderProjectDO> {
-
- default PageResult<SrmTenderProjectDO> selectPage(SrmTenderProjectPageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<SrmTenderProjectDO>()
- .likeIfPresent(SrmTenderProjectDO::getTenderNo, reqVO.getTenderNo())
- .likeIfPresent(SrmTenderProjectDO::getTenderName, reqVO.getTenderName())
- .eqIfPresent(SrmTenderProjectDO::getTenderType, reqVO.getTenderType())
- .eqIfPresent(SrmTenderProjectDO::getTenderStatus, reqVO.getTenderStatus())
- .eqIfPresent(SrmTenderProjectDO::getBiddingMode, reqVO.getBiddingMode())
- .orderByDesc(SrmTenderProjectDO::getId));
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/AwardStatusEnum.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/AwardStatusEnum.java
deleted file mode 100644
index a32e365..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/AwardStatusEnum.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cn.iocoder.yudao.module.srm.enums;
-
-import lombok.Getter;
-
-/**
- * 瀹氭爣鐘舵�佹灇涓�
- */
-@Getter
-public enum AwardStatusEnum {
-
- PENDING_APPROVAL(0, "寰呭鎵�"),
- AWARDED(10, "宸插畾鏍�"),
- ORDER_GENERATED(20, "宸茬敓鎴愯鍗�");
-
- AwardStatusEnum(Integer code, String name) {
- this.code = code;
- this.name = name;
- }
-
- private final Integer code;
- private final String name;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/BidBondRefundStatusEnum.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/BidBondRefundStatusEnum.java
new file mode 100644
index 0000000..a3cd978
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/BidBondRefundStatusEnum.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.srm.enums;
+
+import cn.iocoder.yudao.framework.common.core.ArrayValuable;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Arrays;
+
+/**
+ * 鎶曟爣淇濊瘉閲戦��鍥炵姸鎬佹灇涓�
+ */
+@RequiredArgsConstructor
+@Getter
+public enum BidBondRefundStatusEnum implements ArrayValuable<Integer> {
+
+ NOT_REFUNDED(0, "鏈��鍥�"),
+ PARTIAL_REFUNDED(1, "閮ㄥ垎閫�鍥�"),
+ REFUNDED(2, "宸查��鍥�"),
+ NO_NEED(3, "鏃犻渶閫�鍥�");
+
+ public static final Integer[] ARRAYS = Arrays.stream(values())
+ .map(BidBondRefundStatusEnum::getStatus).toArray(Integer[]::new);
+
+ private final Integer status;
+ private final String name;
+
+ @Override
+ public Integer[] array() {
+ return ARRAYS;
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/BidStatusEnum.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/BidStatusEnum.java
deleted file mode 100644
index 694ae46..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/BidStatusEnum.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.srm.enums;
-
-import lombok.Getter;
-
-/**
- * 鎶曟爣鐘舵�佹灇涓�
- */
-@Getter
-public enum BidStatusEnum {
-
- REGISTERED(0, "鎶ュ悕"),
- BID(10, "宸叉姇鏍�"),
- WITHDRAWN(20, "鎾ゆ爣"),
- WIN(30, "涓爣"),
- LOSE(40, "鏈腑鏍�");
-
- BidStatusEnum(Integer code, String name) {
- this.code = code;
- this.name = name;
- }
-
- private final Integer code;
- private final String name;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/BiddingModeEnum.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/BiddingModeEnum.java
deleted file mode 100644
index 401681b..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/BiddingModeEnum.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.srm.enums;
-
-import lombok.Getter;
-
-/**
- * 鎷涙姇鏍囨ā寮忔灇涓�
- */
-@Getter
-public enum BiddingModeEnum {
-
- FULL("FULL", "瀹屾暣鐗�"),
- SIMPLE("SIMPLE", "绠�鏄撶増");
-
- BiddingModeEnum(String code, String name) {
- this.code = code;
- this.name = name;
- }
-
- private final String code;
- private final String name;
-
- public static boolean isSimple(String mode) {
- return SIMPLE.getCode().equals(mode);
- }
-
- public static boolean isFull(String mode) {
- return mode == null || FULL.getCode().equals(mode);
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/CertificateTypeEnum.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/CertificateTypeEnum.java
deleted file mode 100644
index 7547e53..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/CertificateTypeEnum.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.module.srm.enums;
-
-import lombok.Getter;
-
-/**
- * 璧勮川璇佷功绫诲瀷鏋氫妇
- */
-@Getter
-public enum CertificateTypeEnum {
-
- BUSINESS_LICENSE(1, "钀ヤ笟鎵х収"),
- CERTIFICATION(2, "璁よ瘉璇佷功"),
- INSPECTION_REPORT(3, "妫�娴嬫姤鍛�"),
- OTHER(4, "鍏朵粬");
-
- CertificateTypeEnum(Integer code, String name) {
- this.code = code;
- this.name = name;
- }
-
- private final Integer code;
- private final String name;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/DeliveryStatusEnum.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/DeliveryStatusEnum.java
deleted file mode 100644
index f6890a6..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/DeliveryStatusEnum.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cn.iocoder.yudao.module.srm.enums;
-
-import lombok.Getter;
-
-/**
- * 浜よ揣鐘舵�佹灇涓�
- */
-@Getter
-public enum DeliveryStatusEnum {
-
- PENDING(0, "鏈氦璐�"),
- PARTIAL(10, "閮ㄥ垎浜よ揣"),
- COMPLETED(20, "宸插畬鎴�");
-
- DeliveryStatusEnum(Integer code, String name) {
- this.code = code;
- this.name = name;
- }
-
- private final Integer code;
- private final String name;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/ErrorCodeConstants.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/ErrorCodeConstants.java
index d0a3d7f..f351981 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/ErrorCodeConstants.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/ErrorCodeConstants.java
@@ -13,67 +13,36 @@
ErrorCode SUPPLIER_CODE_EXISTS = new ErrorCode(1_040_100_001, "渚涘簲鍟嗙紪鐮佸凡瀛樺湪");
ErrorCode SUPPLIER_EXISTS_REFERENCE = new ErrorCode(1_040_100_002, "渚涘簲鍟嗚涓氬姟寮曠敤锛屾棤娉曞垹闄�");
ErrorCode SUPPLIER_CONTACT_NOT_EXISTS = new ErrorCode(1_040_100_003, "渚涘簲鍟嗚仈绯讳汉涓嶅瓨鍦�");
- ErrorCode SUPPLIER_NOT_ENABLE = new ErrorCode(1_040_100_004, "渚涘簲鍟嗗凡鍋滅敤锛屾棤娉曞弬涓庢姇鏍�");
+ ErrorCode SUPPLIER_NOT_ENABLE = new ErrorCode(1_040_100_004, "渚涘簲鍟嗗凡鍋滅敤锛屾棤娉曞弬涓庤浠�/閲囪喘");
ErrorCode SUPPLIER_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_040_100_005, "瀵煎叆鐨勪緵搴斿晢鏁版嵁涓嶈兘涓虹┖");
+ ErrorCode SUPPLIER_CONTACT_NAME_REQUIRED = new ErrorCode(1_040_100_006, "渚涘簲鍟嗚仈绯讳汉濮撳悕涓嶈兘涓虹┖");
+ ErrorCode SUPPLIER_BANK_INFO_INCOMPLETE = new ErrorCode(1_040_100_007, "渚涘簲鍟嗛摱琛岃处鎴风殑寮�鎴疯鎴栭摱琛岃处鍙蜂笉鑳戒负绌�");
- // ========== 渚涘簲鍟嗗噯鍏� 1_040_200_000 ==========
- ErrorCode APPLY_NOT_EXISTS = new ErrorCode(1_040_200_000, "鍑嗗叆鐢宠涓嶅瓨鍦�");
- ErrorCode APPLY_STATUS_NOT_DRAFT = new ErrorCode(1_040_200_001, "褰撳墠鐘舵�佷笉鍏佽鎻愪氦");
- ErrorCode APPLY_STATUS_NOT_PENDING = new ErrorCode(1_040_200_002, "褰撳墠鐘舵�佷笉鍏佽瀹℃牳");
- ErrorCode APPLY_SUPPLIER_EXISTS = new ErrorCode(1_040_200_003, "璇ヤ緵搴斿晢宸插瓨鍦ㄥ噯鍏ヨ褰�");
- ErrorCode APPLY_SUPPLIER_NAME_REQUIRED = new ErrorCode(1_040_200_004, "鏈�夋嫨SRM渚涘簲鍟嗘椂锛屼緵搴斿晢鍚嶇О涓嶈兘涓虹┖");
- ErrorCode APPLY_BPM_CATEGORY_NOT_EXISTS = new ErrorCode(1_040_200_005, "渚涘簲鍟嗗噯鍏ュ鎵瑰垎绫讳笉瀛樺湪锛岃鍏堝湪BPM妯″潡鍒涘缓渚涘簲鍟嗗噯鍏ュ鎵规祦绋嬪垎绫�");
- ErrorCode APPLY_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_040_200_006, "渚涘簲鍟嗗噯鍏ュ鎵瑰垎绫讳笅娌℃湁鍙敤鐨勬祦绋嬫ā鍨嬶紝璇峰厛鍒涘缓骞跺彂甯冩祦绋�");
+ // ========== 璇环姣斾环 1_040_600_000 ==========
+ ErrorCode INQUIRY_NOT_EXISTS = new ErrorCode(1_040_600_000, "璇环鍗曚笉瀛樺湪");
+ ErrorCode INQUIRY_STATUS_NOT_EDITABLE = new ErrorCode(1_040_600_001, "璇环鍗曞綋鍓嶇姸鎬佷笉鍏佽缂栬緫");
+ ErrorCode INQUIRY_STATUS_NOT_QUOTING = new ErrorCode(1_040_600_002, "璇环鍗曞綋鍓嶇姸鎬佷笉鍏佽褰曞叆鎶ヤ环");
+ ErrorCode INQUIRY_STATUS_NOT_CONFIRMABLE = new ErrorCode(1_040_600_003, "璇环鍗曞綋鍓嶇姸鎬佷笉鍏佽纭杞鍗�");
+ ErrorCode INQUIRY_STATUS_NOT_CANCELLABLE = new ErrorCode(1_040_600_004, "璇环鍗曞綋鍓嶇姸鎬佷笉鍏佽鍙栨秷");
+ ErrorCode INQUIRY_ITEM_EMPTY = new ErrorCode(1_040_600_005, "璇环鍗曟病鏈変骇鍝佽锛屾棤娉曚繚瀛�");
+ ErrorCode INQUIRY_SUPPLIER_EMPTY = new ErrorCode(1_040_600_006, "璇环鍗曟病鏈夊弬涓庝緵搴斿晢锛屾棤娉曚繚瀛�");
+ ErrorCode INQUIRY_SUPPLIER_DUPLICATE = new ErrorCode(1_040_600_007, "璇环鍗曞瓨鍦ㄩ噸澶嶄緵搴斿晢");
+ ErrorCode INQUIRY_SUPPLIER_NOT_PARTICIPANT = new ErrorCode(1_040_600_008, "鎶ヤ环渚涘簲鍟嗘湭鍙備笌璇ヨ浠峰崟");
+ ErrorCode INQUIRY_QUOTE_NOT_EXISTS = new ErrorCode(1_040_600_009, "鎶ヤ环涓嶅瓨鍦�");
+ ErrorCode INQUIRY_QUOTE_PRICE_INVALID = new ErrorCode(1_040_600_010, "鎶ヤ环鍗曚环蹇呴』澶т簬 0");
+ ErrorCode INQUIRY_WINNER_REQUIRED = new ErrorCode(1_040_600_011, "浜у搧鏈�夋嫨涓爣鎶ヤ环");
+ ErrorCode INQUIRY_WINNER_DUPLICATE = new ErrorCode(1_040_600_012, "鍚屼竴浜у搧閲嶅閫夋嫨涓爣鎶ヤ环");
+ ErrorCode INQUIRY_WINNER_QUOTE_MISMATCH = new ErrorCode(1_040_600_013, "涓爣鎶ヤ环涓嶅睘浜庢墍閫変骇鍝�");
+ ErrorCode INQUIRY_ALREADY_CONFIRMED = new ErrorCode(1_040_600_014, "璇环鍗曞凡琚‘璁よ浆璁㈠崟锛岃鍒锋柊鍚庢煡鐪�");
+ ErrorCode INQUIRY_ORDER_GENERATE_FAIL = new ErrorCode(1_040_600_015, "璇环鍗曠敓鎴愰噰璐鍗曞け璐�");
+ ErrorCode INQUIRY_NO_GENERATE_FAIL = new ErrorCode(1_040_600_016, "璇环鍗曞彿鐢熸垚澶辫触");
- // ========== 渚涘簲鍟嗚祫璐� 1_040_300_000 ==========
- ErrorCode CERTIFICATE_NOT_EXISTS = new ErrorCode(1_040_300_000, "璧勮川璇佷功涓嶅瓨鍦�");
- ErrorCode CERTIFICATE_EXPIRED = new ErrorCode(1_040_300_001, "璧勮川璇佷功宸茶繃鏈�");
-
- // ========== 渚涘簲鍟嗚瘎浠� 1_040_400_000 ==========
- ErrorCode EVALUATION_NOT_EXISTS = new ErrorCode(1_040_400_000, "缁╂晥璇勪环涓嶅瓨鍦�");
- ErrorCode EVALUATION_PERIOD_EXISTS = new ErrorCode(1_040_400_001, "璇ヨ瘎浠峰懆鏈熷凡瀛樺湪璇勪环璁板綍");
-
- // ========== 鎷涙姇鏍囩鐞� 1_040_500_000 ==========
- ErrorCode TENDER_NOT_EXISTS = new ErrorCode(1_040_500_000, "鎷涙爣椤圭洰涓嶅瓨鍦�");
- ErrorCode TENDER_STATUS_NOT_DRAFT = new ErrorCode(1_040_500_001, "褰撳墠鐘舵�佷笉鍏佽缂栬緫");
- ErrorCode TENDER_STATUS_NOT_PUBLISHED = new ErrorCode(1_040_500_002, "褰撳墠鐘舵�佷笉鍏佽鎶曟爣");
- ErrorCode TENDER_STATUS_NOT_BIDDING = new ErrorCode(1_040_500_009, "褰撳墠鐘舵�佷笉鍏佽璇勬爣");
- ErrorCode TENDER_STATUS_ALREADY_CLOSED = new ErrorCode(1_040_500_010, "宸插叧闂殑椤圭洰涓嶅厑璁告搷浣�");
- ErrorCode BID_NOT_EXISTS = new ErrorCode(1_040_500_003, "鎶曟爣璁板綍涓嶅瓨鍦�");
- ErrorCode BID_SUPPLIER_EXISTS = new ErrorCode(1_040_500_004, "渚涘簲鍟嗗凡鍙備笌鎶曟爣");
- ErrorCode BID_NO_EXISTS = new ErrorCode(1_040_500_016, "鎶曟爣缂栧彿宸插瓨鍦�");
- ErrorCode BID_PAST_END_TIME = new ErrorCode(1_040_500_005, "鎶曟爣宸叉埅姝�");
- ErrorCode BID_SUPPLIER_NOT_APPROVED = new ErrorCode(1_040_500_011, "渚涘簲鍟嗘湭閫氳繃鍑嗗叆瀹℃壒锛屾棤娉曞弬涓庢姇鏍�");
- ErrorCode BID_WITHDRAWN_CANNOT_QUOTE = new ErrorCode(1_040_500_012, "鎶曟爣宸叉挙鏍囷紝涓嶅厑璁告姤浠�");
- ErrorCode EVALUATION_NOT_EXISTS_TENDER = new ErrorCode(1_040_500_006, "璇勬爣璁板綍涓嶅瓨鍦�");
- ErrorCode AWARD_NOT_EXISTS = new ErrorCode(1_040_500_007, "瀹氭爣璁板綍涓嶅瓨鍦�");
- ErrorCode AWARD_SUPPLIER_EXISTS = new ErrorCode(1_040_500_008, "宸插瓨鍦ㄥ畾鏍囪褰�");
- ErrorCode AWARD_STATUS_NOT_AWARDED = new ErrorCode(1_040_500_013, "浠呭凡瀹氭爣鐘舵�佸彲鐢熸垚閲囪喘璁㈠崟");
- ErrorCode AWARD_SUPPLIER_NOT_SYNCED = new ErrorCode(1_040_500_014, "渚涘簲鍟嗘湭鍚屾鑷矱RP锛屾棤娉曠敓鎴愰噰璐鍗�");
- ErrorCode AWARD_QUOTE_NOT_EXISTS = new ErrorCode(1_040_500_015, "涓爣渚涘簲鍟嗘姤浠蜂笉瀛樺湪");
-
- // 鐘舵�佹牎楠岀簿缁嗗寲閿欒鐮�
- ErrorCode TENDER_MATERIAL_LOCKED = new ErrorCode(1_040_500_022, "鐗╂枡娓呭崟宸查攣瀹氾紝涓嶅厑璁稿鍒犳敼");
- ErrorCode TENDER_BID_FORBIDDEN = new ErrorCode(1_040_500_023, "褰撳墠鐘舵�佷笉鍏佽鏂板鎶曟爣");
- ErrorCode TENDER_QUOTE_FORBIDDEN = new ErrorCode(1_040_500_024, "褰撳墠鐘舵�佷笉鍏佽鎶ヤ环鎿嶄綔");
- ErrorCode TENDER_END_TIME_PASSED = new ErrorCode(1_040_500_025, "鎶曟爣鎴鏃堕棿宸茶繃锛屼笉鍏佽鏂板鎶曟爣");
- ErrorCode TENDER_PROJECT_LOCKED = new ErrorCode(1_040_500_026, "椤圭洰宸查攣瀹氾紝褰撳墠鐘舵�佷笉鍏佽鎿嶄綔");
- ErrorCode TENDER_HAS_BIDS_CANNOT_DELETE = new ErrorCode(1_040_500_027, "宸插瓨鍦ㄦ姇鏍囨暟鎹紝涓嶅厑璁稿垹闄�");
- ErrorCode TENDER_BID_FORBIDDEN_WITHDRAW = new ErrorCode(1_040_500_028, "褰撳墠鐘舵�佷笉鍏佽鎾ゆ爣");
- ErrorCode TENDER_EVALUATION_FORBIDDEN = new ErrorCode(1_040_500_029, "褰撳墠鐘舵�佷笉鍏佽璇勬爣鎿嶄綔");
- ErrorCode TENDER_AWARD_FORBIDDEN = new ErrorCode(1_040_500_030, "褰撳墠鐘舵�佷笉鍏佽瀹氭爣鎿嶄綔");
- ErrorCode AWARD_BID_NOT_IN_PROJECT = new ErrorCode(1_040_500_031, "鎶曟爣璁板綍涓嶅睘浜庡綋鍓嶆嫑鏍囬」鐩�");
- ErrorCode AWARD_BID_WITHDRAWN = new ErrorCode(1_040_500_032, "鎶曟爣宸叉挙鏍囷紝涓嶅厑璁稿畾鏍�");
- ErrorCode AWARD_SUPPLIER_NOT_MATCH_BID = new ErrorCode(1_040_500_033, "渚涘簲鍟嗕笌鎶曟爣璁板綍涓嶄竴鑷�");
-
- // 绠�鏄撴ā寮�
- ErrorCode TENDER_MODE_NOT_SIMPLE = new ErrorCode(1_040_500_034, "褰撳墠椤圭洰闈炵畝鏄撴ā寮忥紝涓嶅厑璁告鎿嶄綔");
- ErrorCode TENDER_STATUS_NOT_PRICE_COMPARING = new ErrorCode(1_040_500_035, "褰撳墠鐘舵�侀潪姣斾环涓紝涓嶅厑璁哥‘璁�");
- ErrorCode TENDER_CONFIRM_BID_REQUIRED = new ErrorCode(1_040_500_036, "绠�鏄撴ā寮忕‘璁ゆ椂蹇呴』鎸囧畾涓爣鎶曟爣");
- ErrorCode TENDER_NO_MATERIALS = new ErrorCode(1_040_500_037, "鎷涙爣椤圭洰娌℃湁娣诲姞鐗╂枡锛屾棤娉曞紑濮嬫瘮浠�");
- ErrorCode TENDER_NO_BIDS = new ErrorCode(1_040_500_038, "鎷涙爣椤圭洰娌℃湁渚涘簲鍟嗘姇鏍囷紝鏃犳硶寮�濮嬫瘮浠�");
-
- // ========== 閫氱敤 ==========
- ErrorCode QUOTE_MATERIAL_DUPLICATE = new ErrorCode(1_040_900_001, "璇ユ姇鏍囧凡瀛樺湪鐩稿悓鐗╂枡鐨勬姤浠�");
+ // ========== 鎶曟爣淇濊瘉閲� 1_040_700_000 ==========
+ ErrorCode BOND_NOT_EXISTS = new ErrorCode(1_040_700_000, "鎶曟爣淇濊瘉閲戣褰曚笉瀛樺湪");
+ ErrorCode BOND_NO_EXISTS = new ErrorCode(1_040_700_001, "鎶曟爣淇濊瘉閲戝崟鍙峰凡瀛樺湪");
+ ErrorCode BOND_AMOUNT_INVALID = new ErrorCode(1_040_700_002, "淇濊瘉閲戦噾棰濅笉鑳藉皬浜� 0");
+ ErrorCode BOND_REFUND_AMOUNT_INVALID = new ErrorCode(1_040_700_003, "閫�鍥為噾棰濆繀椤诲ぇ浜� 0 涓斾笉鑳借秴杩囦繚璇侀噾閲戦");
+ ErrorCode BOND_REFUND_DATE_REQUIRED = new ErrorCode(1_040_700_004, "閫�鍥炵姸鎬佷负宸查��鍥炴椂锛岄��鍥炴棩鏈熶笉鑳戒负绌�");
+ ErrorCode BOND_SUPPLIER_MISMATCH = new ErrorCode(1_040_700_005, "鍏宠仈閲囪喘璁㈠崟鐨勪緵搴斿晢涓庝繚璇侀噾渚涘簲鍟嗕笉涓�鑷�");
}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/InquiryStatusEnum.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/InquiryStatusEnum.java
new file mode 100644
index 0000000..fab075f
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/InquiryStatusEnum.java
@@ -0,0 +1,32 @@
+package cn.iocoder.yudao.module.srm.enums;
+
+import cn.iocoder.yudao.framework.common.core.ArrayValuable;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Arrays;
+
+/**
+ * SRM 璇环鍗曠姸鎬佹灇涓�
+ */
+@RequiredArgsConstructor
+@Getter
+public enum InquiryStatusEnum implements ArrayValuable<Integer> {
+
+ DRAFT(0, "鑽夌"),
+ QUOTING(10, "璇环涓�"),
+ CONFIRMED(20, "宸茶浆璁㈠崟"),
+ CANCELLED(30, "宸插彇娑�");
+
+ public static final Integer[] ARRAYS = Arrays.stream(values())
+ .map(InquiryStatusEnum::getStatus).toArray(Integer[]::new);
+
+ private final Integer status;
+ private final String name;
+
+ @Override
+ public Integer[] array() {
+ return ARRAYS;
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/LogRecordConstants.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/LogRecordConstants.java
index d637064..6f4a3b7 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/LogRecordConstants.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/LogRecordConstants.java
@@ -5,46 +5,21 @@
*/
public interface LogRecordConstants {
- // ======================= SRM_TENDER 鎷涙爣椤圭洰 =======================
- String LOG_TENDER_TYPE = "SRM 鎷涙爣椤圭洰";
- String LOG_TENDER_UPDATE_SUB_TYPE = "鏇存柊鎷涙爣椤圭洰";
- String LOG_TENDER_UPDATE_SUCCESS = "鏇存柊浜嗘嫑鏍囬」鐩�恵{#tenderName}}銆戯紝"
- + "鎷涙爣璇存槑锛歿{#oldTenderDesc}} 鈫� {{#newTenderDesc}}锛�"
- + "璧勮川瑕佹眰锛歿{#oldQualification}} 鈫� {{#newQualification}}";
-
- // ======================= SRM_BID 鎶曟爣 =======================
- String LOG_BID_TYPE = "SRM 鎶曟爣";
- String LOG_BID_CREATE_SUB_TYPE = "鍒涘缓鎶曟爣";
- String LOG_BID_CREATE_SUCCESS = "渚涘簲鍟嗗鎷涙爣椤圭洰銆恵{#tenderName}}銆戞彁浜や簡鎶曟爣銆恵{#bidNo}}銆�";
- String LOG_BID_WITHDRAW_SUB_TYPE = "鎾ゆ爣";
- String LOG_BID_WITHDRAW_SUCCESS = "鎾ゅ洖浜嗘姇鏍囥�恵{#bidNo}}銆�";
-
- // ======================= SRM_QUOTE 鎶ヤ环 =======================
- String LOG_QUOTE_TYPE = "SRM 鎶ヤ环";
- String LOG_QUOTE_CREATE_SUB_TYPE = "鍒涘缓鎶ヤ环";
- String LOG_QUOTE_CREATE_SUCCESS = "鎻愪氦浜嗘姇鏍囩殑渚涘簲鍟嗘姤浠�";
- String LOG_QUOTE_UPDATE_SUB_TYPE = "鏇存柊鎶ヤ环";
- String LOG_QUOTE_UPDATE_SUCCESS = "鏇存柊浜嗘姇鏍囩殑渚涘簲鍟嗘姤浠�";
-
- // ======================= SRM_EVALUATION 璇勬爣 =======================
- String LOG_EVALUATION_TYPE = "SRM 璇勬爣";
- String LOG_EVALUATION_CREATE_SUB_TYPE = "鍒涘缓璇勬爣";
- String LOG_EVALUATION_CREATE_SUCCESS = "瀵规嫑鏍囬」鐩繘琛屼簡璇勬爣璇勫垎";
- String LOG_EVALUATION_UPDATE_SUB_TYPE = "鏇存柊璇勬爣";
- String LOG_EVALUATION_UPDATE_SUCCESS = "鏇存柊浜嗚瘎鏍囪褰�";
-
- // ======================= SRM_AWARD 瀹氭爣 =======================
- String LOG_AWARD_TYPE = "SRM 瀹氭爣";
- String LOG_AWARD_CREATE_SUB_TYPE = "鍒涘缓瀹氭爣";
- String LOG_AWARD_CREATE_SUCCESS = "鍒涘缓浜嗗畾鏍囥�恵{#createReqVO.awardNo}}銆�";
- String LOG_AWARD_APPROVE_SUB_TYPE = "瀹℃壒瀹氭爣";
- String LOG_AWARD_APPROVE_SUCCESS = "瀹℃壒閫氳繃浜嗗畾鏍囪褰�";
- String LOG_AWARD_ORDER_SUB_TYPE = "鐢熸垚閲囪喘璁㈠崟";
- String LOG_AWARD_ORDER_SUCCESS = "瀹氭爣璁板綍鐢熸垚浜嗛噰璐鍗�";
-
// ======================= SRM_SUPPLIER 渚涘簲鍟� =======================
String LOG_SUPPLIER_TYPE = "SRM 渚涘簲鍟�";
String LOG_SUPPLIER_IMPORT_SUB_TYPE = "瀵煎叆渚涘簲鍟�";
String LOG_SUPPLIER_IMPORT_SUCCESS = "瀵煎叆浜嗕緵搴斿晢锛歿{#importSummary}}";
+ // ======================= SRM_INQUIRY 璇环姣斾环 =======================
+ String LOG_INQUIRY_TYPE = "SRM 璇环姣斾环";
+ String LOG_INQUIRY_CREATE_SUB_TYPE = "鍒涘缓璇环鍗�";
+ String LOG_INQUIRY_CREATE_SUCCESS = "鍒涘缓浜嗚浠峰崟銆恵{#no}}銆�";
+ String LOG_INQUIRY_CONFIRM_SUB_TYPE = "纭璇环杞鍗�";
+ String LOG_INQUIRY_CONFIRM_SUCCESS = "纭璇环鍗曘�恵{#no}}銆戝苟鐢熸垚閲囪喘璁㈠崟";
+
+ // ======================= SRM_BID_BOND 鎶曟爣淇濊瘉閲� =======================
+ String LOG_BID_BOND_TYPE = "SRM 鎶曟爣淇濊瘉閲�";
+ String LOG_BID_BOND_CREATE_SUB_TYPE = "鍒涘缓淇濊瘉閲戣褰�";
+ String LOG_BID_BOND_CREATE_SUCCESS = "鍒涘缓浜嗕繚璇侀噾璁板綍銆恵{#no}}銆�";
+
}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/SupplierApplyStatusEnum.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/SupplierApplyStatusEnum.java
deleted file mode 100644
index ccfd1c3..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/SupplierApplyStatusEnum.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.module.srm.enums;
-
-import lombok.Getter;
-
-/**
- * 渚涘簲鍟嗗噯鍏ョ敵璇风姸鎬佹灇涓�
- *
- * 鎺ュ叆鍗忓悓鍔炲叕(BPM)鍚�,SRM 渚у彧鎰熺煡娴佺▼鏈�缁堢粨鏋�,褰撳墠瀹℃壒杩涘害鍦ㄥ崗鍚屽姙鍏煡鐪嬨��
- * 鍘嗗彶鐘舵��(寰呴噰璐鏍� 10 / 寰呰川閲忓鏍� 20 / 寰呰储鍔″鏍� 30)宸插簾寮�,
- * 鐢� SQL 鑴氭湰缁熶竴杩佺Щ:鍘嗗彶瀹℃壒涓崟鎹噸缃负銆屽緟鎻愪氦銆�,閲嶆柊鎻愪氦璧板崗鍚屽姙鍏��
- */
-@Getter
-public enum SupplierApplyStatusEnum {
-
- DRAFT(0, "寰呮彁浜�"),
- PROCESS(10, "瀹℃壒涓�"),
- CANCEL(30, "宸插彇娑�"),
- APPROVED(40, "宸查�氳繃"),
- REJECTED(50, "宸查┏鍥�");
-
- SupplierApplyStatusEnum(Integer code, String name) {
- this.code = code;
- this.name = name;
- }
-
- private final Integer code;
- private final String name;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/TenderStatusEnum.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/TenderStatusEnum.java
deleted file mode 100644
index 5ab62d6..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/TenderStatusEnum.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package cn.iocoder.yudao.module.srm.enums;
-
-import lombok.Getter;
-
-/**
- * 鎷涙爣鐘舵�佹灇涓�
- */
-@Getter
-public enum TenderStatusEnum {
-
- DRAFT(0, "鑽夌"),
- PUBLISHED(1, "鍙戝竷涓�"),
- BIDDING(2, "鎶曟爣涓�"),
- EVALUATING(3, "璇勬爣涓�"),
- AWARDED(4, "宸插畾鏍�"),
- CLOSED(5, "宸插叧闂�"),
-
- // 绠�鏄撴ā寮忕姸鎬�
- PRICE_COMPARING(10, "姣斾环涓�"),
- CONFIRMED(20, "宸茬‘璁�");
-
- TenderStatusEnum(Integer code, String name) {
- this.code = code;
- this.name = name;
- }
-
- private final Integer code;
- private final String name;
-
- // ========== 鐘舵�佸伐鍏锋柟娉� ==========
-
- /** DRAFT 鍏佽鍏ㄥ瓧娈电紪杈� */
- public static boolean canEditFullProject(Integer status) {
- return DRAFT.getCode().equals(status);
- }
-
- /** PUBLISHED 鎴� BIDDING 鍏佽閮ㄥ垎缂栬緫锛堟嫑鏍囪鏄庛�佽祫璐ㄨ姹傦級 */
- public static boolean canEditPartialProject(Integer status) {
- return PUBLISHED.getCode().equals(status) || BIDDING.getCode().equals(status);
- }
-
- /** DRAFT 鍏佽缂栬緫鐗╂枡娓呭崟 */
- public static boolean canEditMaterial(Integer status) {
- return DRAFT.getCode().equals(status);
- }
-
- /** BIDDING锛堝畬鏁寸増锛夛紝鎴� PRICE_COMPARING锛堢畝鏄撶増锛夊厑璁镐緵搴斿晢鎶曟爣 */
- public static boolean canCreateBid(Integer status) {
- return BIDDING.getCode().equals(status)
- || PRICE_COMPARING.getCode().equals(status);
- }
-
- /** PUBLISHED 鎴� BIDDING锛堝畬鏁寸増锛夛紝鎴� PRICE_COMPARING锛堢畝鏄撶増锛夊厑璁镐緵搴斿晢鎶ヤ环 */
- public static boolean canCreateOrUpdateQuote(Integer status) {
- return PUBLISHED.getCode().equals(status) || BIDDING.getCode().equals(status)
- || PRICE_COMPARING.getCode().equals(status);
- }
-
- /** EVALUATING 鍏佽璇勬爣鎿嶄綔 */
- public static boolean canEvaluate(Integer status) {
- return EVALUATING.getCode().equals(status);
- }
-
- /** EVALUATING 鍏佽瀹氭爣鎿嶄綔 */
- public static boolean canAward(Integer status) {
- return EVALUATING.getCode().equals(status);
- }
-
- // ========== 绠�鏄撴ā寮忓伐鍏锋柟娉� ==========
-
- /** DRAFT 涓旂畝鏄撴ā寮忓厑璁稿紑濮嬫瘮浠� */
- public static boolean canStartPriceComparing(Integer status) {
- return DRAFT.getCode().equals(status);
- }
-
- /** PRICE_COMPARING 鍏佽纭鎺堟爣 */
- public static boolean canConfirm(Integer status) {
- return PRICE_COMPARING.getCode().equals(status);
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/TenderTypeEnum.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/TenderTypeEnum.java
deleted file mode 100644
index de24652..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/TenderTypeEnum.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cn.iocoder.yudao.module.srm.enums;
-
-import lombok.Getter;
-
-/**
- * 鎷涙爣绫诲瀷鏋氫妇
- */
-@Getter
-public enum TenderTypeEnum {
-
- PUBLIC(1, "鍏紑鎷涙爣"),
- INVITATION(2, "閭�璇锋嫑鏍�"),
- COMPETITIVE_NEGOTIATION(3, "绔炰簤鎬ц皥鍒�");
-
- TenderTypeEnum(Integer code, String name) {
- this.code = code;
- this.name = name;
- }
-
- private final Integer code;
- private final String name;
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyService.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyService.java
deleted file mode 100644
index fb3603f..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyService.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.apply;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.srm.controller.admin.apply.vo.SrmSupplierApplyPageReqVO;
-import cn.iocoder.yudao.module.srm.controller.admin.apply.vo.SrmSupplierApplySaveReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierApplyDO;
-import jakarta.validation.Valid;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * SRM 渚涘簲鍟嗗噯鍏ョ敵璇� Service 鎺ュ彛
- */
-public interface SrmSupplierApplyService {
-
- /**
- * 鍒涘缓鍑嗗叆鐢宠
- */
- Long createApply(@Valid SrmSupplierApplySaveReqVO createReqVO);
-
- /**
- * 鏇存柊鍑嗗叆鐢宠
- */
- void updateApply(@Valid SrmSupplierApplySaveReqVO updateReqVO);
-
- /**
- * 鍒犻櫎鍑嗗叆鐢宠
- */
- void deleteApply(Long id);
-
- /**
- * 鑾峰彇鍑嗗叆鐢宠
- */
- SrmSupplierApplyDO getApply(Long id);
-
- /**
- * 鍒嗛〉鏌ヨ鍑嗗叆鐢宠
- */
- PageResult<SrmSupplierApplyDO> getApplyPage(SrmSupplierApplyPageReqVO pageReqVO);
-
- /**
- * 鎻愪氦鐢宠锛堝惎鍔ㄥ崗鍚屽姙鍏祦绋嬶紝鐘舵�佺疆涓哄鎵逛腑锛�
- *
- * @param id 鐢宠缂栧彿
- * @param processDefinitionKey 鍗忓悓鍔炲叕娴佺▼瀹氫箟 Key
- * @param userId 鎻愪氦浜虹紪鍙�
- */
- void submitApply(Long id, String processDefinitionKey, Long userId);
-
- /**
- * 鑾峰彇渚涘簲鍟嗗噯鍏ュ鎵规祦绋嬪垪琛紙鍗忓悓鍔炲叕宸插彂甯冧笖婵�娲荤殑娴佺▼锛�
- */
- List<Map<String, Object>> getSupplierApplyApproveProcessDefinitionList();
-
- /**
- * 鍗忓悓鍔炲叕娴佺▼缁撴灉鍥炲啓
- *
- * @param id 鐢宠缂栧彿
- * @param bpmResult 娴佺▼缁撴灉锛坽@link cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum}锛�
- */
- void updateSupplierApplyAuditStatus(Long id, Integer bpmResult);
-
- /**
- * 瀹℃壒閫氳繃鍚庤嚜鍔ㄥ垱寤轰緵搴斿晢
- */
- void approve(Long id);
-
- /**
- * 纭繚渚涘簲鍟嗗凡鍑嗗叆锛氭湭鍑嗗叆鍒欒嚜鍔ㄥ垱寤哄噯鍏ョ敵璇峰苟缃负宸查�氳繃锛堝畾鏍囪嚜鍔ㄥ噯鍏ワ紝涓嶈蛋鍗忓悓鍔炲叕锛�
- *
- * @param supplierId 渚涘簲鍟嗙紪鍙�
- */
- void ensureSupplierApproved(Long supplierId);
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyServiceImpl.java
deleted file mode 100644
index cedd139..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyServiceImpl.java
+++ /dev/null
@@ -1,330 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.apply;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
-import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
-import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmCategoryDO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
-import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
-import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
-import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
-import cn.iocoder.yudao.module.srm.controller.admin.apply.vo.SrmSupplierApplyPageReqVO;
-import cn.iocoder.yudao.module.srm.controller.admin.apply.vo.SrmSupplierApplySaveReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierApplyDO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierDO;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierApplyMapper;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierMapper;
-import cn.iocoder.yudao.module.srm.enums.ErrorCodeConstants;
-import cn.iocoder.yudao.module.srm.enums.SupplierApplyStatusEnum;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.flowable.engine.repository.ProcessDefinition;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * SRM 渚涘簲鍟嗗噯鍏ョ敵璇� Service 瀹炵幇绫�
- *
- * 鎺ュ叆鍗忓悓鍔炲叕(BPM)鍚�,閲囪喘/璐ㄩ噺/璐㈠姟瀹℃牳鍦ㄥ崗鍚屽姙鍏祦绋嬩腑瀹屾垚,
- * SRM 渚у彧璐熻矗鍙戣捣娴佺▼骞舵帴鏀舵祦绋嬬粨鏉熶簨浠跺洖鍐欑姸鎬併��
- */
-@Service
-@Validated
-@Slf4j
-public class SrmSupplierApplyServiceImpl implements SrmSupplierApplyService {
-
- /**
- * BPM 渚涘簲鍟嗗噯鍏ュ鎵瑰垎绫荤紪鐮�
- */
- private static final String SUPPLIER_APPLY_APPROVE_CATEGORY_CODE = "supplier_apply_approve";
-
- @Resource
- private SrmSupplierApplyMapper supplierApplyMapper;
-
- @Resource
- private SrmSupplierMapper supplierMapper;
-
- @Resource
- private BpmProcessInstanceApi processInstanceApi;
- @Resource
- private BpmCategoryService bpmCategoryService;
- @Resource
- private BpmProcessDefinitionService bpmProcessDefinitionService;
-
- @Override
- public Long createApply(SrmSupplierApplySaveReqVO createReqVO) {
- // 鏍¢獙锛氬繀椤婚�夋嫨 SRM 渚涘簲鍟嗘垨鎵嬪姩濉啓渚涘簲鍟嗗悕绉�
- if (createReqVO.getSupplierId() != null) {
- SrmSupplierDO supplier = supplierMapper.selectById(createReqVO.getSupplierId());
- if (supplier == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.SUPPLIER_NOT_EXISTS);
- }
- } else if (StrUtil.isBlank(createReqVO.getSupplierName())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.APPLY_SUPPLIER_NAME_REQUIRED);
- }
- SrmSupplierApplyDO apply = BeanUtils.toBean(createReqVO, SrmSupplierApplyDO.class);
- apply.setApplyNo(generateApplyNo());
- apply.setApplyStatus(SupplierApplyStatusEnum.DRAFT.getCode());
- apply.setApplyTime(LocalDateTime.now());
- supplierApplyMapper.insert(apply);
- return apply.getId();
- }
-
- @Override
- public void updateApply(SrmSupplierApplySaveReqVO updateReqVO) {
- SrmSupplierApplyDO apply = validateApplyExists(updateReqVO.getId());
- // 浠呭緟鎻愪氦/宸查┏鍥炲彲缂栬緫
- if (!SupplierApplyStatusEnum.DRAFT.getCode().equals(apply.getApplyStatus())
- && !SupplierApplyStatusEnum.REJECTED.getCode().equals(apply.getApplyStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.APPLY_STATUS_NOT_DRAFT);
- }
- // 鏍¢獙锛氬繀椤婚�夋嫨 SRM 渚涘簲鍟嗘垨鎵嬪姩濉啓渚涘簲鍟嗗悕绉�
- if (updateReqVO.getSupplierId() != null) {
- SrmSupplierDO supplier = supplierMapper.selectById(updateReqVO.getSupplierId());
- if (supplier == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.SUPPLIER_NOT_EXISTS);
- }
- } else if (StrUtil.isBlank(updateReqVO.getSupplierName())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.APPLY_SUPPLIER_NAME_REQUIRED);
- }
- SrmSupplierApplyDO updateObj = BeanUtils.toBean(updateReqVO, SrmSupplierApplyDO.class);
- supplierApplyMapper.updateById(updateObj);
- }
-
- @Override
- public void deleteApply(Long id) {
- SrmSupplierApplyDO apply = validateApplyExists(id);
- // 浠呭緟鎻愪氦/宸查┏鍥炲彲鍒犻櫎
- if (!SupplierApplyStatusEnum.DRAFT.getCode().equals(apply.getApplyStatus())
- && !SupplierApplyStatusEnum.REJECTED.getCode().equals(apply.getApplyStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.APPLY_STATUS_NOT_DRAFT);
- }
- supplierApplyMapper.deleteById(id);
- }
-
- @Override
- public SrmSupplierApplyDO getApply(Long id) {
- return supplierApplyMapper.selectById(id);
- }
-
- @Override
- public PageResult<SrmSupplierApplyDO> getApplyPage(SrmSupplierApplyPageReqVO pageReqVO) {
- return supplierApplyMapper.selectPage(pageReqVO);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void submitApply(Long id, String processDefinitionKey, Long userId) {
- // 1. 鏍¢獙瀛樺湪 + 寰呮彁浜�/宸查┏鍥炵姸鎬�
- SrmSupplierApplyDO apply = validateApplyExists(id);
- if (!SupplierApplyStatusEnum.DRAFT.getCode().equals(apply.getApplyStatus())
- && !SupplierApplyStatusEnum.REJECTED.getCode().equals(apply.getApplyStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.APPLY_STATUS_NOT_DRAFT);
- }
- // 2. 鍒涘缓 BPM 娴佺▼瀹炰緥锛堥噰璐鏍糕啋璐ㄩ噺瀹℃牳鈫掕储鍔″鏍革紝娴佺▼涓庡鎵逛汉鍦ㄥ崗鍚屽姙鍏厤缃級
- // 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍¢獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷銆�
- if (processInstanceApi.isGlobalAutoApprove()) {
- supplierApplyMapper.updateById(new SrmSupplierApplyDO()
- .setId(id)
- .setApplyStatus(SupplierApplyStatusEnum.PROCESS.getCode())
- .setProcessInstanceId(""));
- updateSupplierApplyAuditStatus(id, cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum.APPROVE.getStatus());
- return;
- }
-
- String processInstanceId = processInstanceApi.createProcessInstance(userId,
- new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinitionKey)
- .setBusinessKey(String.valueOf(id)));
- // 3. 鏇存柊鐢宠鐘舵�佷负瀹℃壒涓紝鍥炲瓨娴佺▼瀹炰緥缂栧彿
- supplierApplyMapper.updateById(new SrmSupplierApplyDO()
- .setId(id)
- .setApplyStatus(SupplierApplyStatusEnum.PROCESS.getCode())
- .setProcessInstanceId(processInstanceId));
- }
-
- @Override
- public List<Map<String, Object>> getSupplierApplyApproveProcessDefinitionList() {
- // 1. 鏍¢獙鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦�
- validateSupplierApplyApproveCategoryAndProcessDefinition();
-
- // 2. 鑾峰彇鍒嗙被涓嬬殑娴佺▼瀹氫箟淇℃伅
- List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
- .getProcessDefinitionInfoListByCategory(SUPPLIER_APPLY_APPROVE_CATEGORY_CODE);
- if (CollUtil.isEmpty(definitionInfoList)) {
- return Collections.emptyList();
- }
-
- // 3. 閬嶅巻鑾峰彇娴佺▼瀹氫箟璇︽儏锛岃繃婊ゆ縺娲荤姸鎬侊紝淇濈暀鏈�鏂扮増鏈�
- Map<String, ProcessDefinition> latestVersionMap = new HashMap<>();
- for (BpmProcessDefinitionInfoDO info : definitionInfoList) {
- ProcessDefinition pd = bpmProcessDefinitionService.getProcessDefinition(info.getProcessDefinitionId());
- if (pd == null || pd.isSuspended()) {
- continue;
- }
- ProcessDefinition existing = latestVersionMap.get(pd.getKey());
- if (existing == null || pd.getVersion() > existing.getVersion()) {
- latestVersionMap.put(pd.getKey(), pd);
- }
- }
-
- // 4. 杩斿洖娴佺▼瀹氫箟鍒楄〃
- List<Map<String, Object>> result = new ArrayList<>();
- for (ProcessDefinition pd : latestVersionMap.values()) {
- Map<String, Object> item = new HashMap<>();
- item.put("id", pd.getId());
- item.put("key", pd.getKey());
- item.put("name", pd.getName());
- result.add(item);
- }
- return result;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updateSupplierApplyAuditStatus(Long id, Integer bpmResult) {
- // 1. 鏍¢獙瀛樺湪
- SrmSupplierApplyDO apply = validateApplyExists(id);
- if (!SupplierApplyStatusEnum.PROCESS.getCode().equals(apply.getApplyStatus())) {
- log.warn("[updateSupplierApplyAuditStatus] 鍑嗗叆鐢宠({}) 涓嶅浜庡鎵逛腑鐘舵��", id);
- return;
- }
-
- // 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
- Integer newStatus = convertBpmResultToStatus(bpmResult);
- if (newStatus != null) {
- supplierApplyMapper.updateById(new SrmSupplierApplyDO()
- .setId(id).setApplyStatus(newStatus));
- }
-
- // 3. 瀹℃壒閫氳繃锛氳嚜鍔ㄥ垱寤�/鍏宠仈渚涘簲鍟嗘。妗�
- if (SupplierApplyStatusEnum.APPROVED.getCode().equals(newStatus)) {
- approve(id);
- }
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void ensureSupplierApproved(Long supplierId) {
- if (supplierId == null) {
- return;
- }
- // 鏍¢獙渚涘簲鍟嗗瓨鍦�
- SrmSupplierDO supplier = supplierMapper.selectById(supplierId);
- if (supplier == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.SUPPLIER_NOT_EXISTS);
- }
- // 宸插噯鍏ュ垯鏃犻渶澶勭悊
- if (supplierApplyMapper.existsApprovedBySupplierId(supplierId)) {
- return;
- }
- // 鑷姩鍒涘缓鍑嗗叆鐢宠骞剁洿鎺ョ疆涓哄凡閫氳繃锛堝畾鏍囪嚜鍔ㄥ噯鍏ワ紝涓嶈蛋鍗忓悓鍔炲叕锛�
- SrmSupplierApplyDO apply = new SrmSupplierApplyDO();
- apply.setApplyNo(generateApplyNo());
- apply.setSupplierId(supplierId);
- apply.setSupplierName(supplier.getName());
- apply.setSupplierType(supplier.getType());
- apply.setCompanyNature(supplier.getCompanyNature());
- apply.setRegisteredCapital(supplier.getRegisteredCapital());
- apply.setBusinessLicenseNo(supplier.getBusinessLicenseNo());
- apply.setTaxNo(supplier.getTaxNo());
- apply.setAddress(supplier.getAddress());
- apply.setBankName(supplier.getBankName());
- apply.setBankAccount(supplier.getBankAccount());
- apply.setContactName(supplier.getContactName());
- apply.setContactMobile(supplier.getContactMobile());
- apply.setContactEmail(supplier.getContactEmail());
- apply.setRemark("涓爣鐢熸垚閲囪喘璁㈠崟鏃惰嚜鍔ㄥ噯鍏ュ苟閫氳繃");
- apply.setApplyStatus(SupplierApplyStatusEnum.APPROVED.getCode());
- apply.setApplyTime(LocalDateTime.now());
- supplierApplyMapper.insert(apply);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void approve(Long id) {
- SrmSupplierApplyDO apply = validateApplyExists(id);
- if (!SupplierApplyStatusEnum.APPROVED.getCode().equals(apply.getApplyStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.APPLY_STATUS_NOT_PENDING);
- }
- // 濡傛灉宸插叧鑱� SRM 渚涘簲鍟嗭紝涓嶉渶瑕侀噸澶嶅垱寤�
- if (apply.getSupplierId() == null) {
- SrmSupplierDO supplier = new SrmSupplierDO();
- supplier.setName(apply.getSupplierName());
- supplier.setCompanyNature(apply.getCompanyNature());
- supplier.setRegisteredCapital(apply.getRegisteredCapital());
- supplier.setBusinessLicenseNo(apply.getBusinessLicenseNo());
- supplier.setTaxNo(apply.getTaxNo());
- supplier.setAddress(apply.getAddress());
- supplier.setBankName(apply.getBankName());
- supplier.setBankAccount(apply.getBankAccount());
- supplier.setContactName(apply.getContactName());
- supplier.setContactMobile(apply.getContactMobile());
- supplier.setContactEmail(apply.getContactEmail());
- supplier.setRemark(apply.getRemark());
- supplier.setStatus(0);
- supplierMapper.insert(supplier);
-
- apply.setSupplierId(supplier.getId());
- }
- supplierApplyMapper.updateById(apply);
- }
-
- // ========== 鏍¢獙鏂规硶 ==========
-
- private SrmSupplierApplyDO validateApplyExists(Long id) {
- SrmSupplierApplyDO apply = supplierApplyMapper.selectById(id);
- if (apply == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.APPLY_NOT_EXISTS);
- }
- return apply;
- }
-
- /**
- * 鏍¢獙渚涘簲鍟嗗噯鍏ュ鎵瑰垎绫诲瓨鍦�
- */
- private void validateSupplierApplyApproveCategoryAndProcessDefinition() {
- List<BpmCategoryDO> categories = bpmCategoryService.getCategoryListByCode(
- Collections.singletonList(SUPPLIER_APPLY_APPROVE_CATEGORY_CODE));
- if (CollUtil.isEmpty(categories)) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.APPLY_BPM_CATEGORY_NOT_EXISTS);
- }
- }
-
- /**
- * 杞崲 BPM 瀹℃壒缁撴灉涓轰笟鍔$姸鎬�
- */
- private Integer convertBpmResultToStatus(Integer bpmResult) {
- if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
- return SupplierApplyStatusEnum.APPROVED.getCode();
- } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
- return SupplierApplyStatusEnum.REJECTED.getCode();
- } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
- return SupplierApplyStatusEnum.CANCEL.getCode();
- }
- return null;
- }
-
- /**
- * 鐢熸垚鐢宠缂栧彿
- */
- private String generateApplyNo() {
- String prefix = "AP";
- String date = java.time.LocalDate.now().format(java.time.format.DateTimeFormatter.ofPattern("yyyyMM"));
- int seq = (int) (Math.random() * 9000) + 1000;
- return prefix + date + String.format("%04d", seq);
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/listener/SrmSupplierApplyStatusListener.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/listener/SrmSupplierApplyStatusListener.java
deleted file mode 100644
index 8435fcb..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/listener/SrmSupplierApplyStatusListener.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.apply.listener;
-
-import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
-import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
-import cn.iocoder.yudao.module.srm.service.apply.SrmSupplierApplyService;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * 渚涘簲鍟嗗噯鍏ュ鎵圭姸鎬佺洃鍚櫒
- *
- * 鐩戝惉 BPM 娴佺▼瀹炰緥鐘舵�佸彉鏇翠簨浠讹紝鏇存柊鍑嗗叆鐢宠鐨勫鎵圭姸鎬侊紙鍗忓悓鍔炲叕瀹℃壒鍚庡洖鍐欙級
- */
-@Component
-@Slf4j
-public class SrmSupplierApplyStatusListener extends BpmProcessInstanceStatusEventListener {
-
- /**
- * 渚涘簲鍟嗗噯鍏ュ鎵规祦绋嬪畾涔� Key
- */
- private static final String PROCESS_DEFINITION_KEY = "supplier_apply_approve";
-
- @Resource
- private SrmSupplierApplyService supplierApplyService;
-
- @Override
- protected String getProcessDefinitionKey() {
- return PROCESS_DEFINITION_KEY;
- }
-
- @Override
- protected void onEvent(BpmProcessInstanceStatusEvent event) {
- Long applyId;
- try {
- applyId = Long.parseLong(event.getBusinessKey());
- } catch (NumberFormatException e) {
- log.warn("[onEvent] businessKey({}) 涓嶆槸鏈夋晥鐨勫噯鍏ョ敵璇风紪鍙�", event.getBusinessKey());
- return;
- }
-
- log.info("[onEvent] 鏀跺埌BPM瀹℃壒浜嬩欢锛宎pplyId={}, status={}", applyId, event.getStatus());
-
- try {
- supplierApplyService.updateSupplierApplyAuditStatus(applyId, event.getStatus());
- log.info("[onEvent] 鍑嗗叆鐢宠({}) 瀹℃壒鐘舵�佹洿鏂板畬鎴�", applyId);
- } catch (Exception e) {
- log.error("[onEvent] 鏇存柊鍑嗗叆鐢宠瀹℃壒鐘舵�佸け璐ワ紝applyId={}", applyId, e);
- }
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/bond/SrmBidBondService.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/bond/SrmBidBondService.java
new file mode 100644
index 0000000..b5c5138
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/bond/SrmBidBondService.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.srm.service.bond;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.srm.controller.admin.bond.vo.SrmBidBondPageReqVO;
+import cn.iocoder.yudao.module.srm.controller.admin.bond.vo.SrmBidBondRespVO;
+import cn.iocoder.yudao.module.srm.controller.admin.bond.vo.SrmBidBondSaveReqVO;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmBidBondDO;
+import jakarta.validation.Valid;
+
+/**
+ * SRM 鎶曟爣淇濊瘉閲� Service 鎺ュ彛
+ */
+public interface SrmBidBondService {
+
+ Long createBidBond(@Valid SrmBidBondSaveReqVO createReqVO);
+
+ void updateBidBond(@Valid SrmBidBondSaveReqVO updateReqVO);
+
+ void deleteBidBond(Long id);
+
+ SrmBidBondDO getBidBond(Long id);
+
+ SrmBidBondRespVO getBidBondDetail(Long id);
+
+ PageResult<SrmBidBondRespVO> getBidBondPage(SrmBidBondPageReqVO pageReqVO);
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/bond/SrmBidBondServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/bond/SrmBidBondServiceImpl.java
new file mode 100644
index 0000000..59bebb4
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/bond/SrmBidBondServiceImpl.java
@@ -0,0 +1,242 @@
+package cn.iocoder.yudao.module.srm.service.bond;
+
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
+import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderRespDTO;
+import cn.iocoder.yudao.module.srm.controller.admin.bond.vo.SrmBidBondPageReqVO;
+import cn.iocoder.yudao.module.srm.controller.admin.bond.vo.SrmBidBondRespVO;
+import cn.iocoder.yudao.module.srm.controller.admin.bond.vo.SrmBidBondSaveReqVO;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmBidBondDO;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmInquiryDO;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierDO;
+import cn.iocoder.yudao.module.srm.dal.mysql.SrmBidBondMapper;
+import cn.iocoder.yudao.module.srm.dal.mysql.SrmInquiryMapper;
+import cn.iocoder.yudao.module.srm.enums.BidBondRefundStatusEnum;
+import cn.iocoder.yudao.module.srm.enums.ErrorCodeConstants;
+import cn.iocoder.yudao.module.srm.service.supplier.SrmSupplierService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * SRM 鎶曟爣淇濊瘉閲� Service 瀹炵幇
+ */
+@Service
+@Validated
+@Slf4j
+public class SrmBidBondServiceImpl implements SrmBidBondService {
+
+ private static final DateTimeFormatter NO_DATE_FORMAT = DateTimeFormatter.ofPattern("yyyyMM");
+
+ @Resource
+ private SrmBidBondMapper bidBondMapper;
+ @Resource
+ private SrmInquiryMapper inquiryMapper;
+ @Resource
+ private SrmSupplierService supplierService;
+ @Resource
+ private ErpPurchaseOrderApi erpPurchaseOrderApi;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createBidBond(SrmBidBondSaveReqVO createReqVO) {
+ validateBidBond(createReqVO);
+ SrmBidBondDO bond = BeanUtils.toBean(createReqVO, SrmBidBondDO.class);
+ bond.setId(null);
+ bond.setNo(generateBondNo());
+ bond.setWon(Boolean.TRUE.equals(createReqVO.getWon()));
+ bond.setRefundStatus(resolveRefundStatus(createReqVO));
+ if (bond.getRefundStatus() == null) {
+ bond.setRefundStatus(BidBondRefundStatusEnum.NOT_REFUNDED.getStatus());
+ }
+ bidBondMapper.insert(bond);
+ return bond.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateBidBond(SrmBidBondSaveReqVO updateReqVO) {
+ validateBidBondExists(updateReqVO.getId());
+ validateBidBond(updateReqVO);
+ SrmBidBondDO updateObj = BeanUtils.toBean(updateReqVO, SrmBidBondDO.class);
+ updateObj.setNo(null);
+ updateObj.setWon(Boolean.TRUE.equals(updateReqVO.getWon()));
+ updateObj.setRefundStatus(resolveRefundStatus(updateReqVO));
+ bidBondMapper.updateById(updateObj);
+ }
+
+ @Override
+ public void deleteBidBond(Long id) {
+ validateBidBondExists(id);
+ bidBondMapper.deleteById(id);
+ }
+
+ @Override
+ public SrmBidBondDO getBidBond(Long id) {
+ return bidBondMapper.selectById(id);
+ }
+
+ @Override
+ public SrmBidBondRespVO getBidBondDetail(Long id) {
+ SrmBidBondDO bond = validateBidBondExists(id);
+ return buildRespList(List.of(bond)).get(0);
+ }
+
+ @Override
+ public PageResult<SrmBidBondRespVO> getBidBondPage(SrmBidBondPageReqVO pageReqVO) {
+ PageResult<SrmBidBondDO> page = bidBondMapper.selectPage(pageReqVO);
+ return new PageResult<>(buildRespList(page.getList()), page.getTotal());
+ }
+
+ // ========== 鏍¢獙 ==========
+
+ private void validateBidBond(SrmBidBondSaveReqVO reqVO) {
+ if (reqVO.getBondAmount() == null || reqVO.getBondAmount().compareTo(BigDecimal.ZERO) < 0) {
+ throw new ServiceException(ErrorCodeConstants.BOND_AMOUNT_INVALID.getCode(),
+ "淇濊瘉閲戦噾棰濅负銆�" + reqVO.getBondAmount() + "銆戯紝涓嶈兘灏忎簬 0锛岃濉啓姝g‘鐨勭即绾抽噾棰濄��");
+ }
+ SrmSupplierDO supplier = supplierService.getSupplier(reqVO.getSupplierId());
+ if (supplier == null) {
+ throw new ServiceException(ErrorCodeConstants.SUPPLIER_NOT_EXISTS.getCode(),
+ "渚涘簲鍟咺D=" + reqVO.getSupplierId() + " 涓嶅瓨鍦紝璇峰埛鏂颁緵搴斿晢鍒楄〃鍚庨噸鏂伴�夋嫨銆�");
+ }
+ // 鍏宠仈璇环鍗曪細鏍¢獙瀛樺湪锛屽苟鍦ㄦ湭濉」鐩悕绉版椂鑷姩甯﹀嚭璇环鏍囬
+ if (reqVO.getInquiryId() != null) {
+ SrmInquiryDO inquiry = inquiryMapper.selectById(reqVO.getInquiryId());
+ if (inquiry == null) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_NOT_EXISTS.getCode(),
+ "鍏宠仈璇环鍗旾D=" + reqVO.getInquiryId() + " 涓嶅瓨鍦紝璇峰埛鏂拌浠峰崟鍒楄〃鍚庨噸鏂伴�夋嫨銆�");
+ }
+ if (StrUtil.isBlank(reqVO.getProjectName())) {
+ reqVO.setProjectName(inquiry.getTitle());
+ }
+ }
+ // 鍏宠仈閲囪喘璁㈠崟锛氭牎楠屽瓨鍦ㄤ笖渚涘簲鍟嗕竴鑷�
+ if (reqVO.getPurchaseOrderId() != null) {
+ ErpPurchaseOrderRespDTO order = erpPurchaseOrderApi.getPurchaseOrder(reqVO.getPurchaseOrderId())
+ .getCheckedData();
+ if (order == null) {
+ throw new ServiceException(ErrorCodeConstants.BOND_NOT_EXISTS.getCode(),
+ "鍏宠仈閲囪喘璁㈠崟ID=" + reqVO.getPurchaseOrderId() + " 涓嶅瓨鍦紝璇峰埛鏂伴噰璐鍗曞垪琛ㄥ悗閲嶆柊閫夋嫨銆�");
+ }
+ if (!reqVO.getSupplierId().equals(order.getSupplierId())) {
+ throw new ServiceException(ErrorCodeConstants.BOND_SUPPLIER_MISMATCH.getCode(),
+ "鍏宠仈閲囪喘璁㈠崟銆�" + order.getNo() + "銆戠殑渚涘簲鍟咺D=" + order.getSupplierId()
+ + "锛屼笌淇濊瘉閲戜緵搴斿晢ID=" + reqVO.getSupplierId() + " 涓嶄竴鑷达紝璇烽噸鏂伴�夋嫨璁㈠崟鎴栦緵搴斿晢銆�");
+ }
+ if (reqVO.getWon() == null) {
+ reqVO.setWon(true);
+ }
+ }
+ // 閫�鍥為噾棰�/鏃ユ湡
+ if (reqVO.getRefundAmount() != null) {
+ if (reqVO.getRefundAmount().compareTo(BigDecimal.ZERO) <= 0
+ || reqVO.getRefundAmount().compareTo(reqVO.getBondAmount()) > 0) {
+ throw new ServiceException(ErrorCodeConstants.BOND_REFUND_AMOUNT_INVALID.getCode(),
+ "閫�鍥為噾棰濅负銆�" + reqVO.getRefundAmount() + "銆戯紝淇濊瘉閲戦噾棰濅负銆�" + reqVO.getBondAmount()
+ + "銆戯紝閫�鍥為噾棰濆繀椤诲ぇ浜� 0 涓斾笉鑳借秴杩囦繚璇侀噾閲戦锛岃淇敼鍚庨噸鏂颁繚瀛樸��");
+ }
+ }
+ if (BidBondRefundStatusEnum.REFUNDED.getStatus().equals(reqVO.getRefundStatus())) {
+ if (reqVO.getRefundDate() == null) {
+ throw new ServiceException(ErrorCodeConstants.BOND_REFUND_DATE_REQUIRED.getCode(),
+ "閫�鍥炵姸鎬侀�夋嫨銆愬凡閫�鍥炪�戞椂锛岄��鍥炴棩鏈熶笉鑳戒负绌猴紝璇峰~鍐欏疄闄呴��鍥炴棩鏈熴��");
+ }
+ if (reqVO.getRefundAmount() == null) {
+ throw new ServiceException(ErrorCodeConstants.BOND_REFUND_AMOUNT_INVALID.getCode(),
+ "閫�鍥炵姸鎬侀�夋嫨銆愬凡閫�鍥炪�戞椂锛岄��鍥為噾棰濅笉鑳戒负绌猴紝璇峰~鍐欏疄闄呴��鍥為噾棰濄��");
+ }
+ }
+ }
+
+ /**
+ * 鏈樉寮忛�夋嫨閫�鍥炵姸鎬佹椂锛屾寜鏄惁涓爣鎺ㄥ榛樿鍊�
+ */
+ private Integer resolveRefundStatus(SrmBidBondSaveReqVO reqVO) {
+ if (reqVO.getRefundStatus() != null) {
+ return reqVO.getRefundStatus();
+ }
+ if (Boolean.TRUE.equals(reqVO.getWon())) {
+ return BidBondRefundStatusEnum.NO_NEED.getStatus();
+ }
+ return BidBondRefundStatusEnum.NOT_REFUNDED.getStatus();
+ }
+
+ private SrmBidBondDO validateBidBondExists(Long id) {
+ SrmBidBondDO bond = bidBondMapper.selectById(id);
+ if (bond == null) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.BOND_NOT_EXISTS);
+ }
+ return bond;
+ }
+
+ private String generateBondNo() {
+ String date = LocalDate.now().format(NO_DATE_FORMAT);
+ for (int attempt = 0; attempt < 20; attempt++) {
+ int seq = (int) (Math.random() * 9000) + 1000;
+ String no = "BZ" + date + String.format("%04d", seq);
+ if (bidBondMapper.selectByNo(no) == null) {
+ return no;
+ }
+ }
+ throw new ServiceException(ErrorCodeConstants.BOND_NO_EXISTS.getCode(),
+ "淇濊瘉閲戝崟鍙峰湪澶氭灏濊瘯鍚庝粛閲嶅锛岃绋嶅悗閲嶈瘯銆�");
+ }
+
+ // ========== 缁勮 ==========
+
+ private List<SrmBidBondRespVO> buildRespList(List<SrmBidBondDO> bonds) {
+ if (bonds == null || bonds.isEmpty()) {
+ return List.of();
+ }
+ Set<Long> supplierIds = bonds.stream().map(SrmBidBondDO::getSupplierId).collect(Collectors.toSet());
+ Map<Long, SrmSupplierDO> supplierMap = supplierService.getSupplierMap(supplierIds);
+ Set<Long> inquiryIds = bonds.stream().map(SrmBidBondDO::getInquiryId)
+ .filter(java.util.Objects::nonNull).collect(Collectors.toSet());
+ Map<Long, SrmInquiryDO> inquiryMap = inquiryIds.isEmpty() ? Map.of()
+ : inquiryMapper.selectBatchIds(inquiryIds).stream()
+ .collect(Collectors.toMap(SrmInquiryDO::getId, item -> item));
+
+ return bonds.stream().map(bond -> {
+ SrmBidBondRespVO respVO = BeanUtils.toBean(bond, SrmBidBondRespVO.class);
+ SrmSupplierDO supplier = supplierMap.get(bond.getSupplierId());
+ if (supplier != null) {
+ respVO.setSupplierName(supplier.getName());
+ }
+ SrmInquiryDO inquiry = inquiryMap.get(bond.getInquiryId());
+ if (inquiry != null) {
+ respVO.setInquiryNo(inquiry.getNo());
+ if (StrUtil.isBlank(respVO.getProjectName())) {
+ respVO.setProjectName(inquiry.getTitle());
+ }
+ }
+ if (bond.getPurchaseOrderId() != null) {
+ try {
+ ErpPurchaseOrderRespDTO order = erpPurchaseOrderApi.getPurchaseOrder(bond.getPurchaseOrderId())
+ .getCheckedData();
+ if (order != null) {
+ respVO.setPurchaseOrderNo(order.getNo());
+ }
+ } catch (Exception ex) {
+ log.warn("[buildRespList] 鑾峰彇閲囪喘璁㈠崟鍙峰け璐ワ紝purchaseOrderId={}", bond.getPurchaseOrderId(), ex);
+ }
+ }
+ return respVO;
+ }).collect(Collectors.toList());
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/certificate/SrmSupplierCertificateService.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/certificate/SrmSupplierCertificateService.java
deleted file mode 100644
index da43ede..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/certificate/SrmSupplierCertificateService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.certificate;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.srm.controller.admin.certificate.vo.SrmSupplierCertificatePageReqVO;
-import cn.iocoder.yudao.module.srm.controller.admin.certificate.vo.SrmSupplierCertificateSaveReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierCertificateDO;
-import jakarta.validation.Valid;
-
-import java.util.List;
-
-public interface SrmSupplierCertificateService {
-
- Long createCertificate(@Valid SrmSupplierCertificateSaveReqVO createReqVO);
- void updateCertificate(@Valid SrmSupplierCertificateSaveReqVO updateReqVO);
- void deleteCertificate(Long id);
- SrmSupplierCertificateDO getCertificate(Long id);
- PageResult<SrmSupplierCertificateDO> getCertificatePage(SrmSupplierCertificatePageReqVO pageReqVO);
- List<SrmSupplierCertificateDO> getCertificateListBySupplierId(Long supplierId);
- List<SrmSupplierCertificateDO> getExpiringCertificates();
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/certificate/SrmSupplierCertificateServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/certificate/SrmSupplierCertificateServiceImpl.java
deleted file mode 100644
index 78132f6..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/certificate/SrmSupplierCertificateServiceImpl.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.certificate;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.srm.controller.admin.certificate.vo.SrmSupplierCertificatePageReqVO;
-import cn.iocoder.yudao.module.srm.controller.admin.certificate.vo.SrmSupplierCertificateSaveReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierCertificateDO;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierCertificateMapper;
-import cn.iocoder.yudao.module.srm.enums.ErrorCodeConstants;
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
-import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-
-import java.time.LocalDate;
-import java.util.List;
-
-@Service
-@Validated
-public class SrmSupplierCertificateServiceImpl implements SrmSupplierCertificateService {
-
- /**
- * 璧勮川璇佷功闄勪欢鐨勪笟鍔¤褰曠被鍨嬶紝瀵瑰簲 {@link cn.iocoder.yudao.module.system.enums.storage.StorageRecordTypeEnum#SRM_SUPPLIER_CERTIFICATE}
- */
- public static final String CERTIFICATE_RECORD_TYPE = "srm_supplier_certificate";
-
- @Resource
- private SrmSupplierCertificateMapper certificateMapper;
-
- @Resource
- private StorageAttachmentApi storageAttachmentApi;
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public Long createCertificate(SrmSupplierCertificateSaveReqVO createReqVO) {
- SrmSupplierCertificateDO certificate = BeanUtils.toBean(createReqVO, SrmSupplierCertificateDO.class);
- updateStatus(certificate);
- certificateMapper.insert(certificate);
- // 缁戝畾璇佷功闄勪欢
- if (CollUtil.isNotEmpty(createReqVO.getBlobIds())) {
- storageAttachmentApi.bindAttachments("file", CERTIFICATE_RECORD_TYPE, certificate.getId(), createReqVO.getBlobIds());
- }
- return certificate.getId();
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updateCertificate(SrmSupplierCertificateSaveReqVO updateReqVO) {
- validateCertificateExists(updateReqVO.getId());
- SrmSupplierCertificateDO updateObj = BeanUtils.toBean(updateReqVO, SrmSupplierCertificateDO.class);
- updateStatus(updateObj);
- certificateMapper.updateById(updateObj);
- // 澧為噺鏇存柊璇佷功闄勪欢
- storageAttachmentApi.updateAttachments("file", CERTIFICATE_RECORD_TYPE, updateReqVO.getId(), updateReqVO.getBlobIds());
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deleteCertificate(Long id) {
- validateCertificateExists(id);
- // 鍒犻櫎璇佷功闄勪欢
- storageAttachmentApi.deleteAttachmentsByRecord(CERTIFICATE_RECORD_TYPE, id);
- certificateMapper.deleteById(id);
- }
-
- @Override
- public SrmSupplierCertificateDO getCertificate(Long id) {
- return certificateMapper.selectById(id);
- }
-
- @Override
- public PageResult<SrmSupplierCertificateDO> getCertificatePage(SrmSupplierCertificatePageReqVO pageReqVO) {
- return certificateMapper.selectPage(pageReqVO);
- }
-
- @Override
- public List<SrmSupplierCertificateDO> getCertificateListBySupplierId(Long supplierId) {
- return certificateMapper.selectListBySupplierId(supplierId);
- }
-
- @Override
- public List<SrmSupplierCertificateDO> getExpiringCertificates() {
- LocalDate now = LocalDate.now();
- return certificateMapper.selectExpiringList(now, now.plusDays(30));
- }
-
- private void validateCertificateExists(Long id) {
- if (certificateMapper.selectById(id) == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.CERTIFICATE_NOT_EXISTS);
- }
- }
-
- private void updateStatus(SrmSupplierCertificateDO certificate) {
- if (certificate.getValidEndDate() != null) {
- LocalDate now = LocalDate.now();
- if (certificate.getValidEndDate().isBefore(now)) {
- certificate.setStatus(1); // 宸茶繃鏈�
- } else if (certificate.getValidEndDate().isBefore(now.plusDays(30))) {
- certificate.setStatus(2); // 鍗冲皢杩囨湡
- } else {
- certificate.setStatus(0); // 鏈夋晥
- }
- }
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/evaluation/SrmSupplierEvaluationService.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/evaluation/SrmSupplierEvaluationService.java
deleted file mode 100644
index 6fcc93b..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/evaluation/SrmSupplierEvaluationService.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.evaluation;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.srm.controller.admin.evaluation.vo.SrmSupplierEvaluationPageReqVO;
-import cn.iocoder.yudao.module.srm.controller.admin.evaluation.vo.SrmSupplierEvaluationSaveReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierEvaluationDO;
-import jakarta.validation.Valid;
-
-/**
- * SRM 渚涘簲鍟嗙哗鏁堣瘎浠� Service 鎺ュ彛
- */
-public interface SrmSupplierEvaluationService {
-
- /**
- * 鍒涘缓缁╂晥璇勪环
- */
- Long createEvaluation(@Valid SrmSupplierEvaluationSaveReqVO createReqVO);
-
- /**
- * 鏇存柊缁╂晥璇勪环
- */
- void updateEvaluation(@Valid SrmSupplierEvaluationSaveReqVO updateReqVO);
-
- /**
- * 鍒犻櫎缁╂晥璇勪环
- */
- void deleteEvaluation(Long id);
-
- /**
- * 鑾峰彇缁╂晥璇勪环
- */
- SrmSupplierEvaluationDO getEvaluation(Long id);
-
- /**
- * 鍒嗛〉鏌ヨ缁╂晥璇勪环
- */
- PageResult<SrmSupplierEvaluationDO> getEvaluationPage(SrmSupplierEvaluationPageReqVO pageReqVO);
-
- /**
- * 璁$畻缁煎悎璇勫垎骞剁‘瀹氱瓑绾�
- * 缁煎悎璇勫垎 = 璐ㄩ噺*0.4 + 浜や粯*0.3 + 浠锋牸*0.2 + 鏈嶅姟*0.1
- * 绛夌骇: A>=90, B>=80, C>=70, D<70
- */
- void calculateCompositeScore(SrmSupplierEvaluationDO evaluation);
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/evaluation/SrmSupplierEvaluationServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/evaluation/SrmSupplierEvaluationServiceImpl.java
deleted file mode 100644
index 4f36e2f..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/evaluation/SrmSupplierEvaluationServiceImpl.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.evaluation;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.srm.controller.admin.evaluation.vo.SrmSupplierEvaluationPageReqVO;
-import cn.iocoder.yudao.module.srm.controller.admin.evaluation.vo.SrmSupplierEvaluationSaveReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierEvaluationDO;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierEvaluationMapper;
-import cn.iocoder.yudao.module.srm.enums.ErrorCodeConstants;
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDateTime;
-
-/**
- * SRM 渚涘簲鍟嗙哗鏁堣瘎浠� Service 瀹炵幇绫�
- */
-@Service
-@Validated
-public class SrmSupplierEvaluationServiceImpl implements SrmSupplierEvaluationService {
-
- @Resource
- private SrmSupplierEvaluationMapper evaluationMapper;
-
- @Override
- public Long createEvaluation(SrmSupplierEvaluationSaveReqVO createReqVO) {
- // 鏍¢獙鏄惁宸插瓨鍦ㄧ浉鍚屽懆鏈熺殑璇勪环
- SrmSupplierEvaluationDO existing = evaluationMapper.selectBySupplierAndPeriod(createReqVO.getSupplierId(), createReqVO.getEvaluationPeriod());
- if (existing != null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.EVALUATION_PERIOD_EXISTS);
- }
- SrmSupplierEvaluationDO evaluation = BeanUtils.toBean(createReqVO, SrmSupplierEvaluationDO.class);
- calculateCompositeScore(evaluation);
- evaluation.setEvaluationTime(LocalDateTime.now());
- evaluationMapper.insert(evaluation);
- return evaluation.getId();
- }
-
- @Override
- public void updateEvaluation(SrmSupplierEvaluationSaveReqVO updateReqVO) {
- validateEvaluationExists(updateReqVO.getId());
- SrmSupplierEvaluationDO updateObj = BeanUtils.toBean(updateReqVO, SrmSupplierEvaluationDO.class);
- calculateCompositeScore(updateObj);
- evaluationMapper.updateById(updateObj);
- }
-
- @Override
- public void deleteEvaluation(Long id) {
- validateEvaluationExists(id);
- evaluationMapper.deleteById(id);
- }
-
- @Override
- public SrmSupplierEvaluationDO getEvaluation(Long id) {
- return evaluationMapper.selectById(id);
- }
-
- @Override
- public PageResult<SrmSupplierEvaluationDO> getEvaluationPage(SrmSupplierEvaluationPageReqVO pageReqVO) {
- return evaluationMapper.selectPage(pageReqVO);
- }
-
- @Override
- public void calculateCompositeScore(SrmSupplierEvaluationDO evaluation) {
- BigDecimal quality = nvl(evaluation.getQualityScore());
- BigDecimal delivery = nvl(evaluation.getDeliveryScore());
- BigDecimal price = nvl(evaluation.getPriceScore());
- BigDecimal service = nvl(evaluation.getServiceScore());
-
- BigDecimal composite = quality.multiply(new BigDecimal("0.4"))
- .add(delivery.multiply(new BigDecimal("0.3")))
- .add(price.multiply(new BigDecimal("0.2")))
- .add(service.multiply(new BigDecimal("0.1")))
- .setScale(2, RoundingMode.HALF_UP);
-
- evaluation.setCompositeScore(composite);
-
- if (composite.compareTo(new BigDecimal("90")) >= 0) {
- evaluation.setEvaluationLevel("A");
- } else if (composite.compareTo(new BigDecimal("80")) >= 0) {
- evaluation.setEvaluationLevel("B");
- } else if (composite.compareTo(new BigDecimal("70")) >= 0) {
- evaluation.setEvaluationLevel("C");
- } else {
- evaluation.setEvaluationLevel("D");
- }
- }
-
- private void validateEvaluationExists(Long id) {
- if (evaluationMapper.selectById(id) == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.EVALUATION_NOT_EXISTS);
- }
- }
-
- private static BigDecimal nvl(BigDecimal value) {
- return value != null ? value : BigDecimal.ZERO;
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryService.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryService.java
new file mode 100644
index 0000000..c3d4a71
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryService.java
@@ -0,0 +1,60 @@
+package cn.iocoder.yudao.module.srm.service.inquiry;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.srm.controller.admin.inquiry.vo.*;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmInquiryDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
+
+/**
+ * SRM 璇环姣斾环 Service 鎺ュ彛
+ */
+public interface SrmInquiryService {
+
+ Long createInquiry(@Valid SrmInquirySaveReqVO createReqVO);
+
+ void updateInquiry(@Valid SrmInquirySaveReqVO updateReqVO);
+
+ void deleteInquiry(Long id);
+
+ SrmInquiryDO getInquiry(Long id);
+
+ /**
+ * 鑾峰彇璇环鍗曡鎯咃紙鍚骇鍝佽銆佸弬涓庝緵搴斿晢銆佹姤浠枫�佸凡鐢熸垚璁㈠崟锛�
+ */
+ SrmInquiryRespVO getInquiryDetail(Long id);
+
+ PageResult<SrmInquiryDO> getInquiryPage(SrmInquiryPageReqVO pageReqVO);
+
+ /**
+ * 鑾峰彇璇环鍗曠簿绠�鍒楄〃锛堢敤浜庢姇鏍囦繚璇侀噾绛変笅鎷夐�夋嫨锛�
+ */
+ List<SrmInquiryDO> getInquirySimpleList();
+
+ /**
+ * 鍙戝竷璇环鍗曪細鑽夌 -> 璇环涓�
+ */
+ void publishInquiry(Long id);
+
+ /**
+ * 鍙栨秷璇环鍗曪細鑽夌/璇环涓� -> 宸插彇娑�
+ */
+ void cancelInquiry(Long id);
+
+ /**
+ * 鎵归噺淇濆瓨鏌愪緵搴斿晢瀵硅浠峰崟鍚勪骇鍝佽鐨勬姤浠�
+ */
+ void saveQuotes(@Valid SrmInquiryQuoteSaveReqVO saveReqVO);
+
+ /**
+ * 瀵规瘮瑙嗗浘鏁版嵁锛堜骇鍝佽 脳 渚涘簲鍟嗘姤浠凤級
+ */
+ SrmInquiryRespVO getCompare(Long id);
+
+ /**
+ * 纭涓爣骞剁敓鎴愰噰璐鍗曡崏绋�
+ */
+ SrmInquiryConfirmRespVO confirmInquiry(@Valid SrmInquiryConfirmReqVO confirmReqVO);
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryServiceImpl.java
new file mode 100644
index 0000000..98f25c5
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryServiceImpl.java
@@ -0,0 +1,688 @@
+package cn.iocoder.yudao.module.srm.service.inquiry;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
+import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderCreateReqDTO;
+import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderRespDTO;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
+import cn.iocoder.yudao.module.srm.controller.admin.inquiry.vo.*;
+import cn.iocoder.yudao.module.srm.dal.dataobject.*;
+import cn.iocoder.yudao.module.srm.dal.mysql.*;
+import cn.iocoder.yudao.module.srm.enums.ErrorCodeConstants;
+import cn.iocoder.yudao.module.srm.enums.InquiryStatusEnum;
+import cn.iocoder.yudao.module.srm.service.supplier.SrmSupplierService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
+/**
+ * SRM 璇环姣斾环 Service 瀹炵幇
+ */
+@Service
+@Validated
+@Slf4j
+public class SrmInquiryServiceImpl implements SrmInquiryService {
+
+ private static final DateTimeFormatter NO_DATE_FORMAT = DateTimeFormatter.ofPattern("yyyyMM");
+
+ @Resource
+ private SrmInquiryMapper inquiryMapper;
+ @Resource
+ private SrmInquiryItemMapper inquiryItemMapper;
+ @Resource
+ private SrmInquirySupplierMapper inquirySupplierMapper;
+ @Resource
+ private SrmInquiryQuoteMapper inquiryQuoteMapper;
+ @Resource
+ private SrmInquiryOrderMapper inquiryOrderMapper;
+ @Resource
+ private SrmSupplierService supplierService;
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
+ @Resource
+ private ErpPurchaseOrderApi erpPurchaseOrderApi;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createInquiry(SrmInquirySaveReqVO createReqVO) {
+ validateInquiryInput(createReqVO);
+ SrmInquiryDO inquiry = new SrmInquiryDO();
+ inquiry.setNo(generateInquiryNo());
+ inquiry.setTitle(createReqVO.getTitle());
+ inquiry.setStatus(InquiryStatusEnum.DRAFT.getStatus());
+ inquiry.setInquiryDate(createReqVO.getInquiryDate() != null ? createReqVO.getInquiryDate() : LocalDate.now());
+ inquiry.setDeadline(createReqVO.getDeadline());
+ inquiry.setPurchaserUserId(createReqVO.getPurchaserUserId() != null
+ ? createReqVO.getPurchaserUserId() : getLoginUserId());
+ inquiry.setRemark(createReqVO.getRemark());
+ inquiryMapper.insert(inquiry);
+ List<SrmInquiryItemDO> items = saveItems(inquiry.getId(), createReqVO.getItems());
+ saveSuppliers(inquiry.getId(), createReqVO.getSuppliers());
+ saveItemQuotes(inquiry.getId(), items, createReqVO.getItems(),
+ createReqVO.getSuppliers().stream()
+ .map(SrmInquirySaveReqVO.Supplier::getSupplierId)
+ .collect(Collectors.toSet()));
+ return inquiry.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateInquiry(SrmInquirySaveReqVO updateReqVO) {
+ SrmInquiryDO inquiry = validateInquiryExists(updateReqVO.getId());
+ if (!InquiryStatusEnum.DRAFT.getStatus().equals(inquiry.getStatus())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_STATUS_NOT_EDITABLE.getCode(),
+ "璇环鍗曘��" + inquiry.getNo() + "銆戝綋鍓嶇姸鎬佷负銆�" + statusName(inquiry.getStatus())
+ + "銆戯紝浠呰崏绋跨姸鎬佸彲缂栬緫銆傚闇�璋冩暣浜у搧琛屾垨渚涘簲鍟嗭紝璇峰彇娑堝悗閲嶆柊鍒涘缓璇环鍗曘��");
+ }
+ validateInquiryInput(updateReqVO);
+
+ SrmInquiryDO updateObj = new SrmInquiryDO();
+ updateObj.setId(inquiry.getId());
+ updateObj.setTitle(updateReqVO.getTitle());
+ updateObj.setInquiryDate(updateReqVO.getInquiryDate());
+ updateObj.setDeadline(updateReqVO.getDeadline());
+ updateObj.setPurchaserUserId(updateReqVO.getPurchaserUserId());
+ updateObj.setRemark(updateReqVO.getRemark());
+ inquiryMapper.updateById(updateObj);
+
+ // 鑽夌闃舵鍏佽鏁翠綋鏇挎崲浜у搧琛屻�佷緵搴斿晢涓庢姤浠�
+ inquiryQuoteMapper.deleteByInquiryId(inquiry.getId());
+ inquiryItemMapper.deleteByInquiryId(inquiry.getId());
+ inquirySupplierMapper.deleteByInquiryId(inquiry.getId());
+ List<SrmInquiryItemDO> items = saveItems(inquiry.getId(), updateReqVO.getItems());
+ saveSuppliers(inquiry.getId(), updateReqVO.getSuppliers());
+ saveItemQuotes(inquiry.getId(), items, updateReqVO.getItems(),
+ updateReqVO.getSuppliers().stream()
+ .map(SrmInquirySaveReqVO.Supplier::getSupplierId)
+ .collect(Collectors.toSet()));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteInquiry(Long id) {
+ SrmInquiryDO inquiry = validateInquiryExists(id);
+ if (!InquiryStatusEnum.DRAFT.getStatus().equals(inquiry.getStatus())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_STATUS_NOT_EDITABLE.getCode(),
+ "璇环鍗曘��" + inquiry.getNo() + "銆戝綋鍓嶇姸鎬佷负銆�" + statusName(inquiry.getStatus())
+ + "銆戯紝浠呰崏绋跨姸鎬佸彲鍒犻櫎銆傚凡鍙戝竷鎴栧凡杞鍗曠殑璇环鍗曡鏀逛负鍙栨秷銆�");
+ }
+ inquiryItemMapper.deleteByInquiryId(id);
+ inquirySupplierMapper.deleteByInquiryId(id);
+ inquiryQuoteMapper.deleteByInquiryId(id);
+ inquiryMapper.deleteById(id);
+ }
+
+ @Override
+ public SrmInquiryDO getInquiry(Long id) {
+ return inquiryMapper.selectById(id);
+ }
+
+ @Override
+ public SrmInquiryRespVO getInquiryDetail(Long id) {
+ SrmInquiryDO inquiry = validateInquiryExists(id);
+ return buildInquiryResp(inquiry);
+ }
+
+ @Override
+ public PageResult<SrmInquiryDO> getInquiryPage(SrmInquiryPageReqVO pageReqVO) {
+ return inquiryMapper.selectPage(pageReqVO);
+ }
+
+ @Override
+ public List<SrmInquiryDO> getInquirySimpleList() {
+ return inquiryMapper.selectList(null).stream()
+ .filter(item -> !InquiryStatusEnum.CANCELLED.getStatus().equals(item.getStatus()))
+ .sorted(Comparator.comparing(SrmInquiryDO::getId).reversed())
+ .collect(Collectors.toList());
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void publishInquiry(Long id) {
+ SrmInquiryDO inquiry = validateInquiryExists(id);
+ if (!InquiryStatusEnum.DRAFT.getStatus().equals(inquiry.getStatus())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_STATUS_NOT_QUOTING.getCode(),
+ "璇环鍗曘��" + inquiry.getNo() + "銆戝綋鍓嶇姸鎬佷负銆�" + statusName(inquiry.getStatus())
+ + "銆戯紝浠呰崏绋跨姸鎬佸彲鍙戝竷銆�");
+ }
+ inquiryMapper.updateByIdAndStatus(id, InquiryStatusEnum.DRAFT.getStatus(),
+ new SrmInquiryDO().setStatus(InquiryStatusEnum.QUOTING.getStatus()));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void cancelInquiry(Long id) {
+ SrmInquiryDO inquiry = validateInquiryExists(id);
+ if (!InquiryStatusEnum.DRAFT.getStatus().equals(inquiry.getStatus())
+ && !InquiryStatusEnum.QUOTING.getStatus().equals(inquiry.getStatus())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_STATUS_NOT_CANCELLABLE.getCode(),
+ "璇环鍗曘��" + inquiry.getNo() + "銆戝綋鍓嶇姸鎬佷负銆�" + statusName(inquiry.getStatus())
+ + "銆戯紝浠呰崏绋挎垨璇环涓姸鎬佸彲鍙栨秷銆�");
+ }
+ inquiryMapper.updateById(new SrmInquiryDO()
+ .setId(id).setStatus(InquiryStatusEnum.CANCELLED.getStatus()));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saveQuotes(SrmInquiryQuoteSaveReqVO saveReqVO) {
+ SrmInquiryDO inquiry = validateInquiryExists(saveReqVO.getInquiryId());
+ if (!InquiryStatusEnum.DRAFT.getStatus().equals(inquiry.getStatus())
+ && !InquiryStatusEnum.QUOTING.getStatus().equals(inquiry.getStatus())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_STATUS_NOT_QUOTING.getCode(),
+ "璇环鍗曘��" + inquiry.getNo() + "銆戝綋鍓嶇姸鎬佷负銆�" + statusName(inquiry.getStatus())
+ + "銆戯紝浠呰崏绋挎垨璇环涓姸鎬佸彲褰曞叆鎶ヤ环銆�");
+ }
+ List<SrmInquiryItemDO> items = inquiryItemMapper.selectListByInquiryId(inquiry.getId());
+ Map<Long, SrmInquiryItemDO> itemMap = items.stream()
+ .collect(Collectors.toMap(SrmInquiryItemDO::getId, Function.identity()));
+ List<SrmInquirySupplierDO> participants = inquirySupplierMapper.selectListByInquiryId(inquiry.getId());
+ Set<Long> participantIds = participants.stream()
+ .map(SrmInquirySupplierDO::getSupplierId).collect(Collectors.toSet());
+
+ Set<Long> touchedSupplierIds = new HashSet<>();
+ for (SrmInquiryQuoteSaveReqVO.Quote quoteVO : saveReqVO.getQuotes()) {
+ SrmInquiryItemDO item = itemMap.get(quoteVO.getInquiryItemId());
+ if (item == null) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_QUOTE_NOT_EXISTS.getCode(),
+ "璇环浜у搧琛孖D=" + quoteVO.getInquiryItemId() + " 涓嶅睘浜庤浠峰崟銆�" + inquiry.getNo()
+ + "銆戯紝璇峰埛鏂版瘮浠烽〉闈㈠悗閲嶆柊褰曞叆鎶ヤ环銆�");
+ }
+ if (!participantIds.contains(quoteVO.getSupplierId())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_SUPPLIER_NOT_PARTICIPANT.getCode(),
+ "渚涘簲鍟咺D=" + quoteVO.getSupplierId() + " 鏈弬涓庤浠峰崟銆�" + inquiry.getNo()
+ + "銆戯紝璇峰厛鍦ㄨ浠峰崟涓坊鍔犺渚涘簲鍟嗐��");
+ }
+ SrmInquiryQuoteDO existing = inquiryQuoteMapper.selectByItemIdAndSupplierId(
+ quoteVO.getInquiryItemId(), quoteVO.getSupplierId());
+ if (quoteVO.getPrice() == null) {
+ // 娓呯┖鎶ヤ环
+ if (existing != null) {
+ inquiryQuoteMapper.deleteById(existing.getId());
+ touchedSupplierIds.add(quoteVO.getSupplierId());
+ }
+ continue;
+ }
+ if (quoteVO.getPrice().compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_QUOTE_PRICE_INVALID.getCode(),
+ "浜у搧銆�" + item.getProductName() + "銆戜緵搴斿晢ID=" + quoteVO.getSupplierId()
+ + " 鐨勬姤浠峰崟浠蜂负銆�" + quoteVO.getPrice() + "銆戯紝蹇呴』澶т簬 0锛岃淇敼鍚庨噸鏂颁繚瀛樸��");
+ }
+ SrmInquiryQuoteDO quote = BeanUtils.toBean(quoteVO, SrmInquiryQuoteDO.class);
+ quote.setInquiryId(inquiry.getId());
+ quote.setIsSelected(existing != null && Boolean.TRUE.equals(existing.getIsSelected()));
+ if (existing != null) {
+ quote.setId(existing.getId());
+ inquiryQuoteMapper.updateById(quote);
+ } else {
+ inquiryQuoteMapper.insert(quote);
+ }
+ touchedSupplierIds.add(quoteVO.getSupplierId());
+ }
+ // 鍒锋柊鍙備笌渚涘簲鍟嗘姤浠风姸鎬�
+ LocalDateTime now = LocalDateTime.now();
+ for (Long supplierId : touchedSupplierIds) {
+ SrmInquirySupplierDO participant = inquirySupplierMapper
+ .selectByInquiryIdAndSupplierId(inquiry.getId(), supplierId);
+ if (participant == null) {
+ continue;
+ }
+ Long quoteCount = inquiryQuoteMapper.selectCount(new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<SrmInquiryQuoteDO>()
+ .eq(SrmInquiryQuoteDO::getInquiryId, inquiry.getId())
+ .eq(SrmInquiryQuoteDO::getSupplierId, supplierId));
+ SrmInquirySupplierDO updateObj = new SrmInquirySupplierDO();
+ updateObj.setId(participant.getId());
+ updateObj.setQuoteStatus(quoteCount != null && quoteCount > 0 ? 10 : 0);
+ updateObj.setQuoteTime(now);
+ inquirySupplierMapper.updateById(updateObj);
+ }
+ }
+
+ @Override
+ public SrmInquiryRespVO getCompare(Long id) {
+ return getInquiryDetail(id);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public SrmInquiryConfirmRespVO confirmInquiry(SrmInquiryConfirmReqVO confirmReqVO) {
+ SrmInquiryDO inquiry = validateInquiryExists(confirmReqVO.getId());
+ if (!InquiryStatusEnum.DRAFT.getStatus().equals(inquiry.getStatus())
+ && !InquiryStatusEnum.QUOTING.getStatus().equals(inquiry.getStatus())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_STATUS_NOT_CONFIRMABLE.getCode(),
+ "璇环鍗曘��" + inquiry.getNo() + "銆戝綋鍓嶇姸鎬佷负銆�" + statusName(inquiry.getStatus())
+ + "銆戯紝浠呰崏绋挎垨璇环涓姸鎬佸彲纭杞鍗曘��");
+ }
+ List<SrmInquiryItemDO> items = inquiryItemMapper.selectListByInquiryId(inquiry.getId());
+ if (CollUtil.isEmpty(items)) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.INQUIRY_ITEM_EMPTY);
+ }
+ Map<Long, SrmInquiryItemDO> itemMap = items.stream()
+ .collect(Collectors.toMap(SrmInquiryItemDO::getId, Function.identity()));
+ Set<Long> participantIds = inquirySupplierMapper.selectListByInquiryId(inquiry.getId()).stream()
+ .map(SrmInquirySupplierDO::getSupplierId).collect(Collectors.toSet());
+ List<SrmInquiryQuoteDO> allQuotes = inquiryQuoteMapper.selectListByInquiryId(inquiry.getId());
+ Map<Long, SrmInquiryQuoteDO> quoteMap = allQuotes.stream()
+ .collect(Collectors.toMap(SrmInquiryQuoteDO::getId, Function.identity()));
+
+ // 1. 鏍¢獙姣忎釜浜у搧鎭板ソ閫夋嫨涓�鏉℃湁鏁堟姤浠�
+ // 鏈樉寮忎紶 selections 鏃讹紝浣跨敤璇环鍗曚腑宸蹭繚瀛樼殑涓爣閫夋嫨锛堝垱寤�/缂栬緫鏃朵竴骞跺綍鍏ワ級
+ List<SrmInquiryConfirmReqVO.Selection> selections = confirmReqVO.getSelections();
+ if (CollUtil.isEmpty(selections)) {
+ selections = new ArrayList<>();
+ for (SrmInquiryItemDO item : items) {
+ if (item.getSelectedQuoteId() != null) {
+ SrmInquiryConfirmReqVO.Selection selection = new SrmInquiryConfirmReqVO.Selection();
+ selection.setInquiryItemId(item.getId());
+ selection.setQuoteId(item.getSelectedQuoteId());
+ selections.add(selection);
+ }
+ }
+ if (CollUtil.isEmpty(selections)) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_WINNER_REQUIRED.getCode(),
+ "璇环鍗曘��" + inquiry.getNo() + "銆戝皻鏈繚瀛樹换浣曚腑鏍囬�夋嫨锛岃缂栬緫璇环鍗曚负姣忎釜浜у搧閫夋嫨涓爣渚涘簲鍟嗗悗鍐嶇‘璁ゃ��");
+ }
+ }
+ Map<Long, SrmInquiryQuoteDO> selectedByItem = new HashMap<>();
+ for (SrmInquiryConfirmReqVO.Selection selection : selections) {
+ SrmInquiryItemDO item = itemMap.get(selection.getInquiryItemId());
+ if (item == null) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_WINNER_QUOTE_MISMATCH.getCode(),
+ "璇环浜у搧琛孖D=" + selection.getInquiryItemId() + " 涓嶅睘浜庤浠峰崟銆�" + inquiry.getNo()
+ + "銆戯紝璇峰埛鏂版瘮浠烽〉闈㈠悗閲嶆柊閫夋嫨涓爣鎶ヤ环銆�");
+ }
+ if (selectedByItem.containsKey(item.getId())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_WINNER_DUPLICATE.getCode(),
+ "浜у搧銆�" + item.getProductName() + "銆戦�夋嫨浜嗗鏉′腑鏍囨姤浠凤紝璇蜂负姣忎釜浜у搧鍙繚鐣欎竴鏉′腑鏍囨姤浠枫��");
+ }
+ SrmInquiryQuoteDO quote = quoteMap.get(selection.getQuoteId());
+ if (quote == null) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_QUOTE_NOT_EXISTS.getCode(),
+ "涓爣鎶ヤ环ID=" + selection.getQuoteId() + " 涓嶅瓨鍦紝璇峰埛鏂版瘮浠烽〉闈㈠悗閲嶆柊閫夋嫨銆�");
+ }
+ if (!quote.getInquiryItemId().equals(item.getId())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_WINNER_QUOTE_MISMATCH.getCode(),
+ "浜у搧銆�" + item.getProductName() + "銆戦�夋嫨鐨勪腑鏍囨姤浠峰睘浜庝骇鍝佽ID=" + quote.getInquiryItemId()
+ + "锛岃閲嶆柊閫夋嫨璇ヤ骇鍝佽嚜宸辩殑鎶ヤ环銆�");
+ }
+ if (!participantIds.contains(quote.getSupplierId())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_SUPPLIER_NOT_PARTICIPANT.getCode(),
+ "渚涘簲鍟咺D=" + quote.getSupplierId() + " 鏈弬涓庤浠峰崟銆�" + inquiry.getNo()
+ + "銆戯紝鏃犳硶浣滀负涓爣渚涘簲鍟嗐��");
+ }
+ if (quote.getPrice() == null || quote.getPrice().compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_QUOTE_PRICE_INVALID.getCode(),
+ "浜у搧銆�" + item.getProductName() + "銆戠殑涓爣鎶ヤ环鍗曚环涓虹┖鎴栧皬浜庣瓑浜� 0锛岃鍏堝綍鍏ユ姤浠峰悗鍐嶇‘璁ゃ��");
+ }
+ selectedByItem.put(item.getId(), quote);
+ }
+ for (SrmInquiryItemDO item : items) {
+ if (!selectedByItem.containsKey(item.getId())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_WINNER_REQUIRED.getCode(),
+ "浜у搧銆�" + StrUtil.blankToDefault(item.getProductName(), "ID=" + item.getProductId())
+ + "銆戝皻鏈�夋嫨涓爣渚涘簲鍟嗭紝璇蜂负璇ヤ骇鍝侀�夋嫨涓�鏉′腑鏍囨姤浠峰悗鍐嶇‘璁ゃ��");
+ }
+ }
+
+ // 2. 璁板綍涓爣缁撴灉
+ for (SrmInquiryQuoteDO quote : allQuotes) {
+ if (Boolean.TRUE.equals(quote.getIsSelected())) {
+ inquiryQuoteMapper.updateById(new SrmInquiryQuoteDO().setId(quote.getId()).setIsSelected(false));
+ }
+ }
+ for (Map.Entry<Long, SrmInquiryQuoteDO> entry : selectedByItem.entrySet()) {
+ SrmInquiryItemDO item = itemMap.get(entry.getKey());
+ SrmInquiryQuoteDO quote = entry.getValue();
+ inquiryQuoteMapper.updateById(new SrmInquiryQuoteDO().setId(quote.getId()).setIsSelected(true));
+ inquiryItemMapper.updateById(new SrmInquiryItemDO()
+ .setId(item.getId())
+ .setSelectedSupplierId(quote.getSupplierId())
+ .setSelectedQuoteId(quote.getId())
+ .setSelectedPrice(quote.getPrice()));
+ }
+
+ // 3. 鎸変腑鏍囦緵搴斿晢鍒嗙粍鐢熸垚閲囪喘璁㈠崟鑽夌
+ Map<Long, List<QuoteWithItem>> winnersBySupplier = new LinkedHashMap<>();
+ for (Map.Entry<Long, SrmInquiryQuoteDO> entry : selectedByItem.entrySet()) {
+ QuoteWithItem pair = new QuoteWithItem(itemMap.get(entry.getKey()), entry.getValue());
+ winnersBySupplier.computeIfAbsent(entry.getValue().getSupplierId(), k -> new ArrayList<>()).add(pair);
+ }
+ Map<Long, SrmSupplierDO> supplierMap = supplierService.getSupplierMap(winnersBySupplier.keySet());
+ List<SrmInquiryConfirmRespVO.Order> orders = new ArrayList<>();
+ for (Map.Entry<Long, List<QuoteWithItem>> entry : winnersBySupplier.entrySet()) {
+ Long supplierId = entry.getKey();
+ SrmSupplierDO supplier = supplierMap.get(supplierId);
+ String supplierName = supplier != null ? supplier.getName() : "ID=" + supplierId;
+
+ List<ErpPurchaseOrderCreateReqDTO.Item> orderItems = new ArrayList<>();
+ for (QuoteWithItem pair : entry.getValue()) {
+ SrmInquiryItemDO item = pair.item;
+ SrmInquiryQuoteDO quote = pair.quote;
+ Long productUnitId = item.getProductUnitId();
+ if (productUnitId == null) {
+ MdmItemRespDTO mdmItem = mdmItemApi.getItem(item.getProductId()).getCheckedData();
+ productUnitId = mdmItem != null ? mdmItem.getUnitMeasureId() : null;
+ }
+ ErpPurchaseOrderCreateReqDTO.Item orderItem = new ErpPurchaseOrderCreateReqDTO.Item();
+ orderItem.setProductId(item.getProductId());
+ orderItem.setProductUnitId(productUnitId);
+ orderItem.setProductPrice(quote.getPrice());
+ orderItem.setCount(item.getQuantity());
+ orderItem.setTaxPercent(quote.getTaxRate());
+ orderItem.setRemark("SRM璇环 " + inquiry.getNo());
+ orderItem.setQcCheckFlag(false);
+ orderItems.add(orderItem);
+ }
+ ErpPurchaseOrderCreateReqDTO createReqDTO = new ErpPurchaseOrderCreateReqDTO();
+ createReqDTO.setSupplierId(supplierId);
+ createReqDTO.setOrderTime(LocalDateTime.now());
+ createReqDTO.setDiscountPercent(BigDecimal.ZERO);
+ createReqDTO.setDepositPrice(BigDecimal.ZERO);
+ createReqDTO.setSourceType(2);
+ createReqDTO.setSourceNo(inquiry.getNo());
+ createReqDTO.setSourceId(inquiry.getId());
+ createReqDTO.setRemark("SRM璇环鑷姩鐢熸垚锛岃浠峰崟鍙凤細" + inquiry.getNo());
+ createReqDTO.setItems(orderItems);
+
+ Long purchaseOrderId;
+ try {
+ purchaseOrderId = erpPurchaseOrderApi.createPurchaseOrderDraft(createReqDTO).getCheckedData();
+ } catch (Exception ex) {
+ log.error("[confirmInquiry] 璇环鍗�({}) 渚涘簲鍟�({}) 鐢熸垚閲囪喘璁㈠崟澶辫触", inquiry.getNo(), supplierId, ex);
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_ORDER_GENERATE_FAIL.getCode(),
+ "璇环鍗曘��" + inquiry.getNo() + "銆戜负渚涘簲鍟嗐��" + supplierName
+ + "銆戠敓鎴愰噰璐鍗曞け璐ワ細" + ex.getMessage() + "銆傝妫�鏌ヨ渚涘簲鍟嗕笌浜у搧璧勬枡鍚庨噸璇曘��");
+ }
+ String purchaseOrderNo = null;
+ try {
+ ErpPurchaseOrderRespDTO order = erpPurchaseOrderApi.getPurchaseOrder(purchaseOrderId).getCheckedData();
+ purchaseOrderNo = order != null ? order.getNo() : null;
+ } catch (Exception ex) {
+ log.warn("[confirmInquiry] 鑾峰彇閲囪喘璁㈠崟鍙峰け璐ワ紝purchaseOrderId={}", purchaseOrderId, ex);
+ }
+ inquiryOrderMapper.insert(SrmInquiryOrderDO.builder()
+ .inquiryId(inquiry.getId())
+ .supplierId(supplierId)
+ .purchaseOrderId(purchaseOrderId)
+ .purchaseOrderNo(purchaseOrderNo)
+ .build());
+
+ SrmInquiryConfirmRespVO.Order orderResult = new SrmInquiryConfirmRespVO.Order();
+ orderResult.setSupplierId(supplierId);
+ orderResult.setSupplierName(supplierName);
+ orderResult.setPurchaseOrderId(purchaseOrderId);
+ orderResult.setPurchaseOrderNo(purchaseOrderNo);
+ orders.add(orderResult);
+ }
+
+ // 4. 鏇存柊璇环鍗曚负宸茶浆璁㈠崟锛堢姸鎬佹潯浠舵洿鏂帮紝閬垮厤骞跺彂閲嶅鐢熸垚锛�
+ int updated = inquiryMapper.updateByIdAndStatus(inquiry.getId(), inquiry.getStatus(),
+ new SrmInquiryDO().setStatus(InquiryStatusEnum.CONFIRMED.getStatus()));
+ if (updated == 0) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.INQUIRY_ALREADY_CONFIRMED);
+ }
+ SrmInquiryConfirmRespVO result = new SrmInquiryConfirmRespVO();
+ result.setInquiryId(inquiry.getId());
+ result.setOrders(orders);
+ return result;
+ }
+
+ // ========== 缁勮 ==========
+
+ private SrmInquiryRespVO buildInquiryResp(SrmInquiryDO inquiry) {
+ SrmInquiryRespVO respVO = BeanUtils.toBean(inquiry, SrmInquiryRespVO.class);
+ List<SrmInquiryItemDO> items = inquiryItemMapper.selectListByInquiryId(inquiry.getId());
+ List<SrmInquirySupplierDO> participants = inquirySupplierMapper.selectListByInquiryId(inquiry.getId());
+ List<SrmInquiryQuoteDO> quotes = inquiryQuoteMapper.selectListByInquiryId(inquiry.getId());
+ List<SrmInquiryOrderDO> inquiryOrders = inquiryOrderMapper.selectListByInquiryId(inquiry.getId());
+
+ Set<Long> supplierIds = new HashSet<>();
+ participants.forEach(p -> supplierIds.add(p.getSupplierId()));
+ quotes.forEach(q -> supplierIds.add(q.getSupplierId()));
+ inquiryOrders.forEach(o -> supplierIds.add(o.getSupplierId()));
+ Map<Long, SrmSupplierDO> supplierMap = supplierService.getSupplierMap(supplierIds);
+
+ respVO.setItems(BeanUtils.toBean(items, SrmInquiryRespVO.Item.class));
+ respVO.setQuotes(BeanUtils.toBean(quotes, SrmInquiryRespVO.Quote.class));
+
+ List<SrmInquiryRespVO.Supplier> supplierVOs = BeanUtils.toBean(participants, SrmInquiryRespVO.Supplier.class);
+ supplierVOs.forEach(vo -> {
+ SrmSupplierDO supplier = supplierMap.get(vo.getSupplierId());
+ if (supplier != null) {
+ vo.setSupplierName(supplier.getName());
+ vo.setSupplierCode(supplier.getCode());
+ }
+ });
+ respVO.setSuppliers(supplierVOs);
+
+ List<SrmInquiryRespVO.Order> orderVOs = BeanUtils.toBean(inquiryOrders, SrmInquiryRespVO.Order.class);
+ orderVOs.forEach(vo -> {
+ SrmSupplierDO supplier = supplierMap.get(vo.getSupplierId());
+ if (supplier != null) {
+ vo.setSupplierName(supplier.getName());
+ }
+ });
+ respVO.setOrders(orderVOs);
+ return respVO;
+ }
+
+ // ========== 淇濆瓨杈呭姪 ==========
+
+ private void validateInquiryInput(SrmInquirySaveReqVO reqVO) {
+ if (CollUtil.isEmpty(reqVO.getItems())) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.INQUIRY_ITEM_EMPTY);
+ }
+ if (CollUtil.isEmpty(reqVO.getSuppliers())) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.INQUIRY_SUPPLIER_EMPTY);
+ }
+ Set<Long> productIds = new HashSet<>();
+ for (SrmInquirySaveReqVO.Item item : reqVO.getItems()) {
+ if (!productIds.add(item.getProductId())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_ITEM_EMPTY.getCode(),
+ "浜у搧ID=" + item.getProductId() + " 鍦ㄨ浠峰崟涓噸澶嶆坊鍔狅紝璇蜂负姣忎釜浜у搧鍙繚鐣欎竴琛屻��");
+ }
+ if (item.getQuantity() == null || item.getQuantity().compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_ITEM_EMPTY.getCode(),
+ "浜у搧銆�" + StrUtil.blankToDefault(item.getProductName(), "ID=" + item.getProductId())
+ + "銆戠殑閲囪喘鏁伴噺蹇呴』澶т簬 0锛岃濉啓鏁伴噺鍚庨噸鏂颁繚瀛樸��");
+ }
+ }
+ Set<Long> supplierIds = new HashSet<>();
+ for (SrmInquirySaveReqVO.Supplier supplier : reqVO.getSuppliers()) {
+ if (!supplierIds.add(supplier.getSupplierId())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_SUPPLIER_DUPLICATE.getCode(),
+ "渚涘簲鍟咺D=" + supplier.getSupplierId() + " 鍦ㄨ浠峰崟涓噸澶嶆坊鍔狅紝璇蜂负姣忎釜渚涘簲鍟嗗彧淇濈暀涓�琛屻��");
+ }
+ }
+ validateSuppliers(supplierIds);
+ }
+
+ private void validateSuppliers(Collection<Long> supplierIds) {
+ List<SrmSupplierDO> suppliers = supplierService.getSupplierList(supplierIds);
+ Map<Long, SrmSupplierDO> map = suppliers.stream()
+ .collect(Collectors.toMap(SrmSupplierDO::getId, Function.identity()));
+ for (Long supplierId : supplierIds) {
+ SrmSupplierDO supplier = map.get(supplierId);
+ if (supplier == null) {
+ throw new ServiceException(ErrorCodeConstants.SUPPLIER_NOT_EXISTS.getCode(),
+ "渚涘簲鍟咺D=" + supplierId + " 涓嶅瓨鍦紝璇峰埛鏂颁緵搴斿晢鍒楄〃鍚庨噸鏂伴�夋嫨銆�");
+ }
+ if (supplier.getStatus() != null && !CommonStatusEnum.ENABLE.getStatus().equals(supplier.getStatus())) {
+ throw new ServiceException(ErrorCodeConstants.SUPPLIER_NOT_ENABLE.getCode(),
+ "渚涘簲鍟嗐��" + supplier.getName() + "銆戝凡鍋滅敤锛岃鍏堝湪渚涘簲鍟嗘。妗堜腑鍚敤鍚庡啀鍙備笌璇环銆�");
+ }
+ }
+ }
+
+ private List<SrmInquiryItemDO> saveItems(Long inquiryId, List<SrmInquirySaveReqVO.Item> itemVOs) {
+ List<SrmInquiryItemDO> savedItems = new ArrayList<>();
+
+ Set<Long> productIds = itemVOs.stream().map(SrmInquirySaveReqVO.Item::getProductId)
+ .collect(Collectors.toSet());
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemList(productIds).getCheckedData().stream()
+ .collect(Collectors.toMap(MdmItemRespDTO::getId, Function.identity()));
+ Set<Long> unitIds = itemMap.values().stream().map(MdmItemRespDTO::getUnitMeasureId)
+ .filter(Objects::nonNull).collect(Collectors.toSet());
+ Map<Long, MdmUnitMeasureRespDTO> unitMap = unitIds.isEmpty() ? Collections.emptyMap()
+ : mdmUnitMeasureApi.getUnitMeasureMap(unitIds);
+
+ for (int i = 0; i < itemVOs.size(); i++) {
+ SrmInquirySaveReqVO.Item itemVO = itemVOs.get(i);
+ MdmItemRespDTO mdmItem = itemMap.get(itemVO.getProductId());
+ if (mdmItem == null) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_ITEM_EMPTY.getCode(),
+ "浜у搧ID=" + itemVO.getProductId() + " 涓嶅瓨鍦紝璇烽噸鏂伴�夋嫨浜у搧銆�");
+ }
+ SrmInquiryItemDO item = BeanUtils.toBean(itemVO, SrmInquiryItemDO.class);
+ item.setId(null);
+ item.setInquiryId(inquiryId);
+ item.setProductCode(StrUtil.blankToDefault(itemVO.getProductCode(), mdmItem.getCode()));
+ item.setProductName(StrUtil.blankToDefault(itemVO.getProductName(), mdmItem.getName()));
+ item.setProductSpec(StrUtil.blankToDefault(itemVO.getProductSpec(), mdmItem.getSpecification()));
+ Long productUnitId = itemVO.getProductUnitId() != null ? itemVO.getProductUnitId()
+ : mdmItem.getUnitMeasureId();
+ item.setProductUnitId(productUnitId);
+ if (StrUtil.isBlank(itemVO.getUnitName()) && productUnitId != null) {
+ MdmUnitMeasureRespDTO unit = unitMap.get(productUnitId);
+ item.setUnitName(unit != null ? unit.getName() : null);
+ }
+ item.setSort(i);
+ inquiryItemMapper.insert(item);
+ savedItems.add(item);
+ }
+ return savedItems;
+ }
+
+ /**
+ * 淇濆瓨浜у搧琛屾姤浠蜂笌涓爣閫夋嫨锛堝垱寤�/缂栬緫璇环鍗曟椂涓�骞跺啓鍏ワ級
+ */
+ private void saveItemQuotes(Long inquiryId, List<SrmInquiryItemDO> items,
+ List<SrmInquirySaveReqVO.Item> itemVOs, Set<Long> participantIds) {
+ for (int i = 0; i < items.size(); i++) {
+ SrmInquiryItemDO item = items.get(i);
+ SrmInquirySaveReqVO.Item itemVO = itemVOs.get(i);
+ String productLabel = StrUtil.blankToDefault(item.getProductName(), "ID=" + item.getProductId());
+ List<SrmInquirySaveReqVO.Quote> quoteVOs = itemVO.getQuotes() == null
+ ? Collections.emptyList() : itemVO.getQuotes();
+ Set<Long> quoteSupplierIds = new HashSet<>();
+ SrmInquiryQuoteDO selectedQuote = null;
+ for (SrmInquirySaveReqVO.Quote quoteVO : quoteVOs) {
+ if (!quoteSupplierIds.add(quoteVO.getSupplierId())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_SUPPLIER_DUPLICATE.getCode(),
+ "浜у搧銆�" + productLabel + "銆戠殑渚涘簲鍟咺D=" + quoteVO.getSupplierId()
+ + " 鎶ヤ环閲嶅锛岃涓烘瘡涓緵搴斿晢鍙繚鐣欎竴鏉℃姤浠枫��");
+ }
+ if (!participantIds.contains(quoteVO.getSupplierId())) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_SUPPLIER_NOT_PARTICIPANT.getCode(),
+ "渚涘簲鍟咺D=" + quoteVO.getSupplierId() + " 鏈弬涓庤浠峰崟锛屾棤娉曞綍鍏ヤ骇鍝併��"
+ + productLabel + "銆戠殑鎶ヤ环锛岃鍏堝湪鍙備笌渚涘簲鍟嗕腑娣诲姞璇ヤ緵搴斿晢銆�");
+ }
+ if (quoteVO.getPrice() == null || quoteVO.getPrice().compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_QUOTE_PRICE_INVALID.getCode(),
+ "浜у搧銆�" + productLabel + "銆戜緵搴斿晢ID=" + quoteVO.getSupplierId()
+ + " 鐨勬姤浠峰崟浠蜂负銆�" + quoteVO.getPrice() + "銆戯紝蹇呴』澶т簬 0锛岃淇敼鍚庨噸鏂颁繚瀛樸��");
+ }
+ boolean selected = itemVO.getSelectedSupplierId() != null
+ && itemVO.getSelectedSupplierId().equals(quoteVO.getSupplierId());
+ SrmInquiryQuoteDO quote = BeanUtils.toBean(quoteVO, SrmInquiryQuoteDO.class);
+ quote.setInquiryId(inquiryId);
+ quote.setInquiryItemId(item.getId());
+ quote.setIsSelected(selected);
+ inquiryQuoteMapper.insert(quote);
+ if (selected) {
+ selectedQuote = quote;
+ }
+ }
+ Long selectedSupplierId = itemVO.getSelectedSupplierId();
+ if (selectedSupplierId != null && selectedQuote == null) {
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_WINNER_QUOTE_MISMATCH.getCode(),
+ "浜у搧銆�" + productLabel + "銆戦�夋嫨鐨勪腑鏍囦緵搴斿晢ID=" + selectedSupplierId
+ + " 娌℃湁褰曞叆鎶ヤ环锛岃鍏堝~鍐欒渚涘簲鍟嗙殑鎶ヤ环锛屾垨鏀归�夊叾浠栧凡鎶ヤ环渚涘簲鍟嗐��");
+ }
+ if (selectedQuote != null) {
+ inquiryItemMapper.updateById(new SrmInquiryItemDO()
+ .setId(item.getId())
+ .setSelectedSupplierId(selectedQuote.getSupplierId())
+ .setSelectedQuoteId(selectedQuote.getId())
+ .setSelectedPrice(selectedQuote.getPrice()));
+ }
+ }
+ }
+
+ private void saveSuppliers(Long inquiryId, List<SrmInquirySaveReqVO.Supplier> supplierVOs) {
+ for (SrmInquirySaveReqVO.Supplier supplierVO : supplierVOs) {
+ inquirySupplierMapper.insert(SrmInquirySupplierDO.builder()
+ .inquiryId(inquiryId)
+ .supplierId(supplierVO.getSupplierId())
+ .quoteStatus(0)
+ .remark(supplierVO.getRemark())
+ .build());
+ }
+ }
+
+ // ========== 鏍¢獙 ==========
+
+ private SrmInquiryDO validateInquiryExists(Long id) {
+ SrmInquiryDO inquiry = inquiryMapper.selectById(id);
+ if (inquiry == null) {
+ throw ServiceExceptionUtil.exception(ErrorCodeConstants.INQUIRY_NOT_EXISTS);
+ }
+ return inquiry;
+ }
+
+ private String generateInquiryNo() {
+ String date = LocalDate.now().format(NO_DATE_FORMAT);
+ for (int attempt = 0; attempt < 20; attempt++) {
+ int seq = (int) (Math.random() * 9000) + 1000;
+ String no = "XJ" + date + String.format("%04d", seq);
+ if (inquiryMapper.selectByNo(no) == null) {
+ return no;
+ }
+ }
+ throw new ServiceException(ErrorCodeConstants.INQUIRY_NO_GENERATE_FAIL.getCode(),
+ "璇环鍗曞彿鍦ㄥ娆″皾璇曞悗浠嶉噸澶嶏紝璇风◢鍚庨噸璇曘��");
+ }
+
+ private String statusName(Integer status) {
+ for (InquiryStatusEnum e : InquiryStatusEnum.values()) {
+ if (e.getStatus().equals(status)) {
+ return e.getName();
+ }
+ }
+ return "鏈煡";
+ }
+
+ private static class QuoteWithItem {
+ private final SrmInquiryItemDO item;
+ private final SrmInquiryQuoteDO quote;
+
+ private QuoteWithItem(SrmInquiryItemDO item, SrmInquiryQuoteDO quote) {
+ this.item = item;
+ this.quote = quote;
+ }
+ }
+
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/statistics/SrmStatisticsService.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/statistics/SrmStatisticsService.java
deleted file mode 100644
index 4058e5a..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/statistics/SrmStatisticsService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.statistics;
-
-import cn.iocoder.yudao.module.srm.controller.admin.statistics.vo.SrmTenderStatisticsRespVO;
-
-/**
- * SRM 缁熻鍒嗘瀽 Service 鎺ュ彛
- */
-public interface SrmStatisticsService {
-
- /**
- * 鑾峰彇鎷涙爣缁熻鏁版嵁
- *
- * @param year 缁熻骞翠唤
- */
- SrmTenderStatisticsRespVO getTenderStatistics(String year);
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/statistics/SrmStatisticsServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/statistics/SrmStatisticsServiceImpl.java
deleted file mode 100644
index cb26dc4..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/statistics/SrmStatisticsServiceImpl.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.statistics;
-
-import cn.iocoder.yudao.module.srm.controller.admin.statistics.vo.SrmTenderStatisticsRespVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmBidAwardDO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderBidDO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderProjectDO;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmBidAwardMapper;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmTenderBidMapper;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmTenderProjectMapper;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Service
-public class SrmStatisticsServiceImpl implements SrmStatisticsService {
-
- @Resource
- private SrmTenderProjectMapper tenderProjectMapper;
- @Resource
- private SrmTenderBidMapper tenderBidMapper;
- @Resource
- private SrmBidAwardMapper bidAwardMapper;
-
- @Override
- public SrmTenderStatisticsRespVO getTenderStatistics(String year) {
- // 鏌ヨ褰撳勾鎵�鏈夋嫑鏍囬」鐩�
- List<SrmTenderProjectDO> projects = tenderProjectMapper.selectList(
- new LambdaQueryWrapperX<SrmTenderProjectDO>()
- .apply("YEAR(create_time) = {0}", year));
-
- // 鏌ヨ褰撳勾鎵�鏈夊畾鏍囪褰�
- List<SrmBidAwardDO> awards = bidAwardMapper.selectList(
- new LambdaQueryWrapperX<SrmBidAwardDO>()
- .apply("YEAR(create_time) = {0}", year));
-
- // 鏌ヨ褰撳勾鎵�鏈夋姇鏍囦緵搴斿晢鏁帮紙鍘婚噸锛�
- List<SrmTenderBidDO> bids = tenderBidMapper.selectList(
- new LambdaQueryWrapperX<SrmTenderBidDO>()
- .apply("YEAR(create_time) = {0}", year));
-
- long totalTenderCount = projects.size();
- //鎷涙爣鎬婚噾棰�(棰勭畻閲戦)
- BigDecimal totalTenderAmount = projects.stream()
- .map(p -> p.getBudgetAmount() != null ? p.getBudgetAmount() : BigDecimal.ZERO)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- //瀹氭爣鎬婚噾棰�(涓爣閲戦)
- BigDecimal totalAwardAmount = awards.stream()
- .map(a -> a.getAwardAmount() != null ? a.getAwardAmount() : BigDecimal.ZERO)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
-
- // 鑺傜害閲戦(浠呰绠楀綋骞村畾鏍囩殑椤圭洰鐨勶細棰勭畻閲戦 - 涓爣鎬婚噾棰�)
- BigDecimal savedAmount = BigDecimal.ZERO;
- if (!awards.isEmpty()) {
- // 鎸夐」鐩垎缁勬眹鎬讳腑鏍囬噾棰濓紙澶勭悊涓�涓」鐩彲鑳芥湁澶氫釜瀹氭爣璁板綍鐨勬儏鍐碉級
- java.util.Map<Long, BigDecimal> projectAwardSumMap = awards.stream()
- .collect(Collectors.groupingBy(
- SrmBidAwardDO::getTenderProjectId,
- Collectors.reducing(
- BigDecimal.ZERO,
- a -> a.getAwardAmount() != null ? a.getAwardAmount() : BigDecimal.ZERO,
- BigDecimal::add
- )
- ));
-
- List<Long> awardedProjectIds = new java.util.ArrayList<>(projectAwardSumMap.keySet());
- if (!awardedProjectIds.isEmpty()) {
- List<SrmTenderProjectDO> awardedProjects = tenderProjectMapper.selectBatchIds(awardedProjectIds);
- for (SrmTenderProjectDO project : awardedProjects) {
- BigDecimal budget = project.getBudgetAmount() != null ? project.getBudgetAmount() : BigDecimal.ZERO;
- // 澶勭悊鏁版嵁寮傚父锛氬鏋滈」鐩绠椾负 0 鎴栫┖锛岀洿鎺ヨ烦杩囪椤圭洰鐨勮妭绾﹂噾棰濊绠楋紝閬垮厤鐢变簬缂哄け棰勭畻瀵艰嚧鍑虹幇涓嶅悎鐞嗙殑宸ㄥぇ璐熸暟鑺傜害閲戦
- if (budget.compareTo(BigDecimal.ZERO) > 0) {
- BigDecimal awardSum = projectAwardSumMap.getOrDefault(project.getId(), BigDecimal.ZERO);
- savedAmount = savedAmount.add(budget.subtract(awardSum));
- }
- }
- }
- }
-
- long supplierCount = bids.stream()
- .map(SrmTenderBidDO::getSupplierId)
- .distinct()
- .count();
-
- // 瀹氭爣鐜� (褰撳勾鍒涘缓鐨勯」鐩腑锛岀洰鍓嶅凡缁忓畾鏍囩殑椤圭洰鏁� / 褰撳勾鍒涘缓鐨勯」鐩�绘暟)
- BigDecimal winRate = BigDecimal.ZERO;
- if (totalTenderCount > 0) {
- List<Long> projectIds = projects.stream().map(SrmTenderProjectDO::getId).collect(Collectors.toList());
- long awardedCount = 0;
- if (!projectIds.isEmpty()) {
- List<SrmBidAwardDO> matchedAwards = bidAwardMapper.selectList(new LambdaQueryWrapperX<SrmBidAwardDO>()
- .in(SrmBidAwardDO::getTenderProjectId, projectIds)
- .select(SrmBidAwardDO::getTenderProjectId));
- awardedCount = matchedAwards.stream()
- .map(SrmBidAwardDO::getTenderProjectId)
- .distinct()
- .count();
- }
- winRate = BigDecimal.valueOf(awardedCount)
- .multiply(BigDecimal.valueOf(100))
- .divide(BigDecimal.valueOf(totalTenderCount), 1, RoundingMode.HALF_UP);
- }
-
- SrmTenderStatisticsRespVO vo = new SrmTenderStatisticsRespVO();
- vo.setTotalTenderCount(totalTenderCount);
- vo.setTotalTenderAmount(totalTenderAmount);
- vo.setTotalAwardAmount(totalAwardAmount);
- vo.setSavedAmount(savedAmount);
- vo.setWinRate(winRate);
- vo.setSupplierCount(supplierCount);
- vo.setPeriod(year);
- return vo;
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/supplier/SrmSupplierService.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/supplier/SrmSupplierService.java
index d73b842..b039625 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/supplier/SrmSupplierService.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/supplier/SrmSupplierService.java
@@ -5,6 +5,8 @@
import cn.iocoder.yudao.module.srm.controller.admin.supplier.vo.SrmSupplierImportRespVO;
import cn.iocoder.yudao.module.srm.controller.admin.supplier.vo.SrmSupplierPageReqVO;
import cn.iocoder.yudao.module.srm.controller.admin.supplier.vo.SrmSupplierSaveReqVO;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierBankDO;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierContactDO;
import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierDO;
import jakarta.validation.Valid;
@@ -38,6 +40,16 @@
SrmSupplierDO getSupplier(Long id);
/**
+ * 鑾峰彇渚涘簲鍟嗚仈绯讳汉鍒楄〃锛堟寜鎺掑簭杩斿洖锛�
+ */
+ List<SrmSupplierContactDO> getSupplierContactList(Long supplierId);
+
+ /**
+ * 鑾峰彇渚涘簲鍟嗛摱琛岃处鎴峰垪琛紙鎸夋帓搴忚繑鍥烇級
+ */
+ List<SrmSupplierBankDO> getSupplierBankList(Long supplierId);
+
+ /**
* 鍒嗛〉鏌ヨ渚涘簲鍟�
*/
PageResult<SrmSupplierDO> getSupplierPage(SrmSupplierPageReqVO pageReqVO);
@@ -52,12 +64,12 @@
SrmSupplierImportRespVO importSupplierList(List<SrmSupplierImportExcelVO> importList, Boolean updateSupport);
/**
- * 鑾峰彇渚涘簲鍟嗗垪琛紙浠呰繑鍥炲凡閫氳繃鍑嗗叆瀹℃壒鐨勪緵搴斿晢锛岀敤浜庝笅鎷夐�夋嫨锛�
+ * 鑾峰彇鍚敤鐘舵�佺殑渚涘簲鍟嗗垪琛紝鐢ㄤ簬涓氬姟涓嬫媺閫夋嫨
*/
List<SrmSupplierDO> getSupplierSimpleList();
/**
- * 鑾峰彇鍏ㄩ儴渚涘簲鍟嗘。妗堝垪琛紙涓嶈繃婊ゅ噯鍏ョ姸鎬侊紝鐢ㄤ簬鎶曟爣閫夋嫨渚涘簲鍟嗭級
+ * 鑾峰彇鍏ㄩ儴渚涘簲鍟嗘。妗堝垪琛紙鎺掗櫎鍋滅敤渚涘簲鍟嗭級
*/
List<SrmSupplierDO> getSupplierAllList();
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/supplier/SrmSupplierServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/supplier/SrmSupplierServiceImpl.java
index 5cc8fc5..a7e42c9 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/supplier/SrmSupplierServiceImpl.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/supplier/SrmSupplierServiceImpl.java
@@ -9,26 +9,26 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.operatelog.core.util.OperateLogUtils;
-import cn.iocoder.yudao.module.srm.controller.admin.supplier.vo.SrmSupplierImportExcelVO;
-import cn.iocoder.yudao.module.srm.controller.admin.supplier.vo.SrmSupplierImportRespVO;
-import cn.iocoder.yudao.module.srm.controller.admin.supplier.vo.SrmSupplierPageReqVO;
-import cn.iocoder.yudao.module.srm.controller.admin.supplier.vo.SrmSupplierSaveReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.*;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmBidAwardMapper;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmBidEvaluationMapper;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierApplyMapper;
+import cn.iocoder.yudao.module.srm.controller.admin.supplier.vo.*;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierBankDO;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierContactDO;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierDO;
+import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierReferenceApi;
+import cn.iocoder.yudao.module.srm.dal.mysql.SrmBidBondMapper;
+import cn.iocoder.yudao.module.srm.dal.mysql.SrmInquiryOrderMapper;
+import cn.iocoder.yudao.module.srm.dal.mysql.SrmInquiryQuoteMapper;
+import cn.iocoder.yudao.module.srm.dal.mysql.SrmInquirySupplierMapper;
+import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierBankMapper;
import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierCategoryMapper;
import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierContactMapper;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierCertificateMapper;
import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierMapper;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmTenderBidMapper;
import cn.iocoder.yudao.module.srm.enums.ErrorCodeConstants;
import cn.iocoder.yudao.module.srm.enums.SupplierTypeEnum;
import com.mzt.logapi.starter.annotation.LogRecord;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
import java.util.ArrayList;
@@ -36,7 +36,7 @@
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
-import java.util.Map;
+import java.util.Objects;
import static cn.iocoder.yudao.module.srm.enums.LogRecordConstants.*;
@@ -51,34 +51,43 @@
private SrmSupplierContactMapper supplierContactMapper;
@Resource
+ private SrmSupplierBankMapper supplierBankMapper;
+
+ @Resource
private SrmSupplierCategoryMapper supplierCategoryMapper;
@Resource
- private SrmSupplierApplyMapper supplierApplyMapper;
+ private SrmInquirySupplierMapper inquirySupplierMapper;
@Resource
- private SrmSupplierCertificateMapper supplierCertificateMapper;
+ private SrmInquiryQuoteMapper inquiryQuoteMapper;
@Resource
- private SrmTenderBidMapper tenderBidMapper;
+ private SrmInquiryOrderMapper inquiryOrderMapper;
@Resource
- private SrmBidEvaluationMapper bidEvaluationMapper;
+ private SrmBidBondMapper bidBondMapper;
@Resource
- private SrmBidAwardMapper bidAwardMapper;
+ private ErpSupplierReferenceApi erpSupplierReferenceApi;
@Override
+ @Transactional(rollbackFor = Exception.class)
public Long createSupplier(SrmSupplierSaveReqVO createReqVO) {
// 鏍¢獙渚涘簲鍟嗙紪鐮佸敮涓�鎬�
validateCodeUnique(createReqVO.getCode(), null);
// 鎻掑叆
SrmSupplierDO supplier = BeanUtils.toBean(createReqVO, SrmSupplierDO.class);
+ fillDefaultContactAndBankFromFlatFields(createReqVO);
supplierMapper.insert(supplier);
+ saveContacts(supplier.getId(), createReqVO.getContacts());
+ saveBanks(supplier.getId(), createReqVO.getBanks());
+ syncSupplierDefaultFields(supplier.getId(), createReqVO.getContacts(), createReqVO.getBanks());
return supplier.getId();
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void updateSupplier(SrmSupplierSaveReqVO updateReqVO) {
// 鏍¢獙瀛樺湪鎬�
validateSupplierExists(updateReqVO.getId());
@@ -87,17 +96,47 @@
// 鏇存柊
SrmSupplierDO updateObj = BeanUtils.toBean(updateReqVO, SrmSupplierDO.class);
supplierMapper.updateById(updateObj);
+ // 鍒楄〃浼� null 琛ㄧず涓嶄慨鏀癸紱浼犵┖鍒楄〃琛ㄧず娓呯┖
+ if (updateReqVO.getContacts() != null) {
+ saveContacts(updateReqVO.getId(), updateReqVO.getContacts());
+ }
+ if (updateReqVO.getBanks() != null) {
+ saveBanks(updateReqVO.getId(), updateReqVO.getBanks());
+ }
+ syncSupplierDefaultFields(updateReqVO.getId(), updateReqVO.getContacts(), updateReqVO.getBanks());
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteSupplier(Long id) {
// 鏍¢獙瀛樺湪鎬�
- validateSupplierExists(id);
- // 鍏宠仈鏁版嵁瀛樺湪鏃讹紝涓嶅厑璁稿垹闄�
- validateNoReference(id);
+ SrmSupplierDO supplier = validateSupplierExists(id);
+ // 鏍¢獙涓氬姟寮曠敤锛氳浠枫�佷繚璇侀噾銆丒RP 閲囪喘/浠樻绛夊崟鎹�
+ List<String> references = new ArrayList<>();
+ if (inquirySupplierMapper.selectCountBySupplierId(id) > 0) {
+ references.add("SRM璇环鍗�");
+ }
+ if (inquiryQuoteMapper.selectCountBySupplierId(id) > 0) {
+ references.add("SRM璇环鎶ヤ环");
+ }
+ if (inquiryOrderMapper.selectCountBySupplierId(id) > 0) {
+ references.add("SRM璇环杞噰璐鍗曡褰�");
+ }
+ if (bidBondMapper.selectCountBySupplierId(id) > 0) {
+ references.add("SRM鎶曟爣淇濊瘉閲�");
+ }
+ List<String> erpSources = erpSupplierReferenceApi.getSupplierReferenceSources(id).getCheckedData();
+ if (CollUtil.isNotEmpty(erpSources)) {
+ references.addAll(erpSources);
+ }
+ if (!references.isEmpty()) {
+ throw new ServiceException(ErrorCodeConstants.SUPPLIER_EXISTS_REFERENCE.getCode(),
+ "渚涘簲鍟嗐��" + supplier.getName() + "銆戝凡琚笟鍔″紩鐢紙" + String.join("銆�", references)
+ + "锛夛紝鏃犳硶鍒犻櫎銆傝鍏堝鐞嗙浉鍏冲崟鎹紝鎴栧皢渚涘簲鍟嗙姸鎬佹敼涓哄仠鐢ㄣ��");
+ }
// 鍙洿鎺ユ竻鐞嗙殑鍏宠仈鏁版嵁
supplierContactMapper.deleteBySupplierId(id);
+ supplierBankMapper.deleteBySupplierId(id);
supplierCategoryMapper.deleteBySupplierId(id);
// 閫昏緫鍒犻櫎
supplierMapper.deleteById(id);
@@ -106,6 +145,16 @@
@Override
public SrmSupplierDO getSupplier(Long id) {
return supplierMapper.selectById(id);
+ }
+
+ @Override
+ public List<SrmSupplierContactDO> getSupplierContactList(Long supplierId) {
+ return supplierContactMapper.selectListBySupplierId(supplierId);
+ }
+
+ @Override
+ public List<SrmSupplierBankDO> getSupplierBankList(Long supplierId) {
+ return supplierBankMapper.selectListBySupplierId(supplierId);
}
@Override
@@ -162,13 +211,14 @@
@Override
public List<SrmSupplierDO> getSupplierSimpleList() {
- return supplierMapper.selectApprovedList();
+ // 鍑嗗叆鍔熻兘宸茬Щ闄わ紝涓嬫媺閫夋嫨缁熶竴杩斿洖鍚敤鐨勪緵搴斿晢
+ return supplierMapper.selectListByStatus(CommonStatusEnum.ENABLE.getStatus());
}
@Override
public List<SrmSupplierDO> getSupplierAllList() {
return supplierMapper.selectList(new LambdaQueryWrapperX<SrmSupplierDO>()
- // 杩囨护鍋滅敤渚涘簲鍟嗭紝淇濈暀鏈缃姸鎬佷笌鍚敤鐘舵�佺殑妗f渚涘簲鍟嗭紙浠呯敤浜庢嫑鎶曟爣鍦烘櫙锛�
+ // 杩囨护鍋滅敤渚涘簲鍟嗭紝淇濈暀鏈缃姸鎬佷笌鍚敤鐘舵�佺殑妗f渚涘簲鍟�
.and(w -> w.isNull(SrmSupplierDO::getStatus)
.or()
.ne(SrmSupplierDO::getStatus, CommonStatusEnum.DISABLE.getStatus()))
@@ -181,6 +231,124 @@
return Collections.emptyList();
}
return supplierMapper.selectBatchIds(ids);
+ }
+
+ // ========== 鑱旂郴浜� / 閾惰璐︽埛 ==========
+
+ /**
+ * 瀵煎叆鍦烘櫙娌℃湁鑱旂郴浜哄垪琛ㄦ椂锛岀敤涓昏〃鎵佸钩瀛楁鐢熸垚涓�鏉¢粯璁よ仈绯讳汉
+ */
+ private void fillDefaultContactAndBankFromFlatFields(SrmSupplierSaveReqVO reqVO) {
+ if (reqVO.getContacts() == null && StrUtil.isNotBlank(reqVO.getContactName())) {
+ SrmSupplierContactSaveReqVO contact = new SrmSupplierContactSaveReqVO();
+ contact.setName(reqVO.getContactName());
+ contact.setMobile(reqVO.getContactMobile());
+ contact.setEmail(reqVO.getContactEmail());
+ contact.setIsDefault(Boolean.TRUE);
+ reqVO.setContacts(Collections.singletonList(contact));
+ }
+ if (reqVO.getBanks() == null
+ && (StrUtil.isNotBlank(reqVO.getBankName()) || StrUtil.isNotBlank(reqVO.getBankAccount()))) {
+ SrmSupplierBankSaveReqVO bank = new SrmSupplierBankSaveReqVO();
+ bank.setBankName(reqVO.getBankName());
+ bank.setBankAccount(reqVO.getBankAccount());
+ bank.setIsDefault(Boolean.TRUE);
+ reqVO.setBanks(Collections.singletonList(bank));
+ }
+ }
+
+ private void saveContacts(Long supplierId, List<SrmSupplierContactSaveReqVO> contacts) {
+ supplierContactMapper.deleteBySupplierId(supplierId);
+ if (CollUtil.isEmpty(contacts)) {
+ return;
+ }
+ for (int i = 0; i < contacts.size(); i++) {
+ SrmSupplierContactSaveReqVO vo = contacts.get(i);
+ if (StrUtil.isBlank(vo.getName())) {
+ throw new ServiceException(ErrorCodeConstants.SUPPLIER_CONTACT_NAME_REQUIRED.getCode(),
+ "绗� " + (i + 1) + " 涓仈绯讳汉鐨勫鍚嶄笉鑳戒负绌猴紝璇峰~鍐欒仈绯讳汉濮撳悕鍚庨噸鏂颁繚瀛�");
+ }
+ }
+ int defaultIndex = resolveDefaultIndex(contacts.size(),
+ contacts.stream().map(SrmSupplierContactSaveReqVO::getIsDefault).toList());
+ for (int i = 0; i < contacts.size(); i++) {
+ SrmSupplierContactDO contact = BeanUtils.toBean(contacts.get(i), SrmSupplierContactDO.class);
+ contact.setId(null);
+ contact.setSupplierId(supplierId);
+ contact.setSort(i);
+ contact.setIsDefault(i == defaultIndex);
+ supplierContactMapper.insert(contact);
+ }
+ }
+
+ private void saveBanks(Long supplierId, List<SrmSupplierBankSaveReqVO> banks) {
+ supplierBankMapper.deleteBySupplierId(supplierId);
+ if (CollUtil.isEmpty(banks)) {
+ return;
+ }
+ for (int i = 0; i < banks.size(); i++) {
+ SrmSupplierBankSaveReqVO vo = banks.get(i);
+ if (StrUtil.isBlank(vo.getBankName()) || StrUtil.isBlank(vo.getBankAccount())) {
+ throw new ServiceException(ErrorCodeConstants.SUPPLIER_BANK_INFO_INCOMPLETE.getCode(),
+ "绗� " + (i + 1) + " 涓摱琛岃处鎴风殑寮�鎴疯鎴栭摱琛岃处鍙蜂负绌猴紝璇疯ˉ鍏ㄥ紑鎴疯鍜岄摱琛岃处鍙峰悗閲嶆柊淇濆瓨");
+ }
+ }
+ int defaultIndex = resolveDefaultIndex(banks.size(),
+ banks.stream().map(SrmSupplierBankSaveReqVO::getIsDefault).toList());
+ for (int i = 0; i < banks.size(); i++) {
+ SrmSupplierBankDO bank = BeanUtils.toBean(banks.get(i), SrmSupplierBankDO.class);
+ bank.setId(null);
+ bank.setSupplierId(supplierId);
+ bank.setSort(i);
+ bank.setIsDefault(i == defaultIndex);
+ supplierBankMapper.insert(bank);
+ }
+ }
+
+ /**
+ * 瑙f瀽榛樿椤癸細浼樺厛鍙栨爣璁颁簡榛樿鐨勭涓�鏉★紝鍚﹀垯鍙栫涓�鏉�
+ */
+ private int resolveDefaultIndex(int size, List<Boolean> defaults) {
+ for (int i = 0; i < size; i++) {
+ if (Boolean.TRUE.equals(defaults.get(i))) {
+ return i;
+ }
+ }
+ return 0;
+ }
+
+ /**
+ * 鎶婇粯璁よ仈绯讳汉/榛樿閾惰鍥炲啓涓昏〃鎵佸钩瀛楁锛屽吋瀹瑰垪琛ㄣ�佹悳绱笌瀵煎叆瀵煎嚭
+ */
+ private void syncSupplierDefaultFields(Long supplierId, List<SrmSupplierContactSaveReqVO> contacts,
+ List<SrmSupplierBankSaveReqVO> banks) {
+ SrmSupplierDO updateObj = new SrmSupplierDO();
+ updateObj.setId(supplierId);
+ boolean changed = false;
+ if (contacts != null) {
+ SrmSupplierContactSaveReqVO defaultContact = pickDefault(contacts, SrmSupplierContactSaveReqVO::getIsDefault);
+ updateObj.setContactName(defaultContact == null ? null : defaultContact.getName());
+ updateObj.setContactMobile(defaultContact == null ? null : defaultContact.getMobile());
+ updateObj.setContactEmail(defaultContact == null ? null : defaultContact.getEmail());
+ changed = true;
+ }
+ if (banks != null) {
+ SrmSupplierBankSaveReqVO defaultBank = pickDefault(banks, SrmSupplierBankSaveReqVO::getIsDefault);
+ updateObj.setBankName(defaultBank == null ? null : defaultBank.getBankName());
+ updateObj.setBankAccount(defaultBank == null ? null : defaultBank.getBankAccount());
+ changed = true;
+ }
+ if (changed) {
+ supplierMapper.updateById(updateObj);
+ }
+ }
+
+ private <T> T pickDefault(List<T> list, java.util.function.Function<T, Boolean> isDefault) {
+ if (CollUtil.isEmpty(list)) {
+ return null;
+ }
+ return list.stream().filter(item -> Boolean.TRUE.equals(isDefault.apply(item)))
+ .findFirst().orElse(list.get(0));
}
// ========== 瀵煎叆杈呭姪鏂规硶 ==========
@@ -243,27 +411,18 @@
// ========== 鏍¢獙鏂规硶 ==========
- private void validateSupplierExists(Long id) {
- if (supplierMapper.selectById(id) == null) {
+ private SrmSupplierDO validateSupplierExists(Long id) {
+ SrmSupplierDO supplier = supplierMapper.selectById(id);
+ if (supplier == null) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.SUPPLIER_NOT_EXISTS);
}
+ return supplier;
}
private void validateCodeUnique(String code, Long id) {
SrmSupplierDO existing = supplierMapper.selectByCode(code);
- if (existing != null && !existing.getId().equals(id)) {
+ if (existing != null && !Objects.equals(existing.getId(), id)) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.SUPPLIER_CODE_EXISTS);
- }
- }
-
- private void validateNoReference(Long id) {
- boolean hasReference = supplierApplyMapper.existsApprovedBySupplierId(id)
- || supplierCertificateMapper.selectCount(SrmSupplierCertificateDO::getSupplierId, id) > 0
- || tenderBidMapper.selectCount(SrmTenderBidDO::getSupplierId, id) > 0
- || bidEvaluationMapper.selectCount(SrmBidEvaluationDO::getSupplierId, id) > 0
- || bidAwardMapper.selectCount(SrmBidAwardDO::getSupplierId, id) > 0;
- if (hasReference) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.SUPPLIER_EXISTS_REFERENCE);
}
}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardService.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardService.java
deleted file mode 100644
index d27fd62..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.tender;
-
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmBidAwardSaveReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmBidAwardDO;
-import jakarta.validation.Valid;
-
-/**
- * SRM 瀹氭爣绠$悊 Service 鎺ュ彛
- */
-public interface SrmBidAwardService {
-
- /**
- * 鍒涘缓瀹氭爣
- */
- Long createAward(@Valid SrmBidAwardSaveReqVO createReqVO);
-
- /**
- * 鑾峰彇瀹氭爣璁板綍
- */
- SrmBidAwardDO getAward(Long id);
-
- /**
- * 鏍规嵁鎷涙爣椤圭洰ID鑾峰彇瀹氭爣璁板綍
- */
- SrmBidAwardDO getAwardByProjectId(Long tenderProjectId);
-
- /**
- * 鍒犻櫎瀹氭爣
- */
- void deleteAward(Long id);
-
- /**
- * 瀹℃壒瀹氭爣
- */
- void approveAward(Long id);
-
- /**
- * 鐢熸垚閲囪喘璁㈠崟锛堥鐣欐帴鍙o級
- */
- void generatePurchaseOrder(Long id);
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardServiceImpl.java
deleted file mode 100644
index a65fc6d..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidAwardServiceImpl.java
+++ /dev/null
@@ -1,277 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.tender;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
-import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderCreateReqDTO;
-import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
-import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmBidAwardSaveReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.*;
-import cn.iocoder.yudao.module.srm.dal.mysql.*;
-import cn.iocoder.yudao.module.srm.enums.AwardStatusEnum;
-import cn.iocoder.yudao.module.srm.enums.BidStatusEnum;
-import cn.iocoder.yudao.module.srm.enums.ErrorCodeConstants;
-import cn.iocoder.yudao.module.srm.enums.TenderStatusEnum;
-import cn.iocoder.yudao.module.srm.service.apply.SrmSupplierApplyService;
-import com.mzt.logapi.starter.annotation.LogRecord;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import static cn.iocoder.yudao.module.srm.enums.LogRecordConstants.*;
-
-/**
- * SRM 瀹氭爣绠$悊 Service 瀹炵幇绫�
- */
-@Service
-@Validated
-@Slf4j
-public class SrmBidAwardServiceImpl implements SrmBidAwardService {
-
- @Resource
- private SrmBidAwardMapper bidAwardMapper;
-
- @Resource
- private SrmTenderBidMapper tenderBidMapper;
-
- @Resource
- private SrmTenderProjectMapper tenderProjectMapper;
-
- @Resource
- private SrmSupplierMapper supplierMapper;
-
- @Resource
- private SrmTenderMaterialMapper tenderMaterialMapper;
-
- @Resource
- private SrmSupplierQuoteMapper supplierQuoteMapper;
-
- @Resource
- private MdmItemApi mdmItemApi;
-
- @Resource
- private ErpPurchaseOrderApi erpPurchaseOrderApi;
-
- @Resource
- private SrmSupplierApplyService supplierApplyService;
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- @LogRecord(type = LOG_AWARD_TYPE, subType = LOG_AWARD_CREATE_SUB_TYPE,
- bizNo = "{{#createReqVO.awardNo}}", success = LOG_AWARD_CREATE_SUCCESS)
- public Long createAward(SrmBidAwardSaveReqVO createReqVO) {
- // 妫�鏌ユ嫑鏍囬」鐩姸鎬侊細浠� EVALUATING 鍏佽鍒涘缓瀹氭爣
- SrmTenderProjectDO project = tenderProjectMapper.selectById(createReqVO.getTenderProjectId());
- if (project == null || !TenderStatusEnum.canAward(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_AWARD_FORBIDDEN);
- }
- // 鏍¢獙鏄惁宸插瓨鍦ㄥ畾鏍�
- SrmBidAwardDO existing = bidAwardMapper.selectByTenderProjectId(createReqVO.getTenderProjectId());
- if (existing != null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_SUPPLIER_EXISTS);
- }
- // 鏍¢獙鎶曟爣璁板綍锛氬繀椤诲睘浜庤椤圭洰銆佹湭琚挙鏍囥�佷笖渚涘簲鍟嗕竴鑷�
- SrmTenderBidDO bid = tenderBidMapper.selectById(createReqVO.getBidId());
- if (bid == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.BID_NOT_EXISTS);
- }
- if (!bid.getTenderProjectId().equals(createReqVO.getTenderProjectId())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_BID_NOT_IN_PROJECT);
- }
- if (BidStatusEnum.WITHDRAWN.getCode().equals(bid.getBidStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_BID_WITHDRAWN);
- }
- if (!bid.getSupplierId().equals(createReqVO.getSupplierId())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_SUPPLIER_NOT_MATCH_BID);
- }
- SrmBidAwardDO award = BeanUtils.toBean(createReqVO, SrmBidAwardDO.class);
- award.setAwardStatus(AwardStatusEnum.PENDING_APPROVAL.getCode());
- award.setAwardTime(LocalDateTime.now());
- bidAwardMapper.insert(award);
-
- // 鏇存柊鎶曟爣鐘舵�佷负涓爣
- bid.setBidStatus(BidStatusEnum.WIN.getCode());
- tenderBidMapper.updateById(bid);
-
- return award.getId();
- }
-
- @Override
- public SrmBidAwardDO getAward(Long id) {
- return bidAwardMapper.selectById(id);
- }
-
- @Override
- public SrmBidAwardDO getAwardByProjectId(Long tenderProjectId) {
- return bidAwardMapper.selectByTenderProjectId(tenderProjectId);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deleteAward(Long id) {
- SrmBidAwardDO award = validateAwardExists(id);
- // 浠呭緟瀹℃壒鐘舵�佸彲鍒犻櫎
- if (!AwardStatusEnum.PENDING_APPROVAL.getCode().equals(award.getAwardStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_AWARD_FORBIDDEN);
- }
- bidAwardMapper.deleteById(id);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void approveAward(Long id) {
- SrmBidAwardDO award = validateAwardExists(id);
- // 鏍¢獙鎷涙爣椤圭洰鐘舵�佷负璇勬爣涓�
- SrmTenderProjectDO project = tenderProjectMapper.selectById(award.getTenderProjectId());
- if (project == null || !TenderStatusEnum.canAward(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_AWARD_FORBIDDEN);
- }
- award.setAwardStatus(AwardStatusEnum.AWARDED.getCode());
- award.setApprovalTime(LocalDateTime.now());
- bidAwardMapper.updateById(award);
-
- // 鏇存柊鎷涙爣椤圭洰鐘舵�佷负宸插畾鏍�
- project.setTenderStatus(TenderStatusEnum.AWARDED.getCode());
- tenderProjectMapper.updateById(project);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void generatePurchaseOrder(Long id) {
- // 1. 鏍¢獙瀹氭爣瀛樺湪涓旂姸鎬佷负宸插畾鏍�
- SrmBidAwardDO award = validateAwardExists(id);
- if (!AwardStatusEnum.AWARDED.getCode().equals(award.getAwardStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_STATUS_NOT_AWARDED);
- }
- // 鏍¢獙鎷涙爣椤圭洰鐘舵�佷负宸插畾鏍�
- SrmTenderProjectDO project = tenderProjectMapper.selectById(award.getTenderProjectId());
- if (project == null || !TenderStatusEnum.AWARDED.getCode().equals(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_AWARD_FORBIDDEN);
- }
-
- // 2. 鏌� SRM 渚涘簲鍟�
- SrmSupplierDO srmSupplier = supplierMapper.selectById(award.getSupplierId());
- if (srmSupplier == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_SUPPLIER_NOT_SYNCED);
- }
-
- // 渚涘簲鍟嗘湭鍑嗗叆鍒欒嚜鍔ㄥ噯鍏ュ苟閫氳繃锛屼繚璇侀噰璐鍗曟祦绋嬪彲鐢�
- supplierApplyService.ensureSupplierApproved(srmSupplier.getId());
-
- // 3. 鏌ユ嫑鏍囩墿鏂欏垪琛�
- List<SrmTenderMaterialDO> materials = tenderMaterialMapper
- .selectListByTenderProjectId(award.getTenderProjectId());
- if (CollUtil.isEmpty(materials)) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_NOT_EXISTS);
- }
-
- // 4. 鏌ヤ腑鏍囨姤浠峰垪琛�
- List<SrmSupplierQuoteDO> quotes = supplierQuoteMapper.selectListByBidId(award.getBidId());
- if (CollUtil.isEmpty(quotes)) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_QUOTE_NOT_EXISTS);
- }
- Map<Long, SrmSupplierQuoteDO> quoteMap = quotes.stream()
- .collect(Collectors.toMap(
- SrmSupplierQuoteDO::getTenderMaterialId,
- Function.identity(),
- (a, b) -> a));
-
- // 5. 鎵归噺鏌� MDM 鐗╂枡锛岃幏鍙栬閲忓崟浣�
- Set<Long> productIds = materials.stream()
- .map(SrmTenderMaterialDO::getProductId)
- .collect(Collectors.toSet());
- Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemList(productIds).getCheckedData()
- .stream().collect(Collectors.toMap(MdmItemRespDTO::getId, Function.identity()));
-
- // 6. 鏋勫缓璁㈠崟椤癸紙鎶ヤ环涓衡�滃崟浠封�濆彛寰勶細琛岄噾棰� = 鎶ヤ环鍗曚环 脳 鏁伴噺锛�
- // 瀹氭爣閲戦涓庢姤浠峰悎璁′笉涓�鑷存椂鎸夎閲戦姣斾緥鍒嗘憡锛岃鍗曡鍗曚环浠嶅彇鎶ヤ环鍗曚环锛�
- BigDecimal totalQuoteAmount = BigDecimal.ZERO;
- for (SrmTenderMaterialDO material : materials) {
- SrmSupplierQuoteDO quote = quoteMap.get(material.getId());
- BigDecimal quantity = material.getQuantity();
- if (quote == null || quote.getQuotePrice() == null
- || quantity == null || quantity.compareTo(BigDecimal.ZERO) <= 0) {
- continue;
- }
- totalQuoteAmount = totalQuoteAmount.add(quote.getQuotePrice().multiply(quantity));
- }
- BigDecimal awardAmount = award.getAwardAmount() != null ? award.getAwardAmount() : totalQuoteAmount;
- BigDecimal ratio = totalQuoteAmount.compareTo(BigDecimal.ZERO) > 0
- ? awardAmount.divide(totalQuoteAmount, 8, RoundingMode.HALF_UP)
- : BigDecimal.ONE;
-
- List<ErpPurchaseOrderCreateReqDTO.Item> orderItems = new ArrayList<>();
- for (SrmTenderMaterialDO material : materials) {
- SrmSupplierQuoteDO quote = quoteMap.get(material.getId());
- if (quote == null || quote.getQuotePrice() == null) {
- continue;
- }
- BigDecimal quantity = material.getQuantity();
- if (quantity == null || quantity.compareTo(BigDecimal.ZERO) <= 0) {
- continue;
- }
- MdmItemRespDTO mdmItem = itemMap.get(material.getProductId());
- if (mdmItem == null) {
- continue;
- }
- BigDecimal unitPrice = quote.getQuotePrice().multiply(ratio).setScale(4, RoundingMode.HALF_UP);
- ErpPurchaseOrderCreateReqDTO.Item item = new ErpPurchaseOrderCreateReqDTO.Item();
- item.setProductId(material.getProductId());
- item.setProductUnitId(mdmItem.getUnitMeasureId());
- item.setProductPrice(unitPrice);
- item.setCount(quantity);
- item.setTaxPercent(quote.getTaxRate());
- item.setRemark("鎷涙爣缂栧彿: " + award.getAwardNo());
- orderItems.add(item);
- }
-
- // 7. 鏋勫缓骞惰皟鐢� ERP 鍒涘缓閲囪喘璁㈠崟
- ErpPurchaseOrderCreateReqDTO createReq = new ErpPurchaseOrderCreateReqDTO();
- createReq.setSupplierId(srmSupplier.getId());
- createReq.setOrderTime(LocalDateTime.now());
- createReq.setDepositPrice(BigDecimal.ZERO);
- createReq.setItems(orderItems);
- createReq.setRemark("SRM 瀹氭爣鑷姩鐢熸垚, 瀹氭爣缂栧彿: " + award.getAwardNo());
-
- Long purchaseOrderId = erpPurchaseOrderApi.createPurchaseOrder(createReq).getCheckedData();
-
- // 鑾峰彇閲囪喘璁㈠崟鍙�
- String purchaseOrderNo = null;
- try {
- purchaseOrderNo = erpPurchaseOrderApi.getPurchaseOrder(purchaseOrderId)
- .getCheckedData().getNo();
- } catch (Exception e) {
- log.warn("[generatePurchaseOrder] 鑾峰彇閲囪喘璁㈠崟鍙峰け璐ワ紝purchaseOrderId={}", purchaseOrderId, e);
- }
-
- // 8. 鏇存柊瀹氭爣璁板綍
- award.setPurchaseOrderId(purchaseOrderId);
- award.setPurchaseOrderNo(purchaseOrderNo);
- award.setAwardStatus(AwardStatusEnum.ORDER_GENERATED.getCode());
- bidAwardMapper.updateById(award);
-
- // 9. 鏇存柊鎷涙爣椤圭洰鐘舵��
- project.setTenderStatus(TenderStatusEnum.CLOSED.getCode());
- tenderProjectMapper.updateById(project);
- }
-
- private SrmBidAwardDO validateAwardExists(Long id) {
- SrmBidAwardDO award = bidAwardMapper.selectById(id);
- if (award == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_NOT_EXISTS);
- }
- return award;
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidEvaluationService.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidEvaluationService.java
deleted file mode 100644
index 3ffd6a8..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidEvaluationService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.tender;
-
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmBidEvaluationSaveReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmBidEvaluationDO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmBidOpenDO;
-import jakarta.validation.Valid;
-
-import java.util.List;
-
-/**
- * SRM 璇勬爣绠$悊 Service 鎺ュ彛
- */
-public interface SrmBidEvaluationService {
-
- // ========== 璇勬爣绠$悊 ==========
-
- /**
- * 鍒涘缓璇勬爣璁板綍
- */
- Long createEvaluation(@Valid SrmBidEvaluationSaveReqVO createReqVO);
-
- /**
- * 鏇存柊璇勬爣璁板綍
- */
- void updateEvaluation(@Valid SrmBidEvaluationSaveReqVO updateReqVO);
-
- /**
- * 鑾峰彇璇勬爣鍒楄〃锛堟寜鎷涙爣椤圭洰锛�
- */
- List<SrmBidEvaluationDO> getEvaluationList(Long tenderProjectId);
-
- /**
- * 鑷姩鎺掑悕璁$畻
- */
- void calculateRanking(Long tenderProjectId);
-
- // ========== 寮�鏍囩鐞� ==========
-
- /**
- * 鍒涘缓寮�鏍囪褰�
- */
- Long createBidOpen(Long tenderProjectId);
-
- /**
- * 鑾峰彇寮�鏍囪褰�
- */
- SrmBidOpenDO getBidOpen(Long id);
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidEvaluationServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidEvaluationServiceImpl.java
deleted file mode 100644
index f211793..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmBidEvaluationServiceImpl.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.tender;
-
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmBidEvaluationSaveReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmBidEvaluationDO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmBidOpenDO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderProjectDO;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmBidEvaluationMapper;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmBidOpenMapper;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmTenderProjectMapper;
-import cn.iocoder.yudao.module.srm.enums.ErrorCodeConstants;
-import cn.iocoder.yudao.module.srm.enums.TenderStatusEnum;
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
-import com.mzt.logapi.starter.annotation.LogRecord;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDateTime;
-import java.util.Comparator;
-import java.util.List;
-
-import static cn.iocoder.yudao.module.srm.enums.LogRecordConstants.*;
-
-/**
- * SRM 璇勬爣绠$悊 Service 瀹炵幇绫�
- */
-@Service
-@Validated
-public class SrmBidEvaluationServiceImpl implements SrmBidEvaluationService {
-
- @Resource
- private SrmBidEvaluationMapper bidEvaluationMapper;
-
- @Resource
- private SrmBidOpenMapper bidOpenMapper;
-
- @Resource
- private SrmTenderProjectMapper tenderProjectMapper;
-
- // ========== 璇勬爣绠$悊 ==========
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- @LogRecord(type = LOG_EVALUATION_TYPE, subType = LOG_EVALUATION_CREATE_SUB_TYPE,
- bizNo = "{{#createReqVO.tenderProjectId}}", success = LOG_EVALUATION_CREATE_SUCCESS)
- public Long createEvaluation(SrmBidEvaluationSaveReqVO createReqVO) {
- // 妫�鏌ユ嫑鏍囬」鐩姸鎬侊細BIDDING 鎴� EVALUATING 鎵嶅厑璁歌瘎鏍�
- SrmTenderProjectDO project = tenderProjectMapper.selectById(createReqVO.getTenderProjectId());
- if (project == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_NOT_EXISTS);
- }
- Integer status = project.getTenderStatus();
- if (!TenderStatusEnum.BIDDING.getCode().equals(status)
- && !TenderStatusEnum.EVALUATING.getCode().equals(status)) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_EVALUATION_FORBIDDEN);
- }
-
- SrmBidEvaluationDO evaluation = BeanUtils.toBean(createReqVO, SrmBidEvaluationDO.class);
- // 寮哄埗缃┖ id锛岄伩鍏嶅墠绔紶鍏ュ凡鏈� id 瀵艰嚧涓婚敭鍐茬獊锛岀敱鏁版嵁搴撳簭鍒楄嚜鍔ㄧ敓鎴�
- evaluation.setId(null);
- // 璁$畻缁煎悎璇勫垎: 浠锋牸*0.4 + 鎶�鏈�*0.3 + 浜や粯*0.2 + 鏈嶅姟*0.1
- BigDecimal price = nvl(evaluation.getPriceScore());
- BigDecimal tech = nvl(evaluation.getTechScore());
- BigDecimal delivery = nvl(evaluation.getDeliveryScore());
- BigDecimal service = nvl(evaluation.getServiceScore());
- BigDecimal composite = price.multiply(new BigDecimal("0.4"))
- .add(tech.multiply(new BigDecimal("0.3")))
- .add(delivery.multiply(new BigDecimal("0.2")))
- .add(service.multiply(new BigDecimal("0.1")))
- .setScale(2, RoundingMode.HALF_UP);
- evaluation.setCompositeScore(composite);
- evaluation.setEvaluationTime(LocalDateTime.now());
- bidEvaluationMapper.insert(evaluation);
- // 棣栨璇勬爣鏃舵洿鏂版嫑鏍囬」鐩姸鎬佷负璇勬爣涓�
- if (TenderStatusEnum.BIDDING.getCode().equals(project.getTenderStatus())) {
- project.setTenderStatus(TenderStatusEnum.EVALUATING.getCode());
- tenderProjectMapper.updateById(project);
- }
- return evaluation.getId();
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updateEvaluation(SrmBidEvaluationSaveReqVO updateReqVO) {
- SrmBidEvaluationDO existing = bidEvaluationMapper.selectById(updateReqVO.getId());
- if (existing == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.EVALUATION_NOT_EXISTS_TENDER);
- }
- // 妫�鏌ユ嫑鏍囬」鐩姸鎬侊細浠� EVALUATING 鍏佽鏇存柊璇勬爣
- SrmTenderProjectDO project = tenderProjectMapper.selectById(existing.getTenderProjectId());
- if (project == null || !TenderStatusEnum.canEvaluate(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_EVALUATION_FORBIDDEN);
- }
- SrmBidEvaluationDO evaluation = BeanUtils.toBean(updateReqVO, SrmBidEvaluationDO.class);
- BigDecimal price = nvl(evaluation.getPriceScore());
- BigDecimal tech = nvl(evaluation.getTechScore());
- BigDecimal delivery = nvl(evaluation.getDeliveryScore());
- BigDecimal service = nvl(evaluation.getServiceScore());
- BigDecimal composite = price.multiply(new BigDecimal("0.4"))
- .add(tech.multiply(new BigDecimal("0.3")))
- .add(delivery.multiply(new BigDecimal("0.2")))
- .add(service.multiply(new BigDecimal("0.1")))
- .setScale(2, RoundingMode.HALF_UP);
- evaluation.setCompositeScore(composite);
- evaluation.setEvaluationTime(LocalDateTime.now());
- bidEvaluationMapper.updateById(evaluation);
- }
-
- @Override
- public List<SrmBidEvaluationDO> getEvaluationList(Long tenderProjectId) {
- return bidEvaluationMapper.selectListByTenderProjectId(tenderProjectId);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void calculateRanking(Long tenderProjectId) {
- SrmTenderProjectDO project = tenderProjectMapper.selectById(tenderProjectId);
- if (project == null || !TenderStatusEnum.canEvaluate(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_EVALUATION_FORBIDDEN);
- }
- List<SrmBidEvaluationDO> list = bidEvaluationMapper.selectListByTenderProjectId(tenderProjectId);
- // 鎸夌患鍚堣瘎鍒嗛檷搴忔帓鍚�
- list.sort(Comparator.comparing(e -> e.getCompositeScore() != null ? e.getCompositeScore() : BigDecimal.ZERO, Comparator.reverseOrder()));
- for (int i = 0; i < list.size(); i++) {
- SrmBidEvaluationDO evaluation = list.get(i);
- evaluation.setRanking(i + 1);
- bidEvaluationMapper.updateById(evaluation);
- }
- }
-
- // ========== 寮�鏍囩鐞� ==========
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public Long createBidOpen(Long tenderProjectId) {
- // 鏍¢獙鎷涙爣椤圭洰瀛樺湪涓旂姸鎬佷负鍙戝竷涓�
- SrmTenderProjectDO project = tenderProjectMapper.selectById(tenderProjectId);
- if (project == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_NOT_EXISTS);
- }
- if (!TenderStatusEnum.PUBLISHED.getCode().equals(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_STATUS_NOT_PUBLISHED);
- }
- if (bidOpenMapper.selectByTenderProjectId(tenderProjectId) != null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_STATUS_NOT_PUBLISHED);
- }
- // 寮�鏍囧悗鑷姩鏇存柊鎷涙爣椤圭洰鐘舵�佷负鎶曟爣涓�
- project.setTenderStatus(TenderStatusEnum.BIDDING.getCode());
- tenderProjectMapper.updateById(project);
- SrmBidOpenDO open = new SrmBidOpenDO();
- open.setTenderProjectId(tenderProjectId);
- open.setOpenTime(LocalDateTime.now());
- bidOpenMapper.insert(open);
- return open.getId();
- }
-
- @Override
- public SrmBidOpenDO getBidOpen(Long id) {
- return bidOpenMapper.selectById(id);
- }
-
- private static BigDecimal nvl(BigDecimal value) {
- return value != null ? value : BigDecimal.ZERO;
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderBidService.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderBidService.java
deleted file mode 100644
index 8251bf3..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderBidService.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.tender;
-
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmSupplierQuoteSaveReqVO;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmTenderBidSaveReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierQuoteDO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderBidDO;
-import jakarta.validation.Valid;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * SRM 鎶曟爣绠$悊 Service 鎺ュ彛
- */
-public interface SrmTenderBidService {
-
- // ========== 鎶曟爣绠$悊 ==========
-
- /**
- * 鍒涘缓鎶曟爣
- */
- Long createBid(@Valid SrmTenderBidSaveReqVO createReqVO);
-
- /**
- * 鑾峰彇鎶曟爣璇︽儏
- */
- SrmTenderBidDO getBid(Long id);
-
- /**
- * 鏌ヨ鎷涙爣椤圭洰鐨勬姇鏍囧垪琛�
- */
- List<SrmTenderBidDO> getBidListByProject(Long tenderProjectId);
-
- /**
- * 鎾ゆ爣
- */
- void withdrawBid(Long id);
-
- // ========== 鎶ヤ环绠$悊 ==========
-
- /**
- * 鍒涘缓鎶ヤ环
- */
- Long createQuote(@Valid SrmSupplierQuoteSaveReqVO createReqVO);
-
- /**
- * 鏇存柊鎶ヤ环
- */
- void updateQuote(@Valid SrmSupplierQuoteSaveReqVO updateReqVO);
-
- /**
- * 鑾峰彇鎶ヤ环鍒楄〃锛堟寜鎶曟爣ID锛�
- */
- List<SrmSupplierQuoteDO> getQuoteList(Long bidId);
-
- // ========== 鎶曟爣鎬婚噾棰濓紙浜哄伐缁存姢锛� ==========
-
- /**
- * 鏇存柊鎶曟爣鎬婚噾棰濓細鎶ヤ环鏄庣粏濉啓鍚庡彲鐢卞墠绔嚜鍔ㄥ甫鍑烘姤浠峰悎璁★紝鍐嶄汉宸ュ井璋�
- *
- * @param bidTotalAmount 鎶曟爣鎬婚噾棰濓紱涓� null 鏃朵笉鏇存柊
- */
- void updateBidTotal(Long bidId, BigDecimal bidTotalAmount);
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderBidServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderBidServiceImpl.java
deleted file mode 100644
index 7c83815..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderBidServiceImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.tender;
-
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmSupplierQuoteSaveReqVO;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmTenderBidSaveReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierDO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierQuoteDO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderBidDO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderProjectDO;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierMapper;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierQuoteMapper;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmTenderBidMapper;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmTenderProjectMapper;
-import cn.iocoder.yudao.module.srm.enums.BidStatusEnum;
-import cn.iocoder.yudao.module.srm.enums.ErrorCodeConstants;
-import cn.iocoder.yudao.module.srm.enums.TenderStatusEnum;
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
-import com.mzt.logapi.context.LogRecordContext;
-import com.mzt.logapi.starter.annotation.LogRecord;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
-import static cn.iocoder.yudao.module.srm.enums.LogRecordConstants.*;
-
-/**
- * SRM 鎶曟爣绠$悊 Service 瀹炵幇绫�
- */
-@Service
-@Validated
-public class SrmTenderBidServiceImpl implements SrmTenderBidService {
-
- @Resource
- private SrmTenderBidMapper tenderBidMapper;
-
- @Resource
- private SrmSupplierQuoteMapper supplierQuoteMapper;
-
- @Resource
- private SrmTenderProjectMapper tenderProjectMapper;
-
- @Resource
- private SrmSupplierMapper supplierMapper;
-
- // ========== 鎶曟爣绠$悊 ==========
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- @LogRecord(type = LOG_BID_TYPE, subType = LOG_BID_CREATE_SUB_TYPE,
- bizNo = "{{#createReqVO.bidNo}}", success = LOG_BID_CREATE_SUCCESS)
- public Long createBid(SrmTenderBidSaveReqVO createReqVO) {
- // 鏍¢獙鎷涙爣椤圭洰鐘舵�侊紙PUBLISHED/BIDDING 鎵嶅厑璁告姇鏍囷級
- SrmTenderProjectDO project = validateTenderStatus(createReqVO.getTenderProjectId());
- // 妫�鏌ユ姇鏍囨埅姝㈡椂闂�
- if (project.getEndTime() != null && LocalDateTime.now().isAfter(project.getEndTime())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_END_TIME_PASSED);
- }
- // 鏍¢獙鎶曟爣渚涘簲鍟嗗瓨鍦ㄤ笖鏈仠鐢紙鍑嗗叆鐘舵�佷笉闄愬埗鎶曟爣锛屼腑鏍囩敓鎴愰噰璐鍗曟椂鑷姩鍑嗗叆锛�
- SrmSupplierDO supplier = supplierMapper.selectById(createReqVO.getSupplierId());
- if (supplier == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.SUPPLIER_NOT_EXISTS);
- }
- if (CommonStatusEnum.isDisable(supplier.getStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.SUPPLIER_NOT_ENABLE, supplier.getName());
- }
- // 鏍¢獙鎶曟爣缂栧彿鏄惁閲嶅
- if (tenderBidMapper.existsByBidNo(createReqVO.getBidNo())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.BID_NO_EXISTS);
- }
- // 鏍¢獙渚涘簲鍟嗘槸鍚﹀凡鍙備笌鎶曟爣
- SrmTenderBidDO existing = tenderBidMapper.selectByTenderAndSupplier(createReqVO.getTenderProjectId(), createReqVO.getSupplierId());
- if (existing != null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.BID_SUPPLIER_EXISTS);
- }
- SrmTenderBidDO bid = BeanUtils.toBean(createReqVO, SrmTenderBidDO.class);
- bid.setBidStatus(BidStatusEnum.REGISTERED.getCode());
- bid.setBidTime(LocalDateTime.now());
- tenderBidMapper.insert(bid);
- LogRecordContext.putVariable("bidNo", bid.getBidNo());
- LogRecordContext.putVariable("tenderName", project.getTenderName());
- return bid.getId();
- }
-
- @Override
- public SrmTenderBidDO getBid(Long id) {
- return tenderBidMapper.selectById(id);
- }
-
- @Override
- public List<SrmTenderBidDO> getBidListByProject(Long tenderProjectId) {
- return tenderBidMapper.selectListByTenderProjectId(tenderProjectId);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- @LogRecord(type = LOG_BID_TYPE, subType = LOG_BID_WITHDRAW_SUB_TYPE,
- bizNo = "{{#id}}", success = LOG_BID_WITHDRAW_SUCCESS)
- public void withdrawBid(Long id) {
- SrmTenderBidDO bid = validateBidExists(id);
- // 妫�鏌ユ嫑鏍囬」鐩姸鎬侊細浠� PUBLISHED/BIDDING 鍏佽鎾ゆ爣
- SrmTenderProjectDO project = tenderProjectMapper.selectById(bid.getTenderProjectId());
- if (project == null || !TenderStatusEnum.canCreateOrUpdateQuote(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_BID_FORBIDDEN_WITHDRAW);
- }
- bid.setBidStatus(BidStatusEnum.WITHDRAWN.getCode());
- tenderBidMapper.updateById(bid);
- // 鍒犻櫎鎶ヤ环
- supplierQuoteMapper.deleteByBidId(id);
- LogRecordContext.putVariable("bidNo", bid.getBidNo());
- }
-
- // ========== 鎶ヤ环绠$悊 ==========
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- @LogRecord(type = LOG_QUOTE_TYPE, subType = LOG_QUOTE_CREATE_SUB_TYPE,
- bizNo = "{{#createReqVO.bidId}}", success = LOG_QUOTE_CREATE_SUCCESS)
- public Long createQuote(SrmSupplierQuoteSaveReqVO createReqVO) {
- // 鏍¢獙鎶曟爣鐘舵�侊紙鎾ゆ爣鍚庝笉鍏佽鎶ヤ环锛�
- SrmTenderBidDO bid = validateBidNotWithdrawn(createReqVO.getBidId());
- // 鏍¢獙鎷涙爣椤圭洰鐘舵�侊細浠� PUBLISHED/BIDDING 鍏佽鎶ヤ环
- SrmTenderProjectDO project = tenderProjectMapper.selectById(bid.getTenderProjectId());
- if (project == null || !TenderStatusEnum.canCreateOrUpdateQuote(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_QUOTE_FORBIDDEN);
- }
- // 鏍¢獙鍚屼竴鎶曟爣涓嬬墿鏂欎笉鍙噸澶嶆姤浠�
- if (supplierQuoteMapper.existsByBidAndMaterial(createReqVO.getBidId(), createReqVO.getTenderMaterialId())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.QUOTE_MATERIAL_DUPLICATE);
- }
- SrmSupplierQuoteDO quote = BeanUtils.toBean(createReqVO, SrmSupplierQuoteDO.class);
- // 浠庢姇鏍囪褰曚腑鑾峰彇鎷涙爣椤圭洰ID鍜屼緵搴斿晢ID锛岄伩鍏嶅墠绔仐婕忓鑷存暟鎹簱绾︽潫澶辫触
- quote.setTenderProjectId(bid.getTenderProjectId());
- quote.setSupplierId(bid.getSupplierId());
- supplierQuoteMapper.insert(quote);
- return quote.getId();
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updateQuote(SrmSupplierQuoteSaveReqVO updateReqVO) {
- // 鏍¢獙鎶曟爣鐘舵�侊紙鎾ゆ爣鍚庝笉鍏佽鎶ヤ环锛�
- SrmTenderBidDO bid = validateBidNotWithdrawn(updateReqVO.getBidId());
- // 鏍¢獙鎷涙爣椤圭洰鐘舵�侊細浠� PUBLISHED/BIDDING 鍏佽鎶ヤ环
- SrmTenderProjectDO project = tenderProjectMapper.selectById(bid.getTenderProjectId());
- if (project == null || !TenderStatusEnum.canCreateOrUpdateQuote(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_QUOTE_FORBIDDEN);
- }
- // 鏍¢獙鍚屼竴鎶曟爣涓嬬墿鏂欎笉鍙噸澶嶆姤浠凤紙鎺掗櫎鑷韩锛�
- SrmSupplierQuoteDO existing = supplierQuoteMapper.selectById(updateReqVO.getId());
- if (existing != null && !existing.getTenderMaterialId().equals(updateReqVO.getTenderMaterialId())) {
- if (supplierQuoteMapper.existsByBidAndMaterial(updateReqVO.getBidId(), updateReqVO.getTenderMaterialId())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.QUOTE_MATERIAL_DUPLICATE);
- }
- }
- SrmSupplierQuoteDO updateObj = BeanUtils.toBean(updateReqVO, SrmSupplierQuoteDO.class);
- supplierQuoteMapper.updateById(updateObj);
- }
-
- @Override
- public List<SrmSupplierQuoteDO> getQuoteList(Long bidId) {
- return supplierQuoteMapper.selectListByBidId(bidId);
- }
-
- // ========== 鎶曟爣鎬婚噾棰濓紙浜哄伐缁存姢锛屽彲鑷姩甯﹀嚭鎶ヤ环鍚堣鍚庤皟鏁达級 ==========
-
- @Override
- public void updateBidTotal(Long bidId, BigDecimal bidTotalAmount) {
- // 鏍¢獙鎶曟爣鐘舵�侊紙鎾ゆ爣鍚庝笉鍏佽淇敼锛�
- SrmTenderBidDO bid = validateBidNotWithdrawn(bidId);
- // 鏍¢獙鎷涙爣椤圭洰鐘舵�侊細浠呭厑璁哥淮鎶ゆ姤浠风殑鎷涙爣鐘舵�佷笅鍙慨鏀�
- SrmTenderProjectDO project = tenderProjectMapper.selectById(bid.getTenderProjectId());
- if (project == null || !TenderStatusEnum.canCreateOrUpdateQuote(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_QUOTE_FORBIDDEN);
- }
- // 浠呭湪浼犲叆闈� null 鏃舵洿鏂帮紙MyBatis-Plus updateById 浼氬拷鐣� null 瀛楁锛宯ull 瑙嗕负涓嶆敼锛�
- if (bidTotalAmount != null) {
- bid.setBidTotalAmount(bidTotalAmount);
- tenderBidMapper.updateById(bid);
- }
- }
-
- // ========== 鏍¢獙鏂规硶 ==========
-
- private SrmTenderBidDO validateBidExists(Long id) {
- SrmTenderBidDO bid = tenderBidMapper.selectById(id);
- if (bid == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.BID_NOT_EXISTS);
- }
- return bid;
- }
-
- private SrmTenderBidDO validateBidNotWithdrawn(Long bidId) {
- SrmTenderBidDO bid = validateBidExists(bidId);
- if (BidStatusEnum.WITHDRAWN.getCode().equals(bid.getBidStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.BID_WITHDRAWN_CANNOT_QUOTE);
- }
- return bid;
- }
-
- private SrmTenderProjectDO validateTenderStatus(Long tenderProjectId) {
- SrmTenderProjectDO project = tenderProjectMapper.selectById(tenderProjectId);
- if (project == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_NOT_EXISTS);
- }
- if (!TenderStatusEnum.canCreateBid(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_BID_FORBIDDEN);
- }
- return project;
- }
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderConfigService.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderConfigService.java
deleted file mode 100644
index a6e9cf6..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderConfigService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.tender;
-
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderConfigDO;
-
-public interface SrmTenderConfigService {
-
- SrmTenderConfigDO getConfig();
-
- void saveConfig(String defaultBiddingMode);
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderConfigServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderConfigServiceImpl.java
deleted file mode 100644
index 8551e63..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderConfigServiceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.tender;
-
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderConfigDO;
-import cn.iocoder.yudao.module.srm.dal.mysql.SrmTenderConfigMapper;
-import cn.iocoder.yudao.module.srm.enums.BiddingModeEnum;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-@Service
-@Validated
-public class SrmTenderConfigServiceImpl implements SrmTenderConfigService {
-
- @Resource
- private SrmTenderConfigMapper srmTenderConfigMapper;
-
- @Override
- public SrmTenderConfigDO getConfig() {
- SrmTenderConfigDO config = srmTenderConfigMapper.selectOne(null);
- if (config == null) {
- config = new SrmTenderConfigDO();
- config.setDefaultBiddingMode(BiddingModeEnum.FULL.getCode());
- srmTenderConfigMapper.insert(config);
- }
- return config;
- }
-
- @Override
- public void saveConfig(String defaultBiddingMode) {
- SrmTenderConfigDO config = srmTenderConfigMapper.selectOne(null);
- if (config != null) {
- config.setDefaultBiddingMode(defaultBiddingMode);
- srmTenderConfigMapper.updateById(config);
- } else {
- config = new SrmTenderConfigDO();
- config.setDefaultBiddingMode(defaultBiddingMode);
- srmTenderConfigMapper.insert(config);
- }
- }
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectService.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectService.java
deleted file mode 100644
index 74e500f..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.tender;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmTenderProjectPageReqVO;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmTenderProjectPartialUpdateReqVO;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmTenderProjectSaveReqVO;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmTenderMaterialSaveReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderMaterialDO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.SrmTenderProjectDO;
-import jakarta.validation.Valid;
-
-import java.util.List;
-
-public interface SrmTenderProjectService {
-
- Long createTenderProject(@Valid SrmTenderProjectSaveReqVO createReqVO);
- void updateTenderProject(@Valid SrmTenderProjectSaveReqVO updateReqVO);
- void updateTenderProjectPartial(@Valid SrmTenderProjectPartialUpdateReqVO updateReqVO);
- void deleteTenderProject(Long id);
- SrmTenderProjectDO getTenderProject(Long id);
- PageResult<SrmTenderProjectDO> getTenderProjectPage(SrmTenderProjectPageReqVO pageReqVO);
-
- void publishTender(Long id);
- void closeTender(Long id);
- void startBidding(Long id);
- void startEvaluation(Long id);
- void startPriceComparing(Long id);
- void confirmTenderProject(Long id, Long bidId);
-
- // 鐗╂枡瀛愯〃
- void createMaterial(@Valid SrmTenderMaterialSaveReqVO createReqVO);
- void updateMaterial(@Valid SrmTenderMaterialSaveReqVO updateReqVO);
- void deleteMaterial(Long id);
- List<SrmTenderMaterialDO> getMaterialList(Long tenderProjectId);
-
-}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java
deleted file mode 100644
index d6ce3f9..0000000
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java
+++ /dev/null
@@ -1,504 +0,0 @@
-package cn.iocoder.yudao.module.srm.service.tender;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
-import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderCreateReqDTO;
-import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
-import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
-import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmTenderMaterialSaveReqVO;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmTenderProjectPageReqVO;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmTenderProjectPartialUpdateReqVO;
-import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmTenderProjectSaveReqVO;
-import cn.iocoder.yudao.module.srm.dal.dataobject.*;
-import cn.iocoder.yudao.module.srm.dal.mysql.*;
-import cn.iocoder.yudao.module.srm.enums.AwardStatusEnum;
-import cn.iocoder.yudao.module.srm.enums.BiddingModeEnum;
-import cn.iocoder.yudao.module.srm.enums.BidStatusEnum;
-import cn.iocoder.yudao.module.srm.enums.ErrorCodeConstants;
-import cn.iocoder.yudao.module.srm.enums.TenderStatusEnum;
-import cn.iocoder.yudao.module.srm.service.apply.SrmSupplierApplyService;
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
-import com.mzt.logapi.context.LogRecordContext;
-import com.mzt.logapi.starter.annotation.LogRecord;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import static cn.iocoder.yudao.module.srm.enums.LogRecordConstants.*;
-
-@Service
-@Validated
-@Slf4j
-public class SrmTenderProjectServiceImpl implements SrmTenderProjectService {
-
- /**
- * 鎷涙爣椤圭洰璧勮川瑕佹眰闄勪欢鐨勪笟鍔¤褰曠被鍨嬶紝瀵瑰簲 {@link cn.iocoder.yudao.module.system.enums.storage.StorageRecordTypeEnum#SRM_TENDER_PROJECT}
- */
- public static final String TENDER_PROJECT_RECORD_TYPE = "srm_tender_project";
-
- @Resource
- private SrmTenderProjectMapper tenderProjectMapper;
- @Resource
- private SrmTenderMaterialMapper tenderMaterialMapper;
- @Resource
- private SrmBidAwardMapper bidAwardMapper;
- @Resource
- private SrmTenderBidMapper tenderBidMapper;
-
- @Resource
- private SrmTenderConfigService tenderConfigService;
- @Resource
- private SrmSupplierMapper supplierMapper;
- @Resource
- private SrmSupplierQuoteMapper supplierQuoteMapper;
- @Resource
- private MdmItemApi mdmItemApi;
- @Resource
- private ErpPurchaseOrderApi erpPurchaseOrderApi;
- @Resource
- private SrmSupplierApplyService supplierApplyService;
- @Resource
- private StorageAttachmentApi storageAttachmentApi;
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public Long createTenderProject(SrmTenderProjectSaveReqVO createReqVO) {
- SrmTenderProjectDO project = BeanUtils.toBean(createReqVO, SrmTenderProjectDO.class);
- project.setTenderStatus(TenderStatusEnum.DRAFT.getCode());
- if (project.getBiddingMode() == null || project.getBiddingMode().isEmpty()) {
- project.setBiddingMode(tenderConfigService.getConfig().getDefaultBiddingMode());
- }
- tenderProjectMapper.insert(project);
- // 缁戝畾璧勮川瑕佹眰闄勪欢
- if (CollUtil.isNotEmpty(createReqVO.getBlobIds())) {
- storageAttachmentApi.bindAttachments("file", TENDER_PROJECT_RECORD_TYPE, project.getId(), createReqVO.getBlobIds());
- }
- return project.getId();
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- @LogRecord(type = LOG_TENDER_TYPE, subType = LOG_TENDER_UPDATE_SUB_TYPE,
- bizNo = "{{#updateReqVO.id}}", success = LOG_TENDER_UPDATE_SUCCESS)
- public void updateTenderProject(SrmTenderProjectSaveReqVO updateReqVO) {
- SrmTenderProjectDO project = validateTenderExists(updateReqVO.getId());
- Integer status = project.getTenderStatus();
-
- // 鑽夌鐘舵�侊細鍏ㄥ瓧娈靛彲缂栬緫
- if (TenderStatusEnum.canEditFullProject(status)) {
- SrmTenderProjectDO updateObj = BeanUtils.toBean(updateReqVO, SrmTenderProjectDO.class);
- updateObj.setTenderStatus(status); // 鐘舵�佷笉鍏佽鍓嶇浼犲叆瑕嗙洊
- tenderProjectMapper.updateById(updateObj);
- // 澧為噺鏇存柊璧勮川瑕佹眰闄勪欢
- storageAttachmentApi.updateAttachments("file", TENDER_PROJECT_RECORD_TYPE, updateReqVO.getId(), updateReqVO.getBlobIds());
- LogRecordContext.putVariable("tenderName", project.getTenderName());
- LogRecordContext.putVariable("oldTenderDesc", project.getTenderDesc());
- LogRecordContext.putVariable("newTenderDesc", updateReqVO.getTenderDesc());
- LogRecordContext.putVariable("oldQualification", project.getQualificationRequirements());
- LogRecordContext.putVariable("newQualification", updateReqVO.getQualificationRequirements());
- return;
- }
-
- // 鍙戝竷涓�/鎶曟爣涓細浠呭厑璁镐慨鏀规嫑鏍囪鏄庡拰璧勮川瑕佹眰
- if (TenderStatusEnum.canEditPartialProject(status)) {
- SrmTenderProjectDO updateObj = new SrmTenderProjectDO();
- updateObj.setId(updateReqVO.getId());
- updateObj.setTenderDesc(updateReqVO.getTenderDesc());
- updateObj.setQualificationRequirements(updateReqVO.getQualificationRequirements());
- tenderProjectMapper.updateById(updateObj);
- // 澧為噺鏇存柊璧勮川瑕佹眰闄勪欢
- storageAttachmentApi.updateAttachments("file", TENDER_PROJECT_RECORD_TYPE, updateReqVO.getId(), updateReqVO.getBlobIds());
- LogRecordContext.putVariable("tenderName", project.getTenderName());
- LogRecordContext.putVariable("oldTenderDesc", project.getTenderDesc());
- LogRecordContext.putVariable("newTenderDesc", updateReqVO.getTenderDesc());
- LogRecordContext.putVariable("oldQualification", project.getQualificationRequirements());
- LogRecordContext.putVariable("newQualification", updateReqVO.getQualificationRequirements());
- return;
- }
-
- // 鍏朵粬鐘舵�侊細涓嶅厑璁哥紪杈�
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_PROJECT_LOCKED);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deleteTenderProject(Long id) {
- SrmTenderProjectDO project = validateTenderExists(id);
- if (!TenderStatusEnum.DRAFT.getCode().equals(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_STATUS_NOT_DRAFT);
- }
- // 妫�鏌ユ槸鍚﹀凡鏈夋姇鏍囨暟鎹�
- if (tenderBidMapper.countByTenderProjectId(id) > 0) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_HAS_BIDS_CANNOT_DELETE);
- }
- // 鍒犻櫎璧勮川瑕佹眰闄勪欢
- storageAttachmentApi.deleteAttachmentsByRecord(TENDER_PROJECT_RECORD_TYPE, id);
- tenderMaterialMapper.deleteByTenderProjectId(id);
- tenderProjectMapper.deleteById(id);
- }
-
- @Override
- public SrmTenderProjectDO getTenderProject(Long id) {
- SrmTenderProjectDO project = tenderProjectMapper.selectById(id);
- if (project != null) {
- SrmBidAwardDO award = bidAwardMapper.selectByTenderProjectId(id);
- if (award != null) {
- project.setAwardId(award.getId());
- project.setPurchaseOrderNo(award.getPurchaseOrderNo());
- }
- }
- return project;
- }
-
- @Override
- public PageResult<SrmTenderProjectDO> getTenderProjectPage(SrmTenderProjectPageReqVO pageReqVO) {
- PageResult<SrmTenderProjectDO> pageResult = tenderProjectMapper.selectPage(pageReqVO);
- // 鎵归噺鏌ヨ瀹氭爣淇℃伅锛屽~鍏� awardId 鍜� purchaseOrderNo
- List<Long> projectIds = pageResult.getList().stream()
- .map(SrmTenderProjectDO::getId).collect(Collectors.toList());
- if (!projectIds.isEmpty()) {
- List<SrmBidAwardDO> awards = bidAwardMapper.selectListByTenderProjectIds(projectIds);
- Map<Long, SrmBidAwardDO> awardMap = awards.stream().collect(Collectors.toMap(
- SrmBidAwardDO::getTenderProjectId, Function.identity(), (a, b) -> a));
- pageResult.getList().forEach(project -> {
- SrmBidAwardDO award = awardMap.get(project.getId());
- if (award != null) {
- project.setAwardId(award.getId());
- project.setPurchaseOrderNo(award.getPurchaseOrderNo());
- // 闃插尽锛氬鏋滃畾鏍囧凡鐢熸垚璁㈠崟浣嗛」鐩姸鎬佹湭鏇存柊锛屽悓姝ョ姸鎬�
- if (AwardStatusEnum.ORDER_GENERATED.getCode().equals(award.getAwardStatus())) {
- project.setTenderStatus(TenderStatusEnum.CLOSED.getCode());
- }
- }
- });
- }
- return pageResult;
- }
-
- @Override
- public void publishTender(Long id) {
- SrmTenderProjectDO project = validateTenderExists(id);
- if (!TenderStatusEnum.DRAFT.getCode().equals(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_STATUS_NOT_DRAFT);
- }
- project.setTenderStatus(TenderStatusEnum.PUBLISHED.getCode());
- tenderProjectMapper.updateById(project);
- }
-
- @Override
- public void closeTender(Long id) {
- SrmTenderProjectDO project = validateTenderExists(id);
- if (TenderStatusEnum.CLOSED.getCode().equals(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_STATUS_ALREADY_CLOSED);
- }
- // 鑽夌鐘舵�佷笉鍏佽鐩存帴鍏抽棴
- if (TenderStatusEnum.DRAFT.getCode().equals(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_PROJECT_LOCKED);
- }
- project.setTenderStatus(TenderStatusEnum.CLOSED.getCode());
- tenderProjectMapper.updateById(project);
- }
-
- @Override
- public void startBidding(Long id) {
- SrmTenderProjectDO project = validateTenderExists(id);
- if (!TenderStatusEnum.PUBLISHED.getCode().equals(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_STATUS_NOT_PUBLISHED);
- }
- project.setTenderStatus(TenderStatusEnum.BIDDING.getCode());
- tenderProjectMapper.updateById(project);
- }
-
- @Override
- public void startEvaluation(Long id) {
- SrmTenderProjectDO project = validateTenderExists(id);
- if (!TenderStatusEnum.BIDDING.getCode().equals(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_STATUS_NOT_BIDDING);
- }
- project.setTenderStatus(TenderStatusEnum.EVALUATING.getCode());
- tenderProjectMapper.updateById(project);
- }
-
- // ========== 绠�鏄撴ā寮忔搷浣� ==========
-
- @Override
- public void startPriceComparing(Long id) {
- SrmTenderProjectDO project = validateTenderExists(id);
- if (!BiddingModeEnum.isSimple(project.getBiddingMode())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_MODE_NOT_SIMPLE);
- }
- if (!TenderStatusEnum.canStartPriceComparing(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_STATUS_NOT_DRAFT);
- }
- // 妫�鏌ユ槸鍚︽湁鐗╂枡
- if (tenderMaterialMapper.countByTenderProjectId(id) == 0) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_NO_MATERIALS);
- }
- project.setTenderStatus(TenderStatusEnum.PRICE_COMPARING.getCode());
- tenderProjectMapper.updateById(project);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void confirmTenderProject(Long id, Long bidId) {
- // 1. 鏍¢獙椤圭洰鐘舵��
- SrmTenderProjectDO project = validateTenderExists(id);
- if (!BiddingModeEnum.isSimple(project.getBiddingMode())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_MODE_NOT_SIMPLE);
- }
- if (!TenderStatusEnum.canConfirm(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_STATUS_NOT_PRICE_COMPARING);
- }
-
- // 2. 鏍¢獙鎶曟爣璁板綍
- SrmTenderBidDO bid = tenderBidMapper.selectById(bidId);
- if (bid == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.BID_NOT_EXISTS);
- }
- if (!bid.getTenderProjectId().equals(id)) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_BID_NOT_IN_PROJECT);
- }
- if (BidStatusEnum.WITHDRAWN.getCode().equals(bid.getBidStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_BID_WITHDRAWN);
- }
-
- // 3. 鍒涘缓瀹氭爣璁板綍锛堢洿鎺ュ凡瀹氭爣锛岃烦杩囧鎵癸級
- SrmBidAwardDO award = new SrmBidAwardDO();
- award.setTenderProjectId(id);
- award.setSupplierId(bid.getSupplierId());
- award.setBidId(bidId);
- award.setAwardNo("SMP" + System.currentTimeMillis());
- award.setAwardStatus(AwardStatusEnum.AWARDED.getCode());
- // 鎶曟爣閲戦涓虹┖鏃讹紝鍥為��鍒拌鎶曟爣涓嬫墍鏈夋姤浠疯閲戦涔嬪拰 = 危锛堟姤浠峰崟浠� 脳 鐗╂枡鏁伴噺锛夛紝閬垮厤 award_amount 涓虹┖瀵艰嚧鍏ュ簱澶辫触
- award.setAwardAmount(resolveAwardAmount(id, bidId, bid.getBidTotalAmount()));
- award.setAwardTime(LocalDateTime.now());
- award.setApprovalTime(LocalDateTime.now());
- bidAwardMapper.insert(award);
-
- // 4. 璁剧疆鎶曟爣鐘舵�佷负涓爣
- bid.setBidStatus(BidStatusEnum.WIN.getCode());
- tenderBidMapper.updateById(bid);
-
- // 5. 鑷姩鐢熸垚閲囪喘璁㈠崟
- generatePurchaseOrderForSimple(award, project);
-
- // 6. 鏇存柊椤圭洰鐘舵��
- project.setTenderStatus(TenderStatusEnum.CONFIRMED.getCode());
- tenderProjectMapper.updateById(project);
- }
-
- /**
- * 瑙f瀽涓爣閲戦锛氭姇鏍囬噾棰濅负绌烘椂锛屾眹鎬昏鎶曟爣涓嬫墍鏈夋姤浠疯閲戦 = 危锛堟姤浠峰崟浠� 脳 鐗╂枡鏁伴噺锛�
- */
- private BigDecimal resolveAwardAmount(Long tenderProjectId, Long bidId, BigDecimal bidTotalAmount) {
- if (bidTotalAmount != null) {
- return bidTotalAmount;
- }
- List<SrmTenderMaterialDO> materials = tenderMaterialMapper.selectListByTenderProjectId(tenderProjectId);
- Map<Long, BigDecimal> quantityMap = materials.stream()
- .collect(Collectors.toMap(SrmTenderMaterialDO::getId,
- material -> material.getQuantity() == null ? BigDecimal.ZERO : material.getQuantity()));
- return supplierQuoteMapper.selectListByBidId(bidId).stream()
- .filter(quote -> quote.getQuotePrice() != null && quote.getTenderMaterialId() != null)
- .map(quote -> quote.getQuotePrice()
- .multiply(quantityMap.getOrDefault(quote.getTenderMaterialId(), BigDecimal.ZERO)))
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- }
-
- /**
- * 绠�鏄撴ā寮忥細鏍规嵁瀹氭爣淇℃伅鑷姩鐢熸垚閲囪喘璁㈠崟
- */
- private void generatePurchaseOrderForSimple(SrmBidAwardDO award, SrmTenderProjectDO project) {
- // 鏌ヤ緵搴斿晢
- SrmSupplierDO supplier = supplierMapper.selectById(award.getSupplierId());
- if (supplier == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_SUPPLIER_NOT_SYNCED);
- }
-
- // 渚涘簲鍟嗘湭鍑嗗叆鍒欒嚜鍔ㄥ噯鍏ュ苟閫氳繃锛屼繚璇侀噰璐鍗曟祦绋嬪彲鐢�
- supplierApplyService.ensureSupplierApproved(supplier.getId());
-
- // 鏌ユ嫑鏍囩墿鏂�
- List<SrmTenderMaterialDO> materials = tenderMaterialMapper
- .selectListByTenderProjectId(award.getTenderProjectId());
- if (CollUtil.isEmpty(materials)) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_NOT_EXISTS);
- }
-
- // 鏌ヤ腑鏍囨姤浠�
- List<SrmSupplierQuoteDO> quotes = supplierQuoteMapper.selectListByBidId(award.getBidId());
- if (CollUtil.isEmpty(quotes)) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_QUOTE_NOT_EXISTS);
- }
- Map<Long, SrmSupplierQuoteDO> quoteMap = quotes.stream()
- .collect(Collectors.toMap(
- SrmSupplierQuoteDO::getTenderMaterialId,
- Function.identity(),
- (a, b) -> a));
-
- // 鏌� MDM 鐗╂枡
- Set<Long> productIds = materials.stream()
- .map(SrmTenderMaterialDO::getProductId)
- .collect(Collectors.toSet());
- Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemList(productIds).getCheckedData()
- .stream().collect(Collectors.toMap(MdmItemRespDTO::getId, Function.identity()));
-
- // 璁$畻浠锋牸锛堟姤浠蜂负鈥滃崟浠封�濆彛寰勶細琛岄噾棰� = 鎶ヤ环鍗曚环 脳 鏁伴噺锛�
- // 瀹氭爣閲戦涓庢姤浠峰悎璁′笉涓�鑷存椂鎸夎閲戦姣斾緥鍒嗘憡锛岃鍗曡鍗曚环浠嶅彇鎶ヤ环鍗曚环锛�
- BigDecimal totalQuoteAmount = BigDecimal.ZERO;
- for (SrmTenderMaterialDO material : materials) {
- SrmSupplierQuoteDO quote = quoteMap.get(material.getId());
- BigDecimal quantity = material.getQuantity();
- if (quote == null || quote.getQuotePrice() == null
- || quantity == null || quantity.compareTo(BigDecimal.ZERO) <= 0) {
- continue;
- }
- totalQuoteAmount = totalQuoteAmount.add(quote.getQuotePrice().multiply(quantity));
- }
- BigDecimal awardAmount = award.getAwardAmount() != null ? award.getAwardAmount() : totalQuoteAmount;
- BigDecimal ratio = totalQuoteAmount.compareTo(BigDecimal.ZERO) > 0
- ? awardAmount.divide(totalQuoteAmount, 8, RoundingMode.HALF_UP)
- : BigDecimal.ONE;
-
- // 鏋勫缓璁㈠崟椤�
- List<ErpPurchaseOrderCreateReqDTO.Item> orderItems = new ArrayList<>();
- for (SrmTenderMaterialDO material : materials) {
- SrmSupplierQuoteDO quote = quoteMap.get(material.getId());
- if (quote == null) {
- continue;
- }
- BigDecimal quotePrice = quote.getQuotePrice();
- if (quotePrice == null) {
- continue;
- }
- BigDecimal quantity = material.getQuantity();
- if (quantity == null || quantity.compareTo(BigDecimal.ZERO) <= 0) {
- continue;
- }
- MdmItemRespDTO mdmItem = itemMap.get(material.getProductId());
- if (mdmItem == null) {
- continue;
- }
- BigDecimal unitPrice = quotePrice.multiply(ratio).setScale(4, RoundingMode.HALF_UP);
- ErpPurchaseOrderCreateReqDTO.Item item = new ErpPurchaseOrderCreateReqDTO.Item();
- item.setProductId(material.getProductId());
- item.setProductUnitId(mdmItem.getUnitMeasureId());
- item.setProductPrice(unitPrice);
- item.setCount(quantity);
- item.setTaxPercent(quote.getTaxRate());
- item.setRemark("瀹氭爣缂栧彿: " + award.getAwardNo());
- orderItems.add(item);
- }
-
- // 璋冪敤 ERP 鍒涘缓閲囪喘璁㈠崟
- ErpPurchaseOrderCreateReqDTO createReq = new ErpPurchaseOrderCreateReqDTO();
- createReq.setSupplierId(supplier.getId());
- createReq.setOrderTime(LocalDateTime.now());
- createReq.setDepositPrice(BigDecimal.ZERO);
- createReq.setItems(orderItems);
- createReq.setRemark("SRM 绠�鏄撴嫑鎶曟爣鑷姩鐢熸垚, 瀹氭爣缂栧彿: " + award.getAwardNo());
-
- Long purchaseOrderId = erpPurchaseOrderApi.createPurchaseOrder(createReq).getCheckedData();
-
- // 鑾峰彇閲囪喘璁㈠崟鍙�
- String purchaseOrderNo = null;
- try {
- purchaseOrderNo = erpPurchaseOrderApi.getPurchaseOrder(purchaseOrderId)
- .getCheckedData().getNo();
- } catch (Exception e) {
- log.warn("[generatePurchaseOrderForSimple] 鑾峰彇閲囪喘璁㈠崟鍙峰け璐ワ紝purchaseOrderId={}", purchaseOrderId, e);
- }
-
- // 鏇存柊瀹氭爣璁板綍
- award.setPurchaseOrderId(purchaseOrderId);
- award.setPurchaseOrderNo(purchaseOrderNo);
- award.setAwardStatus(AwardStatusEnum.ORDER_GENERATED.getCode());
- bidAwardMapper.updateById(award);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- @LogRecord(type = LOG_TENDER_TYPE, subType = LOG_TENDER_UPDATE_SUB_TYPE,
- bizNo = "{{#updateReqVO.id}}", success = LOG_TENDER_UPDATE_SUCCESS)
- public void updateTenderProjectPartial(SrmTenderProjectPartialUpdateReqVO updateReqVO) {
- SrmTenderProjectDO project = validateTenderExists(updateReqVO.getId());
- if (!TenderStatusEnum.canEditPartialProject(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_PROJECT_LOCKED);
- }
- SrmTenderProjectDO updateObj = new SrmTenderProjectDO();
- updateObj.setId(updateReqVO.getId());
- updateObj.setTenderDesc(updateReqVO.getTenderDesc());
- updateObj.setQualificationRequirements(updateReqVO.getQualificationRequirements());
- tenderProjectMapper.updateById(updateObj);
- // 澧為噺鏇存柊璧勮川瑕佹眰闄勪欢
- storageAttachmentApi.updateAttachments("file", TENDER_PROJECT_RECORD_TYPE, updateReqVO.getId(), updateReqVO.getBlobIds());
- LogRecordContext.putVariable("tenderName", project.getTenderName());
- LogRecordContext.putVariable("oldTenderDesc", project.getTenderDesc());
- LogRecordContext.putVariable("newTenderDesc", updateReqVO.getTenderDesc());
- LogRecordContext.putVariable("oldQualification", project.getQualificationRequirements());
- LogRecordContext.putVariable("newQualification", updateReqVO.getQualificationRequirements());
- }
-
- // ========== 鐗╂枡瀛愯〃 ==========
-
- @Override
- public void createMaterial(SrmTenderMaterialSaveReqVO createReqVO) {
- SrmTenderProjectDO project = validateTenderExists(createReqVO.getTenderProjectId());
- if (!TenderStatusEnum.canEditMaterial(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_MATERIAL_LOCKED);
- }
- SrmTenderMaterialDO material = BeanUtils.toBean(createReqVO, SrmTenderMaterialDO.class);
- tenderMaterialMapper.insert(material);
- }
-
- @Override
- public void updateMaterial(SrmTenderMaterialSaveReqVO updateReqVO) {
- SrmTenderMaterialDO existing = tenderMaterialMapper.selectById(updateReqVO.getId());
- if (existing != null) {
- SrmTenderProjectDO project = tenderProjectMapper.selectById(existing.getTenderProjectId());
- if (project != null && !TenderStatusEnum.canEditMaterial(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_MATERIAL_LOCKED);
- }
- }
- SrmTenderMaterialDO updateObj = BeanUtils.toBean(updateReqVO, SrmTenderMaterialDO.class);
- tenderMaterialMapper.updateById(updateObj);
- }
-
- @Override
- public void deleteMaterial(Long id) {
- SrmTenderMaterialDO material = tenderMaterialMapper.selectById(id);
- if (material != null) {
- SrmTenderProjectDO project = tenderProjectMapper.selectById(material.getTenderProjectId());
- if (project != null && !TenderStatusEnum.canEditMaterial(project.getTenderStatus())) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_MATERIAL_LOCKED);
- }
- }
- tenderMaterialMapper.deleteById(id);
- }
-
- @Override
- public List<SrmTenderMaterialDO> getMaterialList(Long tenderProjectId) {
- return tenderMaterialMapper.selectListByTenderProjectId(tenderProjectId);
- }
-
- private SrmTenderProjectDO validateTenderExists(Long id) {
- SrmTenderProjectDO project = tenderProjectMapper.selectById(id);
- if (project == null) {
- throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_NOT_EXISTS);
- }
- return project;
- }
-
-}
diff --git a/yudao-module-srm/src/main/resources/sql/srm_init.sql b/yudao-module-srm/src/main/resources/sql/srm_init.sql
index faef6eb..a7dcc50 100644
--- a/yudao-module-srm/src/main/resources/sql/srm_init.sql
+++ b/yudao-module-srm/src/main/resources/sql/srm_init.sql
@@ -1,19 +1,11 @@
-- =============================================
-- SRM 渚涘簲鍟嗗叧绯荤鐞嗘ā鍧� - 鏁版嵁搴撳垵濮嬪寲鑴氭湰
-- MySQL 8.4+
+--
+-- 淇濈暀鑼冨洿锛氫緵搴斿晢妗f锛堝惈澶氳仈绯讳汉/澶氶摱琛岃处鎴凤級銆佽浠锋瘮浠枫�佹姇鏍囦繚璇侀噾
+-- 宸茬Щ闄わ細渚涘簲鍟嗗噯鍏ャ�佽祫璐ㄣ�佺哗鏁堛�佹嫑鎶曟爣銆佺粺璁″垎鏋愶紙瀵瑰簲琛ㄥ凡鍦�
+-- sql/mysql/srm_procurement_refactor_20261103.sql 涓� DROP锛�
-- =============================================
-
--- 0. 鎷涙姇鏍囬厤缃〃
-CREATE TABLE IF NOT EXISTS srm_tender_config (
- id BIGINT NOT NULL AUTO_INCREMENT COMMENT '閰嶇疆ID',
- default_bidding_mode VARCHAR(20) NOT NULL DEFAULT 'FULL' COMMENT '榛樿鎷涙姇鏍囨ā寮�: FULL-瀹屾暣鐗�, SIMPLE-绠�鏄撶増',
- 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)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='SRM鎷涙姇鏍囬厤缃〃';
-- 1. 渚涘簲鍟嗕富琛�
CREATE TABLE IF NOT EXISTS srm_supplier (
@@ -29,11 +21,11 @@
legal_person VARCHAR(50) DEFAULT NULL COMMENT '娉曚汉浠h〃',
address VARCHAR(500) DEFAULT NULL COMMENT '鍏徃鍦板潃',
website VARCHAR(200) DEFAULT NULL COMMENT '鍏徃缃戝潃',
- contact_name VARCHAR(50) DEFAULT NULL COMMENT '鑱旂郴浜�',
- contact_mobile VARCHAR(20) DEFAULT NULL COMMENT '鑱旂郴鐢佃瘽',
- contact_email VARCHAR(100) DEFAULT NULL COMMENT '閭',
- bank_name VARCHAR(255) DEFAULT NULL COMMENT '寮�鎴烽摱琛�',
- bank_account VARCHAR(100) DEFAULT NULL COMMENT '閾惰璐﹀彿',
+ contact_name VARCHAR(50) DEFAULT NULL COMMENT '榛樿鑱旂郴浜猴紙涓昏〃鍐椾綑锛�',
+ contact_mobile VARCHAR(20) DEFAULT NULL COMMENT '榛樿鑱旂郴鐢佃瘽锛堜富琛ㄥ啑浣欙級',
+ contact_email VARCHAR(100) DEFAULT NULL COMMENT '榛樿閭锛堜富琛ㄥ啑浣欙級',
+ bank_name VARCHAR(255) DEFAULT NULL COMMENT '榛樿寮�鎴烽摱琛岋紙涓昏〃鍐椾綑锛�',
+ bank_account VARCHAR(100) DEFAULT NULL COMMENT '榛樿閾惰璐﹀彿锛堜富琛ㄥ啑浣欙級',
status INT NOT NULL DEFAULT 0 COMMENT '鐘舵�侊紙0鍚敤 1绂佺敤锛�',
remark VARCHAR(500) DEFAULT NULL COMMENT '澶囨敞',
erp_supplier_id BIGINT DEFAULT NULL COMMENT '鍏宠仈ERP渚涘簲鍟咺D',
@@ -49,7 +41,7 @@
KEY idx_erp_supplier_id (erp_supplier_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='渚涘簲鍟嗕富琛�';
--- 2. 渚涘簲鍟嗚仈绯讳汉琛�
+-- 2. 渚涘簲鍟嗚仈绯讳汉琛紙鏀寔澶氫釜鑱旂郴浜猴紝浠呬竴涓粯璁わ級
CREATE TABLE IF NOT EXISTS srm_supplier_contact (
id BIGINT NOT NULL AUTO_INCREMENT COMMENT '鑱旂郴浜篒D',
supplier_id BIGINT NOT NULL COMMENT '渚涘簲鍟咺D',
@@ -70,7 +62,27 @@
KEY idx_supplier_id (supplier_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='渚涘簲鍟嗚仈绯讳汉琛�';
--- 3. 渚涘簲鍟嗗垎绫诲叧鑱旇〃
+-- 3. 渚涘簲鍟嗛摱琛岃处鎴疯〃锛堟敮鎸佸涓紑鎴疯锛屼粎涓�涓粯璁わ級
+CREATE TABLE IF NOT EXISTS srm_supplier_bank (
+ id BIGINT NOT NULL AUTO_INCREMENT COMMENT '閾惰璐︽埛ID',
+ supplier_id BIGINT NOT NULL COMMENT '渚涘簲鍟咺D',
+ bank_name VARCHAR(128) NOT NULL COMMENT '寮�鎴疯',
+ bank_account VARCHAR(64) NOT NULL COMMENT '閾惰璐﹀彿',
+ bank_no VARCHAR(64) DEFAULT NULL COMMENT '閾惰琛屽彿',
+ bank_address VARCHAR(255) DEFAULT NULL COMMENT '寮�鎴疯鍦板潃',
+ is_default BIT(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁榛樿閾惰璐︽埛',
+ sort INT NOT NULL DEFAULT 0 COMMENT '鎺掑簭',
+ remark VARCHAR(500) DEFAULT NULL 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_supplier_id (supplier_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='渚涘簲鍟嗛摱琛岃处鎴疯〃';
+
+-- 4. 渚涘簲鍟嗗垎绫诲叧鑱旇〃
CREATE TABLE IF NOT EXISTS srm_supplier_category (
id BIGINT NOT NULL AUTO_INCREMENT COMMENT '鍏宠仈ID',
supplier_id BIGINT NOT NULL COMMENT '渚涘簲鍟咺D',
@@ -78,41 +90,23 @@
category_name VARCHAR(100) DEFAULT NULL 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 INT NOT NULL DEFAULT 0 COMMENT '鏄惁鍒犻櫎 0=鍚� 1=鏄�',
PRIMARY KEY (id),
KEY idx_supplier_id (supplier_id),
KEY idx_category_id (category_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='渚涘簲鍟嗗垎绫诲叧鑱旇〃';
--- 4. 渚涘簲鍟嗗噯鍏ョ敵璇疯〃
-CREATE TABLE IF NOT EXISTS srm_supplier_apply (
- id BIGINT NOT NULL AUTO_INCREMENT COMMENT '鐢宠ID',
- apply_no VARCHAR(64) NOT NULL COMMENT '鐢宠缂栧彿',
- supplier_id BIGINT DEFAULT NULL COMMENT '渚涘簲鍟咺D锛堟柊寤轰负绌猴紝鍑嗗叆鍚庡洖濉級',
- supplier_name VARCHAR(255) NOT NULL COMMENT '渚涘簲鍟嗗悕绉�',
- supplier_type VARCHAR(50) DEFAULT NULL COMMENT '渚涘簲鍟嗙被鍨�',
- company_nature VARCHAR(50) DEFAULT NULL COMMENT '浼佷笟鎬ц川',
- registered_capital DECIMAL(24,6) DEFAULT NULL COMMENT '娉ㄥ唽璧勯噾锛堜竾鍏冿級',
- business_license_no VARCHAR(100) DEFAULT NULL COMMENT '钀ヤ笟鎵х収缂栧彿',
- tax_no VARCHAR(100) DEFAULT NULL COMMENT '绋庡彿',
- address VARCHAR(500) DEFAULT NULL COMMENT '鍏徃鍦板潃',
- bank_name VARCHAR(255) DEFAULT NULL COMMENT '寮�鎴烽摱琛�',
- bank_account VARCHAR(100) DEFAULT NULL COMMENT '閾惰璐﹀彿',
- contact_name VARCHAR(50) DEFAULT NULL COMMENT '鑱旂郴浜�',
- contact_mobile VARCHAR(20) DEFAULT NULL COMMENT '鑱旂郴鐢佃瘽',
- contact_email VARCHAR(100) DEFAULT NULL COMMENT '閭',
- apply_user_id BIGINT DEFAULT NULL COMMENT '鐢宠浜篒D',
- apply_user_name VARCHAR(50) DEFAULT NULL COMMENT '鐢宠浜哄鍚�',
- apply_time DATETIME DEFAULT NULL COMMENT '鐢宠鏃堕棿',
- apply_status INT NOT NULL DEFAULT 0 COMMENT '瀹℃牳鐘舵�侊紙0寰呮彁浜� 10寰呴噰璐鏍� 20寰呰川閲忓鏍� 30寰呰储鍔″鏍� 40宸查�氳繃 50宸叉嫆缁濓級',
- purchase_reviewer_id BIGINT DEFAULT NULL COMMENT '閲囪喘瀹℃牳浜篒D',
- purchase_review_time DATETIME DEFAULT NULL COMMENT '閲囪喘瀹℃牳鏃堕棿',
- purchase_review_opinion VARCHAR(500) DEFAULT NULL COMMENT '閲囪喘瀹℃牳鎰忚',
- quality_reviewer_id BIGINT DEFAULT NULL COMMENT '璐ㄩ噺瀹℃牳浜篒D',
- quality_review_time DATETIME DEFAULT NULL COMMENT '璐ㄩ噺瀹℃牳鏃堕棿',
- quality_review_opinion VARCHAR(500) DEFAULT NULL COMMENT '璐ㄩ噺瀹℃牳鎰忚',
- finance_reviewer_id BIGINT DEFAULT NULL COMMENT '璐㈠姟瀹℃牳浜篒D',
- finance_review_time DATETIME DEFAULT NULL COMMENT '璐㈠姟瀹℃牳鏃堕棿',
- finance_review_opinion VARCHAR(500) DEFAULT NULL COMMENT '璐㈠姟瀹℃牳鎰忚',
+-- 5. 璇环鍗�
+CREATE TABLE IF NOT EXISTS srm_inquiry (
+ id BIGINT NOT NULL AUTO_INCREMENT COMMENT '璇环鍗旾D',
+ no VARCHAR(32) NOT NULL COMMENT '璇环鍗曞彿',
+ title VARCHAR(128) NOT NULL COMMENT '璇环鏍囬',
+ status TINYINT NOT NULL DEFAULT 0 COMMENT '鐘舵�侊細0鑽夌 10璇环涓� 20宸茶浆璁㈠崟 30宸插彇娑�',
+ inquiry_date DATE DEFAULT NULL COMMENT '璇环鏃ユ湡',
+ deadline DATE DEFAULT NULL COMMENT '鎶ヤ环鎴鏃ユ湡',
+ purchaser_user_id BIGINT DEFAULT NULL COMMENT '閲囪喘鍛樼敤鎴稩D',
remark VARCHAR(500) DEFAULT NULL COMMENT '澶囨敞',
creator VARCHAR(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
@@ -120,116 +114,27 @@
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),
- UNIQUE KEY uk_apply_no (apply_no),
- KEY idx_supplier_id (supplier_id),
- KEY idx_apply_status (apply_status)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='渚涘簲鍟嗗噯鍏ョ敵璇疯〃';
+ UNIQUE KEY uk_no (no),
+ KEY idx_status (status),
+ KEY idx_inquiry_date (inquiry_date)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='SRM璇环鍗�';
--- 5. 渚涘簲鍟嗚祫璐ㄨ瘉涔﹁〃
-CREATE TABLE IF NOT EXISTS srm_supplier_certificate (
- id BIGINT NOT NULL AUTO_INCREMENT COMMENT '璇佷功ID',
- supplier_id BIGINT NOT NULL COMMENT '渚涘簲鍟咺D',
- certificate_type INT NOT NULL COMMENT '璇佷功绫诲瀷锛�1钀ヤ笟鎵х収 2璁よ瘉璇佷功 3妫�娴嬫姤鍛� 4鍏朵粬锛�',
- certificate_name VARCHAR(255) NOT NULL COMMENT '璇佷功鍚嶇О',
- certificate_no VARCHAR(100) DEFAULT NULL COMMENT '璇佷功缂栧彿',
- file_name VARCHAR(255) DEFAULT NULL COMMENT '鏂囦欢鍚嶇О',
- file_url VARCHAR(500) DEFAULT NULL COMMENT '鏂囦欢鍦板潃',
- issuing_authority VARCHAR(255) DEFAULT NULL COMMENT '棰佸彂鏈烘瀯',
- valid_start_date DATE DEFAULT NULL COMMENT '鏈夋晥寮�濮嬫棩鏈�',
- valid_end_date DATE DEFAULT NULL COMMENT '鏈夋晥缁撴潫鏃ユ湡',
- status INT NOT NULL DEFAULT 0 COMMENT '鐘舵�侊紙0鏈夋晥 1杩囨湡 2鍗冲皢杩囨湡锛�',
- remark VARCHAR(500) DEFAULT NULL 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_supplier_id (supplier_id),
- KEY idx_certificate_type (certificate_type),
- KEY idx_valid_end_date (valid_end_date)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='渚涘簲鍟嗚祫璐ㄨ瘉涔﹁〃';
-
--- 6. 渚涘簲鍟嗙哗鏁堣瘎浠疯〃
-CREATE TABLE IF NOT EXISTS srm_supplier_evaluation (
- id BIGINT NOT NULL AUTO_INCREMENT COMMENT '璇勪环ID',
- supplier_id BIGINT NOT NULL COMMENT '渚涘簲鍟咺D',
- evaluation_period VARCHAR(50) NOT NULL COMMENT '璇勪环鍛ㄦ湡锛堝锛�2026-Q1锛�',
- quality_score DECIMAL(5,2) DEFAULT NULL COMMENT '璐ㄩ噺璇勫垎锛堟弧鍒�100锛�',
- quality_pass_rate DECIMAL(5,2) DEFAULT NULL COMMENT '鏉ユ枡鍚堟牸鐜�(%)',
- quality_defect_count INT DEFAULT 0 COMMENT '涓嶈壇娆℃暟',
- delivery_score DECIMAL(5,2) DEFAULT NULL COMMENT '浜や粯璇勫垎锛堟弧鍒�100锛�',
- delivery_on_time_rate DECIMAL(5,2) DEFAULT NULL COMMENT '鍑嗘椂浜や粯鐜�(%)',
- delivery_delay_count INT DEFAULT 0 COMMENT '寤惰繜娆℃暟',
- price_score DECIMAL(5,2) DEFAULT NULL COMMENT '浠锋牸璇勫垎锛堟弧鍒�100锛�',
- service_score DECIMAL(5,2) DEFAULT NULL COMMENT '鏈嶅姟璇勫垎锛堟弧鍒�100锛�',
- service_response_speed INT DEFAULT NULL COMMENT '鍝嶅簲閫熷害锛堣瘎鍒�1-10锛�',
- composite_score DECIMAL(5,2) DEFAULT NULL COMMENT '缁煎悎璇勫垎锛堣嚜鍔ㄨ绠楋級',
- evaluation_level VARCHAR(20) DEFAULT NULL COMMENT '璇勪环绛夌骇锛圓/B/C/D锛�',
- evaluator_id BIGINT DEFAULT NULL COMMENT '璇勪环浜篒D',
- evaluation_time DATETIME DEFAULT NULL COMMENT '璇勪环鏃堕棿',
- remark VARCHAR(500) DEFAULT NULL 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_supplier_id (supplier_id),
- KEY idx_evaluation_period (evaluation_period),
- KEY idx_composite_score (composite_score)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='渚涘簲鍟嗙哗鏁堣瘎浠疯〃';
-
--- 7. 鎷涙爣椤圭洰琛�
-CREATE TABLE IF NOT EXISTS srm_tender_project (
- id BIGINT NOT NULL AUTO_INCREMENT COMMENT '鎷涙爣椤圭洰ID',
- tender_no VARCHAR(64) NOT NULL COMMENT '鎷涙爣缂栧彿',
- tender_name VARCHAR(255) NOT NULL COMMENT '鎷涙爣鍚嶇О',
- tender_type INT NOT NULL COMMENT '鎷涙爣绫诲瀷锛�1鍏紑鎷涙爣 2閭�璇锋嫑鏍� 3绔炰簤鎬ц皥鍒わ級',
- purchase_org VARCHAR(100) DEFAULT NULL COMMENT '閲囪喘缁勭粐',
- project_leader_id BIGINT DEFAULT NULL COMMENT '椤圭洰璐熻矗浜篒D',
- project_leader_name VARCHAR(50) DEFAULT NULL COMMENT '椤圭洰璐熻矗浜哄鍚�',
- tender_status INT NOT NULL DEFAULT 0 COMMENT '鎷涙爣鐘舵�侊紙0鑽夌 1鍙戝竷涓� 2鎶曟爣涓� 3璇勬爣涓� 4宸插畾鏍� 5宸插叧闂級',
- budget_amount DECIMAL(24,6) DEFAULT NULL COMMENT '棰勭畻閲戦',
- start_time DATETIME DEFAULT NULL COMMENT '寮�濮嬫椂闂�',
- end_time DATETIME DEFAULT NULL COMMENT '鎴鏃堕棿',
- bid_open_time DATETIME DEFAULT NULL COMMENT '棰勮寮�鏍囨椂闂�',
- tender_desc TEXT DEFAULT NULL COMMENT '鎷涙爣璇存槑',
- qualification_requirements TEXT DEFAULT NULL COMMENT '璧勮川瑕佹眰',
- purchase_request_id BIGINT DEFAULT NULL COMMENT '鍏宠仈閲囪喘鐢宠ID',
- 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),
- UNIQUE KEY uk_tender_no (tender_no),
- KEY idx_tender_status (tender_status),
- KEY idx_purchase_request_id (purchase_request_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='鎷涙爣椤圭洰琛�';
-
--- 鎷涙爣椤圭洰琛ㄥ鍔� bidding_mode 瀛楁锛堢畝鏄撴ā寮忔敮鎸侊級
-SET @exists = (SELECT COUNT(*) FROM information_schema.columns
- WHERE table_schema = DATABASE() AND table_name = 'srm_tender_project' AND column_name = 'bidding_mode');
-SET @sql = IF(@exists = 0,
- 'ALTER TABLE srm_tender_project ADD COLUMN bidding_mode VARCHAR(20) NOT NULL DEFAULT ''FULL'' COMMENT ''鎷涙姇鏍囨ā寮�: FULL-瀹屾暣鐗�, SIMPLE-绠�鏄撶増'' AFTER tender_status',
- 'SELECT 1');
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
--- 8. 鎷涙爣鐗╂枡鏄庣粏琛�
-CREATE TABLE IF NOT EXISTS srm_tender_material (
- id BIGINT NOT NULL AUTO_INCREMENT COMMENT '鐗╂枡鏄庣粏ID',
- tender_project_id BIGINT NOT NULL COMMENT '鎷涙爣椤圭洰ID',
- product_id BIGINT DEFAULT NULL COMMENT '鐗╂枡ID锛堝叧鑱擬DM鐗╂枡锛�',
- product_code VARCHAR(64) DEFAULT NULL COMMENT '鐗╂枡缂栫爜',
- product_name VARCHAR(255) NOT NULL COMMENT '鐗╂枡鍚嶇О',
+-- 6. 璇环鍗曚骇鍝佽
+CREATE TABLE IF NOT EXISTS srm_inquiry_item (
+ id BIGINT NOT NULL AUTO_INCREMENT COMMENT '璇环浜у搧琛孖D',
+ inquiry_id BIGINT NOT NULL COMMENT '璇环鍗旾D',
+ product_id BIGINT DEFAULT NULL COMMENT '浜у搧ID',
+ product_unit_id BIGINT DEFAULT NULL COMMENT '浜у搧鍗曚綅ID',
+ product_code VARCHAR(64) DEFAULT NULL COMMENT '浜у搧缂栫爜',
+ product_name VARCHAR(255) DEFAULT NULL COMMENT '浜у搧鍚嶇О',
product_spec VARCHAR(200) DEFAULT NULL COMMENT '瑙勬牸鍨嬪彿',
- quantity DECIMAL(24,6) NOT NULL COMMENT '鏁伴噺',
- unit VARCHAR(20) NOT NULL COMMENT '鍗曚綅',
- tech_requirement TEXT DEFAULT NULL COMMENT '鎶�鏈姹�',
+ unit_name VARCHAR(50) DEFAULT NULL COMMENT '鍗曚綅鍚嶇О',
+ quantity DECIMAL(24,6) NOT NULL DEFAULT 0 COMMENT '閲囪喘鏁伴噺',
estimated_price DECIMAL(24,6) DEFAULT NULL COMMENT '棰勪及鍗曚环',
+ selected_supplier_id BIGINT DEFAULT NULL COMMENT '涓爣渚涘簲鍟咺D',
+ selected_quote_id BIGINT DEFAULT NULL COMMENT '涓爣鎶ヤ环ID',
+ selected_price DECIMAL(24,6) DEFAULT NULL COMMENT '涓爣鍗曚环',
+ remark VARCHAR(500) DEFAULT NULL COMMENT '澶囨敞',
sort INT NOT NULL DEFAULT 0 COMMENT '鎺掑簭',
creator VARCHAR(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
@@ -237,131 +142,92 @@
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_tender_project_id (tender_project_id),
- KEY idx_product_code (product_code)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='鎷涙爣鐗╂枡鏄庣粏琛�';
+ KEY idx_inquiry_id (inquiry_id),
+ KEY idx_product_id (product_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='SRM璇环鍗曚骇鍝佽';
--- 9. 鎶曟爣璁板綍琛�
-CREATE TABLE IF NOT EXISTS srm_tender_bid (
- id BIGINT NOT NULL AUTO_INCREMENT COMMENT '鎶曟爣ID',
- tender_project_id BIGINT NOT NULL COMMENT '鎷涙爣椤圭洰ID',
+-- 7. 璇环鍙備笌渚涘簲鍟�
+CREATE TABLE IF NOT EXISTS srm_inquiry_supplier (
+ id BIGINT NOT NULL AUTO_INCREMENT COMMENT '璇环鍙備笌渚涘簲鍟咺D',
+ inquiry_id BIGINT NOT NULL COMMENT '璇环鍗旾D',
supplier_id BIGINT NOT NULL COMMENT '渚涘簲鍟咺D',
- bid_no VARCHAR(64) NOT NULL COMMENT '鎶曟爣缂栧彿',
- bid_status INT NOT NULL DEFAULT 0 COMMENT '鎶曟爣鐘舵�侊紙0鎶ュ悕 10宸叉姇鏍� 20鎾ゆ爣 30涓爣 40鏈腑鏍囷級',
- bid_time DATETIME DEFAULT NULL COMMENT '鎶曟爣鏃堕棿',
- bid_total_amount DECIMAL(24,6) DEFAULT NULL COMMENT '鎶曟爣鎬婚噾棰�',
- bid_file_name VARCHAR(255) DEFAULT NULL COMMENT '鎶曟爣鏂囦欢鍚嶇О',
- bid_file_url VARCHAR(500) DEFAULT NULL COMMENT '鎶曟爣鏂囦欢鍦板潃',
- withdraw_reason VARCHAR(500) DEFAULT NULL COMMENT '鎾ゆ爣鍘熷洜',
+ quote_status TINYINT NOT NULL DEFAULT 0 COMMENT '鎶ヤ环鐘舵�侊細0鏈姤浠� 10宸叉姤浠�',
+ quote_time DATETIME DEFAULT NULL COMMENT '鏈�杩戞姤浠锋椂闂�',
+ remark VARCHAR(500) DEFAULT NULL 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),
- UNIQUE KEY uk_bid_no (bid_no),
- KEY idx_tender_project_id (tender_project_id),
- KEY idx_supplier_id (supplier_id),
- KEY idx_bid_status (bid_status)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='鎶曟爣璁板綍琛�';
+ KEY idx_inquiry_id (inquiry_id),
+ KEY idx_supplier_id (supplier_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='SRM璇环鍙備笌渚涘簲鍟�';
--- 10. 渚涘簲鍟嗘姤浠锋槑缁嗚〃
-CREATE TABLE IF NOT EXISTS srm_supplier_quote (
- id BIGINT NOT NULL AUTO_INCREMENT COMMENT '鎶ヤ环ID',
- tender_project_id BIGINT NOT NULL COMMENT '鎷涙爣椤圭洰ID',
+-- 8. 璇环鎶ヤ环鏄庣粏
+CREATE TABLE IF NOT EXISTS srm_inquiry_quote (
+ id BIGINT NOT NULL AUTO_INCREMENT COMMENT '璇环鎶ヤ环ID',
+ inquiry_id BIGINT NOT NULL COMMENT '璇环鍗旾D',
+ inquiry_item_id BIGINT NOT NULL COMMENT '璇环浜у搧琛孖D',
supplier_id BIGINT NOT NULL COMMENT '渚涘簲鍟咺D',
- bid_id BIGINT DEFAULT NULL COMMENT '鎶曟爣璁板綍ID',
- tender_material_id BIGINT NOT NULL COMMENT '鎷涙爣鐗╂枡ID',
- quote_price DECIMAL(24,6) NOT NULL COMMENT '鎶ヤ环浠锋牸',
- tax_rate DECIMAL(5,2) DEFAULT NULL COMMENT '绋庣巼(%)',
+ price DECIMAL(24,6) NOT NULL COMMENT '鎶ヤ环鍗曚环',
+ tax_rate DECIMAL(24,6) DEFAULT NULL COMMENT '绋庣巼锛�%锛�',
delivery_cycle INT DEFAULT NULL COMMENT '浜よ揣鍛ㄦ湡锛堝ぉ锛�',
- payment_terms VARCHAR(500) DEFAULT NULL COMMENT '浠樻鏉′欢',
- warranty_period INT DEFAULT NULL COMMENT '璐ㄤ繚鏈燂紙鏈堬級',
+ payment_terms VARCHAR(128) DEFAULT NULL COMMENT '浠樻鏉′欢',
remark VARCHAR(500) DEFAULT NULL COMMENT '澶囨敞',
+ is_selected BIT(1) NOT NULL DEFAULT b'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_tender_project_id (tender_project_id),
- KEY idx_supplier_id (supplier_id),
- KEY idx_bid_id (bid_id),
- KEY idx_tender_material_id (tender_material_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='渚涘簲鍟嗘姤浠锋槑缁嗚〃';
+ KEY idx_inquiry_id (inquiry_id),
+ KEY idx_inquiry_item_id (inquiry_item_id),
+ KEY idx_supplier_id (supplier_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='SRM璇环鎶ヤ环鏄庣粏';
--- 11. 寮�鏍囪褰曡〃
-CREATE TABLE IF NOT EXISTS srm_bid_open (
- id BIGINT NOT NULL AUTO_INCREMENT COMMENT '寮�鏍嘔D',
- tender_project_id BIGINT NOT NULL COMMENT '鎷涙爣椤圭洰ID',
- open_time DATETIME NOT NULL COMMENT '寮�鏍囨椂闂�',
- open_person_id BIGINT DEFAULT NULL COMMENT '寮�鏍囦汉鍛業D',
- open_person_name VARCHAR(50) DEFAULT NULL COMMENT '寮�鏍囦汉鍛樺鍚�',
- open_record TEXT DEFAULT NULL COMMENT '寮�鏍囪褰�',
- attachment_name VARCHAR(255) DEFAULT NULL COMMENT '闄勪欢鍚嶇О',
- attachment_url VARCHAR(500) DEFAULT NULL 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_tender_project_id (tender_project_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='寮�鏍囪褰曡〃';
-
--- 12. 璇勬爣璁板綍琛�
-CREATE TABLE IF NOT EXISTS srm_bid_evaluation (
- id BIGINT NOT NULL AUTO_INCREMENT COMMENT '璇勬爣ID',
- tender_project_id BIGINT NOT NULL COMMENT '鎷涙爣椤圭洰ID',
- supplier_id BIGINT NOT NULL COMMENT '渚涘簲鍟咺D',
- bid_id BIGINT NOT NULL COMMENT '鎶曟爣璁板綍ID',
- price_score DECIMAL(5,2) DEFAULT NULL COMMENT '浠锋牸璇勫垎锛堟弧鍒�40锛�',
- tech_score DECIMAL(5,2) DEFAULT NULL COMMENT '鎶�鏈瘎鍒嗭紙婊″垎30锛�',
- delivery_score DECIMAL(5,2) DEFAULT NULL COMMENT '浜や粯璇勫垎锛堟弧鍒�20锛�',
- service_score DECIMAL(5,2) DEFAULT NULL COMMENT '鏈嶅姟璇勫垎锛堟弧鍒�10锛�',
- composite_score DECIMAL(5,2) DEFAULT NULL COMMENT '缁煎悎璇勫垎锛堣嚜鍔ㄨ绠�=浠锋牸+鎶�鏈�+浜や粯+鏈嶅姟锛�',
- ranking INT DEFAULT NULL COMMENT '鎺掑悕',
- evaluator_id BIGINT DEFAULT NULL COMMENT '璇勬爣浜篒D',
- evaluator_name VARCHAR(50) DEFAULT NULL COMMENT '璇勬爣浜哄鍚�',
- evaluation_opinion VARCHAR(500) DEFAULT NULL COMMENT '璇勬爣鎰忚',
- evaluation_time DATETIME DEFAULT NULL 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_tender_project_id (tender_project_id),
- KEY idx_supplier_id (supplier_id),
- KEY idx_bid_id (bid_id),
- KEY idx_ranking (ranking)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='璇勬爣璁板綍琛�';
-
--- 13. 瀹氭爣璁板綍琛�
-CREATE TABLE IF NOT EXISTS srm_bid_award (
- id BIGINT NOT NULL AUTO_INCREMENT COMMENT '瀹氭爣ID',
- tender_project_id BIGINT NOT NULL COMMENT '鎷涙爣椤圭洰ID',
+-- 9. 璇环杞鍗曡褰�
+CREATE TABLE IF NOT EXISTS srm_inquiry_order (
+ id BIGINT NOT NULL AUTO_INCREMENT COMMENT '璇环杞鍗曡褰旾D',
+ inquiry_id BIGINT NOT NULL COMMENT '璇环鍗旾D',
supplier_id BIGINT NOT NULL COMMENT '涓爣渚涘簲鍟咺D',
- bid_id BIGINT NOT NULL COMMENT '涓爣鎶曟爣ID',
- award_no VARCHAR(64) NOT NULL COMMENT '涓爣閫氱煡涔︾紪鍙�',
- award_status INT NOT NULL DEFAULT 0 COMMENT '瀹氭爣鐘舵�侊紙0寰呭鎵� 10宸插畾鏍� 20宸茬敓鎴愯鍗曪級',
- award_amount DECIMAL(24,6) NOT NULL COMMENT '涓爣閲戦',
- award_time DATETIME DEFAULT NULL COMMENT '瀹氭爣鏃堕棿',
- notice_file_name VARCHAR(255) DEFAULT NULL COMMENT '涓爣閫氱煡涔︽枃浠跺悕',
- notice_file_url VARCHAR(500) DEFAULT NULL COMMENT '涓爣閫氱煡涔︽枃浠跺湴鍧�',
- purchase_order_id BIGINT DEFAULT NULL COMMENT '鍏宠仈鐢熸垚鐨勯噰璐鍗旾D',
- purchase_order_no VARCHAR(64) DEFAULT NULL COMMENT '鍏宠仈鐢熸垚鐨勯噰璐鍗曞彿',
- approver_id BIGINT DEFAULT NULL COMMENT '瀹℃壒浜篒D',
- approval_time DATETIME DEFAULT NULL COMMENT '瀹℃壒鏃堕棿',
- remark VARCHAR(500) DEFAULT NULL COMMENT '澶囨敞',
+ purchase_order_id BIGINT DEFAULT NULL COMMENT '鐢熸垚鐨勯噰璐鍗旾D',
+ purchase_order_no VARCHAR(64) DEFAULT NULL 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),
- UNIQUE KEY uk_award_no (award_no),
- KEY idx_tender_project_id (tender_project_id),
+ KEY idx_inquiry_id (inquiry_id),
KEY idx_supplier_id (supplier_id),
KEY idx_purchase_order_id (purchase_order_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='瀹氭爣璁板綍琛�';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='SRM璇环杞噰璐鍗曡褰�';
+
+-- 10. 鎶曟爣淇濊瘉閲戝彴璐�
+CREATE TABLE IF NOT EXISTS srm_bid_bond (
+ id BIGINT NOT NULL AUTO_INCREMENT COMMENT '鎶曟爣淇濊瘉閲慖D',
+ no VARCHAR(32) NOT NULL COMMENT '淇濊瘉閲戝崟鍙�',
+ supplier_id BIGINT NOT NULL COMMENT '渚涘簲鍟咺D',
+ project_name VARCHAR(255) DEFAULT NULL COMMENT '椤圭洰鍚嶇О',
+ inquiry_id BIGINT DEFAULT NULL COMMENT '鍏宠仈璇环鍗旾D',
+ purchase_order_id BIGINT DEFAULT NULL COMMENT '鍏宠仈閲囪喘璁㈠崟ID',
+ bond_amount DECIMAL(24,6) NOT NULL DEFAULT 0 COMMENT '淇濊瘉閲戦噾棰�',
+ pay_date DATE DEFAULT NULL COMMENT '缂寸撼鏃ユ湡',
+ won BIT(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁涓爣',
+ refund_status TINYINT NOT NULL DEFAULT 0 COMMENT '閫�鍥炵姸鎬侊細0鏈��鍥� 1閮ㄥ垎閫�鍥� 2宸查��鍥� 3鏃犻渶閫�鍥�',
+ refund_amount DECIMAL(24,6) DEFAULT NULL COMMENT '閫�鍥為噾棰�',
+ refund_date DATE DEFAULT NULL COMMENT '閫�鍥炴棩鏈�',
+ remark VARCHAR(500) DEFAULT NULL 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),
+ UNIQUE KEY uk_no (no),
+ KEY idx_supplier_id (supplier_id),
+ KEY idx_inquiry_id (inquiry_id),
+ KEY idx_refund_status (refund_status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='SRM鎶曟爣淇濊瘉閲戝彴璐�';
diff --git a/yudao-module-srm/src/main/resources/sql/srm_menu_init.sql b/yudao-module-srm/src/main/resources/sql/srm_menu_init.sql
index 1887397..70619f5 100644
--- a/yudao-module-srm/src/main/resources/sql/srm_menu_init.sql
+++ b/yudao-module-srm/src/main/resources/sql/srm_menu_init.sql
@@ -1,100 +1,50 @@
-- =====================================================
--- SRM 妯″潡鑿滃崟鏁版嵁
+-- SRM 妯″潡鑿滃崟鏁版嵁锛堟柊搴撳垵濮嬪寲鐢級
+-- 宸茬Щ闄わ細渚涘簲鍟嗗噯鍏�/璧勮川/缁╂晥/鎷涙姇鏍�/缁熻鍒嗘瀽
+-- 淇濈暀锛氫緵搴斿晢妗f銆佽浠锋瘮浠枫�佹姇鏍囦繚璇侀噾銆佷緵搴斿晢寰�鏉�
+-- 璇存槑锛氫娇鐢� INSERT IGNORE锛岄噸澶嶆墽琛屼笉浼氭姤涓婚敭鍐茬獊銆�
-- =====================================================
--- 1. 浜岀骇鐩綍锛歋RM 渚涘簲鍟嗙鐞嗭紙鎸傚湪閲囪喘绠$悊涓嬶級
-INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
-VALUES
-(602524, 'SRM 渚涘簲鍟嗙鐞�', '', 1, 5, 2602, 'srm', 'ep:avatar', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+-- 1. 渚涘簲鍟嗘。妗堬紙鐩存帴鎸傚湪閲囪喘绠$悊鏍硅彍鍗曚笅锛�
+INSERT IGNORE INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
+VALUES (602525, '渚涘簲鍟嗘。妗�', '', 2, 1, 2602, 'supplier', 'ep:document', 'srm/supplier/index', 'SrmSupplier', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
--- 2. 渚涘簲鍟嗘。妗�
-INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
-VALUES (602525, '渚涘簲鍟嗘。妗�', '', 2, 10, 602524, 'supplier', 'ep:document', 'srm/supplier/index', 'SrmSupplier', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
-
-INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
+INSERT IGNORE INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
VALUES
(602526, '渚涘簲鍟嗘煡璇�', 'srm:supplier:query', 3, 1, 602525, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
(602527, '渚涘簲鍟嗗垱寤�', 'srm:supplier:create', 3, 2, 602525, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
(602528, '渚涘簲鍟嗘洿鏂�', 'srm:supplier:update', 3, 3, 602525, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602529, '渚涘簲鍟嗗垹闄�', 'srm:supplier:delete', 3, 4, 602525, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+(602529, '渚涘簲鍟嗗垹闄�', 'srm:supplier:delete', 3, 4, 602525, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075301, '渚涘簲鍟嗗鍑�', 'srm:supplier:export', 3, 5, 602525, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(1075302, '渚涘簲鍟嗗鍏�', 'srm:supplier:import', 3, 6, 602525, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
--- 3. 渚涘簲鍟嗗噯鍏�
-INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
-VALUES (602530, '渚涘簲鍟嗗噯鍏�', '', 2, 20, 602524, 'supplier-apply', 'ep:checked', 'srm/supplierApply/index', 'SrmSupplierApply', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+-- 2. 璇环姣斾环
+INSERT IGNORE INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
+VALUES (602620, '璇环姣斾环', '', 2, 2, 2602, 'inquiry', 'ep:search', 'srm/inquiry/index', 'SrmInquiry', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
-INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
+INSERT IGNORE INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
VALUES
-(602531, '鍑嗗叆鏌ヨ', 'srm:supplier-apply:query', 3, 1, 602530, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602532, '鍑嗗叆鍒涘缓', 'srm:supplier-apply:create', 3, 2, 602530, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602533, '鍑嗗叆鏇存柊', 'srm:supplier-apply:update', 3, 3, 602530, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602534, '鍑嗗叆鍒犻櫎', 'srm:supplier-apply:delete', 3, 4, 602530, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+(602621, '璇环鏌ヨ', 'srm:inquiry:query', 3, 1, 602620, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(602622, '璇环鍒涘缓', 'srm:inquiry:create', 3, 2, 602620, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(602623, '璇环鏇存柊', 'srm:inquiry:update', 3, 3, 602620, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(602624, '璇环鍒犻櫎', 'srm:inquiry:delete', 3, 4, 602620, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(602625, '璇环纭杞鍗�', 'srm:inquiry:confirm', 3, 5, 602620, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(602626, '璇环褰曞叆鎶ヤ环', 'srm:inquiry:quote', 3, 6, 602620, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
--- 4. 渚涘簲鍟嗚祫璐�
-INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
-VALUES (602535, '渚涘簲鍟嗚祫璐�', '', 2, 30, 602524, 'supplier-certificate', 'ep:medal', 'srm/supplierCertificate/index', 'SrmSupplierCertificate', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+-- 3. 鎶曟爣淇濊瘉閲�
+INSERT IGNORE INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
+VALUES (602630, '鎶曟爣淇濊瘉閲�', '', 2, 3, 2602, 'bid-bond', 'ep:money', 'srm/bidBond/index', 'SrmBidBond', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
-INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
+INSERT IGNORE INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
VALUES
-(602536, '璧勮川鏌ヨ', 'srm:supplier-certificate:query', 3, 1, 602535, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602537, '璧勮川鍒涘缓', 'srm:supplier-certificate:create', 3, 2, 602535, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602538, '璧勮川鏇存柊', 'srm:supplier-certificate:update', 3, 3, 602535, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602539, '璧勮川鍒犻櫎', 'srm:supplier-certificate:delete', 3, 4, 602535, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+(602631, '淇濊瘉閲戞煡璇�', 'srm:bid-bond:query', 3, 1, 602630, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(602632, '淇濊瘉閲戝垱寤�', 'srm:bid-bond:create', 3, 2, 602630, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(602633, '淇濊瘉閲戞洿鏂�', 'srm:bid-bond:update', 3, 3, 602630, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
+(602634, '淇濊瘉閲戝垹闄�', 'srm:bid-bond:delete', 3, 4, 602630, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
--- 5. 渚涘簲鍟嗙哗鏁�
-INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
-VALUES (602540, '渚涘簲鍟嗙哗鏁�', '', 2, 40, 602524, 'supplier-evaluation', 'ep:data-analysis', 'srm/supplierEvaluation/index', 'SrmSupplierEvaluation', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+-- 4. 渚涘簲鍟嗗線鏉ワ紙閲囪喘绠$悊鏍硅彍鍗曚笅锛�
+INSERT IGNORE INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
+VALUES (602640, '渚涘簲鍟嗗線鏉�', '', 2, 8, 2602, 'supplier-statement', 'ep:wallet', 'erp/purchase/statement/index', 'ErpSupplierStatement', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
-INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
-VALUES
-(602541, '璇勪环鏌ヨ', 'srm:supplier-evaluation:query', 3, 1, 602540, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602542, '璇勪环鍒涘缓', 'srm:supplier-evaluation:create', 3, 2, 602540, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602543, '璇勪环鏇存柊', 'srm:supplier-evaluation:update', 3, 3, 602540, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602544, '璇勪环鍒犻櫎', 'srm:supplier-evaluation:delete', 3, 4, 602540, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
-
--- 6. 鎷涙姇鏍囩鐞�
-INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
-VALUES (602545, '鎷涙姇鏍囩鐞�', '', 2, 50, 602524, 'tender', 'ep:files', 'srm/tender/index', 'SrmTender', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
-
-INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
-VALUES
--- 鎷涙爣椤圭洰
-(602546, '鎷涙爣鏌ヨ', 'srm:tender-project:query', 3, 1, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602547, '鎷涙爣鍒涘缓', 'srm:tender-project:create', 3, 2, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602548, '鎷涙爣鏇存柊', 'srm:tender-project:update', 3, 3, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602549, '鎷涙爣鍒犻櫎', 'srm:tender-project:delete', 3, 4, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
--- 鎶曟爣
-(602550, '鎶曟爣鏌ヨ', 'srm:tender-bid:query', 3, 5, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602551, '鎶曟爣鍒涘缓', 'srm:tender-bid:create', 3, 6, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602552, '鎶曟爣鏇存柊', 'srm:tender-bid:update', 3, 7, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
--- 鎶ヤ环
-(602553, '鎶ヤ环鏌ヨ', 'srm:supplier-quote:query', 3, 8, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602554, '鎶ヤ环鍒涘缓', 'srm:supplier-quote:create', 3, 9, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602555, '鎶ヤ环鏇存柊', 'srm:supplier-quote:update', 3, 10, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
--- 璇勬爣
-(602556, '璇勬爣鏌ヨ', 'srm:bid-evaluation:query', 3, 11, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602557, '璇勬爣鍒涘缓', 'srm:bid-evaluation:create', 3, 12, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602558, '璇勬爣鏇存柊', 'srm:bid-evaluation:update', 3, 13, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
--- 寮�鏍�
-(602559, '寮�鏍囨煡璇�', 'srm:bid-open:query', 3, 14, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602560, '寮�鏍囧垱寤�', 'srm:bid-open:create', 3, 15, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
--- 瀹氭爣
-(602561, '瀹氭爣鏌ヨ', 'srm:bid-award:query', 3, 16, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602562, '瀹氭爣鍒涘缓', 'srm:bid-award:create', 3, 17, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602563, '瀹氭爣鏇存柊', 'srm:bid-award:update', 3, 18, 602545, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
-
--- 7. 鎷涙姇鏍囬厤缃�
-INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
-VALUES (602612, '鎷涙姇鏍囬厤缃�', '', 2, 55, 602524, 'tender-config', 'ep:setting', 'srm/tender/config/index', 'SrmTenderConfig', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
-
-INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
-VALUES
-(602613, '閰嶇疆鏌ヨ', 'srm:tender-config:query', 3, 1, 602612, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),
-(602614, '閰嶇疆鏇存柊', 'srm:tender-config:update', 3, 2, 602612, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
-
--- 8. 缁熻鍒嗘瀽
-INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
-VALUES (602569, '缁熻鍒嗘瀽', '', 2, 70, 602524, 'statistics', 'ep:trend-charts', 'srm/statistics/index', 'SrmStatistics', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
-
-INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
-VALUES
-(602570, '缁熻鏌ヨ', 'srm:statistics:query', 3, 1, 602569, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
+INSERT IGNORE INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
+VALUES (602641, '渚涘簲鍟嗗線鏉ユ煡璇�', 'erp:supplier-statement:query', 3, 1, 602640, '', '', '', '', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0');
diff --git a/yudao-module-srm/src/main/resources/sql/srm_test_data.sql b/yudao-module-srm/src/main/resources/sql/srm_test_data.sql
index 87461a5..e0752e6 100644
--- a/yudao-module-srm/src/main/resources/sql/srm_test_data.sql
+++ b/yudao-module-srm/src/main/resources/sql/srm_test_data.sql
@@ -1,90 +1,39 @@
-- =====================================================
-- SRM 妯″潡娴嬭瘯鏁版嵁
-- 杩愯鍓嶈鍏堢‘淇� srm_init.sql 宸叉墽琛�
+-- 浠呭寘鍚細渚涘簲鍟嗐�佽仈绯讳汉銆侀摱琛岃处鎴枫�佸垎绫诲叧鑱�
+-- 璇环/淇濊瘉閲戞暟鎹閫氳繃椤甸潰鎴栨帴鍙e垱寤猴紝閬垮厤涓庣湡瀹炲崟鎹紪鍙峰啿绐�
-- =====================================================
-- 1. 渚涘簲鍟嗘祴璇曟暟鎹�
-INSERT INTO srm_supplier (id, code, name, type, status, contact_name, contact_mobile, contact_email, address, bank_name, bank_account, tax_no, remark, create_time, update_time, creator, updater, deleted)
+INSERT IGNORE INTO srm_supplier (id, code, name, type, status, contact_name, contact_mobile, contact_email, address, bank_name, bank_account, tax_no, remark, create_time, update_time, creator, updater, deleted)
VALUES
-(1001, 'SUP-20240001', '姹熻嫃鏅鸿兘鍒堕�犳湁闄愬叕鍙�', 1, 1, '寮犱笁', '13800001111', 'zhangsan@test.com', '姹熻嫃鐪佸崡浜競姹熷畞鍖簒x璺�100鍙�', '涓浗閾惰鍗椾含鍒嗚', '6222024301000000001', '91320115MA1XXXXXX1', '浼樿川渚涘簲鍟�', NOW(), NOW(), 'admin', 'admin', 0),
-(1002, 'SUP-20240002', '涓婃捣璐告槗杩涘嚭鍙e叕鍙�', 2, 1, '鏉庡洓', '13800002222', 'lisi@test.com', '涓婃捣甯傛郸涓滄柊鍖簒x璺�200鍙�', '宸ュ晢閾惰涓婃捣鍒嗚', '1002024301000000002', '91310115MA2XXXXXX2', '闀挎湡鍚堜綔', NOW(), NOW(), 'admin', 'admin', 0),
-(1003, 'SUP-20240003', '娣卞湷绉戞妧鏈嶅姟鏈夐檺鍏徃', 3, 1, '鐜嬩簲', '13800003333', 'wangwu@test.com', '娣卞湷甯傚崡灞卞尯xx璺�300鍙�', '鎷涘晢閾惰娣卞湷鍒嗚', '6225884301000000003', '91440300MA3XXXXXX3', '鏂颁緵搴斿晢', NOW(), NOW(), 'admin', 'admin', 0),
-(1004, 'SUP-20240004', '娴欐睙绮惧瘑鏈烘鏈夐檺鍏徃', 1, 0, '璧靛叚', '13800004444', 'zhaoliu@test.com', '娴欐睙鐪佹澀宸炲競瑗挎箹鍖簒x璺�400鍙�', '寤鸿閾惰鏉窞鍒嗚', '6227004301000000004', '91330100MA4XXXXXX4', '鏆傚仠鍚堜綔', NOW(), NOW(), 'admin', 'admin', 0);
+(1001, 'SUP-20240001', '姹熻嫃鏅鸿兘鍒堕�犳湁闄愬叕鍙�', 1, 0, '寮犱笁', '13800001111', 'zhangsan@test.com', '姹熻嫃鐪佸崡浜競姹熷畞鍖簒x璺�100鍙�', '涓浗閾惰鍗椾含鍒嗚', '6222024301000000001', '91320115MA1XXXXXX1', '浼樿川渚涘簲鍟�', NOW(), NOW(), 'admin', 'admin', b'0'),
+(1002, 'SUP-20240002', '涓婃捣璐告槗杩涘嚭鍙e叕鍙�', 2, 0, '鏉庡洓', '13800002222', 'lisi@test.com', '涓婃捣甯傛郸涓滄柊鍖簒x璺�200鍙�', '宸ュ晢閾惰涓婃捣鍒嗚', '1002024301000000002', '91310115MA2XXXXXX2', '闀挎湡鍚堜綔', NOW(), NOW(), 'admin', 'admin', b'0'),
+(1003, 'SUP-20240003', '娣卞湷绉戞妧鏈嶅姟鏈夐檺鍏徃', 3, 0, '鐜嬩簲', '13800003333', 'wangwu@test.com', '娣卞湷甯傚崡灞卞尯xx璺�300鍙�', '鎷涘晢閾惰娣卞湷鍒嗚', '6225884301000000003', '91440300MA3XXXXXX3', '鏂颁緵搴斿晢', NOW(), NOW(), 'admin', 'admin', b'0'),
+(1004, 'SUP-20240004', '娴欐睙绮惧瘑鏈烘鏈夐檺鍏徃', 1, 1, '璧靛叚', '13800004444', 'zhaoliu@test.com', '娴欐睙鐪佹澀宸炲競瑗挎箹鍖簒x璺�400鍙�', '寤鸿閾惰鏉窞鍒嗚', '6227004301000000004', '91330100MA4XXXXXX4', '鏆傚仠鍚堜綔', NOW(), NOW(), 'admin', 'admin', b'0');
--- 2. 渚涘簲鍟嗚仈绯讳汉
-INSERT INTO srm_supplier_contact (id, supplier_id, name, mobile, email, position, is_primary, remark, create_time, update_time, creator, updater, deleted)
+-- 2. 渚涘簲鍟嗚仈绯讳汉锛堟瘡涓緵搴斿晢涓�鏉¢粯璁よ仈绯讳汉锛�
+INSERT IGNORE INTO srm_supplier_contact (id, supplier_id, name, mobile, email, position, is_default, sort, create_time, update_time, creator, updater, deleted)
VALUES
-(2001, 1001, '寮犱笁', '13800001111', 'zhangsan@test.com', '閲囪喘缁忕悊', 1, '涓昏鑱旂郴浜�', NOW(), NOW(), 'admin', 'admin', 0),
-(2002, 1001, '寮犱笁涓�', '13800001112', 'zhangsanfeng@test.com', '鎶�鏈�荤洃', 0, '鎶�鏈鎺�', NOW(), NOW(), 'admin', 'admin', 0),
-(2003, 1002, '鏉庡洓', '13800002222', 'lisi@test.com', '鎬荤粡鐞�', 1, NULL, NOW(), NOW(), 'admin', 'admin', 0);
+(2001, 1001, '寮犱笁', '13800001111', 'zhangsan@test.com', '閲囪喘缁忕悊', b'1', 0, NOW(), NOW(), 'admin', 'admin', b'0'),
+(2002, 1001, '寮犱笁涓�', '13800001112', 'zhangsanfeng@test.com', '鎶�鏈�荤洃', b'0', 1, NOW(), NOW(), 'admin', 'admin', b'0'),
+(2003, 1002, '鏉庡洓', '13800002222', 'lisi@test.com', '鎬荤粡鐞�', b'1', 0, NOW(), NOW(), 'admin', 'admin', b'0'),
+(2004, 1003, '鐜嬩簲', '13800003333', 'wangwu@test.com', '閿�鍞粡鐞�', b'1', 0, NOW(), NOW(), 'admin', 'admin', b'0'),
+(2005, 1004, '璧靛叚', '13800004444', 'zhaoliu@test.com', '鍘傞暱', b'1', 0, NOW(), NOW(), 'admin', 'admin', b'0');
--- 3. 渚涘簲鍟嗗垎绫诲叧鑱�
-INSERT INTO srm_supplier_category (id, supplier_id, category_id, category_name, create_time, update_time, creator, updater, deleted)
+-- 3. 渚涘簲鍟嗛摱琛岃处鎴凤紙姣忎釜渚涘簲鍟嗕竴鏉¢粯璁よ处鎴凤級
+INSERT IGNORE INTO srm_supplier_bank (id, supplier_id, bank_name, bank_account, bank_no, bank_address, is_default, sort, create_time, update_time, creator, updater, deleted)
+VALUES
+(2101, 1001, '涓浗閾惰鍗椾含鍒嗚', '6222024301000000001', '104301000013', '鍗椾含甯備腑灞辫矾1鍙�', b'1', 0, NOW(), NOW(), 'admin', 'admin', b'0'),
+(2102, 1001, '宸ュ晢閾惰鍗椾含姹熷畞鏀', '6222024301000000099', '102301000088', '鍗椾含甯傛睙瀹佸尯xx璺�100鍙�', b'0', 1, NOW(), NOW(), 'admin', 'admin', b'0'),
+(2103, 1002, '宸ュ晢閾惰涓婃捣鍒嗚', '1002024301000000002', '102290000001', '涓婃捣甯傛郸涓滄柊鍖簒x璺�200鍙�', b'1', 0, NOW(), NOW(), 'admin', 'admin', b'0'),
+(2104, 1003, '鎷涘晢閾惰娣卞湷鍒嗚', '6225884301000000003', '103584000002', '娣卞湷甯傚崡灞卞尯xx璺�300鍙�', b'1', 0, NOW(), NOW(), 'admin', 'admin', b'0'),
+(2105, 1004, '寤鸿閾惰鏉窞鍒嗚', '6227004301000000004', '105331000003', '鏉窞甯傝タ婀栧尯xx璺�400鍙�', b'1', 0, NOW(), NOW(), 'admin', 'admin', b'0');
+
+-- 4. 渚涘簲鍟嗗垎绫诲叧鑱�
+INSERT IGNORE INTO srm_supplier_category (id, supplier_id, category_id, category_name, create_time, update_time, creator, updater, deleted)
VALUES
(3001, 1001, 1, '鏈烘鍔犲伐', NOW(), NOW(), 'admin', 'admin', 0),
(3002, 1001, 2, '绮惧瘑鍒堕��', NOW(), NOW(), 'admin', 'admin', 0),
(3003, 1002, 3, '璐告槗鏈嶅姟', NOW(), NOW(), 'admin', 'admin', 0);
-
--- 4. 渚涘簲鍟嗗噯鍏ョ敵璇�
-INSERT INTO srm_supplier_apply (id, apply_no, supplier_name, contact_name, contact_mobile, contact_email, address, bank_name, bank_account, tax_no, apply_status, audit_comment, remark, create_time, update_time, creator, updater, deleted)
-VALUES
-(4001, 'AP2024010001', '姹熻嫃鏅鸿兘鍒堕�犳湁闄愬叕鍙�', '寮犱笁', '13800001111', 'zhangsan@test.com', '姹熻嫃鐪佸崡浜競姹熷畞鍖簒x璺�100鍙�', '涓浗閾惰鍗椾含鍒嗚', '6222024301000000001', '91320115MA1XXXXXX1', 4, '璧勮川榻愬叏锛屽鎵归�氳繃', NULL, NOW(), NOW(), 'admin', 'admin', 0),
-(4002, 'AP2024020002', '鍖椾含鏂扮鎶�鏈夐檺鍏徃', '鍒樹竷', '13800005555', 'liuqi@test.com', '鍖椾含甯傛捣娣�鍖簒x璺�500鍙�', '鍐滀笟閾惰鍖椾含鍒嗚', '6228484301000000005', '91110108MA5XXXXXX5', 1, NULL, '寰呭鏍�', NOW(), NOW(), 'admin', 'admin', 0);
-
--- 5. 渚涘簲鍟嗚祫璐ㄨ瘉涔�
-INSERT INTO srm_supplier_certificate (id, supplier_id, certificate_name, certificate_no, certificate_type, issuing_authority, issue_date, expire_date, remark, create_time, update_time, creator, updater, deleted)
-VALUES
-(5001, 1001, 'ISO9001璐ㄩ噺绠$悊浣撶郴璇佷功', 'ISO9001-2024-001', 1, 'SGS璁よ瘉鏈烘瀯', '2024-01-15', '2027-01-14', '涓夊勾鏈夋晥鏈�', NOW(), NOW(), 'admin', 'admin', 0),
-(5002, 1001, 'ISO14001鐜绠$悊浣撶郴璇佷功', 'ISO14001-2024-002', 2, 'TUV璁よ瘉鏈烘瀯', '2024-03-01', '2027-02-28', NULL, NOW(), NOW(), 'admin', 'admin', 0),
-(5003, 1002, '杩涘嚭鍙h锤鏄撹鍙瘉', 'TRADE-2024-001', 4, '鍟嗗姟閮�', '2024-02-01', '2025-01-31', '鍗冲皢鍒版湡', NOW(), NOW(), 'admin', 'admin', 0);
-
--- 6. 渚涘簲鍟嗙哗鏁堣瘎浠�
-INSERT INTO srm_supplier_evaluation (id, supplier_id, evaluation_period, quality_score, delivery_score, price_score, service_score, composite_score, grade, remark, create_time, update_time, creator, updater, deleted)
-VALUES
-(6001, 1001, '2024-Q1', 92, 88, 85, 90, 89, 'B', '璐ㄩ噺绋冲畾锛屼氦浠樺強鏃�', NOW(), NOW(), 'admin', 'admin', 0),
-(6002, 1001, '2024-Q2', 95, 92, 88, 93, 92, 'A', '鍚勯」鎸囨爣浼樼', NOW(), NOW(), 'admin', 'admin', 0),
-(6003, 1002, '2024-Q1', 80, 75, 90, 85, 81, 'B', '浠锋牸鏈変紭鍔匡紝浜や粯鐣ユ參', NOW(), NOW(), 'admin', 'admin', 0);
-
--- 7. 鎷涙爣椤圭洰
-INSERT INTO srm_tender_project (id, tender_no, tender_name, tender_type, purchase_org, project_leader_id, project_leader_name, tender_status, budget_amount, start_time, end_time, bid_open_time, tender_desc, qualification_requirements, purchase_request_id, create_time, update_time, creator, updater, deleted)
-VALUES
-(7001, 'TEN-202401001', '2024骞碤1鍘熸潗鏂欓噰璐嫑鏍�', 1, '閲囪喘閮�', 1, '绠$悊鍛�', 4, 5000000.00, '2024-01-01 00:00:00', '2024-01-31 23:59:59', '2024-02-01 10:00:00', '閲囪喘涓嶉攬閽㈡澘鏉�200鍚�', '1. 娉ㄥ唽璧勯噾鈮�500涓� 2. 鍏峰ISO9001璁よ瘉', NULL, NOW(), NOW(), 'admin', 'admin', 0),
-(7002, 'TEN-202402002', '2024骞碤2璁惧閲囪喘鎷涙爣', 2, '璁惧閮�', 2, '鐜嬬粡鐞�', 1, 2000000.00, '2024-04-01 00:00:00', '2024-04-30 23:59:59', '2024-05-01 14:00:00', '閲囪喘鏁版帶鏈哄簥5鍙�', '1. 鍏峰璁惧浠g悊璧勮川 2. 鎻愪緵鍞悗鏈嶅姟鎵胯', NULL, NOW(), NOW(), 'admin', 'admin', 0);
-
--- 8. 鎷涙爣鐗╂枡
-INSERT INTO srm_tender_material (id, tender_project_id, item_code, item_name, spec, unit, quantity, remark, create_time, update_time, creator, updater, deleted)
-VALUES
-(8001, 7001, 'MAT-001', '涓嶉攬閽㈡澘304', '2.0*1500*3000mm', '鍚�', 100, NULL, NOW(), NOW(), 'admin', 'admin', 0),
-(8002, 7001, 'MAT-002', '涓嶉攬閽㈡澘316L', '1.5*1500*3000mm', '鍚�', 100, '鑰愯厫铓�瑕佹眰', NOW(), NOW(), 'admin', 'admin', 0),
-(8003, 7002, 'MAT-003', '鏁版帶鏈哄簥CNC-500', '鍔犲伐鑼冨洿500*400mm', '鍙�', 5, '鍚畨瑁呰皟璇�', NOW(), NOW(), 'admin', 'admin', 0);
-
--- 9. 鎶曟爣璁板綍
-INSERT INTO srm_tender_bid (id, tender_project_id, supplier_id, bid_no, bid_status, bid_time, bid_total_amount, withdraw_reason, create_time, update_time, creator, updater, deleted)
-VALUES
-(9001, 7001, 1001, 'BID-202401-001', 1, '2024-01-15 10:00:00', 4800000.00, NULL, NOW(), NOW(), 'admin', 'admin', 0),
-(9002, 7001, 1002, 'BID-202401-002', 1, '2024-01-20 14:00:00', 4900000.00, NULL, NOW(), NOW(), 'admin', 'admin', 0);
-
--- 10. 渚涘簲鍟嗘姤浠�
-INSERT INTO srm_supplier_quote (id, bid_id, material_id, unit_price, total_price, delivery_days, remark, create_time, update_time, creator, updater, deleted)
-VALUES
-(10001, 9001, 8001, 22000.00, 2200000.00, 30, NULL, NOW(), NOW(), 'admin', 'admin', 0),
-(10002, 9001, 8002, 26000.00, 2600000.00, 30, '鍚繍璐�', NOW(), NOW(), 'admin', 'admin', 0),
-(10003, 9002, 8001, 23000.00, 2300000.00, 25, NULL, NOW(), NOW(), 'admin', 'admin', 0),
-(10004, 9002, 8002, 26000.00, 2600000.00, 28, NULL, NOW(), NOW(), 'admin', 'admin', 0);
-
--- 11. 寮�鏍囪褰�
-INSERT INTO srm_bid_open (id, tender_project_id, open_no, open_time, bid_count, supplier_count, open_status, remark, create_time, update_time, creator, updater, deleted)
-VALUES
-(11001, 7001, 'OPEN-20240201', '2024-02-01 10:00:00', 2, 2, 1, '鎶曟爣鎴锛屽叡2瀹朵緵搴斿晢鍙備笌', NOW(), NOW(), 'admin', 'admin', 0);
-
--- 12. 璇勬爣璁板綍
-INSERT INTO srm_bid_evaluation (id, tender_project_id, bid_id, technical_score, commercial_score, composite_score, rank, comment, create_time, update_time, creator, updater, deleted)
-VALUES
-(12001, 7001, 9001, 88, 85, 86, 1, '鎶�鏈柟妗堜紭绉�锛屼环鏍煎悎鐞�', NOW(), NOW(), 'admin', 'admin', 0),
-(12002, 7001, 9002, 82, 90, 87, 2, '浠锋牸鏈変紭鍔匡紝鎶�鏈柟妗堜竴鑸�', NOW(), NOW(), 'admin', 'admin', 0);
-
--- 13. 瀹氭爣璁板綍
-INSERT INTO srm_bid_award (id, tender_project_id, supplier_id, bid_id, award_no, award_status, award_amount, award_time, purchase_order_id, purchase_order_no, remark, create_time, update_time, creator, updater, deleted)
-VALUES
-(13001, 7001, 1001, 9001, 'AWARD-202402-001', 1, 4800000.00, '2024-02-05 16:00:00', NULL, NULL, '缁煎悎璇勫垎绗竴', NOW(), NOW(), 'admin', 'admin', 0);
-
--
Gitblit v1.9.3