From 8168aef3c7557c9e1361892270a1ebe35dbddba5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 十一月 2026 11:42:19 +0800
Subject: [PATCH] refactor(erp): 采购申请与询价比价流程重构

---
 yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseRequestApi.java                               |   51 ++
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestDO.java                         |   40 -
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java                                             |    5 
 yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/vo/SrmInquiryRespVO.java                         |    6 
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestItemDO.java                     |   20 -
 yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/inquiry/SrmInquiryController.java                        |    8 
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderSaveReqVO.java         |    3 
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestRespVO.java        |   28 -
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseRequestApiImpl.java                               |   73 ++++
 sql/mysql/20261110_purchase_menu_sort.sql                                                                                            |   24 +
 yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmInquiryDO.java                                          |    8 
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java            |    3 
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java                          |   14 
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java                         |   44 ++
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSaveReqVO.java     |   14 
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java                       |  141 ++-----
 yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/ErrorCodeConstants.java                                             |    5 
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java               |    7 
 yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/dto/ErpPurchaseRequestRespDTO.java                       |  127 +++++++
 yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryServiceImpl.java                                |  136 +++++++
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpPurchaseOrderSourceTypeEnum.java                                 |    3 
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestPageReqVO.java     |    9 
 yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/dto/ErpPurchaseOrderCreateReqDTO.java                    |    3 
 yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/inquiry/SrmInquiryService.java                                    |    8 
 sql/mysql/20261109_purchase_request_inquiry_refactor.sql                                                                             |  123 ++++++
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderDO.java                           |    7 
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestImportExcelVO.java |   16 
 sql/mysql/20261110_srm_inquiry_approve_flow.sql                                                                                      |  147 ++++++++
 28 files changed, 865 insertions(+), 208 deletions(-)

diff --git a/sql/mysql/20261109_purchase_request_inquiry_refactor.sql b/sql/mysql/20261109_purchase_request_inquiry_refactor.sql
new file mode 100644
index 0000000..1874d85
--- /dev/null
+++ b/sql/mysql/20261109_purchase_request_inquiry_refactor.sql
@@ -0,0 +1,123 @@
+-- =============================================
+-- 閲囪喘鐢宠鍘讳环鏍� + 璇环姣斾环 / 閲囪喘鍙拌处琛旀帴鏀归��
+-- 鐩爣搴擄細mom-ntsh锛圡ySQL 8.4锛�
+-- 璇存槑锛�
+--   1. 閲囪喘鐢宠锛堣〃澶� + 鏄庣粏锛変笉鍐嶄繚瀛樹换浣曚环鏍煎瓧娈碉紝浠锋牸鍦ㄨ浠锋垨閲囪喘鍙拌处闃舵纭畾
+--   2. 閲囪喘鐢宠瀹℃壒閫氳繃鍚庯紝鐢遍噰璐憳鍐冲畾銆屽彂璧疯浠枫�嶆垨銆岀洿鎺ョ敓鎴愰噰璐彴璐︺��
+--   3. 鑴氭湰鍙噸澶嶆墽琛岋細鍒犲垪/鍔犲垪鍧囧厛鐢� information_schema 棰勬鏌�
+--   4. 涓嶅寘鍚� tenant_id锛堟湰椤圭洰涓嶄娇鐢ㄥ绉熸埛锛�
+-- =============================================
+
+-- ---------------------------------------------
+-- 涓�銆佸垹闄ら噰璐敵璇疯〃澶翠环鏍煎瓧娈�
+-- ---------------------------------------------
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+               WHERE table_schema = DATABASE() AND table_name = 'erp_purchase_request' AND column_name = 'total_price');
+SET @sql = IF(@exists > 0, 'ALTER TABLE erp_purchase_request DROP COLUMN total_price', 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+               WHERE table_schema = DATABASE() AND table_name = 'erp_purchase_request' AND column_name = 'total_product_price');
+SET @sql = IF(@exists > 0, 'ALTER TABLE erp_purchase_request DROP COLUMN total_product_price', 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+               WHERE table_schema = DATABASE() AND table_name = 'erp_purchase_request' AND column_name = 'total_tax_price');
+SET @sql = IF(@exists > 0, 'ALTER TABLE erp_purchase_request DROP COLUMN total_tax_price', 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+               WHERE table_schema = DATABASE() AND table_name = 'erp_purchase_request' AND column_name = 'discount_percent');
+SET @sql = IF(@exists > 0, 'ALTER TABLE erp_purchase_request DROP COLUMN discount_percent', 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+               WHERE table_schema = DATABASE() AND table_name = 'erp_purchase_request' AND column_name = 'discount_price');
+SET @sql = IF(@exists > 0, 'ALTER TABLE erp_purchase_request DROP COLUMN discount_price', 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+               WHERE table_schema = DATABASE() AND table_name = 'erp_purchase_request' AND column_name = 'deposit_price');
+SET @sql = IF(@exists > 0, 'ALTER TABLE erp_purchase_request DROP COLUMN deposit_price', 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- ---------------------------------------------
+-- 浜屻�佸垹闄ら噰璐敵璇锋槑缁嗕环鏍煎瓧娈�
+-- ---------------------------------------------
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+               WHERE table_schema = DATABASE() AND table_name = 'erp_purchase_request_items' AND column_name = 'product_price');
+SET @sql = IF(@exists > 0, 'ALTER TABLE erp_purchase_request_items DROP COLUMN product_price', 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+               WHERE table_schema = DATABASE() AND table_name = 'erp_purchase_request_items' AND column_name = 'total_price');
+SET @sql = IF(@exists > 0, 'ALTER TABLE erp_purchase_request_items DROP COLUMN total_price', 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+               WHERE table_schema = DATABASE() AND table_name = 'erp_purchase_request_items' AND column_name = 'tax_percent');
+SET @sql = IF(@exists > 0, 'ALTER TABLE erp_purchase_request_items DROP COLUMN tax_percent', 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+               WHERE table_schema = DATABASE() AND table_name = 'erp_purchase_request_items' AND column_name = 'tax_price');
+SET @sql = IF(@exists > 0, 'ALTER TABLE erp_purchase_request_items DROP COLUMN tax_price', 'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- ---------------------------------------------
+-- 涓夈�侀噰璐敵璇峰叧鑱旇浠峰崟锛堥噰璐憳瀹℃壒閫氳繃鍚庡彂璧疯浠锋椂鍥炲啓锛�
+-- ---------------------------------------------
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+               WHERE table_schema = DATABASE() AND table_name = 'erp_purchase_request' AND column_name = 'inquiry_id');
+SET @sql = IF(@exists = 0,
+    'ALTER TABLE erp_purchase_request ADD COLUMN inquiry_id BIGINT NULL COMMENT ''鍏宠仈璇环鍗曠紪鍙�'' AFTER order_no',
+    'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+               WHERE table_schema = DATABASE() AND table_name = 'erp_purchase_request' AND column_name = 'inquiry_no');
+SET @sql = IF(@exists = 0,
+    'ALTER TABLE erp_purchase_request ADD COLUMN inquiry_no VARCHAR(64) NULL COMMENT ''鍏宠仈璇环鍗曞彿'' AFTER inquiry_id',
+    'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- ---------------------------------------------
+-- 鍥涖�佽浠峰崟鍏宠仈閲囪喘鐢宠
+-- ---------------------------------------------
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+               WHERE table_schema = DATABASE() AND table_name = 'srm_inquiry' AND column_name = 'purchase_request_id');
+SET @sql = IF(@exists = 0,
+    'ALTER TABLE srm_inquiry ADD COLUMN purchase_request_id BIGINT NULL COMMENT ''鍏宠仈閲囪喘鐢宠缂栧彿'' AFTER process_instance_id',
+    'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+               WHERE table_schema = DATABASE() AND table_name = 'srm_inquiry' AND column_name = 'purchase_request_no');
+SET @sql = IF(@exists = 0,
+    'ALTER TABLE srm_inquiry ADD COLUMN purchase_request_no VARCHAR(64) NULL COMMENT ''鍏宠仈閲囪喘鐢宠鍗曞彿'' AFTER purchase_request_id',
+    'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- ---------------------------------------------
+-- 浜斻�侀噰璐彴璐﹁褰曟潵婧愰噰璐敵璇凤紙涓�寮犵敵璇峰彲鑳藉洜澶氫緵搴斿晢鐢熸垚澶氬紶鍙拌处锛�
+-- ---------------------------------------------
+SET @exists = (SELECT COUNT(*) FROM information_schema.columns
+               WHERE table_schema = DATABASE() AND table_name = 'erp_purchase_order' AND column_name = 'purchase_request_id');
+SET @sql = IF(@exists = 0,
+    'ALTER TABLE erp_purchase_order ADD COLUMN purchase_request_id BIGINT NULL COMMENT ''鏉ユ簮閲囪喘鐢宠缂栧彿'' AFTER source_id',
+    'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.statistics
+               WHERE table_schema = DATABASE() AND table_name = 'erp_purchase_order' AND index_name = 'idx_purchase_request_id');
+SET @sql = IF(@exists = 0,
+    'ALTER TABLE erp_purchase_order ADD INDEX idx_purchase_request_id (purchase_request_id)',
+    'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @exists = (SELECT COUNT(*) FROM information_schema.statistics
+               WHERE table_schema = DATABASE() AND table_name = 'srm_inquiry' AND index_name = 'idx_purchase_request_id');
+SET @sql = IF(@exists = 0,
+    'ALTER TABLE srm_inquiry ADD INDEX idx_purchase_request_id (purchase_request_id)',
+    'SELECT 1');
+PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
diff --git a/sql/mysql/20261110_purchase_menu_sort.sql b/sql/mysql/20261110_purchase_menu_sort.sql
new file mode 100644
index 0000000..1fccbc6
--- /dev/null
+++ b/sql/mysql/20261110_purchase_menu_sort.sql
@@ -0,0 +1,24 @@
+-- =============================================================================
+-- 閲囪喘绠$悊鑿滃崟鎸変笟鍔℃祦杞『搴忛噸鎺�
+-- 鐩爣搴擄細mom-ntsh
+-- 椤哄簭锛氶噰璐敵璇� 鈫� 璇环姣斾环 鈫� 閲囪喘鍙拌处 鈫� 閲囪喘鏉ョエ 鈫� 浠樻 鈫� 渚涘簲鍟嗗線鏉� 鈫� 渚涘簲鍟嗘。妗�
+-- 璇存槑锛氫緵搴斿晢妗f灞炰簬鍩虹妗f锛屾斁鍦ㄤ笟鍔″崟鎹箣鍚庛��
+-- =============================================================================
+
+UPDATE system_menu
+   SET sort = CASE id
+                WHEN 602498  THEN 1  -- 閲囪喘鐢宠
+                WHEN 602620  THEN 2  -- 璇环姣斾环
+                WHEN 2666    THEN 3  -- 閲囪喘鍙拌处
+                WHEN 1063110 THEN 4  -- 閲囪喘鏉ョエ
+                WHEN 1063116 THEN 5  -- 浠樻
+                WHEN 602640  THEN 6  -- 渚涘簲鍟嗗線鏉�
+                WHEN 602525  THEN 7  -- 渚涘簲鍟嗘。妗�
+              END
+ WHERE id IN (602498, 602620, 2666, 1063110, 1063116, 602640, 602525)
+   AND deleted = 0;
+
+SELECT id, name, sort
+  FROM system_menu
+ WHERE parent_id = 2602 AND deleted = 0
+ ORDER BY sort, id;
diff --git a/sql/mysql/20261110_srm_inquiry_approve_flow.sql b/sql/mysql/20261110_srm_inquiry_approve_flow.sql
new file mode 100644
index 0000000..1774f25
--- /dev/null
+++ b/sql/mysql/20261110_srm_inquiry_approve_flow.sql
@@ -0,0 +1,147 @@
+-- =============================================================================
+-- 琛ラ儴缃� SRM 璇环鍗曞鎵规祦绋嬶細srm_inquiry_approve
+-- 鐩爣搴擄細mom-ntsh
+-- 鑳屾櫙锛歋rmInquiryServiceImpl 鎻愪氦瀹℃牳鏃朵娇鐢ㄦ祦绋� key=srm_inquiry_approve锛�
+--       浣� ACT_RE_PROCDEF 涓笉瀛樺湪璇ュ畾涔夛紝鍓嶇鎻愪氦鎶ャ�屾祦绋嬪畾涔変笉瀛樺湪銆嶃��
+-- 鏂瑰紡锛氬鍒堕噰璐敵璇峰鎵癸紙purchase_request_approve锛屽彂璧蜂汉 + 瑙掕壊1瀹℃壒锛夋ā鏉匡紝
+--       浠呮浛鎹� key 涓庢樉绀哄悕锛屼繚鎸佷笌閲囪喘鍗曟嵁瀹℃壒涓�鑷寸殑瀹℃壒浜洪厤缃��
+-- 骞傜瓑锛歬ey 宸插瓨鍦ㄥ垯璺宠繃锛屽彲閲嶅鎵ц銆�
+-- =============================================================================
+
+SET NAMES utf8mb4;
+
+-- 娴佺▼鍒嗙被锛堝箓绛夛級
+INSERT INTO bpm_category (name, code, description, status, sort, creator, updater, deleted)
+SELECT '璇环鍗曞鎵�', 'srm_inquiry_approve', '璇环鍗曞鎵�', 0, 23, '1', '1', b'0'
+ WHERE NOT EXISTS (SELECT 1 FROM bpm_category WHERE code = 'srm_inquiry_approve' AND deleted = b'0');
+
+-- 瀹℃壒璇︽儏涓氬姟缁勪欢锛堝箓绛夛級锛氳瀹℃壒璇︽儏椤垫覆鏌撹浠锋槑缁嗚�岄潪绌虹櫧閫氱敤琛ㄥ崟
+INSERT INTO bpm_business_attach
+    (process_definition_key, business_type, component_path, status, remark, creator, updater, deleted)
+SELECT 'srm_inquiry_approve', 'srm_inquiry', '/srm/inquiry/detail/approve/index.vue', 0,
+       '璇环鍗曞鎵逛笟鍔¤鎯呯粍浠�', '1', '1', b'0'
+ WHERE NOT EXISTS (SELECT 1 FROM bpm_business_attach
+                    WHERE process_definition_key = 'srm_inquiry_approve' AND deleted = b'0');
+
+DROP PROCEDURE IF EXISTS bpm_deploy_srm_inquiry_approve;
+
+DELIMITER $$
+
+CREATE PROCEDURE bpm_deploy_srm_inquiry_approve()
+label_deploy: BEGIN
+    DECLARE v_p_key      VARCHAR(64)  DEFAULT 'srm_inquiry_approve';
+    DECLARE v_p_name     VARCHAR(128) DEFAULT '璇环鍗曞鎵�';
+    DECLARE v_p_category VARCHAR(64)  DEFAULT 'srm_inquiry_approve';
+    DECLARE v_tpl_key    VARCHAR(64)  DEFAULT 'purchase_request_approve';
+    DECLARE v_exist      INT DEFAULT 0;
+    DECLARE v_tpl_dep    VARCHAR(64) DEFAULT NULL;
+    DECLARE v_tpl_name   VARCHAR(255) DEFAULT NULL;
+    DECLARE v_dep        VARCHAR(64);
+    DECLARE v_model_id   VARCHAR(64);
+    DECLARE v_byte_id    VARCHAR(64);
+    DECLARE v_procdef_id VARCHAR(64);
+    DECLARE v_meta       TEXT;
+    DECLARE v_sort       BIGINT;
+    DECLARE v_now        DATETIME;
+
+    DECLARE EXIT HANDLER FOR SQLEXCEPTION
+    BEGIN
+        ROLLBACK;
+        RESIGNAL;
+    END;
+
+    SELECT COUNT(*) INTO v_exist FROM ACT_RE_PROCDEF WHERE KEY_ = v_p_key;
+    IF v_exist > 0 THEN
+        SELECT CONCAT('[SKIP] 娴佺▼宸插瓨鍦紝璺宠繃锛�', v_p_key) AS deploy_result;
+        LEAVE label_deploy;
+    END IF;
+
+    SELECT DEPLOYMENT_ID_ INTO v_tpl_dep FROM ACT_RE_PROCDEF
+     WHERE KEY_ = v_tpl_key ORDER BY VERSION_ DESC LIMIT 1;
+    SELECT NAME_        INTO v_tpl_name FROM ACT_RE_PROCDEF
+     WHERE KEY_ = v_tpl_key ORDER BY VERSION_ DESC LIMIT 1;
+    IF v_tpl_dep IS NULL THEN
+        SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '妯℃澘娴佺▼ purchase_request_approve 涓嶅瓨鍦紝鏃犳硶澶嶅埗';
+    END IF;
+
+    SET v_now     = NOW(3);
+    SET v_sort    = UNIX_TIMESTAMP(v_now) * 1000;
+    SET v_dep     = REPLACE(UUID(), '-', '');
+    SET v_model_id = REPLACE(UUID(), '-', '');
+    SET v_byte_id  = REPLACE(UUID(), '-', '');
+    SET v_procdef_id = CONCAT(v_p_key, ':1:', v_dep);
+
+    START TRANSACTION;
+
+    -- 1) 閮ㄧ讲璁板綍
+    INSERT INTO ACT_RE_DEPLOYMENT
+        (ID_, NAME_, CATEGORY_, KEY_, TENANT_ID_, DEPLOY_TIME_, ENGINE_VERSION_)
+    VALUES
+        (v_dep, v_p_name, v_p_category, v_p_key, '', v_now, NULL);
+
+    -- 2) BPMN 瀛楄妭锛堟浛鎹� key 涓庢樉绀哄悕锛�
+    INSERT INTO ACT_GE_BYTEARRAY
+        (ID_, NAME_, DEPLOYMENT_ID_, BYTES_, GENERATED_)
+    SELECT
+        v_byte_id,
+        CONCAT(v_p_key, '.bpmn'),
+        v_dep,
+        CONVERT(
+            REPLACE(
+                REPLACE(CONVERT(BYTES_ USING utf8mb4), v_tpl_key, v_p_key),
+                v_tpl_name, v_p_name)
+        USING utf8mb4),
+        0
+      FROM ACT_GE_BYTEARRAY
+     WHERE DEPLOYMENT_ID_ = v_tpl_dep
+       AND NAME_ = CONCAT(v_tpl_key, '.bpmn');
+
+    -- 3) 娴佺▼瀹氫箟
+    INSERT INTO ACT_RE_PROCDEF
+        (ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_,
+         DGRM_RESOURCE_NAME_, DESCRIPTION_, HAS_START_FORM_KEY_, HAS_GRAPHICAL_NOTATION_,
+         SUSPENSION_STATE_, TENANT_ID_, ENGINE_VERSION_, DERIVED_VERSION_)
+    VALUES
+        (v_procdef_id, 1, v_p_category, v_p_name, v_p_key, 1, v_dep, CONCAT(v_p_key, '.bpmn'),
+         NULL, NULL, 0, 1,
+         1, '', NULL, 0);
+
+    -- 4) 娴佺▼妯″瀷
+    SET v_meta = CONCAT(
+        '{"type":10,"formType":10,"sort":', v_sort,
+        ',"visible":true,"allowCancelRunningProcess":true,"allowWithdrawTask":false',
+        ',"autoApprovalType":0,"description":"","formCustomCreatePath":"","formCustomViewPath":"",',
+        '"formId":4,"managerUserIds":[],"startUserIds":[],"startDeptIds":[],"icon":null,',
+        '"processBeforeTriggerSetting":null,"processAfterTriggerSetting":null,',
+        '"taskBeforeTriggerSetting":null,"taskAfterTriggerSetting":null,',
+        '"printTemplateSetting":null,"summarySetting":null,"titleSetting":null,"processIdRule":null}');
+    INSERT INTO ACT_RE_MODEL
+        (ID_, NAME_, KEY_, CATEGORY_, CREATE_TIME_, LAST_UPDATE_TIME_, VERSION_, META_INFO_, DEPLOYMENT_ID_, TENANT_ID_)
+    VALUES
+        (v_model_id, v_p_name, v_p_key, v_p_category, v_now, v_now, 1, v_meta, v_dep, '');
+
+    -- 5) 娴佺▼瀹氫箟鎵╁睍淇℃伅锛堥�氱敤瀹℃壒琛ㄥ崟 id=4锛�
+    INSERT INTO bpm_process_definition_info
+        (process_definition_id, model_id, model_type, category, form_type, form_id, visible, sort,
+         allow_cancel_running_process, allow_withdraw_task,
+         creator, create_time, updater, update_time, deleted)
+    VALUES
+        (v_procdef_id, v_model_id, 10, v_p_category, 10, 4, 1, v_sort,
+         1, 1,
+         '1', v_now, '1', v_now, 0);
+
+    COMMIT;
+
+    SELECT CONCAT('[OK] 宸查儴缃叉柊瀹℃牳娴佺▼锛�', v_p_key, ' (procdef=', v_procdef_id, ')') AS deploy_result;
+END$$
+
+DELIMITER ;
+
+CALL bpm_deploy_srm_inquiry_approve();
+
+-- 鏍¢獙
+SELECT p.KEY_, p.NAME_, p.VERSION_, p.SUSPENSION_STATE_ AS active_flag,
+       i.model_type, i.category, i.form_id
+  FROM ACT_RE_PROCDEF p
+  LEFT JOIN bpm_process_definition_info i ON i.process_definition_id = p.ID_
+ WHERE p.KEY_ = 'srm_inquiry_approve';
diff --git a/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseRequestApi.java b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseRequestApi.java
new file mode 100644
index 0000000..e25928d
--- /dev/null
+++ b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseRequestApi.java
@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.erp.api.purchase;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseRequestRespDTO;
+
+/**
+ * ERP 閲囪喘鐢宠 API 鎺ュ彛
+ *
+ * 渚� SRM 绛夋ā鍧楀湪瀹℃壒閫氳繃鍚庡彂璧疯浠枫�佸洖鍐欏彴璐︽椂璋冪敤銆�
+ */
+public interface ErpPurchaseRequestApi {
+
+    String PREFIX = "/rpc-api/erp/purchase-request";
+
+    /**
+     * 鑾峰彇閲囪喘鐢宠锛堝惈鏄庣粏锛�
+     *
+     * @param id 閲囪喘鐢宠缂栧彿
+     * @return 閲囪喘鐢宠
+     */
+    CommonResult<ErpPurchaseRequestRespDTO> getPurchaseRequest(Long id);
+
+    /**
+     * 鍥炲啓閲囪喘鐢宠鍏宠仈鐨勮浠峰崟
+     *
+     * @param id        閲囪喘鐢宠缂栧彿
+     * @param inquiryId 璇环鍗曠紪鍙�
+     * @param inquiryNo 璇环鍗曞彿
+     * @return 鏄惁鎴愬姛
+     */
+    CommonResult<Boolean> updatePurchaseRequestInquiry(Long id, Long inquiryId, String inquiryNo);
+
+    /**
+     * 娓呴櫎閲囪喘鐢宠鍏宠仈鐨勮浠峰崟锛堣浠峰崟琚彇娑�/鍒犻櫎鍚庯紝閲囪喘鍛樺彲閲嶆柊閫夋嫨鍙戣捣璇环鎴栫洿鎺ョ敓鎴愬彴璐︼級
+     *
+     * @param id 閲囪喘鐢宠缂栧彿
+     * @return 鏄惁鎴愬姛
+     */
+    CommonResult<Boolean> clearPurchaseRequestInquiry(Long id);
+
+    /**
+     * 鍥炲啓閲囪喘鐢宠鍏宠仈鐨勯噰璐彴璐�
+     *
+     * @param id      閲囪喘鐢宠缂栧彿
+     * @param orderId 閲囪喘鍙拌处缂栧彿
+     * @param orderNo 閲囪喘鍙拌处鍗曞彿
+     * @return 鏄惁鎴愬姛
+     */
+    CommonResult<Boolean> updatePurchaseRequestOrder(Long id, Long orderId, String orderNo);
+
+}
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 e37c8e6..88355ab 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
@@ -38,6 +38,9 @@
     @Schema(description = "鏉ユ簮鍗曟嵁缂栧彿", example = "1")
     private Long sourceId;
 
+    @Schema(description = "鏉ユ簮閲囪喘鐢宠缂栧彿", example = "1")
+    private Long purchaseRequestId;
+
     @Schema(description = "澶囨敞", example = "澶囨敞淇℃伅")
     private String remark;
 
diff --git a/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/dto/ErpPurchaseRequestRespDTO.java b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/dto/ErpPurchaseRequestRespDTO.java
new file mode 100644
index 0000000..3070d97
--- /dev/null
+++ b/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/dto/ErpPurchaseRequestRespDTO.java
@@ -0,0 +1,127 @@
+package cn.iocoder.yudao.module.erp.api.purchase.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * ERP 閲囪喘鐢宠 Response DTO
+ *
+ * 渚� SRM 璇环姣斾环绛夋ā鍧楅�氳繃 RPC 璇诲彇閲囪喘鐢宠鍙婂叾鏄庣粏銆�
+ */
+@Data
+public class ErpPurchaseRequestRespDTO {
+
+    /**
+     * 缂栧彿
+     */
+    private Long id;
+
+    /**
+     * 閲囪喘鐢宠鍗曞彿
+     */
+    private String no;
+
+    /**
+     * 鐘舵�侊細0 鏈彁浜� 10 瀹℃壒涓� 20 瀹℃牳閫氳繃 30 瀹℃牳涓嶉�氳繃 40 宸插彇娑�
+     */
+    private Integer status;
+
+    /**
+     * 鐢宠浜虹紪鍙�
+     */
+    private Long requestUserId;
+
+    /**
+     * 鐢宠閮ㄩ棬缂栧彿
+     */
+    private Long requestDeptId;
+
+    /**
+     * 鐢宠鏃堕棿
+     */
+    private LocalDateTime requestTime;
+
+    /**
+     * 鐢宠鐞嗙敱
+     */
+    private String requestReason;
+
+    /**
+     * 渚涘簲鍟嗙紪鍙凤紙鍙�夛級
+     */
+    private Long supplierId;
+
+    /**
+     * 澶囨敞
+     */
+    private String remark;
+
+    /**
+     * 宸茬敓鎴愮殑閲囪喘鍙拌处缂栧彿
+     */
+    private Long orderId;
+
+    /**
+     * 宸茬敓鎴愮殑閲囪喘鍙拌处鍗曞彿
+     */
+    private String orderNo;
+
+    /**
+     * 宸插彂璧风殑璇环鍗曠紪鍙�
+     */
+    private Long inquiryId;
+
+    /**
+     * 宸插彂璧风殑璇环鍗曞彿
+     */
+    private String inquiryNo;
+
+    /**
+     * 鐢宠鏄庣粏
+     */
+    private List<Item> items;
+
+    @Data
+    public static class Item {
+
+        /**
+         * 鏄庣粏缂栧彿
+         */
+        private Long id;
+
+        /**
+         * 浜у搧缂栧彿
+         */
+        private Long productId;
+
+        /**
+         * 浜у搧鍗曚綅缂栧彿
+         */
+        private Long productUnitId;
+
+        /**
+         * 鏁伴噺
+         */
+        private BigDecimal count;
+
+        /**
+         * 闇�姹傛棩鏈�
+         */
+        private LocalDate demandTime;
+
+        /**
+         * 鏄惁闇�瑕佹潵鏂欐楠�
+         */
+        private Boolean qcCheckFlag;
+
+        /**
+         * 澶囨敞
+         */
+        private String remark;
+    }
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseRequestApiImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseRequestApiImpl.java
new file mode 100644
index 0000000..87e9bfe
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/api/purchase/ErpPurchaseRequestApiImpl.java
@@ -0,0 +1,73 @@
+package cn.iocoder.yudao.module.erp.api.purchase;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseRequestRespDTO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestItemDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseRequestItemMapper;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseRequestMapper;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * ERP 閲囪喘鐢宠 API 瀹炵幇绫�
+ *
+ * 渚� SRM 璇环姣斾环妯″潡璇诲彇閲囪喘鐢宠銆佸洖鍐欒浠峰崟涓庨噰璐彴璐﹀叧鑱斻��
+ */
+@Service
+@Validated
+@Slf4j
+public class ErpPurchaseRequestApiImpl implements ErpPurchaseRequestApi {
+
+    @Resource
+    private ErpPurchaseRequestMapper purchaseRequestMapper;
+    @Resource
+    private ErpPurchaseRequestItemMapper purchaseRequestItemMapper;
+
+    @Override
+    public CommonResult<ErpPurchaseRequestRespDTO> getPurchaseRequest(Long id) {
+        ErpPurchaseRequestDO request = purchaseRequestMapper.selectById(id);
+        if (request == null) {
+            return success(null);
+        }
+        List<ErpPurchaseRequestItemDO> items = purchaseRequestItemMapper.selectListByRequestId(id);
+        return success(BeanUtils.toBean(request, ErpPurchaseRequestRespDTO.class, resp -> resp
+                .setItems(BeanUtils.toBean(items, ErpPurchaseRequestRespDTO.Item.class))));
+    }
+
+    @Override
+    public CommonResult<Boolean> updatePurchaseRequestInquiry(Long id, Long inquiryId, String inquiryNo) {
+        purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
+                .setId(id)
+                .setInquiryId(inquiryId)
+                .setInquiryNo(inquiryNo));
+        return success(true);
+    }
+
+    @Override
+    public CommonResult<Boolean> clearPurchaseRequestInquiry(Long id) {
+        purchaseRequestMapper.update(null, new LambdaUpdateWrapper<ErpPurchaseRequestDO>()
+                .eq(ErpPurchaseRequestDO::getId, id)
+                .set(ErpPurchaseRequestDO::getInquiryId, null)
+                .set(ErpPurchaseRequestDO::getInquiryNo, null));
+        return success(true);
+    }
+
+    @Override
+    public CommonResult<Boolean> updatePurchaseRequestOrder(Long id, Long orderId, String orderNo) {
+        purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
+                .setId(id)
+                .setOrderId(orderId)
+                .setOrderNo(orderNo));
+        return success(true);
+    }
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
index 3c86b7f..0a65c24 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
@@ -158,12 +158,11 @@
     public void importTemplate(HttpServletResponse response) throws IOException {
         List<ErpPurchaseRequestImportExcelVO> list = Arrays.asList(
                 ErpPurchaseRequestImportExcelVO.builder()
-                        .no("CGSQ20260101000001").supplierName("绀轰緥渚涘簲鍟�")
+                        .no("CGSQ20260101000001")
                         .requestTime("2026-01-01 10:00:00").requestReason("绀轰緥锛氱敓浜ч渶瑕�")
                         .productCode("ITEM001").productName("绀轰緥浜у搧A")
-                        .count(new BigDecimal("100")).productPrice(new BigDecimal("10.00"))
-                        .taxPercent(new BigDecimal("13")).demandTime("2026-01-10")
-                        .qcCheckFlag("鍚�").remark("绀轰緥").build());
+                        .count(new BigDecimal("100")).demandTime("2026-01-10")
+                        .remark("绀轰緥").build());
         ExcelUtils.write(response, "閲囪喘鐢宠瀵煎叆妯℃澘.xls", "閲囪喘鐢宠", ErpPurchaseRequestImportExcelVO.class, list);
     }
 
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java
index bbbed5a..39cbaf2 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java
@@ -106,6 +106,9 @@
     @Schema(description = "鏉ユ簮鍗曟嵁缂栧彿", example = "48")
     private Long sourceId;
 
+    @Schema(description = "鏉ユ簮閲囪喘鐢宠缂栧彿", example = "12")
+    private Long purchaseRequestId;
+
     @Schema(description = "鏉ユ簮绫诲瀷鍚嶇О", example = "鐢熶骇宸ュ崟")
     private String sourceTypeName;
 
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderSaveReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderSaveReqVO.java
index ca8f9cb..9d40694 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderSaveReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderSaveReqVO.java
@@ -57,6 +57,9 @@
     @Schema(description = "鏉ユ簮鍗曟嵁缂栧彿", example = "48")
     private Long sourceId;
 
+    @Schema(description = "鏉ユ簮閲囪喘鐢宠缂栧彿", example = "1")
+    private Long purchaseRequestId;
+
     @Schema(description = "澶囨敞", example = "浣犵寽")
     private String remark;
 
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestImportExcelVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestImportExcelVO.java
index f1903fd..5940200 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestImportExcelVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestImportExcelVO.java
@@ -29,10 +29,6 @@
     @Schema(description = "閲囪喘鐢宠鍗曞彿锛岀暀绌哄垯鑷姩鐢熸垚锛涚浉鍚岀紪鍙风殑澶氳鍚堝苟涓哄悓涓�寮犵敵璇�")
     private String no;
 
-    @ExcelProperty("渚涘簲鍟嗗悕绉�")
-    @Schema(description = "渚涘簲鍟嗗悕绉帮紙鍙�夛紝闇�涓庣郴缁熷唴渚涘簲鍟嗗悕绉版垨缂栫爜涓�鑷达級")
-    private String supplierName;
-
     @ExcelProperty("鐢宠鏃堕棿")
     @Schema(description = "鐢宠鏃堕棿锛屾牸寮忓 2026-01-01 10:00:00锛涚暀绌哄彇褰撳墠鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
     private String requestTime;
@@ -53,21 +49,9 @@
     @Schema(description = "浜у搧鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED)
     private BigDecimal count;
 
-    @ExcelProperty("鍗曚环")
-    @Schema(description = "浜у搧鍙傝�冨崟浠凤紱鐣欑┖鍒欏彇璇ョ墿鏂欑殑閲囪喘浠�")
-    private BigDecimal productPrice;
-
-    @ExcelProperty("绋庣巼(%)")
-    @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮锛屼緥濡� 13 琛ㄧず 13%")
-    private BigDecimal taxPercent;
-
     @ExcelProperty("闇�姹傛棩鏈�")
     @Schema(description = "闇�姹傛棩鏈燂紝鏍煎紡 yyyy-MM-dd")
     private String demandTime;
-
-    @ExcelProperty("鏄惁鏉ユ枡妫�楠�")
-    @Schema(description = "鏄惁闇�瑕佹潵鏂欐楠岋細濉�滄槸鈥濅负闇�瑕侊紝鍏跺畠涓轰笉闇�瑕�")
-    private String qcCheckFlag;
 
     @ExcelProperty("澶囨敞")
     @Schema(description = "澶囨敞锛涘悓涓�寮犵敵璇峰彇棣栬澶囨敞浣滀负鏁村崟澶囨敞")
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestPageReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestPageReqVO.java
index b427449..43cf564 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestPageReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestPageReqVO.java
@@ -29,6 +29,12 @@
     @Schema(description = "渚涘簲鍟嗙紪鍙�", example = "1")
     private Long supplierId;
 
+    @Schema(description = "鍏宠仈璇环鍗曞彿", example = "XJ2026110001")
+    private String inquiryNo;
+
+    @Schema(description = "鐢熸垚鐨勯噰璐彴璐﹀彿", example = "CGDD001")
+    private String orderNo;
+
     @Schema(description = "鐘舵��", example = "0")
     private Integer status;
 
@@ -42,4 +48,7 @@
     @Schema(description = "鍏ュ簱鐘舵�侊紙0:鏈叆搴� 1:閮ㄥ垎鍏ュ簱 2:鍏ㄩ儴鍏ュ簱锛�", example = "0")
     private Integer inStatus;
 
+    @Schema(description = "鏄惁鏌ヨ寰呭鐞嗙敵璇凤紙瀹℃壒閫氳繃涓旀湭鍙戣捣璇环銆佹湭鐢熸垚鍙拌处锛�", example = "true")
+    private Boolean todo;
+
 }
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestRespVO.java
index 74ff12b..50c373a 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestRespVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestRespVO.java
@@ -64,17 +64,9 @@
     @ExcelProperty("渚涘簲鍟嗗悕绉�")
     private String supplierName;
 
-    @Schema(description = "瀹氶噾閲戦", example = "1000.00")
-    @ExcelProperty("瀹氶噾閲戦")
-    private BigDecimal depositPrice;
-
     @Schema(description = "鍚堣鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("鍚堣鏁伴噺")
     private BigDecimal totalCount;
-
-    @Schema(description = "鍚堣浠锋牸", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("鍚堣浠锋牸")
-    private BigDecimal totalPrice;
 
     @Schema(description = "浜у搧鍚嶇О鍒楄〃", example = "浜у搧A,浜у搧B")
     @ExcelProperty("浜у搧鍚嶇О鍒楄〃")
@@ -87,6 +79,14 @@
     @Schema(description = "鐢熸垚鐨勯噰璐鍗曞彿", example = "CGDD001")
     @ExcelProperty("閲囪喘璁㈠崟鍙�")
     private String orderNo;
+
+    @Schema(description = "鍏宠仈璇环鍗曠紪鍙�", example = "1")
+    @ExcelIgnore
+    private Long inquiryId;
+
+    @Schema(description = "鍏宠仈璇环鍗曞彿", example = "XJ2026110001")
+    @ExcelProperty("璇环鍗曞彿")
+    private String inquiryNo;
 
     @Schema(description = "鍏ュ簱鐘舵��", example = "0")
     @ExcelProperty(value = "鍏ュ簱鐘舵��", converter = cn.iocoder.yudao.module.erp.convert.ErpPurchaseOrderInStatusConvert.class)
@@ -130,20 +130,8 @@
         @Schema(description = "浜у搧鍗曚綅鍚嶇О", example = "涓�")
         private String productUnitName;
 
-        @Schema(description = "浜у搧鍙傝�冨崟浠�", example = "100.00")
-        private BigDecimal productPrice;
-
         @Schema(description = "鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
         private BigDecimal count;
-
-        @Schema(description = "鎬讳环", example = "1000.00")
-        private BigDecimal totalPrice;
-
-        @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮", example = "13")
-        private BigDecimal taxPercent;
-
-        @Schema(description = "绋庨", example = "130.00")
-        private BigDecimal taxPrice;
 
         @Schema(description = "闇�姹傛棩鏈�")
         private LocalDate demandTime;
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSaveReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSaveReqVO.java
index d12da09..cc2363f 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSaveReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSaveReqVO.java
@@ -25,14 +25,8 @@
     @Schema(description = "鐢宠鐞嗙敱", example = "鐢熶骇闇�瑕�")
     private String requestReason;
 
-    @Schema(description = "渚涘簲鍟嗙紪鍙�", example = "1")
+    @Schema(description = "渚涘簲鍟嗙紪鍙凤紙鍙�夛紝瀹℃壒閫氳繃鐢熸垚閲囪喘鍙拌处鏃跺彲鍐嶉�夋嫨锛�", example = "1")
     private Long supplierId;
-
-    @Schema(description = "浼樻儬鐜囷紝鐧惧垎姣�", example = "10")
-    private BigDecimal discountPercent;
-
-    @Schema(description = "瀹氶噾閲戦", example = "1000.00")
-    private BigDecimal depositPrice;
 
     @Schema(description = "澶囨敞", example = "澶囨敞")
     private String remark;
@@ -60,15 +54,9 @@
         @NotNull(message = "浜у搧鍗曚綅涓嶈兘涓虹┖")
         private Long productUnitId;
 
-        @Schema(description = "浜у搧鍙傝�冨崟浠�", example = "100.00")
-        private BigDecimal productPrice;
-
         @Schema(description = "鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
         @NotNull(message = "鏁伴噺涓嶈兘涓虹┖")
         private BigDecimal count;
-
-        @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮", example = "13")
-        private BigDecimal taxPercent;
 
         @Schema(description = "闇�姹傛棩鏈�")
         private LocalDate demandTime;
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderDO.java
index c757c26..0ea9cde 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderDO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderDO.java
@@ -135,6 +135,13 @@
     private Long sourceId;
 
     /**
+     * 鏉ユ簮閲囪喘鐢宠缂栧彿
+     *
+     * 涓�寮犻噰璐敵璇峰彲鑳藉洜澶氫緵搴斿晢璇环鐢熸垚澶氬紶閲囪喘鍙拌处锛岄�氳繃璇ュ瓧娈靛綊闆�
+     */
+    private Long purchaseRequestId;
+
+    /**
      * 澶囨敞
      */
     private String remark;
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestDO.java
index de4cde0..b526bd7 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestDO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestDO.java
@@ -75,36 +75,6 @@
     private BigDecimal totalCount;
 
     /**
-     * 鍚堣浠锋牸
-     */
-    private BigDecimal totalPrice;
-
-    /**
-     * 鍚堣浜у搧浠锋牸
-     */
-    private BigDecimal totalProductPrice;
-
-    /**
-     * 鍚堣绋庨
-     */
-    private BigDecimal totalTaxPrice;
-
-    /**
-     * 浼樻儬鐜囷紝鐧惧垎姣�
-     */
-    private BigDecimal discountPercent;
-
-    /**
-     * 浼樻儬閲戦
-     */
-    private BigDecimal discountPrice;
-
-    /**
-     * 瀹氶噾閲戦
-     */
-    private BigDecimal depositPrice;
-
-    /**
      * 澶囨敞
      */
     private String remark;
@@ -125,6 +95,16 @@
     private String orderNo;
 
     /**
+     * 鍏宠仈鐨勮浠峰崟缂栧彿
+     */
+    private Long inquiryId;
+
+    /**
+     * 鍏宠仈鐨勮浠峰崟鍙�
+     */
+    private String inquiryNo;
+
+    /**
      * 鍏ュ簱鐘舵��
      *
      * 0: 鏈叆搴�
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestItemDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestItemDO.java
index f69cae5..0e85eb2 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestItemDO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestItemDO.java
@@ -44,29 +44,9 @@
     private Long productUnitId;
 
     /**
-     * 浜у搧鍙傝�冨崟浠�
-     */
-    private BigDecimal productPrice;
-
-    /**
      * 鏁伴噺
      */
     private BigDecimal count;
-
-    /**
-     * 鎬讳环
-     */
-    private BigDecimal totalPrice;
-
-    /**
-     * 绋庣巼锛岀櫨鍒嗘瘮
-     */
-    private BigDecimal taxPercent;
-
-    /**
-     * 绋庨
-     */
-    private BigDecimal taxPrice;
 
     /**
      * 闇�姹傛棩鏈�
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
index 0c989a6..1564a8e 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
@@ -31,15 +31,23 @@
     }
 
     default PageResult<ErpPurchaseRequestDO> selectPage(ErpPurchaseRequestPageReqVO pageReqVO) {
-        return selectPage(pageReqVO, new LambdaQueryWrapperX<ErpPurchaseRequestDO>()
+        LambdaQueryWrapperX<ErpPurchaseRequestDO> wrapper = new LambdaQueryWrapperX<ErpPurchaseRequestDO>()
                 .likeIfPresent(ErpPurchaseRequestDO::getNo, pageReqVO.getNo())
                 .eqIfPresent(ErpPurchaseRequestDO::getRequestUserId, pageReqVO.getRequestUserId())
                 .eqIfPresent(ErpPurchaseRequestDO::getRequestDeptId, pageReqVO.getRequestDeptId())
                 .eqIfPresent(ErpPurchaseRequestDO::getSupplierId, pageReqVO.getSupplierId())
+                .likeIfPresent(ErpPurchaseRequestDO::getInquiryNo, pageReqVO.getInquiryNo())
+                .likeIfPresent(ErpPurchaseRequestDO::getOrderNo, pageReqVO.getOrderNo())
                 .eqIfPresent(ErpPurchaseRequestDO::getStatus, pageReqVO.getStatus())
                 .eqIfPresent(ErpPurchaseRequestDO::getInStatus, pageReqVO.getInStatus())
-                .betweenIfPresent(ErpPurchaseRequestDO::getRequestTime, pageReqVO.getRequestTime())
-                .orderByDesc(ErpPurchaseRequestDO::getId));
+                .betweenIfPresent(ErpPurchaseRequestDO::getRequestTime, pageReqVO.getRequestTime());
+        // 寰呭鐞嗭細瀹℃壒閫氳繃鍚庯紝灏氭湭鍙戣捣璇环銆佷篃灏氭湭鐢熸垚閲囪喘鍙拌处
+        if (Boolean.TRUE.equals(pageReqVO.getTodo())) {
+            wrapper.isNull(ErpPurchaseRequestDO::getInquiryId)
+                    .isNull(ErpPurchaseRequestDO::getOrderId);
+        }
+        wrapper.orderByDesc(ErpPurchaseRequestDO::getId);
+        return selectPage(pageReqVO, wrapper);
     }
 
 }
\ 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 f311bdd..f926ef9 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
@@ -17,7 +17,8 @@
 
     WORK_ORDER(1, "鐢熶骇宸ュ崟"),
     SRM_INQUIRY(2, "SRM璇环"),
-    SALE_ORDER(3, "閿�鍞鍗�");
+    SALE_ORDER(3, "閿�鍞鍗�"),
+    PURCHASE_REQUEST(4, "閲囪喘鐢宠");
 
     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/enums/ErrorCodeConstants.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
index 047c2bd..0291c7d 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
@@ -34,6 +34,9 @@
     ErrorCode PURCHASE_ORDER_PURCHASE_TYPE_INVALID = new ErrorCode(1_030_101_016, "閲囪喘绫诲瀷({})涓嶅悎娉曪紝鍙兘閫夋嫨锛�1鐢熶骇銆�2鍔炲叕鐢ㄥ搧銆�3鍏朵粬");
     ErrorCode PURCHASE_ORDER_PAYMENT_METHOD_INVALID = new ErrorCode(1_030_101_017, "浠樻鏂瑰紡({})涓嶅悎娉曪紝鍙兘閫夋嫨锛�1鐢垫眹銆�2姹囩エ銆�3鐜伴噾銆�4鎵嬫満鏀粯");
     ErrorCode PURCHASE_ORDER_ITEM_PRODUCT_CODE_MISSING = new ErrorCode(1_030_101_018, "鐗╂枡[{}]鏈淮鎶� MDM 鐗╂枡缂栫爜锛岃鍏堝湪 MDM 鐗╂枡妗f琛ュ厖缂栫爜鍚庡啀淇濆瓨");
+    ErrorCode PURCHASE_ORDER_SUBMIT_SUPPLIER_REQUIRED = new ErrorCode(1_030_101_019, "鎻愪氦瀹℃壒澶辫触锛氶噰璐彴璐�({})鏈~鍐欎緵搴斿晢锛岃鍏堢紪杈戝彴璐﹂�夋嫨渚涘簲鍟嗗悗鍐嶆彁浜�");
+    ErrorCode PURCHASE_ORDER_SUBMIT_PRICE_REQUIRED = new ErrorCode(1_030_101_020, "鎻愪氦瀹℃壒澶辫触锛氭槑缁嗙墿鏂橻{}]鐨勫崟浠蜂负[{}]锛岃鍏堝湪閲囪喘鍙拌处鏄庣粏涓ˉ褰曞惈绋庡崟浠凤紙澶т簬 0锛夊悗鍐嶆彁浜�");
+    ErrorCode PURCHASE_ORDER_SUBMIT_ITEM_REQUIRED = new ErrorCode(1_030_101_021, "鎻愪氦瀹℃壒澶辫触锛氶噰璐彴璐�({})娌℃湁鐗╂枡鏄庣粏锛岃鍏堣ˉ鍏呮槑缁嗗悗鍐嶆彁浜�");
 
     // ========== ERP 閲囪喘鍏ュ簱锛�1-030-102-000锛� ==========
     ErrorCode PURCHASE_IN_NOT_EXISTS = new ErrorCode(1_030_102_000, "閲囪喘鍏ュ簱鍗曚笉瀛樺湪");
@@ -58,7 +61,7 @@
     ErrorCode PURCHASE_REQUEST_BPM_CATEGORY_NOT_EXISTS = new ErrorCode(1_030_104_008, "閲囪喘鐢宠瀹℃壒鍒嗙被涓嶅瓨鍦紝璇峰厛鍦˙PM妯″潡鍒涘缓閲囪喘鐢宠瀹℃壒娴佺▼鍒嗙被");
     ErrorCode PURCHASE_REQUEST_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_030_104_009, "閲囪喘鐢宠瀹℃壒鍒嗙被涓嬫病鏈夊彲鐢ㄧ殑娴佺▼妯″瀷锛岃鍏堝垱寤哄苟鍙戝竷娴佺▼");
     ErrorCode PURCHASE_REQUEST_RESET_FAIL_NOT_REJECT = new ErrorCode(1_030_104_010, "閲嶇疆澶辫触锛屽彧鏈夐┏鍥炵姸鎬佺殑閲囪喘鐢宠鍗曟墠鑳介噸缃�");
-    ErrorCode PURCHASE_REQUEST_SUPPLIER_REQUIRED = new ErrorCode(1_030_104_011, "閲囪喘鐢宠鍗曟湭鎸囧畾渚涘簲鍟嗭紝鏃犳硶鐢熸垚閲囪喘璁㈠崟锛岃鍏堢紪杈戠敵璇峰崟琛ュ厖渚涘簲鍟�");
+    ErrorCode PURCHASE_REQUEST_INQUIRY_EXISTS = new ErrorCode(1_030_104_012, "閲囪喘鐢宠鍗曞凡鍙戣捣璇环姣斾环锛岃绛夊緟璇环纭鍚庡啀鐢熸垚閲囪喘鍙拌处");
 
     // ========== ERP 閲囪喘鏉ョエ锛�1-030-105-000锛� ==========
     ErrorCode PURCHASE_INVOICE_NOT_EXISTS = new ErrorCode(1_030_105_000, "鏉ョエ涓嶅瓨鍦�");
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
index 594dc18..3e77826 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
@@ -453,6 +453,43 @@
         }
     }
 
+    /**
+     * 鎻愪氦瀹℃壒鍓嶆牎楠岄噰璐彴璐︽暟鎹槸鍚﹀凡琛ラ綈
+     *
+     * <p>閲囪喘鐢宠鐩存帴鐢熸垚鐨勫彴璐﹀彧鏈夌墿鏂欎笌鏁伴噺锛堥浂閲戦銆佹棤渚涘簲鍟嗭級锛�
+     * 閲囪喘鍛橀渶瑕佸湪鍙拌处閲岃ˉ褰曚緵搴斿晢銆佸崟浠枫�佷粯娆炬棩鏈熷悗鎵嶈兘鎻愪氦瀹℃壒銆傞�愰」鏍¢獙锛屽懡涓涓�澶勫嵆鎻愮ず鍏蜂綋鎬庝箞鏀广��</p>
+     *
+     * @param purchaseOrder 閲囪喘鍙拌处
+     */
+    private void validatePurchaseOrderReadyForSubmit(ErpPurchaseOrderDO purchaseOrder) {
+        // 2.1 渚涘簲鍟嗗繀閫�
+        if (purchaseOrder.getSupplierId() == null) {
+            throw exception(PURCHASE_ORDER_SUBMIT_SUPPLIER_REQUIRED, purchaseOrder.getNo());
+        }
+        // 2.2 浠樻鏃ユ湡蹇呴�夛細閲囪喘鐢宠鑷姩鐢熸垚鐨勮崏绋胯鍗曟病鏈変粯娆炬棩鏈�
+        if (purchaseOrder.getPaymentDate() == null) {
+            throw exception(PURCHASE_ORDER_PAYMENT_DATE_REQUIRED);
+        }
+        // 2.3 鏄庣粏鍗曚环蹇呴』琛ュ綍锛堝ぇ浜� 0锛�
+        List<ErpPurchaseOrderItemDO> items = purchaseOrderItemMapper.selectListByOrderId(purchaseOrder.getId());
+        if (CollUtil.isEmpty(items)) {
+            throw exception(PURCHASE_ORDER_SUBMIT_ITEM_REQUIRED, purchaseOrder.getNo());
+        }
+        Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
+                convertSet(items, ErpPurchaseOrderItemDO::getProductId));
+        for (ErpPurchaseOrderItemDO item : items) {
+            BigDecimal productPrice = item.getProductPrice();
+            if (productPrice != null && productPrice.compareTo(BigDecimal.ZERO) > 0) {
+                continue;
+            }
+            MdmItemRespDTO itemDTO = itemMap.get(item.getProductId());
+            String itemName = itemDTO != null && StrUtil.isNotBlank(itemDTO.getName())
+                    ? itemDTO.getName() : "ID=" + item.getProductId();
+            throw exception(PURCHASE_ORDER_SUBMIT_PRICE_REQUIRED, itemName,
+                    productPrice == null ? "鏈~鍐�" : productPrice.toPlainString());
+        }
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void submitPurchaseOrder(Long id, String processDefinitionKey, Long userId) {
@@ -463,10 +500,9 @@
         if (!submitable) {
             throw exception(PURCHASE_ORDER_SUBMIT_FAIL_STATUS);
         }
-        // 2. 浠樻鏃ユ湡蹇呴�夛細閲囪喘鐢宠鑷姩鐢熸垚鐨勮崏绋胯鍗曟病鏈変粯娆炬棩鏈燂紝鎻愪氦鍓嶅繀椤诲厛缂栬緫琛ラ綈
-        if (purchaseOrder.getPaymentDate() == null) {
-            throw exception(PURCHASE_ORDER_PAYMENT_DATE_REQUIRED);
-        }
+        // 2. 鎻愪氦鍓嶆牎楠屽彴璐︽暟鎹凡琛ラ綈锛氶噰璐敵璇风洿鎺ョ敓鎴愮殑鑽夌鍙湁鐗╂枡涓庢暟閲忥紝
+        //    渚涘簲鍟嗐�佸崟浠风瓑闇�瑕侀噰璐憳鍦ㄥ彴璐︿腑琛ュ綍鍚庢墠鑳芥彁浜ゅ鎵�
+        validatePurchaseOrderReadyForSubmit(purchaseOrder);
 
         // 3. 鍒涘缓 BPM 娴佺▼瀹炰緥
         // 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍¢獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷銆�
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 4c2366e..9ffba24 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
@@ -4,7 +4,6 @@
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.operatelog.core.util.OperateLogUtils;
 import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
@@ -30,9 +29,8 @@
 import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
 import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
 import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderSourceTypeEnum;
 import cn.iocoder.yudao.module.erp.enums.ErpPurchaseRequestStatusEnum;
-import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
-import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@@ -86,8 +84,6 @@
     @Resource
     private ErpSupplierService supplierService;
     @Resource
-    private SrmSupplierApi srmSupplierApi;
-    @Resource
     private MdmItemApi mdmItemApi;
 
     @Resource
@@ -128,7 +124,7 @@
                 .setStatus(ErpPurchaseRequestStatusEnum.DRAFT.getStatus())
                 .setRequestUserId(userId)
                 .setRequestDeptId(deptId));
-        calculateTotalPrice(purchaseRequest, requestItems);
+        calculateTotalCount(purchaseRequest, requestItems);
         purchaseRequestMapper.insert(purchaseRequest);
 
         // 6. 缁戝畾闄勪欢
@@ -156,7 +152,7 @@
 
         // 4. 鏇存柊鐢宠鍗�
         ErpPurchaseRequestDO updateObj = BeanUtils.toBean(updateReqVO, ErpPurchaseRequestDO.class);
-        calculateTotalPrice(updateObj, requestItems);
+        calculateTotalCount(updateObj, requestItems);
         purchaseRequestMapper.updateById(updateObj);
 
         // 5. 鏇存柊鐢宠鏄庣粏
@@ -182,39 +178,24 @@
             return respVO;
         }
 
-        // 1. 棰勭儹鈥滀緵搴斿晢鍚嶇О/缂栫爜 -> 渚涘簲鍟嗙紪鍙封�濇槧灏勶紙渚涘簲鍟嗕负鍙�夛級
-        Map<String, Long> supplierIdMap = new HashMap<>();
-        CommonResult<List<SrmSupplierRespDTO>> supplierResult = srmSupplierApi.getSupplierSimpleList();
-        if (supplierResult != null && CollUtil.isNotEmpty(supplierResult.getData())) {
-            supplierResult.getData().forEach(supplier -> {
-                if (StrUtil.isNotBlank(supplier.getName())) {
-                    supplierIdMap.putIfAbsent(supplier.getName().trim(), supplier.getId());
-                }
-                if (StrUtil.isNotBlank(supplier.getCode())) {
-                    supplierIdMap.putIfAbsent(supplier.getCode().trim(), supplier.getId());
-                }
-            });
-        }
-
-        // 2. 鎸夆�滈噰璐敵璇峰崟鍙封�濆垎缁�
+        // 1. 鎸夆�滈噰璐敵璇峰崟鍙封�濆垎缁�
         Map<String, List<ErpPurchaseRequestImportExcelVO>> groups = new LinkedHashMap<>();
         for (int i = 0; i < importList.size(); i++) {
             ErpPurchaseRequestImportExcelVO row = importList.get(i);
-            if (row == null || (StrUtil.isBlank(row.getProductCode()) && StrUtil.isBlank(row.getSupplierName())
-                    && StrUtil.isBlank(row.getNo()))) {
+            if (row == null || (StrUtil.isBlank(row.getProductCode()) && StrUtil.isBlank(row.getNo()))) {
                 continue; // 璺宠繃绌鸿
             }
             String key = StrUtil.isNotBlank(row.getNo()) ? row.getNo().trim() : "__row_" + (i + 2);
             groups.computeIfAbsent(key, k -> new ArrayList<>()).add(row);
         }
 
-        // 3. 閫愬紶鐢宠瀵煎叆
+        // 2. 閫愬紶鐢宠瀵煎叆
         for (Map.Entry<String, List<ErpPurchaseRequestImportExcelVO>> entry : groups.entrySet()) {
             List<ErpPurchaseRequestImportExcelVO> rows = entry.getValue();
             String label = StrUtil.isNotBlank(rows.get(0).getNo()) ? rows.get(0).getNo().trim()
                     : "绗� " + entry.getKey().substring("__row_".length()) + " 琛�";
             try {
-                ErpPurchaseRequestDO purchaseRequest = createPurchaseRequestByImport(rows, supplierIdMap);
+                ErpPurchaseRequestDO purchaseRequest = createPurchaseRequestByImport(rows);
                 respVO.getCreateList().add(purchaseRequest.getNo());
             } catch (Exception ex) {
                 respVO.getFailureList().put(label, resolveImportErrorMessage(ex));
@@ -228,21 +209,10 @@
     /**
      * 渚濇嵁瀵煎叆鏁版嵁鍒涘缓涓�寮犻噰璐敵璇凤紙鍚槑缁嗭級銆傜敵璇蜂汉/鐢宠閮ㄩ棬鐢卞綋鍓嶇櫥褰曠敤鎴疯嚜鍔ㄥ~鍏咃紱鐘舵�佷负鈥滄湭鎻愪氦(0)鈥濄��
      */
-    private ErpPurchaseRequestDO createPurchaseRequestByImport(List<ErpPurchaseRequestImportExcelVO> rows,
-                                                              Map<String, Long> supplierIdMap) {
+    private ErpPurchaseRequestDO createPurchaseRequestByImport(List<ErpPurchaseRequestImportExcelVO> rows) {
         ErpPurchaseRequestImportExcelVO head = rows.get(0);
 
-        // 1. 渚涘簲鍟嗭紙鍙�夛級锛氬~浜嗗垯鎸夊悕绉�/缂栫爜鍖归厤骞舵牎楠�
-        Long supplierId = null;
-        if (StrUtil.isNotBlank(head.getSupplierName())) {
-            supplierId = supplierIdMap.get(head.getSupplierName().trim());
-            if (supplierId == null) {
-                throw new IllegalArgumentException("渚涘簲鍟嗕笉瀛樺湪锛�" + head.getSupplierName());
-            }
-            supplierService.validateSupplier(supplierId);
-        }
-
-        // 2. 鏄庣粏
+        // 1. 鏄庣粏
         List<ErpPurchaseRequestSaveReqVO.Item> items = new ArrayList<>();
         for (ErpPurchaseRequestImportExcelVO row : rows) {
             if (StrUtil.isBlank(row.getProductCode())) {
@@ -262,13 +232,8 @@
             ErpPurchaseRequestSaveReqVO.Item itemVO = new ErpPurchaseRequestSaveReqVO.Item();
             itemVO.setProductId(item.getId());
             itemVO.setProductUnitId(item.getUnitMeasureId());
-            // 鍗曚环锛氭湭濉啓鏃跺彇鐗╂枡鐨勯噰璐环
-            itemVO.setProductPrice(row.getProductPrice() != null ? row.getProductPrice()
-                    : (item.getPurchasePrice() != null ? item.getPurchasePrice() : BigDecimal.ZERO));
             itemVO.setCount(row.getCount());
-            itemVO.setTaxPercent(row.getTaxPercent());
             itemVO.setDemandTime(parseImportDate(row.getDemandTime()));
-            itemVO.setQcCheckFlag("鏄�".equals(StrUtil.trim(row.getQcCheckFlag())));
             itemVO.setRemark(row.getRemark());
             items.add(itemVO);
         }
@@ -293,17 +258,15 @@
         // 5. 缁勮涓昏〃锛堢姸鎬佷负鈥滄湭鎻愪氦鈥濓級
         ErpPurchaseRequestDO purchaseRequest = new ErpPurchaseRequestDO();
         purchaseRequest.setNo(no);
-        purchaseRequest.setSupplierId(supplierId);
         purchaseRequest.setRequestTime(parseImportDateTime(head.getRequestTime()));
         purchaseRequest.setRequestReason(head.getRequestReason());
         purchaseRequest.setRemark(head.getRemark());
         purchaseRequest.setStatus(ErpPurchaseRequestStatusEnum.DRAFT.getStatus());
         purchaseRequest.setRequestUserId(userId);
         purchaseRequest.setRequestDeptId(deptId);
-        purchaseRequest.setDepositPrice(BigDecimal.ZERO);
 
         List<ErpPurchaseRequestItemDO> itemDOs = validatePurchaseRequestItems(items);
-        calculateTotalPrice(purchaseRequest, itemDOs);
+        calculateTotalCount(purchaseRequest, itemDOs);
         purchaseRequestMapper.insert(purchaseRequest);
         itemDOs.forEach(item -> item.setRequestId(purchaseRequest.getId()));
         purchaseRequestItemMapper.insertBatch(itemDOs);
@@ -359,30 +322,19 @@
         return StrUtil.blankToDefault(ex.getMessage(), "瀵煎叆澶辫触");
     }
 
-    private void calculateTotalPrice(ErpPurchaseRequestDO purchaseRequest, List<ErpPurchaseRequestItemDO> requestItems) {
+    private void calculateTotalCount(ErpPurchaseRequestDO purchaseRequest, List<ErpPurchaseRequestItemDO> requestItems) {
         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());
-        // 璁$畻浼樻儬浠锋牸
-        if (purchaseRequest.getDiscountPercent() == null) {
-            purchaseRequest.setDiscountPercent(BigDecimal.ZERO);
-        }
-        purchaseRequest.setDiscountPrice(MoneyUtils.priceMultiplyPercent(purchaseRequest.getTotalPrice(), purchaseRequest.getDiscountPercent()));
-        purchaseRequest.setTotalPrice(purchaseRequest.getTotalPrice().subtract(purchaseRequest.getDiscountPrice()));
     }
 
     private List<ErpPurchaseRequestItemDO> validatePurchaseRequestItems(List<ErpPurchaseRequestSaveReqVO.Item> list) {
-        return convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseRequestItemDO.class, item -> {
-            if (item.getProductPrice() != null && item.getCount() != null) {
-                item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
-                if (item.getTaxPercent() != null) {
-                    // 鍗曚环涓哄惈绋庡崟浠凤細绋庨浠庝环绋庡悎璁′腑鍙嶇畻锛岃�屼笉鏄湪鍚堣涓婂啀鍔犵◣
-                    item.setTaxPrice(MoneyUtils.taxPriceIncluded(item.getTotalPrice(), item.getTaxPercent()));
-                }
+        return convertList(list, o -> {
+            ErpPurchaseRequestItemDO item = BeanUtils.toBean(o, ErpPurchaseRequestItemDO.class);
+            // 閲囪喘鐢宠涓嶅啀濉啓鈥滄槸鍚﹁川妫�鈥濓紝榛樿闇�瑕佹潵鏂欐楠岋紝鐢熸垚鍙拌处鍚庡彲鍦ㄥ彴璐︿腑璋冩暣
+            if (item.getQcCheckFlag() == null) {
+                item.setQcCheckFlag(true);
             }
-        }));
+            return item;
+        });
     }
 
     private void updatePurchaseRequestItemList(Long id, List<ErpPurchaseRequestItemDO> newList) {
@@ -538,23 +490,11 @@
         }
 
         // 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
+        // 瀹℃壒閫氳繃鍚庝笉鑷姩鐢熸垚閲囪喘鍙拌处锛氱敱閲囪喘鍛樺湪鍒楄〃涓喅瀹氥�屽彂璧疯浠枫�嶆垨銆岀洿鎺ョ敓鎴愰噰璐彴璐︺��
         Integer newStatus = convertBpmResultToStatus(bpmResult);
         if (newStatus != null) {
             purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
                     .setId(id).setStatus(newStatus));
-        }
-
-        // 3. 瀹℃壒閫氳繃涓旀湁渚涘簲鍟嗭紝鑷姩鐢熸垚閲囪喘璁㈠崟
-        if (ErpPurchaseRequestStatusEnum.APPROVE.getStatus().equals(newStatus)
-                && purchaseRequest.getSupplierId() != null
-                && purchaseRequest.getOrderId() == null) {
-            try {
-                Long orderId = doGeneratePurchaseOrder(purchaseRequest);
-                log.info("[updatePurchaseRequestAuditStatus] 閲囪喘鐢宠({}) 鑷姩鐢熸垚閲囪喘璁㈠崟({})", id, orderId);
-            } catch (Exception e) {
-                log.error("[updatePurchaseRequestAuditStatus] 閲囪喘鐢宠({}) 鑷姩鐢熸垚閲囪喘璁㈠崟澶辫触", id, e);
-                // 涓嶆姏鍑哄紓甯革紝閬垮厤褰卞搷鐘舵�佹洿鏂�
-            }
         }
     }
 
@@ -570,15 +510,18 @@
         if (purchaseRequest.getOrderId() != null) {
             throw exception(PURCHASE_REQUEST_ORDER_EXISTS);
         }
-        // 3. 渚涘簲鍟嗕互閲囪喘鐢宠鍗曚负鍑嗭細鐢宠鎻愪氦鏃跺凡缁忛�夎繃渚涘簲鍟嗭紝鐢熸垚璁㈠崟涓嶅啀瑕佹眰閲嶆柊閫夋嫨
-        //    鍏煎鏃ц皟鐢ㄦ柟浠嶆樉寮忎紶 supplierId 鐨勬儏鍐碉紝浼犱簡鍒欎互浼犲叆鍊间负鍑�
-        Long targetSupplierId = supplierId != null ? supplierId : purchaseRequest.getSupplierId();
-        if (targetSupplierId == null) {
-            throw exception(PURCHASE_REQUEST_SUPPLIER_REQUIRED);
+        // 3. 宸插彂璧疯浠风殑鐢宠锛屽繀椤荤瓑璇环纭锛堢‘瀹氫环鏍硷級鍚庢墠鑳界敓鎴愰噰璐彴璐�
+        if (purchaseRequest.getInquiryId() != null) {
+            throw exception(PURCHASE_REQUEST_INQUIRY_EXISTS);
         }
-        supplierService.validateSupplier(targetSupplierId);
+        // 4. 渚涘簲鍟嗕笉鍦ㄨ繖閲岀‘瀹氾細閲囪喘鐢宠鏈韩涓嶅~渚涘簲鍟嗭紝鐩存帴鐢熸垚鍙拌处鏃朵篃鍏佽涓虹┖锛�
+        //    鐢遍噰璐憳鍦ㄩ噰璐彴璐﹁崏绋块噷琛ュ厖渚涘簲鍟嗕笌浠锋牸鍚庡啀鎻愪氦瀹℃壒
+        Long targetSupplierId = supplierId != null ? supplierId : purchaseRequest.getSupplierId();
+        if (targetSupplierId != null) {
+            supplierService.validateSupplier(targetSupplierId);
+        }
 
-        // 4. 璁剧疆渚涘簲鍟嗗苟鐢熸垚璁㈠崟
+        // 5. 鐢熸垚璁㈠崟锛坰upplierId 鍙负绌猴紝鐣欏緟鍙拌处琛ュ厖锛�
         purchaseRequest.setSupplierId(targetSupplierId);
         return doGeneratePurchaseOrder(purchaseRequest);
     }
@@ -611,12 +554,17 @@
         purchaseOrder.setSupplierId(purchaseRequest.getSupplierId());
         purchaseOrder.setOrderTime(purchaseRequest.getRequestTime());
         purchaseOrder.setTotalCount(purchaseRequest.getTotalCount());
-        purchaseOrder.setTotalPrice(purchaseRequest.getTotalPrice());
-        purchaseOrder.setTotalProductPrice(purchaseRequest.getTotalProductPrice());
-        purchaseOrder.setTotalTaxPrice(purchaseRequest.getTotalTaxPrice());
-        purchaseOrder.setDiscountPercent(purchaseRequest.getDiscountPercent());
-        purchaseOrder.setDiscountPrice(purchaseRequest.getDiscountPrice());
-        purchaseOrder.setDepositPrice(purchaseRequest.getDepositPrice() != null ? purchaseRequest.getDepositPrice() : BigDecimal.ZERO);
+        // 閲囪喘鐢宠涓嶅惈浠锋牸锛氬彴璐﹀厛浠� 0 閲戦鐢熸垚鑽夌锛岀敱閲囪喘鍛樺湪鍙拌处涓ˉ褰曞崟浠�/绋庣巼鍚庡啀鎻愪氦瀹℃壒
+        purchaseOrder.setTotalPrice(BigDecimal.ZERO);
+        purchaseOrder.setTotalProductPrice(BigDecimal.ZERO);
+        purchaseOrder.setTotalTaxPrice(BigDecimal.ZERO);
+        purchaseOrder.setDiscountPercent(BigDecimal.ZERO);
+        purchaseOrder.setDiscountPrice(BigDecimal.ZERO);
+        purchaseOrder.setDepositPrice(BigDecimal.ZERO);
+        purchaseOrder.setSourceType(ErpPurchaseOrderSourceTypeEnum.PURCHASE_REQUEST.getType());
+        purchaseOrder.setSourceId(purchaseRequest.getId());
+        purchaseOrder.setSourceNo(purchaseRequest.getNo());
+        purchaseOrder.setPurchaseRequestId(purchaseRequest.getId());
         purchaseOrder.setRemark(purchaseRequest.getRemark());
         purchaseOrder.setInCount(BigDecimal.ZERO);
         purchaseOrder.setInStatus(0);
@@ -629,11 +577,12 @@
             orderItem.setRequestItemId(item.getId()); // 鍏宠仈閲囪喘鐢宠鏄庣粏
             orderItem.setProductId(item.getProductId());
             orderItem.setProductUnitId(item.getProductUnitId());
-            orderItem.setProductPrice(item.getProductPrice());
+            // 鍗曚环/绋庣巼寰呴噰璐憳鍦ㄥ彴璐︿腑琛ュ綍锛屽厛鎸� 0 淇濆瓨
+            orderItem.setProductPrice(BigDecimal.ZERO);
             orderItem.setCount(item.getCount());
-            orderItem.setTotalPrice(item.getTotalPrice());
-            orderItem.setTaxPercent(item.getTaxPercent());
-            orderItem.setTaxPrice(item.getTaxPrice());
+            orderItem.setTotalPrice(BigDecimal.ZERO);
+            orderItem.setTaxPercent(BigDecimal.ZERO);
+            orderItem.setTaxPrice(BigDecimal.ZERO);
             orderItem.setRemark(item.getRemark());
             orderItem.setInCount(BigDecimal.ZERO);
             // 鏄惁璐ㄦ涓庨噰璐敵璇蜂繚鎸佷竴鑷达細鏄庣粏鏈槑纭爣璁版椂榛樿涓恒�屾槸銆嶏紙鍘嗗彶鐢宠鍗曞彲鑳戒负 null锛�
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
index 09ef8cf..73a3b68 100644
--- 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
@@ -35,6 +35,14 @@
         return success(inquiryService.createInquiry(createReqVO));
     }
 
+    @PostMapping("/create-from-request")
+    @Operation(summary = "鐢遍噰璐敵璇峰彂璧疯浠�")
+    @Parameter(name = "requestId", description = "閲囪喘鐢宠缂栧彿", required = true)
+    @PreAuthorize("@ss.hasPermission('srm:inquiry:create')")
+    public CommonResult<Long> createInquiryFromPurchaseRequest(@RequestParam("requestId") Long requestId) {
+        return success(inquiryService.createInquiryFromPurchaseRequest(requestId));
+    }
+
     @PutMapping("/update")
     @Operation(summary = "鏇存柊璇环鍗曪紙浠呰崏绋匡級")
     @PreAuthorize("@ss.hasPermission('srm:inquiry:update')")
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
index 0a0d069..c573333 100644
--- 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
@@ -25,6 +25,12 @@
     private Integer status;
     private String processInstanceId;
 
+    @Schema(description = "鍏宠仈閲囪喘鐢宠缂栧彿")
+    private Long purchaseRequestId;
+
+    @Schema(description = "鍏宠仈閲囪喘鐢宠鍗曞彿")
+    private String purchaseRequestNo;
+
     @Schema(description = "璇环鏃ユ湡")
     private LocalDate inquiryDate;
 
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
index 320a183..c0d5336 100644
--- 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
@@ -50,5 +50,13 @@
     private Long purchaserUserId;
     private String remark;
     private String processInstanceId;
+    /**
+     * 鍏宠仈閲囪喘鐢宠缂栧彿
+     */
+    private Long purchaseRequestId;
+    /**
+     * 鍏宠仈閲囪喘鐢宠鍗曞彿
+     */
+    private String purchaseRequestNo;
 
 }
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 93c192f..8d88322 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
@@ -36,5 +36,10 @@
     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, "璇环鍗曞彿鐢熸垚澶辫触");
+    ErrorCode INQUIRY_PURCHASE_REQUEST_NOT_EXISTS = new ErrorCode(1_040_600_017, "閲囪喘鐢宠涓嶅瓨鍦�");
+    ErrorCode INQUIRY_PURCHASE_REQUEST_NOT_APPROVED = new ErrorCode(1_040_600_018, "閲囪喘鐢宠瀹℃牳閫氳繃鍚庢墠鑳藉彂璧疯浠�");
+    ErrorCode INQUIRY_PURCHASE_REQUEST_HAS_ORDER = new ErrorCode(1_040_600_019, "閲囪喘鐢宠宸茬敓鎴愰噰璐彴璐︼紝鏃犳硶鍐嶅彂璧疯浠�");
+    ErrorCode INQUIRY_PURCHASE_REQUEST_HAS_INQUIRY = new ErrorCode(1_040_600_020, "閲囪喘鐢宠宸插彂璧疯繃璇环锛岃鍕块噸澶嶆搷浣�");
+    ErrorCode INQUIRY_PURCHASE_REQUEST_ITEM_EMPTY = new ErrorCode(1_040_600_021, "閲囪喘鐢宠娌℃湁鏄庣粏锛屾棤娉曞彂璧疯浠�");
 
 }
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
index 334c853..e190a20 100644
--- 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
@@ -14,6 +14,14 @@
 
     Long createInquiry(@Valid SrmInquirySaveReqVO createReqVO);
 
+    /**
+     * 鐢遍噰璐敵璇峰彂璧疯浠凤細鎸夌敵璇锋槑缁嗙敓鎴愯浠峰崟鑽夌锛屽苟鍥炲啓閲囪喘鐢宠鐨勮浠峰崟鍏宠仈
+     *
+     * @param purchaseRequestId 閲囪喘鐢宠缂栧彿
+     * @return 璇环鍗曠紪鍙�
+     */
+    Long createInquiryFromPurchaseRequest(Long purchaseRequestId);
+
     void updateInquiry(@Valid SrmInquirySaveReqVO updateReqVO);
 
     void deleteInquiry(Long id);
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
index a750fba..2761cf4 100644
--- 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
@@ -11,8 +11,10 @@
 import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
 import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
+import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseRequestApi;
 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.erp.api.purchase.dto.ErpPurchaseRequestRespDTO;
 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;
@@ -49,6 +51,11 @@
 
     private static final DateTimeFormatter NO_DATE_FORMAT = DateTimeFormatter.ofPattern("yyyyMM");
 
+    /**
+     * 閲囪喘鐢宠銆屽鏍搁�氳繃銆嶇姸鎬佸�硷紝涓� ERP 妯″潡 ErpPurchaseRequestStatusEnum.APPROVE 淇濇寔涓�鑷�
+     */
+    private static final Integer PURCHASE_REQUEST_STATUS_APPROVED = 20;
+
     @Resource
     private SrmInquiryMapper inquiryMapper;
     @Resource
@@ -69,6 +76,8 @@
     private MdmUnitMeasureApi mdmUnitMeasureApi;
     @Resource
     private ErpPurchaseOrderApi erpPurchaseOrderApi;
+    @Resource
+    private ErpPurchaseRequestApi erpPurchaseRequestApi;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -90,6 +99,73 @@
                 createReqVO.getSuppliers().stream()
                         .map(SrmInquirySaveReqVO.Supplier::getSupplierId)
                         .collect(Collectors.toSet()));
+        return inquiry.getId();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long createInquiryFromPurchaseRequest(Long purchaseRequestId) {
+        ErpPurchaseRequestRespDTO purchaseRequest = erpPurchaseRequestApi
+                .getPurchaseRequest(purchaseRequestId).getCheckedData();
+        if (purchaseRequest == null) {
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.INQUIRY_PURCHASE_REQUEST_NOT_EXISTS);
+        }
+        if (!PURCHASE_REQUEST_STATUS_APPROVED.equals(purchaseRequest.getStatus())) {
+            throw new ServiceException(ErrorCodeConstants.INQUIRY_PURCHASE_REQUEST_NOT_APPROVED.getCode(),
+                    "閲囪喘鐢宠銆�" + purchaseRequest.getNo() + "銆戝綋鍓嶇姸鎬佷笉鏄�屽鏍搁�氳繃銆嶏紝鏃犳硶鍙戣捣璇环銆�"
+                            + "璇峰厛鍦ㄩ噰璐敵璇蜂腑瀹屾垚瀹℃壒锛屽鎵归�氳繃鍚庡啀鍙戣捣璇环銆�");
+        }
+        if (purchaseRequest.getOrderId() != null) {
+            throw new ServiceException(ErrorCodeConstants.INQUIRY_PURCHASE_REQUEST_HAS_ORDER.getCode(),
+                    "閲囪喘鐢宠銆�" + purchaseRequest.getNo() + "銆戝凡鐢熸垚閲囪喘鍙拌处銆�"
+                            + StrUtil.blankToDefault(purchaseRequest.getOrderNo(), "ID=" + purchaseRequest.getOrderId())
+                            + "銆戯紝鏃犳硶鍐嶅彂璧疯浠枫�傝鍒伴噰璐彴璐︿腑鏌ョ湅浠锋牸鏄庣粏銆�");
+        }
+        SrmInquiryDO linkedInquiry = purchaseRequest.getInquiryId() != null
+                ? inquiryMapper.selectById(purchaseRequest.getInquiryId()) : null;
+        if (linkedInquiry != null
+                && !InquiryStatusEnum.CANCELLED.getStatus().equals(linkedInquiry.getStatus())) {
+            throw new ServiceException(ErrorCodeConstants.INQUIRY_PURCHASE_REQUEST_HAS_INQUIRY.getCode(),
+                    "閲囪喘鐢宠銆�" + purchaseRequest.getNo() + "銆戝凡鍙戣捣杩囪浠枫��"
+                            + StrUtil.blankToDefault(purchaseRequest.getInquiryNo(), "ID=" + purchaseRequest.getInquiryId())
+                            + "銆戯紝璇风洿鎺ユ墦寮�璇ヨ浠峰崟缁х画澶勭悊锛屼笉瑕侀噸澶嶅彂璧枫��");
+        }
+        List<ErpPurchaseRequestRespDTO.Item> requestItems = purchaseRequest.getItems();
+        if (CollUtil.isEmpty(requestItems)) {
+            throw new ServiceException(ErrorCodeConstants.INQUIRY_PURCHASE_REQUEST_ITEM_EMPTY.getCode(),
+                    "閲囪喘鐢宠銆�" + purchaseRequest.getNo() + "銆戞病鏈夋槑缁嗚锛屾棤娉曞彂璧疯浠枫�傝鍥炲埌閲囪喘鐢宠琛ュ厖鏄庣粏鍚庡啀璇曘��");
+        }
+
+        SrmInquiryDO inquiry = new SrmInquiryDO();
+        inquiry.setNo(generateInquiryNo());
+        inquiry.setTitle("閲囪喘鐢宠銆�" + purchaseRequest.getNo() + "銆戣浠�");
+        inquiry.setStatus(InquiryStatusEnum.DRAFT.getStatus());
+        inquiry.setInquiryDate(LocalDate.now());
+        inquiry.setPurchaserUserId(getLoginUserId());
+        inquiry.setRemark("鐢遍噰璐敵璇枫��" + purchaseRequest.getNo() + "銆戝彂璧�");
+        inquiry.setPurchaseRequestId(purchaseRequest.getId());
+        inquiry.setPurchaseRequestNo(purchaseRequest.getNo());
+        inquiryMapper.insert(inquiry);
+
+        List<SrmInquirySaveReqVO.Item> itemVOs = new ArrayList<>();
+        Set<Long> productIds = new HashSet<>();
+        for (ErpPurchaseRequestRespDTO.Item requestItem : requestItems) {
+            if (!productIds.add(requestItem.getProductId())) {
+                throw new ServiceException(ErrorCodeConstants.INQUIRY_PURCHASE_REQUEST_ITEM_EMPTY.getCode(),
+                        "閲囪喘鐢宠銆�" + purchaseRequest.getNo() + "銆戜腑浜у搧銆�"
+                                + resolveItemName(requestItem.getProductId()) + "銆戝瓨鍦ㄥ琛屾槑缁嗭紝鏃犳硶鐩存帴鍙戣捣璇环銆�"
+                                + "璇峰厛鍦ㄩ噰璐敵璇蜂腑鍚堝苟鍚屼竴浜у搧鐨勬暟閲忓悗鍐嶈瘯銆�");
+            }
+            SrmInquirySaveReqVO.Item itemVO = new SrmInquirySaveReqVO.Item();
+            itemVO.setProductId(requestItem.getProductId());
+            itemVO.setProductUnitId(requestItem.getProductUnitId());
+            itemVO.setQuantity(requestItem.getCount());
+            itemVO.setRemark(requestItem.getRemark());
+            itemVOs.add(itemVO);
+        }
+        saveItems(inquiry.getId(), itemVOs);
+
+        erpPurchaseRequestApi.updatePurchaseRequestInquiry(purchaseRequest.getId(), inquiry.getId(), inquiry.getNo());
         return inquiry.getId();
     }
 
@@ -139,6 +215,7 @@
         inquirySupplierMapper.deleteByInquiryId(id);
         inquiryQuoteMapper.deleteByInquiryId(id);
         inquiryMapper.deleteById(id);
+        clearPurchaseRequestLink(inquiry);
     }
 
     @Override
@@ -235,6 +312,8 @@
         }
         inquiryMapper.updateById(new SrmInquiryDO()
                 .setId(id).setStatus(InquiryStatusEnum.CANCELLED.getStatus()));
+        // 璇环鍙栨秷鍚庤В闄ら噰璐敵璇峰叧鑱旓紝閲囪喘鍛樺彲閲嶆柊閫夋嫨銆屽彂璧疯浠枫�嶆垨銆岀洿鎺ョ敓鎴愬彴璐︺��
+        clearPurchaseRequestLink(inquiry);
     }
 
     @Override
@@ -458,6 +537,7 @@
             createReqDTO.setSourceType(2);
             createReqDTO.setSourceNo(inquiry.getNo());
             createReqDTO.setSourceId(inquiry.getId());
+            createReqDTO.setPurchaseRequestId(inquiry.getPurchaseRequestId());
             createReqDTO.setRemark("SRM璇环鑷姩鐢熸垚锛岃浠峰崟鍙凤細" + inquiry.getNo());
             createReqDTO.setItems(orderItems);
 
@@ -490,6 +570,28 @@
             orderResult.setPurchaseOrderId(purchaseOrderId);
             orderResult.setPurchaseOrderNo(purchaseOrderNo);
             orders.add(orderResult);
+        }
+
+        // 3.1 璇环鍗曟潵婧愪簬閲囪喘鐢宠鏃讹紝鍥炲啓閲囪喘鐢宠鍏宠仈鐨勯噰璐彴璐�
+        //     涓�涓浠峰崟鍙兘鎸変腑鏍囦緵搴斿晢鎷嗘垚澶氬紶鍙拌处锛岄噰璐敵璇峰彧璁板綍绗竴寮狅紝瀹屾暣娓呭崟鍙�氳繃鍙拌处鐨勯噰璐敵璇峰瓧娈靛弽鏌�
+        if (inquiry.getPurchaseRequestId() != null && CollUtil.isNotEmpty(orders)) {
+            SrmInquiryConfirmRespVO.Order firstOrder = orders.get(0);
+            if (orders.size() > 1) {
+                log.info("[confirmInquiry] 璇环鍗�({}) 涓洪噰璐敵璇�({}) 鐢熸垚 {} 寮犲彴璐︼紝閲囪喘鐢宠浠呭洖鍐欓寮犲彴璐�({})",
+                        inquiry.getNo(), inquiry.getPurchaseRequestNo(), orders.size(), firstOrder.getPurchaseOrderNo());
+            }
+            try {
+                erpPurchaseRequestApi.updatePurchaseRequestOrder(inquiry.getPurchaseRequestId(),
+                        firstOrder.getPurchaseOrderId(), firstOrder.getPurchaseOrderNo());
+            } catch (Exception ex) {
+                log.error("[confirmInquiry] 璇环鍗�({}) 鍥炲啓閲囪喘鐢宠({}) 鍏宠仈鍙拌处澶辫触",
+                        inquiry.getNo(), inquiry.getPurchaseRequestNo(), ex);
+                throw new ServiceException(ErrorCodeConstants.INQUIRY_ORDER_GENERATE_FAIL.getCode(),
+                        "璇环鍗曘��" + inquiry.getNo() + "銆戝凡鐢熸垚閲囪喘鍙拌处銆�"
+                                + StrUtil.blankToDefault(firstOrder.getPurchaseOrderNo(), "ID=" + firstOrder.getPurchaseOrderId())
+                                + "銆戯紝浣嗗洖鍐欓噰璐敵璇枫��" + inquiry.getPurchaseRequestNo() + "銆戝け璐ワ細" + ex.getMessage()
+                                + "銆傝鍒伴噰璐敵璇蜂腑鏍稿鍏宠仈鍙拌处锛屾垨鑱旂郴绠$悊鍛樺鐞嗐��");
+            }
         }
 
         // 4. 鏇存柊璇环鍗曚负宸茶浆璁㈠崟锛堢姸鎬佹潯浠舵洿鏂帮紝閬垮厤骞跺彂閲嶅鐢熸垚锛�
@@ -726,6 +828,40 @@
                 "璇环鍗曞彿鍦ㄥ娆″皾璇曞悗浠嶉噸澶嶏紝璇风◢鍚庨噸璇曘��");
     }
 
+    /**
+     * 璇环鍗曡鍙栨秷/鍒犻櫎鏃讹紝瑙i櫎瀵归噰璐敵璇风殑鍏宠仈锛岃閲囪喘鍛樺彲閲嶆柊閫夋嫨銆屽彂璧疯浠枫�嶆垨銆岀洿鎺ョ敓鎴愬彴璐︺�嶃��
+     * 瑙i櫎澶辫触鍙褰曟棩蹇楋紝涓嶉樆鏂彇娑堟搷浣滐紱鍙戣捣璇环鏃朵細鍐嶆寜璇环鍗曠姸鎬佸仛鍏滃簳鍒ゆ柇銆�
+     */
+    private void clearPurchaseRequestLink(SrmInquiryDO inquiry) {
+        if (inquiry.getPurchaseRequestId() == null) {
+            return;
+        }
+        try {
+            erpPurchaseRequestApi.clearPurchaseRequestInquiry(inquiry.getPurchaseRequestId());
+        } catch (Exception ex) {
+            log.warn("[clearPurchaseRequestLink] 璇环鍗�({}) 瑙i櫎閲囪喘鐢宠({}) 鍏宠仈澶辫触锛岃浜哄伐鏍稿",
+                    inquiry.getNo(), inquiry.getPurchaseRequestNo(), ex);
+        }
+    }
+
+    /**
+     * 瑙f瀽浜у搧鍚嶇О锛屼粎鐢ㄤ簬寮傚父鎻愮ず锛涜В鏋愬け璐ユ椂鍥為��涓哄彲璇� ID锛岄伩鍏嶄簩娆″紓甯�
+     */
+    private String resolveItemName(Long productId) {
+        if (productId == null) {
+            return "鏈�夋嫨";
+        }
+        try {
+            MdmItemRespDTO item = mdmItemApi.getItem(productId).getCheckedData();
+            if (item != null && StrUtil.isNotBlank(item.getName())) {
+                return item.getName();
+            }
+        } catch (Exception ex) {
+            log.warn("[resolveItemName] 鏌ヨ浜у搧({}) 鍚嶇О澶辫触", productId, ex);
+        }
+        return "ID=" + productId;
+    }
+
     private String statusName(Integer status) {
         for (InquiryStatusEnum e : InquiryStatusEnum.values()) {
             if (e.getStatus().equals(status)) {

--
Gitblit v1.9.3