From 8782476e9cb4480be5da588888d08022b7942d0c Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期六, 07 十一月 2026 14:07:59 +0800
Subject: [PATCH] feat: 补齐需求10/15/16/17/18/21/23,改用现有模块替代 ERP 依赖

---
 yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/api/certificate/SrmSupplierCertificateApiImpl.java                                    |   42 +
 yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/service/statistics/PurchasePriceMetricsTest.java                                      |   15 
 sql/mysql/mdm_item_outsource_lead_time_20261107.sql                                                                                              |    9 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProTaskExecutionService.java                                  |  180 ++++
 sql/mysql/mes_work_order_market_type_20261107.sql                                                                                                |    9 
 sql/mysql/safety_risk_source_20261107.sql                                                                                                        |   22 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskSourceService.java                                           |   98 ++
 yudao-module-aftersales/src/test/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnMesLinkTest.java                       |  104 ++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java                           |   13 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectQueryService.java                                           |   62 +
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProTaskExecutionRespVO.java                       |  100 ++
 sql/mysql/after_sale_cancellation_20261107.sql                                                                                                   |   49 +
 yudao-module-srm-api/src/main/java/cn/iocoder/yudao/module/srm/api/certificate/SrmSupplierCertificateApi.java                                    |   22 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/vo/MesDvRepairDiagnosisRespVO.java                         |   69 +
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/MesDvRepairController.java                                 |   13 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyRiskSourceDO.java                                         |    4 
 sql/mysql/bpm_invoice_legacy_derived_from_20261106.sql                                                                                           |    9 
 sql/mysql/safety_risk_source_collect_20261107.sql                                                                                                |   24 
 yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/service/finance/ErpAfterSaleFinanceDraftServiceTest.java                              |   53 +
 yudao-module-aftersales/src/test/java/cn/iocoder/yudao/module/aftersales/service/collaboration/AfterSaleCollaborationServiceTest.java            |  204 ++++
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketService.java                              |    8 
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/cancellation/vo/AfterSaleCancellationSaveReqVO.java    |   49 +
 yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/statistics/SrmStatisticsController.java                              |   25 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/statistics/MesDvStatisticsController.java                         |   17 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/risk/SafetyRiskSourceSaveReqVO.java                        |    4 
 yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/statistics/SrmCostAnalysisService.java                                        |  183 ++++
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/cancellation/AfterSaleCancellationMapper.java                 |   26 
 yudao-module-aftersales-api/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApi.java                                         |    9 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java                                   |   47 +
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/ticket/AfterSaleTicketMapper.java                             |    7 
 sql/mysql/safety_hazard_employee_link_20261107.sql                                                                                               |   23 
 yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/statistics/vo/SrmCostAnalysisRespVO.java                             |   84 ++
 yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderCancellationGuardTest.java                                   |   96 ++
 sql/mysql/purchase_order_srm_menu_20261107.sql                                                                                                   |   14 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyRiskSourceController.java                               |    5 
 yudao-module-srm-api/src/main/java/cn/iocoder/yudao/module/srm/api/certificate/dto/SrmSupplierCertificateRespDTO.java                            |   24 
 yudao-module-aftersales/src/test/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleLedgerServiceTest.java                          |   30 
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/cancellation/AfterSaleCancellationService.java                  |  213 +++++
 sql/mysql/mes_work_order_schedule_priority_20261107.sql                                                                                          |    9 
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApiImpl.java                                         |    8 
 yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/api/sale/ErpSaleOrderNoticeLockTest.java                                              |   26 
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/cancellation/AfterSaleCancellationController.java      |  100 ++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectDowntimeDetailRespVO.java                       |   71 +
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/repair/MesDvRepairDiagnosisService.java                                    |  163 +++
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java                                   |    5 
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/cancellation/vo/AfterSaleCancellationApproveReqVO.java |   23 
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java                          |    8 
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java                                           |   10 
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/cancellation/AfterSaleCancellationDO.java                |   51 +
 49 files changed, 2,438 insertions(+), 1 deletions(-)

diff --git a/sql/mysql/after_sale_cancellation_20261107.sql b/sql/mysql/after_sale_cancellation_20261107.sql
new file mode 100644
index 0000000..336e256
--- /dev/null
+++ b/sql/mysql/after_sale_cancellation_20261107.sql
@@ -0,0 +1,49 @@
+-- 缁熶竴閫�鍗曞彈鐞嗗崟锛氶��璐� / 鍚堝悓鍙樻洿 / 鍚堝悓缁堟锛岃蛋瀹℃壒闂幆銆�
+-- 璇存槑锛氫笉渚濊禆 ERP 閿�鍞鍗曪紱鐢� CRM 鍚堝悓涓庡敭鍚庨��璐у崟浣滀负鎵ц瀵硅薄銆�
+CREATE TABLE IF NOT EXISTS after_sale_cancellation (
+  id BIGINT NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+  code VARCHAR(64) NOT NULL COMMENT '鍙楃悊鍗曞彿',
+  type VARCHAR(32) NOT NULL COMMENT 'RETURN 閫�璐� / CONTRACT_CHANGE 鍚堝悓鍙樻洿 / CONTRACT_TERMINATE 鍚堝悓缁堟',
+  status TINYINT NOT NULL DEFAULT 0 COMMENT '0 鑽夌 1 寰呭鎵� 2 宸查�氳繃 3 宸查┏鍥� 4 宸插彇娑�',
+  ticket_id BIGINT DEFAULT NULL COMMENT '鍏宠仈鍞悗宸ュ崟',
+  customer_id BIGINT DEFAULT NULL COMMENT '瀹㈡埛缂栧彿',
+  contract_id BIGINT DEFAULT NULL COMMENT 'CRM 鍚堝悓缂栧彿',
+  sale_order_no VARCHAR(64) DEFAULT NULL COMMENT '閿�鍞鍗曞彿锛堟湁鍒欒褰曪紝鏃� ERP 鏃跺彲涓虹┖锛�',
+  return_type TINYINT DEFAULT NULL COMMENT '閫�璐х被鍨嬶細1 閫�娆鹃��璐� 2 鎹㈣揣 3 浠呴��娆�',
+  reason VARCHAR(500) NOT NULL COMMENT '鐢宠鍘熷洜',
+  expected_amount DECIMAL(20,6) DEFAULT NULL COMMENT '棰勮閲戦',
+  applicant_id BIGINT DEFAULT NULL COMMENT '鐢宠浜�',
+  approver_id BIGINT DEFAULT NULL COMMENT '瀹℃壒浜�',
+  approval_time DATETIME DEFAULT NULL COMMENT '瀹℃壒鏃堕棿',
+  approval_remark VARCHAR(500) DEFAULT NULL COMMENT '瀹℃壒鎰忚',
+  return_id BIGINT DEFAULT NULL COMMENT '瀹℃壒閫氳繃鍚庣敓鎴愮殑閫�璐у崟缂栧彿',
+  executed TINYINT NOT NULL DEFAULT 0 COMMENT '鏄惁宸叉墽琛屼笅娓稿姩浣滐細0 鏈墽琛� 1 宸叉墽琛�',
+  execute_remark VARCHAR(500) DEFAULT NULL COMMENT '涓嬫父鎵ц璇存槑鎴栧け璐ュ師鍥�',
+  remark VARCHAR(500) DEFAULT NULL,
+  tenant_id BIGINT NOT NULL DEFAULT 0,
+  creator VARCHAR(64) DEFAULT '', create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updater VARCHAR(64) DEFAULT '', update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  deleted BIT(1) NOT NULL DEFAULT b'0',
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_after_sale_cancellation_code (code),
+  KEY idx_after_sale_cancellation_status (status, deleted),
+  KEY idx_after_sale_cancellation_ticket (ticket_id, deleted),
+  KEY idx_after_sale_cancellation_contract (contract_id, deleted)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='鍞悗缁熶竴閫�鍗�/鍙樻洿鍙楃悊';
+
+-- 鑿滃崟锛氭寕鍦ㄥ敭鍚庢湇鍔′笅
+SET @as_parent := (SELECT id FROM system_menu WHERE name='鍞悗鏈嶅姟' AND parent_id=0 AND CAST(deleted AS UNSIGNED)=0 LIMIT 1);
+INSERT INTO system_menu (name,permission,type,sort,parent_id,path,icon,component,component_name,status,visible,keep_alive,always_show,creator,updater)
+SELECT '閫�鍗曠鐞�','',2,90,@as_parent,'cancellation','lucide:undo-2','aftersales/cancellation/index','AfterSaleCancellation',0,b'1',b'1',b'1','1','1'
+WHERE @as_parent IS NOT NULL AND NOT EXISTS (SELECT 1 FROM system_menu WHERE component='aftersales/cancellation/index' AND CAST(deleted AS UNSIGNED)=0);
+
+SET @pg := (SELECT id FROM system_menu WHERE component='aftersales/cancellation/index' AND CAST(deleted AS UNSIGNED)=0 LIMIT 1);
+INSERT INTO system_menu (name,permission,type,sort,parent_id,path,icon,status,visible,keep_alive,always_show,creator,updater)
+SELECT p.name,p.permission,3,p.sort_no,@pg,'','',0,b'1',b'1',b'1','1','1'
+FROM (SELECT '鏌ヨ' name,'aftersales:cancellation:query' permission,1 sort_no
+      UNION ALL SELECT '鏂板','aftersales:cancellation:create',2
+      UNION ALL SELECT '鎻愪氦','aftersales:cancellation:submit',3
+      UNION ALL SELECT '瀹℃壒','aftersales:cancellation:approve',4
+      UNION ALL SELECT '鍙栨秷','aftersales:cancellation:cancel',5
+      UNION ALL SELECT '鍒犻櫎','aftersales:cancellation:delete',6) p
+WHERE @pg IS NOT NULL AND NOT EXISTS (SELECT 1 FROM system_menu m WHERE m.parent_id=@pg AND m.permission=p.permission AND CAST(m.deleted AS UNSIGNED)=0);
diff --git a/sql/mysql/bpm_invoice_legacy_derived_from_20261106.sql b/sql/mysql/bpm_invoice_legacy_derived_from_20261106.sql
new file mode 100644
index 0000000..08e958c
--- /dev/null
+++ b/sql/mysql/bpm_invoice_legacy_derived_from_20261106.sql
@@ -0,0 +1,9 @@
+-- 浠呬慨姝f棫鐗堟潵绁ㄥ鎵瑰畾涔変腑浠ョ┖瀛楃涓蹭繚瀛樼殑娲剧敓鏉ユ簮銆�
+-- 绌哄瓧绗︿覆涓嶆槸鏈夋晥鐨勬淳鐢熸祦绋嬬紪鍙凤紱Flowable 鏌ヨ鏅�氭祦绋嬫椂瑕佹眰璇ュ瓧娈典负 NULL銆�
+-- 鎵ц鍓嶅簲鍏堝浠藉苟纭鐩爣搴撱�佽褰曚互鍙婂巻鍙叉祦绋嬬殑涓氬姟褰掑睘銆�
+UPDATE act_re_procdef
+SET DERIVED_FROM_ = NULL
+WHERE KEY_ = 'erp-purchase-invoice-audit'
+  AND VERSION_ = 1
+  AND DERIVED_VERSION_ = 0
+  AND DERIVED_FROM_ = '';
diff --git a/sql/mysql/mdm_item_outsource_lead_time_20261107.sql b/sql/mysql/mdm_item_outsource_lead_time_20261107.sql
new file mode 100644
index 0000000..5ebeade
--- /dev/null
+++ b/sql/mysql/mdm_item_outsource_lead_time_20261107.sql
@@ -0,0 +1,9 @@
+-- 鐗╂枡澶栧崗鎻愬墠鏈熺敱涓氬姟浜哄憳缁存姢锛岀┖鍊艰〃绀烘湭閰嶇疆銆�
+SET @has_outsource_lead_time := (SELECT COUNT(*) FROM information_schema.COLUMNS
+ WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='mdm_item' AND COLUMN_NAME='outsource_lead_time');
+SET @lead_sql := IF(@has_outsource_lead_time=0,
+ 'ALTER TABLE mdm_item ADD COLUMN outsource_lead_time INT NULL COMMENT ''澶栧崗鎻愬墠鏈燂紙澶╋級''',
+ 'SELECT 1');
+PREPARE lead_stmt FROM @lead_sql;
+EXECUTE lead_stmt;
+DEALLOCATE PREPARE lead_stmt;
diff --git a/sql/mysql/mes_work_order_market_type_20261107.sql b/sql/mysql/mes_work_order_market_type_20261107.sql
new file mode 100644
index 0000000..765d7c0
--- /dev/null
+++ b/sql/mysql/mes_work_order_market_type_20261107.sql
@@ -0,0 +1,9 @@
+-- 鍐呭閿�鍒嗙被鐢变笟鍔′汉鍛樼淮鎶わ紝涓嶆牴鎹鎴峰悕绉版帹鏂��
+SET @has_market_type := (SELECT COUNT(*) FROM information_schema.COLUMNS
+ WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='mes_pro_work_order' AND COLUMN_NAME='market_type');
+SET @market_sql := IF(@has_market_type=0,
+ 'ALTER TABLE mes_pro_work_order ADD COLUMN market_type VARCHAR(16) NULL COMMENT ''甯傚満绫诲瀷 DOMESTIC/EXPORT''',
+ 'SELECT 1');
+PREPARE market_stmt FROM @market_sql;
+EXECUTE market_stmt;
+DEALLOCATE PREPARE market_stmt;
diff --git a/sql/mysql/mes_work_order_schedule_priority_20261107.sql b/sql/mysql/mes_work_order_schedule_priority_20261107.sql
new file mode 100644
index 0000000..7077359
--- /dev/null
+++ b/sql/mysql/mes_work_order_schedule_priority_20261107.sql
@@ -0,0 +1,9 @@
+-- 鎸夊疄闄呬笟鍔$淮鎶ゆ帓浜т紭鍏堢骇锛涙暟瀛楄秺澶ц秺鍏堟帓锛屽巻鍙插伐鍗曚繚鎸� 0銆�
+SET @has_schedule_priority := (SELECT COUNT(*) FROM information_schema.COLUMNS
+ WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='mes_pro_work_order' AND COLUMN_NAME='schedule_priority');
+SET @priority_sql := IF(@has_schedule_priority=0,
+ 'ALTER TABLE mes_pro_work_order ADD COLUMN schedule_priority INT NOT NULL DEFAULT 0 COMMENT ''鎺掍骇浼樺厛绾э紝鏁板瓧瓒婂ぇ瓒婁紭鍏�''',
+ 'SELECT 1');
+PREPARE priority_stmt FROM @priority_sql;
+EXECUTE priority_stmt;
+DEALLOCATE PREPARE priority_stmt;
diff --git a/sql/mysql/purchase_order_srm_menu_20261107.sql b/sql/mysql/purchase_order_srm_menu_20261107.sql
new file mode 100644
index 0000000..7a34928
--- /dev/null
+++ b/sql/mysql/purchase_order_srm_menu_20261107.sql
@@ -0,0 +1,14 @@
+-- 鍘熼噰璐竴绾ц彍鍗曞仠鐢ㄦ椂锛屽皢鍘熼噰璐鍗曞強鍏舵寜閽綊鍏ョ幇鏈変粨鍌ㄧ墿娴�/SRM 鐩綍銆�
+-- 涓嶅垱寤轰竴绾ц彍鍗曪紝涓嶆巿浜堟柊鐨勯噰璐笟鍔℃潈闄愶紱鐩爣涓嶅瓨鍦ㄦ垨璺緞鍐茬獊鏃朵笉杩佺Щ銆�
+SET @old_purchase := (SELECT id FROM system_menu WHERE parent_id=0 AND path='/purchase' AND type=1 AND status=1 AND deleted=b'0' LIMIT 1);
+SET @warehouse := (SELECT id FROM system_menu WHERE parent_id=0 AND path='/wls' AND type=1 AND status=0 AND deleted=b'0' LIMIT 1);
+SET @srm := (SELECT id FROM system_menu WHERE parent_id=@warehouse AND path='srm' AND type=1 AND status=0 AND deleted=b'0' LIMIT 1);
+SET @order := (SELECT id FROM system_menu WHERE parent_id=@old_purchase AND component='erp/purchase/order/index' AND type=2 AND deleted=b'0' LIMIT 1);
+SET @conflict := (SELECT COUNT(*) FROM system_menu WHERE parent_id=@srm AND path='order' AND deleted=b'0' AND id<>IFNULL(@order,0));
+UPDATE system_menu SET parent_id=@srm, updater='1', update_time=NOW()
+WHERE id=@order AND @srm IS NOT NULL AND @conflict=0;
+INSERT INTO system_role_menu (role_id,menu_id,creator,updater,tenant_id)
+SELECT DISTINCT rm.role_id, parents.id, '1','1',rm.tenant_id
+FROM system_role_menu rm JOIN system_menu parents ON parents.id IN (@warehouse,@srm)
+WHERE rm.menu_id=@order AND rm.deleted=b'0' AND @srm IS NOT NULL AND @conflict=0
+  AND NOT EXISTS (SELECT 1 FROM system_role_menu e WHERE e.role_id=rm.role_id AND e.tenant_id=rm.tenant_id AND e.menu_id=parents.id AND e.deleted=b'0');
diff --git a/sql/mysql/safety_hazard_employee_link_20261107.sql b/sql/mysql/safety_hazard_employee_link_20261107.sql
new file mode 100644
index 0000000..883b759
--- /dev/null
+++ b/sql/mysql/safety_hazard_employee_link_20261107.sql
@@ -0,0 +1,23 @@
+-- 闅愭偅鍙拌处琛ラ綈鍛樺伐鍏宠仈鍒楋紙reporter_id / assignee_id / rechecker_id锛�
+-- 鑳屾櫙锛歴afety_hazard 鏃╂湡寤鸿〃閬楁紡浜嗚繖涓変釜鍏宠仈鍒楋紝瀵艰嚧闅愭偅鍒涘缓/鍒嗘淳鎺ュ彛 500銆�
+-- 閲囩敤 DO 瀛楁 -> 鍒楀悕鏄犲皠锛屽箓绛夋墽琛屻��
+
+SET @c1 := (SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='safety_hazard' AND COLUMN_NAME='reporter_id');
+SET @s1 := IF(@c1=0, 'ALTER TABLE safety_hazard ADD COLUMN reporter_id BIGINT DEFAULT NULL COMMENT ''涓婃姤浜猴紙hrm_employee.id锛�'' AFTER photo_urls', 'SELECT 1');
+PREPARE a1 FROM @s1; EXECUTE a1; DEALLOCATE PREPARE a1;
+
+SET @c2 := (SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='safety_hazard' AND COLUMN_NAME='assignee_id');
+SET @s2 := IF(@c2=0, 'ALTER TABLE safety_hazard ADD COLUMN assignee_id BIGINT DEFAULT NULL COMMENT ''鏁存敼璐d换浜猴紙hrm_employee.id锛�'' AFTER report_time', 'SELECT 1');
+PREPARE a2 FROM @s2; EXECUTE a2; DEALLOCATE PREPARE a2;
+
+SET @c3 := (SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='safety_hazard' AND COLUMN_NAME='rechecker_id');
+SET @s3 := IF(@c3=0, 'ALTER TABLE safety_hazard ADD COLUMN rechecker_id BIGINT DEFAULT NULL COMMENT ''澶嶆煡浜猴紙hrm_employee.id锛�'' AFTER rectify_time', 'SELECT 1');
+PREPARE a3 FROM @s3; EXECUTE a3; DEALLOCATE PREPARE a3;
+
+SET @i1 := (SELECT COUNT(*) FROM information_schema.STATISTICS WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='safety_hazard' AND INDEX_NAME='idx_safety_hazard_reporter');
+SET @s4 := IF(@i1=0, 'ALTER TABLE safety_hazard ADD KEY idx_safety_hazard_reporter (reporter_id, deleted)', 'SELECT 1');
+PREPARE a4 FROM @s4; EXECUTE a4; DEALLOCATE PREPARE a4;
+
+SET @i2 := (SELECT COUNT(*) FROM information_schema.STATISTICS WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='safety_hazard' AND INDEX_NAME='idx_safety_hazard_assignee');
+SET @s5 := IF(@i2=0, 'ALTER TABLE safety_hazard ADD KEY idx_safety_hazard_assignee (assignee_id, status, deleted)', 'SELECT 1');
+PREPARE a5 FROM @s5; EXECUTE a5; DEALLOCATE PREPARE a5;
diff --git a/sql/mysql/safety_risk_source_20261107.sql b/sql/mysql/safety_risk_source_20261107.sql
new file mode 100644
index 0000000..ae03eab
--- /dev/null
+++ b/sql/mysql/safety_risk_source_20261107.sql
@@ -0,0 +1,22 @@
+-- 浜哄伐缁存姢鍗遍櫓婧愬綋鍓嶅�硷紱涓嶈〃绀哄凡鎺ュ叆鑷姩鏁伴噰锛屼篃涓嶄繚鐣欏巻鍙茶娴嬪簭鍒椼��
+CREATE TABLE IF NOT EXISTS safety_risk_source (
+ id BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ name VARCHAR(120) NOT NULL, category VARCHAR(24) NOT NULL, location VARCHAR(160) DEFAULT NULL,
+ metric_name VARCHAR(80) NOT NULL, unit VARCHAR(32) DEFAULT NULL,
+ lower_limit DECIMAL(20,6) DEFAULT NULL, upper_limit DECIMAL(20,6) DEFAULT NULL,
+ current_value DECIMAL(20,6) DEFAULT NULL, observed_at DATETIME DEFAULT NULL,
+ risk_status VARCHAR(16) NOT NULL DEFAULT 'UNKNOWN', remark VARCHAR(500) DEFAULT NULL,
+ tenant_id BIGINT NOT NULL DEFAULT 0,
+ creator VARCHAR(64) DEFAULT '', create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ updater VARCHAR(64) DEFAULT '', update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ deleted BIT(1) NOT NULL DEFAULT b'0', KEY idx_safety_risk_status (risk_status,deleted)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='鍗遍櫓婧愪汉宸ョ洃娴嬪彴璐�';
+SET @risk_parent := (SELECT id FROM system_menu WHERE parent_id=0 AND path='/safety' AND type=1 AND deleted=b'0' LIMIT 1);
+INSERT INTO system_menu (name,permission,type,sort,parent_id,path,icon,component,component_name,status,visible,keep_alive,always_show,creator,updater)
+SELECT '鍗遍櫓婧愬彴璐�','',2,36,@risk_parent,'risk-source','lucide:triangle-alert','safety/risk-source/index','SafetyRiskSource',0,b'1',b'1',b'1','1','1'
+WHERE @risk_parent IS NOT NULL AND NOT EXISTS (SELECT 1 FROM system_menu WHERE component='safety/risk-source/index' AND deleted=b'0');
+SET @risk_page := (SELECT id FROM system_menu WHERE component='safety/risk-source/index' AND deleted=b'0' LIMIT 1);
+INSERT INTO system_menu (name,permission,type,sort,parent_id,path,icon,status,visible,keep_alive,always_show,creator,updater)
+SELECT p.name,p.permission,3,p.sort_no,@risk_page,'','',0,b'1',b'1',b'1','1','1'
+FROM (SELECT '鏌ヨ' name,'safety:risk:query' permission,1 sort_no UNION ALL SELECT '鏂板','safety:risk:create',2 UNION ALL SELECT '淇敼','safety:risk:update',3 UNION ALL SELECT '鍒犻櫎','safety:risk:delete',4) p
+WHERE @risk_page IS NOT NULL AND NOT EXISTS (SELECT 1 FROM system_menu m WHERE m.parent_id=@risk_page AND m.permission=p.permission AND m.deleted=b'0');
diff --git a/sql/mysql/safety_risk_source_collect_20261107.sql b/sql/mysql/safety_risk_source_collect_20261107.sql
new file mode 100644
index 0000000..fef7a0f
--- /dev/null
+++ b/sql/mysql/safety_risk_source_collect_20261107.sql
@@ -0,0 +1,24 @@
+-- 鍗遍櫓婧愭帴鍏ヨ澶囬噰闆嗭細缁戝畾璁惧鍙拌处涓庢暟閲囨寚鏍囬敭
+-- 缁戝畾鍚庣敱 POST /safety/risk-source/refresh 浠� mes_collect_realtime 鍙栧�煎苟鎸夐槇鍊煎垽瀹氾紝
+-- 涓嶈鐩栦汉宸ュ綍鍏ユā寮忥紙machinery_id 涓虹┖鏃朵粛浠� current_value 涓哄噯锛夈��
+
+SET @has_machinery := (SELECT COUNT(*) FROM information_schema.COLUMNS
+  WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='safety_risk_source' AND COLUMN_NAME='machinery_id');
+SET @s := IF(@has_machinery=0,
+  'ALTER TABLE safety_risk_source ADD COLUMN machinery_id BIGINT DEFAULT NULL COMMENT ''鍏宠仈璁惧鍙拌处缂栧彿锛涗负绌鸿〃绀轰汉宸ュ綍鍏�'' AFTER metric_name',
+  'SELECT 1');
+PREPARE st FROM @s; EXECUTE st; DEALLOCATE PREPARE st;
+
+SET @has_metric_key := (SELECT COUNT(*) FROM information_schema.COLUMNS
+  WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='safety_risk_source' AND COLUMN_NAME='metric_key');
+SET @s2 := IF(@has_metric_key=0,
+  'ALTER TABLE safety_risk_source ADD COLUMN metric_key VARCHAR(64) DEFAULT NULL COMMENT ''鏁伴噰鎸囨爣閿紙data_json 瀛楁鍚嶏級'' AFTER machinery_id',
+  'SELECT 1');
+PREPARE st2 FROM @s2; EXECUTE st2; DEALLOCATE PREPARE st2;
+
+SET @has_idx := (SELECT COUNT(*) FROM information_schema.STATISTICS
+  WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='safety_risk_source' AND INDEX_NAME='idx_safety_risk_machinery');
+SET @s3 := IF(@has_idx=0,
+  'ALTER TABLE safety_risk_source ADD KEY idx_safety_risk_machinery (machinery_id, deleted)',
+  'SELECT 1');
+PREPARE st3 FROM @s3; EXECUTE st3; DEALLOCATE PREPARE st3;
diff --git a/yudao-module-aftersales-api/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApi.java b/yudao-module-aftersales-api/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApi.java
index f3567d7..06f28d2 100644
--- a/yudao-module-aftersales-api/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApi.java
+++ b/yudao-module-aftersales-api/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApi.java
@@ -5,6 +5,7 @@
 import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleTicketRespDTO;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 鍞悗宸ュ崟 API 鎺ュ彛锛堜緵 MES/ERP 璺ㄦā鍧楄皟鐢級
@@ -51,4 +52,12 @@
      */
     CommonResult<AfterSaleReturnRespDTO> getReturn(Long id);
 
+    /**
+     * 鎸夐攢鍞鍗曞彿鏌ヨ鍞悗宸ュ崟锛堜緵 MES 璐ㄩ噺杩芥函鍏宠仈鍞悗鏁呴殰璁板綍锛�
+     *
+     * @param saleOrderNo 閿�鍞鍗曞彿
+     * @return 宸ュ崟鍒楄〃锛涙棤鍏宠仈鏃朵负绌哄垪琛�
+     */
+    CommonResult<List<AfterSaleTicketRespDTO>> getTicketsBySaleOrderNo(String saleOrderNo);
+
 }
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApiImpl.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApiImpl.java
index d636f28..aa2d89c 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApiImpl.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/api/AfterSaleTicketApiImpl.java
@@ -12,6 +12,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
@@ -56,4 +57,11 @@
         return success(BeanUtils.toBean(returnDO, AfterSaleReturnRespDTO.class));
     }
 
+    @Override
+    public CommonResult<List<AfterSaleTicketRespDTO>> getTicketsBySaleOrderNo(String saleOrderNo) {
+        if (saleOrderNo == null || saleOrderNo.isBlank()) return success(List.of());
+        List<AfterSaleTicketDO> list = ticketService.getTicketListBySaleOrderNo(saleOrderNo);
+        return success(list.stream().map(t -> BeanUtils.toBean(t, AfterSaleTicketRespDTO.class)).toList());
+    }
+
 }
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/cancellation/AfterSaleCancellationController.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/cancellation/AfterSaleCancellationController.java
new file mode 100644
index 0000000..6306a9a
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/cancellation/AfterSaleCancellationController.java
@@ -0,0 +1,100 @@
+package cn.iocoder.yudao.module.aftersales.controller.admin.cancellation;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.aftersales.controller.admin.cancellation.vo.AfterSaleCancellationApproveReqVO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.cancellation.vo.AfterSaleCancellationSaveReqVO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.cancellation.AfterSaleCancellationDO;
+import cn.iocoder.yudao.module.aftersales.service.cancellation.AfterSaleCancellationService;
+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;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
+@Tag(name = "绠$悊鍚庡彴 - 鍞悗閫�鍗�/鍙樻洿鍙楃悊")
+@RestController
+@RequestMapping("/aftersales/cancellation")
+@Validated
+public class AfterSaleCancellationController {
+
+    @Resource
+    private AfterSaleCancellationService service;
+
+    @GetMapping("/page")
+    @Operation(summary = "鑾峰緱閫�鍗�/鍙樻洿鍙楃悊鍒嗛〉")
+    @PreAuthorize("@ss.hasPermission('aftersales:cancellation:query')")
+    public CommonResult<PageResult<AfterSaleCancellationDO>> page(
+            @Valid PageParam page,
+            @RequestParam(value = "code", required = false) String code,
+            @RequestParam(value = "type", required = false) String type,
+            @RequestParam(value = "status", required = false) Integer status,
+            @RequestParam(value = "customerId", required = false) Long customerId) {
+        return success(service.page(page, code, type, status, customerId));
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "鑾峰緱閫�鍗�/鍙樻洿鍙楃悊")
+    @Parameter(name = "id", description = "缂栧彿", required = true)
+    @PreAuthorize("@ss.hasPermission('aftersales:cancellation:query')")
+    public CommonResult<AfterSaleCancellationDO> get(@RequestParam("id") Long id) {
+        return success(service.get(id));
+    }
+
+    @PostMapping("/create")
+    @Operation(summary = "鍒涘缓閫�鍗�/鍙樻洿鍙楃悊")
+    @PreAuthorize("@ss.hasPermission('aftersales:cancellation:create')")
+    public CommonResult<Long> create(@Valid @RequestBody AfterSaleCancellationSaveReqVO req) {
+        req.setId(null);
+        return success(service.create(req, getLoginUserId()));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "淇敼閫�鍗�/鍙樻洿鍙楃悊锛堜粎鑽夌锛�")
+    @PreAuthorize("@ss.hasPermission('aftersales:cancellation:update')")
+    public CommonResult<Boolean> update(@Valid @RequestBody AfterSaleCancellationSaveReqVO req) {
+        service.update(req);
+        return success(true);
+    }
+
+    @PutMapping("/submit")
+    @Operation(summary = "鎻愪氦瀹℃壒")
+    @Parameter(name = "id", description = "缂栧彿", required = true)
+    @PreAuthorize("@ss.hasPermission('aftersales:cancellation:submit')")
+    public CommonResult<Boolean> submit(@RequestParam("id") Long id) {
+        service.submit(id);
+        return success(true);
+    }
+
+    @PutMapping("/approve")
+    @Operation(summary = "瀹℃壒锛堥�氳繃鍚庢墽琛屼笅娓稿姩浣滐級")
+    @PreAuthorize("@ss.hasPermission('aftersales:cancellation:approve')")
+    public CommonResult<Long> approve(@Valid @RequestBody AfterSaleCancellationApproveReqVO req) {
+        return success(service.approve(req, getLoginUserId()));
+    }
+
+    @PutMapping("/cancel")
+    @Operation(summary = "鍙栨秷鍙楃悊")
+    @Parameter(name = "id", description = "缂栧彿", required = true)
+    @PreAuthorize("@ss.hasPermission('aftersales:cancellation:cancel')")
+    public CommonResult<Boolean> cancel(@RequestParam("id") Long id) {
+        service.cancel(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "鍒犻櫎閫�鍗�/鍙樻洿鍙楃悊锛堜粎鑽夌锛�")
+    @Parameter(name = "id", description = "缂栧彿", required = true)
+    @PreAuthorize("@ss.hasPermission('aftersales:cancellation:delete')")
+    public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+        service.delete(id);
+        return success(true);
+    }
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/cancellation/vo/AfterSaleCancellationApproveReqVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/cancellation/vo/AfterSaleCancellationApproveReqVO.java
new file mode 100644
index 0000000..2d77931
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/cancellation/vo/AfterSaleCancellationApproveReqVO.java
@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.aftersales.controller.admin.cancellation.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+@Schema(description = "绠$悊鍚庡彴 - 鍞悗閫�鍗�/鍙樻洿鍙楃悊 瀹℃壒 Request VO")
+@Data
+public class AfterSaleCancellationApproveReqVO {
+
+    @Schema(description = "鍙楃悊鍗曠紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "鍙楃悊鍗曠紪鍙蜂笉鑳戒负绌�")
+    private Long id;
+
+    @Schema(description = "鏄惁閫氳繃", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "瀹℃壒缁撹涓嶈兘涓虹┖")
+    private Boolean approved;
+
+    @Schema(description = "瀹℃壒鎰忚锛堥┏鍥炴椂蹇呭~锛�")
+    @Size(max = 500)
+    private String remark;
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/cancellation/vo/AfterSaleCancellationSaveReqVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/cancellation/vo/AfterSaleCancellationSaveReqVO.java
new file mode 100644
index 0000000..148148d
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/cancellation/vo/AfterSaleCancellationSaveReqVO.java
@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.aftersales.controller.admin.cancellation.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "绠$悊鍚庡彴 - 鍞悗閫�鍗�/鍙樻洿鍙楃悊 淇濆瓨 Request VO")
+@Data
+public class AfterSaleCancellationSaveReqVO {
+
+    private Long id;
+
+    @Schema(description = "绫诲瀷锛歊ETURN 閫�璐� / CONTRACT_CHANGE 鍚堝悓鍙樻洿 / CONTRACT_TERMINATE 鍚堝悓缁堟",
+            requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank
+    @Pattern(regexp = "RETURN|CONTRACT_CHANGE|CONTRACT_TERMINATE", message = "鍙楃悊绫诲瀷涓嶅悎娉�")
+    private String type;
+
+    @Schema(description = "鍏宠仈鍞悗宸ュ崟缂栧彿")
+    private Long ticketId;
+
+    @Schema(description = "瀹㈡埛缂栧彿")
+    private Long customerId;
+
+    @Schema(description = "CRM 鍚堝悓缂栧彿")
+    private Long contractId;
+
+    @Schema(description = "閿�鍞鍗曞彿锛堟棤 ERP 鏃跺彲涓虹┖锛�")
+    @Size(max = 64)
+    private String saleOrderNo;
+
+    @Schema(description = "閫�璐х被鍨嬶細1 閫�娆鹃��璐� 2 鎹㈣揣 3 浠呴��娆�")
+    private Integer returnType;
+
+    @Schema(description = "鐢宠鍘熷洜", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "鐢宠鍘熷洜涓嶈兘涓虹┖")
+    @Size(max = 500)
+    private String reason;
+
+    @Schema(description = "棰勮閲戦")
+    @Digits(integer = 14, fraction = 6)
+    private BigDecimal expectedAmount;
+
+    @Schema(description = "澶囨敞")
+    @Size(max = 500)
+    private String remark;
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/cancellation/AfterSaleCancellationDO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/cancellation/AfterSaleCancellationDO.java
new file mode 100644
index 0000000..7fb3f46
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/cancellation/AfterSaleCancellationDO.java
@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.aftersales.dal.dataobject.cancellation;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 鍞悗缁熶竴閫�鍗�/鍙樻洿鍙楃悊 DO銆�
+ *
+ * <p>鎶娿�屽鎴烽��璐с�佸悎鍚屽彉鏇淬�佸悎鍚岀粓姝€�嶆敹鏁涘埌鍚屼竴寮犲彈鐞嗗崟锛�
+ * 缁熶竴璧板鎵癸紱瀹℃壒閫氳繃鍚庢寜绫诲瀷鎵ц涓嬫父鍔ㄤ綔锛�
+ * 閫�璐х敓鎴愬敭鍚庨��璐у崟锛屽悎鍚岀粓姝綔搴� CRM 鍚堝悓銆�
+ */
+@TableName("after_sale_cancellation")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AfterSaleCancellationDO extends BaseDO {
+
+    @TableId
+    private Long id;
+    /** 鍙楃悊鍗曞彿 */
+    private String code;
+    /** 绫诲瀷锛歊ETURN / CONTRACT_CHANGE / CONTRACT_TERMINATE */
+    private String type;
+    /** 鐘舵�侊細0 鑽夌 1 寰呭鎵� 2 宸查�氳繃 3 宸查┏鍥� 4 宸插彇娑� */
+    private Integer status;
+    private Long ticketId;
+    private Long customerId;
+    private Long contractId;
+    private String saleOrderNo;
+    /** 閫�璐х被鍨嬶細1 閫�娆鹃��璐� 2 鎹㈣揣 3 浠呴��娆� */
+    private Integer returnType;
+    private String reason;
+    private BigDecimal expectedAmount;
+    private Long applicantId;
+    private Long approverId;
+    private LocalDateTime approvalTime;
+    private String approvalRemark;
+    /** 瀹℃壒閫氳繃鍚庣敓鎴愮殑閫�璐у崟缂栧彿 */
+    private Long returnId;
+    /** 涓嬫父鍔ㄤ綔鏄惁宸叉墽琛岋細0 鏈墽琛� 1 宸叉墽琛� */
+    private Integer executed;
+    /** 涓嬫父鎵ц璇存槑鎴栧け璐ュ師鍥� */
+    private String executeRemark;
+    private String remark;
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/cancellation/AfterSaleCancellationMapper.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/cancellation/AfterSaleCancellationMapper.java
new file mode 100644
index 0000000..bd45e5a
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/cancellation/AfterSaleCancellationMapper.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.aftersales.dal.mysql.cancellation;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+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.aftersales.dal.dataobject.cancellation.AfterSaleCancellationDO;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AfterSaleCancellationMapper extends BaseMapperX<AfterSaleCancellationDO> {
+
+    default AfterSaleCancellationDO selectByCode(String code) {
+        return selectOne(AfterSaleCancellationDO::getCode, code);
+    }
+
+    default PageResult<AfterSaleCancellationDO> selectPage(PageParam pageParam, String code, String type,
+                                                           Integer status, Long customerId) {
+        return selectPage(pageParam, new LambdaQueryWrapperX<AfterSaleCancellationDO>()
+                .likeIfPresent(AfterSaleCancellationDO::getCode, code)
+                .eqIfPresent(AfterSaleCancellationDO::getType, type)
+                .eqIfPresent(AfterSaleCancellationDO::getStatus, status)
+                .eqIfPresent(AfterSaleCancellationDO::getCustomerId, customerId)
+                .orderByDesc(AfterSaleCancellationDO::getId));
+    }
+}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/ticket/AfterSaleTicketMapper.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/ticket/AfterSaleTicketMapper.java
index 319d61f..3f41536 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/ticket/AfterSaleTicketMapper.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/ticket/AfterSaleTicketMapper.java
@@ -56,4 +56,11 @@
         return selectCount(AfterSaleTicketDO::getOwnerUserId, ownerUserId);
     }
 
+    /** 鎸夐攢鍞鍗曞彿鏌ヨ宸ュ崟锛堣川閲忚拷婧叧鑱斿敭鍚庢晠闅滆褰曪級 */
+    default List<AfterSaleTicketDO> selectListBySaleOrderNo(String saleOrderNo) {
+        return selectList(new LambdaQueryWrapperX<AfterSaleTicketDO>()
+                .eq(AfterSaleTicketDO::getSaleOrderNo, saleOrderNo)
+                .orderByDesc(AfterSaleTicketDO::getId));
+    }
+
 }
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java
index ab2b488..ab0b8de 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java
@@ -27,6 +27,11 @@
     public static final String RETURN_NO_PREFIX = "RT";
 
     /**
+     * 閫�鍗�/鍙樻洿鍙楃悊 {@link cn.iocoder.yudao.module.aftersales.dal.dataobject.cancellation.AfterSaleCancellationDO}
+     */
+    public static final String CANCELLATION_NO_PREFIX = "CX";
+
+    /**
      * 鍞悗闂搴� {@link cn.iocoder.yudao.module.aftersales.dal.dataobject.problem.AfterSaleProblemDO}
      */
     public static final String PROBLEM_NO_PREFIX = "AP";
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
index d49adcf..5742920 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
@@ -48,4 +48,14 @@
     ErrorCode PROBLEM_PUBLISH_FAIL_STATUS = new ErrorCode(1_022_005_004, "闂鍙戝竷澶辫触锛屽師鍥狅細褰撳墠鐘舵�佷笉鍙彂甯�");
     ErrorCode PROBLEM_DISABLE_FAIL_STATUS = new ErrorCode(1_022_005_005, "闂鍋滅敤澶辫触锛屽師鍥狅細褰撳墠鐘舵�佷笉鍙仠鐢�");
 
+    // ========== 鍞悗缁熶竴閫�鍗�/鍙樻洿鍙楃悊 1-022-006-000 ==========
+    ErrorCode CANCELLATION_NOT_EXISTS = new ErrorCode(1_022_006_000, "鍙楃悊鍗曚笉瀛樺湪");
+    ErrorCode CANCELLATION_UPDATE_FAIL_STATUS = new ErrorCode(1_022_006_001, "鍙楃悊鍗曚慨鏀瑰け璐ワ紝鍘熷洜锛氫粎鑽夌鐘舵�佸彲缂栬緫");
+    ErrorCode CANCELLATION_SUBMIT_FAIL_STATUS = new ErrorCode(1_022_006_002, "鍙楃悊鍗曟彁浜ゅけ璐ワ紝鍘熷洜锛氫粎鑽夌鐘舵�佸彲鎻愪氦");
+    ErrorCode CANCELLATION_APPROVE_FAIL_STATUS = new ErrorCode(1_022_006_003, "鍙楃悊鍗曞鎵瑰け璐ワ紝鍘熷洜锛氫粎寰呭鎵圭姸鎬佸彲瀹℃壒");
+    ErrorCode CANCELLATION_CANCEL_FAIL_STATUS = new ErrorCode(1_022_006_004, "鍙楃悊鍗曞彇娑堝け璐ワ紝鍘熷洜锛氬綋鍓嶇姸鎬佷笉鍙彇娑�");
+    ErrorCode CANCELLATION_APPROVE_REMARK_REQUIRED = new ErrorCode(1_022_006_005, "椹冲洖鏃跺繀椤诲~鍐欏鎵规剰瑙�");
+    ErrorCode CANCELLATION_RETURN_TICKET_REQUIRED = new ErrorCode(1_022_006_006, "閫�璐х被鍨嬪彈鐞嗗崟蹇呴』鍏宠仈鍞悗宸ュ崟");
+    ErrorCode CANCELLATION_CONTRACT_REQUIRED = new ErrorCode(1_022_006_007, "鍚堝悓鍙樻洿/缁堟蹇呴』閫夋嫨 CRM 鍚堝悓");
+
 }
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/cancellation/AfterSaleCancellationService.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/cancellation/AfterSaleCancellationService.java
new file mode 100644
index 0000000..f7ea701
--- /dev/null
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/cancellation/AfterSaleCancellationService.java
@@ -0,0 +1,213 @@
+package cn.iocoder.yudao.module.aftersales.service.cancellation;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import cn.iocoder.yudao.module.aftersales.controller.admin.cancellation.vo.AfterSaleCancellationApproveReqVO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.cancellation.vo.AfterSaleCancellationSaveReqVO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.returnobj.vo.AfterSaleReturnSaveReqVO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.cancellation.AfterSaleCancellationDO;
+import cn.iocoder.yudao.module.aftersales.dal.mysql.cancellation.AfterSaleCancellationMapper;
+import cn.iocoder.yudao.module.aftersales.dal.redis.no.AfterSaleNoRedisDAO;
+import cn.iocoder.yudao.module.aftersales.service.returnobj.AfterSaleReturnService;
+import cn.iocoder.yudao.module.crm.api.contract.CrmContractApi;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.Objects;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.aftersales.enums.ErrorCodeConstants.*;
+
+/**
+ * 鍞悗缁熶竴閫�鍗�/鍙樻洿鍙楃悊銆�
+ *
+ * <p>鎶娿�屽鎴烽��璐с�佸悎鍚屽彉鏇淬�佸悎鍚岀粓姝€�嶆敹鏁涗负鍚屼竴鍙楃悊娴佺▼锛屼笉渚濊禆 ERP 閿�鍞鍗曪細
+ * <ul>
+ *   <li>閫�璐э細瀹℃壒閫氳繃鍚庣敓鎴愬敭鍚庨��璐у崟锛堝鐢� {@link AfterSaleReturnService}锛夛紱</li>
+ *   <li>鍚堝悓缁堟锛氬鎵归�氳繃鍚庝綔搴� CRM 鍚堝悓锛坰tatus=50锛夛紱</li>
+ *   <li>鍚堝悓鍙樻洿锛欳RM 鏃犮�屽彉鏇翠腑銆嶇姸鎬侊紝瀹℃壒閫氳繃浠呰惤鍦板彈鐞嗚褰曪紝鍙樻洿鍐呭鍦ㄥ悎鍚屽娉ㄦ垨闄勪欢浣撶幇銆�</li>
+ * </ul>
+ * 涓嬫父鍔ㄤ綔鎵ц缁撴灉鍐欏叆 executed / executeRemark锛屼究浜庡け璐ュ悗浜哄伐琛ュ仛锛屼笉闈欓粯鍚炴帀閿欒銆�
+ */
+@Slf4j
+@Service
+public class AfterSaleCancellationService {
+
+    /** 鐘舵�侊細0 鑽夌 1 寰呭鎵� 2 宸查�氳繃 3 宸查┏鍥� 4 宸插彇娑� */
+    private static final int ST_DRAFT = 0;
+    private static final int ST_PENDING = 1;
+    private static final int ST_APPROVED = 2;
+    private static final int ST_REJECTED = 3;
+    private static final int ST_CANCELLED = 4;
+
+    /** CRM 鍚堝悓浣滃簾鐘舵�� */
+    private static final int CRM_CONTRACT_INVALID = 50;
+
+    @Resource private AfterSaleCancellationMapper mapper;
+    @Resource private AfterSaleNoRedisDAO noRedisDAO;
+    @Resource private AfterSaleReturnService returnService;
+    @Resource private CrmContractApi crmContractApi;
+
+    public PageResult<AfterSaleCancellationDO> page(PageParam page, String code, String type,
+                                                    Integer status, Long customerId) {
+        return mapper.selectPage(page, code, type, status, customerId);
+    }
+
+    public AfterSaleCancellationDO get(Long id) {
+        AfterSaleCancellationDO row = id == null ? null : mapper.selectById(id);
+        if (row == null) throw exception(CANCELLATION_NOT_EXISTS);
+        return row;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public Long create(AfterSaleCancellationSaveReqVO req, Long userId) {
+        validateByType(req);
+        var row = BeanUtils.toBean(req, AfterSaleCancellationDO.class);
+        row.setStatus(ST_DRAFT);
+        row.setApplicantId(userId);
+        row.setExecuted(0);
+        row.setCode(noRedisDAO.generate(AfterSaleNoRedisDAO.CANCELLATION_NO_PREFIX));
+        try {
+            mapper.insert(row);
+        } catch (DuplicateKeyException e) {
+            throw exception(CANCELLATION_NOT_EXISTS);
+        }
+        return row.getId();
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void update(AfterSaleCancellationSaveReqVO req) {
+        AfterSaleCancellationDO old = get(req.getId());
+        if (!Objects.equals(old.getStatus(), ST_DRAFT)) throw exception(CANCELLATION_UPDATE_FAIL_STATUS);
+        validateByType(req);
+        var update = new AfterSaleCancellationDO();
+        BeanUtils.copyProperties(req, update);
+        update.setId(old.getId());
+        update.setCode(old.getCode());
+        update.setStatus(ST_DRAFT);
+        mapper.updateById(update);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void submit(Long id) {
+        AfterSaleCancellationDO old = get(id);
+        if (!Objects.equals(old.getStatus(), ST_DRAFT)) throw exception(CANCELLATION_SUBMIT_FAIL_STATUS);
+        if (mapper.update(null, new LambdaUpdateWrapper<AfterSaleCancellationDO>()
+                .eq(AfterSaleCancellationDO::getId, id)
+                .eq(AfterSaleCancellationDO::getStatus, ST_DRAFT)
+                .set(AfterSaleCancellationDO::getStatus, ST_PENDING)) != 1) {
+            throw exception(CANCELLATION_SUBMIT_FAIL_STATUS);
+        }
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void cancel(Long id) {
+        AfterSaleCancellationDO old = get(id);
+        if (!Objects.equals(old.getStatus(), ST_DRAFT) && !Objects.equals(old.getStatus(), ST_PENDING)) {
+            throw exception(CANCELLATION_CANCEL_FAIL_STATUS);
+        }
+        if (mapper.update(null, new LambdaUpdateWrapper<AfterSaleCancellationDO>()
+                .eq(AfterSaleCancellationDO::getId, id)
+                .in(AfterSaleCancellationDO::getStatus, ST_DRAFT, ST_PENDING)
+                .set(AfterSaleCancellationDO::getStatus, ST_CANCELLED)) != 1) {
+            throw exception(CANCELLATION_CANCEL_FAIL_STATUS);
+        }
+    }
+
+    public void delete(Long id) {
+        AfterSaleCancellationDO old = get(id);
+        if (!Objects.equals(old.getStatus(), ST_DRAFT)) throw exception(CANCELLATION_UPDATE_FAIL_STATUS);
+        mapper.deleteById(id);
+    }
+
+    @javax.annotation.Nullable
+    public Long getReturnId(Long id) {
+        AfterSaleCancellationDO row = mapper.selectById(id);
+        return row == null ? null : row.getReturnId();
+    }
+
+    /**
+     * 瀹℃壒锛氶�氳繃鍚庢墽琛屼笅娓稿姩浣滐紱椹冲洖蹇呴』濉剰瑙併��
+     *
+     * @return 閫氳繃鏃剁敓鎴愮殑閫�璐у崟缂栧彿锛堥潪閫�璐х被鍨嬩负 null锛�
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Long approve(AfterSaleCancellationApproveReqVO req, Long userId) {
+        if (!Boolean.TRUE.equals(req.getApproved())
+                && (req.getRemark() == null || req.getRemark().isBlank())) {
+            throw exception(CANCELLATION_APPROVE_REMARK_REQUIRED);
+        }
+        AfterSaleCancellationDO task = get(req.getId());
+        if (!Objects.equals(task.getStatus(), ST_PENDING)) throw exception(CANCELLATION_APPROVE_FAIL_STATUS);
+
+        int target = Boolean.TRUE.equals(req.getApproved()) ? ST_APPROVED : ST_REJECTED;
+        if (mapper.update(null, new LambdaUpdateWrapper<AfterSaleCancellationDO>()
+                .eq(AfterSaleCancellationDO::getId, task.getId())
+                .eq(AfterSaleCancellationDO::getStatus, ST_PENDING)
+                .set(AfterSaleCancellationDO::getStatus, target)
+                .set(AfterSaleCancellationDO::getApproverId, userId)
+                .set(AfterSaleCancellationDO::getApprovalTime, LocalDateTime.now())
+                .set(AfterSaleCancellationDO::getApprovalRemark, req.getRemark())) != 1) {
+            throw exception(CANCELLATION_APPROVE_FAIL_STATUS);
+        }
+
+        if (!Boolean.TRUE.equals(req.getApproved())) return null;
+        return executeDownstream(task, userId);
+    }
+
+    /** 瀹℃壒閫氳繃鍚庣殑涓嬫父鍔ㄤ綔锛涘け璐ユ椂璁板綍鍘熷洜浣嗕笉鍥炴粴瀹℃壒缁撹锛屼究浜庝汉宸ヨˉ鍋氥�� */
+    private Long executeDownstream(AfterSaleCancellationDO task, Long userId) {
+        Long returnId = null;
+        String remark;
+        boolean ok = true;
+        try {
+            switch (task.getType()) {
+                case "RETURN" -> {
+                    var vo = new AfterSaleReturnSaveReqVO();
+                    vo.setTicketId(task.getTicketId());
+                    vo.setCustomerId(task.getCustomerId());
+                    vo.setReturnType(task.getReturnType() == null ? 1 : task.getReturnType());
+                    vo.setReturnReason(task.getReason());
+                    returnId = returnService.createReturn(vo, userId);
+                    remark = "宸茬敓鎴愰��璐у崟 " + returnId;
+                }
+                case "CONTRACT_TERMINATE" -> {
+                    crmContractApi.updateContractStatus(task.getContractId(), CRM_CONTRACT_INVALID).getCheckedData();
+                    remark = "宸蹭綔搴� CRM 鍚堝悓 " + task.getContractId();
+                }
+                case "CONTRACT_CHANGE" -> remark = "鍙樻洿鍙楃悊宸查�氳繃锛汣RM 鍚堝悓鍐呭璇锋寜闄勪欢鍚屾缁存姢";
+                default -> { ok = false; remark = "鏈煡鍙楃悊绫诲瀷锛�" + task.getType(); }
+            }
+        } catch (Exception e) {
+            ok = false;
+            remark = "涓嬫父鎵ц澶辫触锛�" + e.getMessage();
+            log.warn("閫�鍗曞彈鐞哰{}]涓嬫父鍔ㄤ綔澶辫触锛歿}", task.getCode(), e.getMessage());
+        }
+        var update = new AfterSaleCancellationDO();
+        update.setId(task.getId());
+        update.setExecuted(ok ? 1 : 0);
+        update.setExecuteRemark(remark);
+        if (returnId != null) update.setReturnId(returnId);
+        mapper.updateById(update);
+        return returnId;
+    }
+
+    /** 鎸夌被鍨嬫牎楠屽繀濉細閫�璐ч渶宸ュ崟锛涘悎鍚屽彉鏇�/缁堟闇�鍚堝悓銆� */
+    private void validateByType(AfterSaleCancellationSaveReqVO req) {
+        switch (req.getType()) {
+            case "RETURN" -> {
+                if (req.getTicketId() == null) throw exception(CANCELLATION_RETURN_TICKET_REQUIRED);
+            }
+            case "CONTRACT_CHANGE", "CONTRACT_TERMINATE" -> {
+                if (req.getContractId() == null) throw exception(CANCELLATION_CONTRACT_REQUIRED);
+            }
+            default -> { }
+        }
+    }
+}
\ No newline at end of file
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketService.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketService.java
index 7c3a9d0..8333319 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketService.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketService.java
@@ -47,6 +47,14 @@
     AfterSaleTicketDO getTicket(Long id);
 
     /**
+     * 鎸夐攢鍞鍗曞彿鑾峰緱宸ュ崟鍒楄〃锛堜緵璐ㄩ噺杩芥函鍏宠仈鍞悗鏁呴殰璁板綍锛�
+     *
+     * @param saleOrderNo 閿�鍞鍗曞彿
+     * @return 宸ュ崟鍒楄〃
+     */
+    List<AfterSaleTicketDO> getTicketListBySaleOrderNo(String saleOrderNo);
+
+    /**
      * 鑾峰緱宸ュ崟鍒楄〃
      *
      * @param ids 缂栧彿鍒楄〃
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java
index bc01293..036e259 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java
@@ -140,6 +140,14 @@
     }
 
     @Override
+    public List<AfterSaleTicketDO> getTicketListBySaleOrderNo(String saleOrderNo) {
+        if (saleOrderNo == null || saleOrderNo.isBlank()) {
+            return List.of();
+        }
+        return ticketMapper.selectListBySaleOrderNo(saleOrderNo);
+    }
+
+    @Override
     public List<AfterSaleTicketDO> getTicketList(Collection<Long> ids) {
         if (CollUtil.isEmpty(ids)) {
             return List.of();
diff --git a/yudao-module-aftersales/src/test/java/cn/iocoder/yudao/module/aftersales/service/collaboration/AfterSaleCollaborationServiceTest.java b/yudao-module-aftersales/src/test/java/cn/iocoder/yudao/module/aftersales/service/collaboration/AfterSaleCollaborationServiceTest.java
new file mode 100644
index 0000000..9040b9d
--- /dev/null
+++ b/yudao-module-aftersales/src/test/java/cn/iocoder/yudao/module/aftersales/service/collaboration/AfterSaleCollaborationServiceTest.java
@@ -0,0 +1,204 @@
+package cn.iocoder.yudao.module.aftersales.service.collaboration;
+
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.collaboration.AfterSaleCollaborationDO;
+import cn.iocoder.yudao.module.aftersales.dal.mysql.collaboration.AfterSaleCollaborationMapper;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketDO;
+import cn.iocoder.yudao.module.aftersales.service.ticket.AfterSaleTicketService;
+import cn.iocoder.yudao.module.aftersales.service.permission.AfterSalePermissionService;
+import cn.iocoder.yudao.framework.common.biz.system.permission.PermissionCommonApi;
+import cn.iocoder.yudao.module.erp.api.finance.AfterSaleFinanceDraftApi;
+import cn.iocoder.yudao.module.erp.api.finance.dto.AfterSaleFinanceDraftCreateDTO;
+import cn.iocoder.yudao.module.erp.api.finance.dto.AfterSaleFinanceReviewDTO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
+import java.math.BigDecimal;
+import java.util.Map;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.mockito.ArgumentCaptor;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
+import org.apache.ibatis.builder.MapperBuilderAssistant;
+
+class AfterSaleCollaborationServiceTest {
+    @Test
+    void warrantyUsesTicketCustomerInsteadOfSubmittedName() {
+        var tickets = mock(AfterSaleTicketService.class);
+        var ticket = new AfterSaleTicketDO(); ticket.setId(8L); ticket.setOwnerUserId(10L); ticket.setStatus(10); ticket.setCustomerId(99L);
+        when(tickets.getTicket(8L)).thenReturn(ticket);
+        var customers = mock(CrmCustomerApi.class);
+        var customer = new CrmCustomerRespDTO(); customer.setId(99L); customer.setName("宸ュ崟瀹㈡埛");
+        when(customers.getCustomer(99L)).thenReturn(customer);
+        var mapper = mock(AfterSaleCollaborationMapper.class);
+        var service = new AfterSaleCollaborationService();
+        ReflectionTestUtils.setField(service, "ticketService", tickets);
+        ReflectionTestUtils.setField(service, "mapper", mapper);
+        ReflectionTestUtils.setField(service, "customerApi", customers);
+        ReflectionTestUtils.setField(service, "userApi", mock(AdminUserApi.class));
+        var input = new AfterSaleCollaborationService.CreateRequest();
+        input.setTicketId(8L); input.setAssigneeUserId(20L); input.setCategory("WARRANTY");
+        input.setTitle("涓夊寘"); input.setContent("鏍告煡"); input.setAmount(BigDecimal.TEN);
+        input.setDirection("PAYABLE"); input.setPartyName("浼�犲悕绉�");
+        service.create(input, 10L);
+        var created = ArgumentCaptor.forClass(AfterSaleCollaborationDO.class);
+        verify(mapper).insert(created.capture());
+        assertEquals("宸ュ崟瀹㈡埛", created.getValue().getPartyName());
+        assertEquals("CUSTOMER", created.getValue().getPartyType());
+        assertEquals(99L, created.getValue().getPartyId());
+    }
+    @Test
+    void supplierClaimRequiresMasterSupplier() {
+        var tickets = mock(AfterSaleTicketService.class);
+        var ticket = new AfterSaleTicketDO(); ticket.setId(8L); ticket.setOwnerUserId(10L); ticket.setStatus(10);
+        when(tickets.getTicket(8L)).thenReturn(ticket);
+        var service = new AfterSaleCollaborationService();
+        ReflectionTestUtils.setField(service, "ticketService", tickets);
+        var mapper = mock(AfterSaleCollaborationMapper.class);
+        ReflectionTestUtils.setField(service, "mapper", mapper);
+        ReflectionTestUtils.setField(service, "userApi", mock(AdminUserApi.class));
+        var input = new AfterSaleCollaborationService.CreateRequest();
+        input.setTicketId(8L); input.setAssigneeUserId(20L); input.setCategory("SUPPLIER");
+        input.setTitle("绱㈣禂"); input.setContent("鏍告煡"); input.setAmount(BigDecimal.TEN);
+        input.setDirection("RECEIVABLE"); input.setPartyName("浠绘剰濉啓鐨勪緵搴斿晢");
+        assertThrows(RuntimeException.class, () -> service.create(input, 10L));
+        verifyNoInteractions(mapper);
+    }
+    @Test
+    void rejectedFinanceDraftCanBeRetriedWithTraceableNewTask() {
+        var mapper = mock(AfterSaleCollaborationMapper.class);
+        var tickets = mock(AfterSaleTicketService.class);
+        var finance = mock(AfterSaleFinanceDraftApi.class);
+        var previous = new AfterSaleCollaborationDO(); previous.setId(1L); previous.setTicketId(8L);
+        previous.setRequestedBy(10L); previous.setCategory("SUPPLIER"); previous.setStatus(3); previous.setFinanceDraftId(50L);
+        when(mapper.selectById(1L)).thenReturn(previous);
+        var ticket = new AfterSaleTicketDO(); ticket.setId(8L); ticket.setOwnerUserId(10L); ticket.setStatus(10);
+        when(tickets.getTicket(8L)).thenReturn(ticket);
+        var review = new AfterSaleFinanceReviewDTO(); review.setStatus(2);
+        when(finance.getReviewResults(List.of(50L))).thenReturn(Map.of(50L, review));
+        when(mapper.insert(any(AfterSaleCollaborationDO.class))).thenAnswer(call -> {
+            AfterSaleCollaborationDO created = call.getArgument(0); created.setId(2L); return 1;
+        });
+        var service = new AfterSaleCollaborationService();
+        ReflectionTestUtils.setField(service, "mapper", mapper); ReflectionTestUtils.setField(service, "ticketService", tickets);
+        ReflectionTestUtils.setField(service, "financeDraftApi", finance); ReflectionTestUtils.setField(service, "userApi", mock(AdminUserApi.class));
+        var suppliers = mock(SrmSupplierApi.class);
+        var supplier = new SrmSupplierRespDTO(); supplier.setId(600L); supplier.setName("涓绘暟鎹緵搴斿晢"); supplier.setStatus(0);
+        when(suppliers.getSupplier(600L)).thenReturn(CommonResult.success(supplier));
+        ReflectionTestUtils.setField(service, "supplierApi", suppliers);
+        var input = new AfterSaleCollaborationService.CreateRequest(); input.setPreviousId(1L); input.setTicketId(8L);
+        input.setAssigneeUserId(20L); input.setCategory("SUPPLIER"); input.setTitle("閲嶅姙"); input.setContent("琛ュ厖鏉愭枡");
+        input.setAmount(new BigDecimal("100.00")); input.setDirection("RECEIVABLE"); input.setPartyName("浼�犲悕绉�"); input.setPartyId(600L);
+        assertEquals(2L, service.create(input, 10L));
+        verify(mapper).insert((AfterSaleCollaborationDO) argThat(value -> Long.valueOf(1L).equals(((AfterSaleCollaborationDO) value).getPreviousId())));
+        var created = ArgumentCaptor.forClass(AfterSaleCollaborationDO.class);
+        verify(mapper).insert(created.capture());
+        assertEquals("涓绘暟鎹緵搴斿晢", created.getValue().getPartyName());
+        assertEquals("SUPPLIER", created.getValue().getPartyType());
+        assertEquals(600L, created.getValue().getPartyId());
+    }
+
+    @Test
+    void businessApprovalCreatesOneFinanceDraftFromSubmittedAmount() {
+        TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), AfterSaleCollaborationDO.class);
+        var mapper = mock(AfterSaleCollaborationMapper.class);
+        var tickets = mock(AfterSaleTicketService.class);
+        var finance = mock(AfterSaleFinanceDraftApi.class);
+        var task = new AfterSaleCollaborationDO(); task.setId(1L); task.setTicketId(8L); task.setStatus(1);
+        task.setAmount(new BigDecimal("123.45")); task.setCategory("SUPPLIER"); task.setDirection("RECEIVABLE");
+        task.setPartyName("渚涘簲鍟�"); task.setResult("鏍告煡瀹屾垚");
+        task.setPartyType("SUPPLIER"); task.setPartyId(600L);
+        when(mapper.selectById(1L)).thenReturn(task);
+        var ticket = new AfterSaleTicketDO(); ticket.setId(8L); ticket.setOwnerUserId(10L);
+        when(tickets.getTicket(8L)).thenReturn(ticket);
+        when(mapper.update(any(), any())).thenReturn(1);
+        when(mapper.updateById(any(AfterSaleCollaborationDO.class))).thenReturn(1);
+        when(finance.createDraft(any())).thenReturn(50L);
+        var service = new AfterSaleCollaborationService();
+        ReflectionTestUtils.setField(service, "mapper", mapper); ReflectionTestUtils.setField(service, "ticketService", tickets);
+        ReflectionTestUtils.setField(service, "financeDraftApi", finance);
+        service.reviewFinancial(1L, 10L, true, "鍚屾剰");
+        var capture = ArgumentCaptor.forClass(AfterSaleFinanceDraftCreateDTO.class);
+        verify(finance).createDraft(capture.capture());
+        assertEquals(new BigDecimal("123.45"), capture.getValue().getAmount());
+        assertEquals(10L, capture.getValue().getBusinessApproverId());
+        assertEquals(600L, capture.getValue().getPartyId());
+        verify(mapper).updateById((AfterSaleCollaborationDO) argThat(value -> Long.valueOf(50L).equals(((AfterSaleCollaborationDO) value).getFinanceDraftId())));
+    }
+
+    @Test
+    void onlyRequesterCanCancelPendingTask() {
+        var mapper = mock(AfterSaleCollaborationMapper.class);
+        var task = new AfterSaleCollaborationDO(); task.setId(2L); task.setRequestedBy(10L); task.setStatus(0);
+        when(mapper.selectById(2L)).thenReturn(task);
+        var service = new AfterSaleCollaborationService();
+        ReflectionTestUtils.setField(service, "mapper", mapper);
+        assertThrows(RuntimeException.class, () -> service.cancel(2L, 20L));
+        verify(mapper, never()).update(any(), any());
+    }
+
+    @Test
+    void unrelatedUserCannotCreateTasksForSomeoneElsesTicket() {
+        var mapper = mock(AfterSaleCollaborationMapper.class);
+        var tickets = mock(AfterSaleTicketService.class);
+        var ticket = new AfterSaleTicketDO(); ticket.setId(8L); ticket.setOwnerUserId(10L); ticket.setStatus(10);
+        when(tickets.getTicket(8L)).thenReturn(ticket);
+        var service = new AfterSaleCollaborationService();
+        ReflectionTestUtils.setField(service, "mapper", mapper);
+        ReflectionTestUtils.setField(service, "ticketService", tickets);
+        ReflectionTestUtils.setField(service, "permissionService", mock(AfterSalePermissionService.class));
+        ReflectionTestUtils.setField(service, "permissionApi", mock(PermissionCommonApi.class));
+        var input = new AfterSaleCollaborationService.CreateRequest();
+        input.setTicketId(8L); input.setAssigneeUserId(20L); input.setCategory("FINANCE");
+        input.setAmount(new BigDecimal("100.00")); input.setDirection("INTERNAL");
+        input.setTitle("鏍告煡"); input.setContent("鏍告煡澶勭悊鎯呭喌");
+        assertThrows(RuntimeException.class, () -> service.create(input, 30L));
+        verifyNoInteractions(mapper);
+    }
+
+    @Test
+    void unauthorizedBusinessReviewerCannotGenerateFinanceDraft() {
+        var mapper = mock(AfterSaleCollaborationMapper.class);
+        var tickets = mock(AfterSaleTicketService.class);
+        var finance = mock(AfterSaleFinanceDraftApi.class);
+        var task = new AfterSaleCollaborationDO(); task.setId(1L); task.setTicketId(8L); task.setStatus(1); task.setAmount(BigDecimal.TEN);
+        when(mapper.selectById(1L)).thenReturn(task);
+        var ticket = new AfterSaleTicketDO(); ticket.setId(8L); ticket.setOwnerUserId(10L);
+        when(tickets.getTicket(8L)).thenReturn(ticket);
+        var service = new AfterSaleCollaborationService();
+        ReflectionTestUtils.setField(service, "mapper", mapper); ReflectionTestUtils.setField(service, "ticketService", tickets);
+        ReflectionTestUtils.setField(service, "financeDraftApi", finance);
+        ReflectionTestUtils.setField(service, "permissionService", mock(AfterSalePermissionService.class));
+        ReflectionTestUtils.setField(service, "permissionApi", mock(PermissionCommonApi.class));
+        assertThrows(RuntimeException.class, () -> service.reviewFinancial(1L, 30L, true, null));
+        verifyNoInteractions(finance);
+        verify(mapper, never()).update(any(), any());
+    }
+
+    @Test
+    void onlyAssigneeCanCompleteTask() {
+        var mapper = mock(AfterSaleCollaborationMapper.class);
+        var task = new AfterSaleCollaborationDO(); task.setId(1L); task.setAssigneeUserId(10L); task.setStatus(0);
+        when(mapper.selectById(1L)).thenReturn(task);
+        var service = new AfterSaleCollaborationService();
+        ReflectionTestUtils.setField(service, "mapper", mapper);
+        assertThrows(RuntimeException.class, () -> service.complete(1L, 20L, "宸插鐞�"));
+        verify(mapper, never()).update(any(), any());
+    }
+
+    @Test
+    void completionRequiresResult() {
+        var mapper = mock(AfterSaleCollaborationMapper.class);
+        var service = new AfterSaleCollaborationService();
+        ReflectionTestUtils.setField(service, "mapper", mapper);
+        assertThrows(RuntimeException.class, () -> service.complete(1L, 10L, " "));
+        verifyNoInteractions(mapper);
+    }
+}
diff --git a/yudao-module-aftersales/src/test/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnMesLinkTest.java b/yudao-module-aftersales/src/test/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnMesLinkTest.java
new file mode 100644
index 0000000..c62a10c
--- /dev/null
+++ b/yudao-module-aftersales/src/test/java/cn/iocoder/yudao/module/aftersales/service/returnobj/AfterSaleReturnMesLinkTest.java
@@ -0,0 +1,104 @@
+package cn.iocoder.yudao.module.aftersales.service.returnobj;
+
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.returnobj.AfterSaleReturnDO;
+import cn.iocoder.yudao.module.aftersales.controller.admin.returnobj.vo.AfterSaleReturnSaveReqVO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.returnobj.AfterSaleReturnItemDO;
+import cn.iocoder.yudao.module.aftersales.dal.mysql.returnobj.AfterSaleReturnMapper;
+import cn.iocoder.yudao.module.aftersales.dal.mysql.returnobj.AfterSaleReturnItemMapper;
+import cn.iocoder.yudao.module.aftersales.dal.mysql.ticket.AfterSaleTicketMapper;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketDO;
+import cn.iocoder.yudao.module.aftersales.dal.redis.no.AfterSaleNoRedisDAO;
+import cn.iocoder.yudao.module.aftersales.service.permission.AfterSalePermissionService;
+import cn.iocoder.yudao.module.mes.api.returnsales.MesWmReturnSalesApi;
+import cn.iocoder.yudao.module.mes.api.returnsales.dto.MesWmReturnSalesLineCreateDTO;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
+import org.apache.ibatis.builder.MapperBuilderAssistant;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.springframework.test.util.ReflectionTestUtils;
+import java.math.BigDecimal;
+import java.util.List;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+class AfterSaleReturnMesLinkTest {
+    @Test
+    void refundOnlyDoesNotCreatePhysicalReturnDraft() {
+        var mapper = mock(AfterSaleReturnMapper.class);
+        var service = new AfterSaleReturnServiceImpl();
+        ReflectionTestUtils.setField(service, "returnMapper", mapper);
+        var tickets = mock(AfterSaleTicketMapper.class);
+        when(tickets.selectById(8L)).thenReturn(new AfterSaleTicketDO().setId(8L));
+        ReflectionTestUtils.setField(service, "ticketMapper", tickets);
+        ReflectionTestUtils.setField(service, "noRedisDAO", mock(AfterSaleNoRedisDAO.class));
+        ReflectionTestUtils.setField(service, "permissionService", mock(AfterSalePermissionService.class));
+        var input = new AfterSaleReturnSaveReqVO(); input.setReturnType(3); input.setTicketId(8L);
+        assertThrows(RuntimeException.class, () -> service.createReturn(input, 1L));
+        verifyNoInteractions(mapper);
+    }
+    @Test
+    void noPhysicalLinesDoesNotCreateMesDocument() {
+        var mapper = mock(AfterSaleReturnMapper.class);
+        var items = mock(AfterSaleReturnItemMapper.class);
+        var api = mock(MesWmReturnSalesApi.class);
+        when(mapper.selectById(1L)).thenReturn(new AfterSaleReturnDO().setId(1L).setStatus(0).setReturnType(1));
+        when(items.selectListByReturnId(1L)).thenReturn(List.of());
+        var service = new AfterSaleReturnServiceImpl();
+        ReflectionTestUtils.setField(service, "returnMapper", mapper);
+        ReflectionTestUtils.setField(service, "returnItemMapper", items);
+        ReflectionTestUtils.setField(service, "mesWmReturnSalesApi", api);
+        assertThrows(RuntimeException.class, () -> service.approveReturn(1L));
+        verifyNoInteractions(api);
+    }
+
+    @Test
+    void lostApprovalRaceDoesNotCreateSecondMesDocument() {
+        TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), AfterSaleReturnDO.class);
+        var mapper = mock(AfterSaleReturnMapper.class);
+        var items = mock(AfterSaleReturnItemMapper.class);
+        var api = mock(MesWmReturnSalesApi.class);
+        when(mapper.selectById(1L)).thenReturn(new AfterSaleReturnDO().setId(1L).setStatus(0).setReturnType(1));
+        var line = new AfterSaleReturnItemDO(); line.setItemId(4L); line.setReturnQuantity(BigDecimal.ONE);
+        when(items.selectListByReturnId(1L)).thenReturn(List.of(line));
+        when(mapper.update(any(), any())).thenReturn(0);
+        var service = new AfterSaleReturnServiceImpl();
+        ReflectionTestUtils.setField(service, "returnMapper", mapper);
+        ReflectionTestUtils.setField(service, "returnItemMapper", items);
+        ReflectionTestUtils.setField(service, "mesWmReturnSalesApi", api);
+        assertThrows(RuntimeException.class, () -> service.approveReturn(1L));
+        verifyNoInteractions(api);
+    }
+    @Test
+    void approvalCopiesReturnLinesAndPersistsTheirMesIds() {
+        TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), AfterSaleReturnDO.class);
+        var mapper = mock(AfterSaleReturnMapper.class);
+        var items = mock(AfterSaleReturnItemMapper.class);
+        var api = mock(MesWmReturnSalesApi.class);
+        var source = new AfterSaleReturnDO().setId(1L).setTicketId(2L).setStatus(0).setNo("RET-1").setReturnType(1);
+        when(mapper.selectById(1L)).thenReturn(source);
+        when(mapper.update(any(), any())).thenReturn(1);
+        when(mapper.updateById(any(AfterSaleReturnDO.class))).thenReturn(1);
+        when(items.updateById(any(AfterSaleReturnItemDO.class))).thenReturn(1);
+        var line = new AfterSaleReturnItemDO(); line.setId(3L); line.setReturnId(1L); line.setItemId(4L);
+        line.setReturnQuantity(new BigDecimal("2.50")); line.setBatchId(5L); line.setBatchCode("B-1");
+        when(items.selectListByReturnId(1L)).thenReturn(List.of(line));
+        when(api.createReturnSales(any())).thenReturn(6L);
+        when(api.createReturnSalesLine(any())).thenReturn(7L);
+        var service = new AfterSaleReturnServiceImpl();
+        ReflectionTestUtils.setField(service, "returnMapper", mapper);
+        ReflectionTestUtils.setField(service, "returnItemMapper", items);
+        ReflectionTestUtils.setField(service, "ticketMapper", mock(AfterSaleTicketMapper.class));
+        ReflectionTestUtils.setField(service, "mesWmReturnSalesApi", api);
+        service.approveReturn(1L);
+        var capture = ArgumentCaptor.forClass(MesWmReturnSalesLineCreateDTO.class);
+        verify(api).createReturnSalesLine(capture.capture());
+        assertEquals(6L, capture.getValue().getReturnId());
+        assertEquals(4L, capture.getValue().getItemId());
+        assertEquals(new BigDecimal("2.50"), capture.getValue().getQuantity());
+        assertEquals(5L, capture.getValue().getBatchId());
+        var updated = ArgumentCaptor.forClass(AfterSaleReturnItemDO.class);
+        verify(items).updateById(updated.capture());
+        assertEquals(7L, updated.getValue().getMesReturnLineId());
+    }
+}
diff --git a/yudao-module-aftersales/src/test/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleLedgerServiceTest.java b/yudao-module-aftersales/src/test/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleLedgerServiceTest.java
new file mode 100644
index 0000000..ce4b3c8
--- /dev/null
+++ b/yudao-module-aftersales/src/test/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleLedgerServiceTest.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.aftersales.service.ticket;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.aftersales.controller.admin.ticket.vo.ticket.AfterSaleTicketPageReqVO;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class AfterSaleLedgerServiceTest {
+    @Test
+    void countsUseTheSameUserAndSceneAsTheTicketList() {
+        var tickets = mock(AfterSaleTicketService.class);
+        when(tickets.getTicketPage(any(), eq(99L))).thenAnswer(call -> {
+            AfterSaleTicketPageReqVO request = call.getArgument(0);
+            assertEquals(2, request.getSceneType());
+            assertEquals(1, request.getPageSize());
+            return new PageResult<>(List.of(), request.getStatus().longValue());
+        });
+        var service = new AfterSaleLedgerService();
+        ReflectionTestUtils.setField(service, "ticketService", tickets);
+        var result = service.overview(99L, 2);
+        assertEquals(10L, result.get(10));
+        assertEquals(60L, result.get(60));
+        verify(tickets, times(7)).getTicketPage(any(), eq(99L));
+    }
+}
diff --git a/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/api/sale/ErpSaleOrderNoticeLockTest.java b/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/api/sale/ErpSaleOrderNoticeLockTest.java
new file mode 100644
index 0000000..aa29642
--- /dev/null
+++ b/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/api/sale/ErpSaleOrderNoticeLockTest.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.erp.api.sale;
+
+import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.sale.ErpSaleOrderMapper;
+import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+class ErpSaleOrderNoticeLockTest {
+    @Test
+    void cancelledOrderCannotBeUsedForNotice() {
+        var mapper = mock(ErpSaleOrderMapper.class);
+        when(mapper.selectByIdForUpdate(1L)).thenReturn(new ErpSaleOrderDO().setId(1L).setNo("SO-1").setStatus(ErpAuditStatus.CANCEL.getStatus()));
+        var api = new ErpSaleOrderApiImpl(); ReflectionTestUtils.setField(api, "saleOrderMapper", mapper);
+        assertThrows(RuntimeException.class, () -> api.lockSaleOrderForNotice(1L, "SO-1"));
+    }
+    @Test
+    void orderCodeMustMatchLockedOrder() {
+        var mapper = mock(ErpSaleOrderMapper.class);
+        when(mapper.selectByIdForUpdate(1L)).thenReturn(new ErpSaleOrderDO().setId(1L).setNo("SO-1").setStatus(ErpAuditStatus.APPROVE.getStatus()));
+        var api = new ErpSaleOrderApiImpl(); ReflectionTestUtils.setField(api, "saleOrderMapper", mapper);
+        assertThrows(RuntimeException.class, () -> api.lockSaleOrderForNotice(1L, "SO-2"));
+    }
+}
diff --git a/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/service/finance/ErpAfterSaleFinanceDraftServiceTest.java b/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/service/finance/ErpAfterSaleFinanceDraftServiceTest.java
new file mode 100644
index 0000000..2b4f37c
--- /dev/null
+++ b/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/service/finance/ErpAfterSaleFinanceDraftServiceTest.java
@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.erp.service.finance;
+
+import cn.iocoder.yudao.module.erp.api.finance.dto.AfterSaleFinanceDraftCreateDTO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpAfterSaleFinanceDraftDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.finance.ErpAfterSaleFinanceDraftMapper;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+import java.math.BigDecimal;
+import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.*;
+
+class ErpAfterSaleFinanceDraftServiceTest {
+    @Test
+    void exposesReviewResultByDraftIdWithoutChangingIt() {
+        var mapper = mock(ErpAfterSaleFinanceDraftMapper.class);
+        var draft = new ErpAfterSaleFinanceDraftDO(); draft.setId(4L); draft.setStatus(2); draft.setReviewRemark("鏉愭枡涓嶅叏");
+        when(mapper.selectBatchIds(List.of(4L))).thenReturn(List.of(draft));
+        var service = new ErpAfterSaleFinanceDraftService();
+        ReflectionTestUtils.setField(service, "mapper", mapper);
+        var result = service.getReviewResults(List.of(4L));
+        assertEquals(2, result.get(4L).getStatus());
+        assertEquals("鏉愭枡涓嶅叏", result.get(4L).getRemark());
+    }
+
+    @Test
+    void rejectsNonPositiveAmountBeforeInsert() {
+        var mapper = mock(ErpAfterSaleFinanceDraftMapper.class);
+        var service = new ErpAfterSaleFinanceDraftService();
+        ReflectionTestUtils.setField(service, "mapper", mapper);
+        var input = new AfterSaleFinanceDraftCreateDTO(); input.setCollaborationId(1L); input.setTicketId(2L);
+        input.setBusinessApproverId(3L); input.setCategory("QUALITY"); input.setDirection("INTERNAL");
+        input.setDescription("璐圭敤璇存槑"); input.setAmount(BigDecimal.ZERO);
+        assertThrows(RuntimeException.class, () -> service.createDraft(input));
+        input.setAmount(new BigDecimal("1.001"));
+        assertThrows(RuntimeException.class, () -> service.createDraft(input));
+        input.setAmount(new BigDecimal("10000000000000000.00"));
+        assertThrows(RuntimeException.class, () -> service.createDraft(input));
+        verifyNoInteractions(mapper);
+    }
+
+    @Test
+    void onlyPendingDraftCanBeReviewed() {
+        var mapper = mock(ErpAfterSaleFinanceDraftMapper.class);
+        var draft = new ErpAfterSaleFinanceDraftDO(); draft.setId(4L); draft.setStatus(1);
+        when(mapper.selectById(4L)).thenReturn(draft);
+        var service = new ErpAfterSaleFinanceDraftService();
+        ReflectionTestUtils.setField(service, "mapper", mapper);
+        assertThrows(RuntimeException.class, () -> service.review(4L, 9L, true, "纭"));
+        verify(mapper, never()).update(any(), any());
+    }
+}
diff --git a/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderCancellationGuardTest.java b/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderCancellationGuardTest.java
new file mode 100644
index 0000000..0265058
--- /dev/null
+++ b/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderCancellationGuardTest.java
@@ -0,0 +1,96 @@
+package cn.iocoder.yudao.module.erp.service.sale;
+
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderItemDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.sale.ErpSaleOrderMapper;
+import cn.iocoder.yudao.module.erp.dal.mysql.sale.ErpSaleOrderItemMapper;
+import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import cn.iocoder.yudao.module.mes.api.mps.MesProMpsApi;
+import cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsRespDTO;
+import cn.iocoder.yudao.module.mes.api.salesnotice.MesWmSalesNoticeApi;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+class ErpSaleOrderCancellationGuardTest {
+    @Test
+    void missingDeliveryNoticeResultFailsClosed() {
+        var orders = mock(ErpSaleOrderMapper.class);
+        var items = mock(ErpSaleOrderItemMapper.class);
+        var notices = mock(MesWmSalesNoticeApi.class);
+        when(orders.selectByIdForUpdate(1L)).thenReturn(new ErpSaleOrderDO().setId(1L).setNo("TEST").setStatus(ErpAuditStatus.APPROVE.getStatus()).setOutCount(BigDecimal.ZERO));
+        when(items.selectListByOrderId(1L)).thenReturn(List.of());
+        when(notices.checkSalesNoticeBySaleOrderIds(List.of(1L))).thenReturn(Map.of());
+        var service = new ErpSaleOrderServiceImpl();
+        ReflectionTestUtils.setField(service, "saleOrderMapper", orders);
+        ReflectionTestUtils.setField(service, "saleOrderItemMapper", items);
+        ReflectionTestUtils.setField(service, "salesNoticeApi", notices);
+        assertThrows(ServiceException.class, () -> service.cancelSaleOrder(1L));
+        verify(orders, never()).updateByIdAndStatus(anyLong(), anyInt(), any());
+    }
+    @Test
+    void existingDeliveryNoticeBlocksOrderCancellation() {
+        var orderMapper = mock(ErpSaleOrderMapper.class);
+        var itemMapper = mock(ErpSaleOrderItemMapper.class);
+        var mpsApi = mock(MesProMpsApi.class);
+        var noticeApi = mock(MesWmSalesNoticeApi.class);
+        var order = new ErpSaleOrderDO().setId(1L).setNo("TEST").setStatus(ErpAuditStatus.APPROVE.getStatus()).setOutCount(BigDecimal.ZERO);
+        when(orderMapper.selectByIdForUpdate(1L)).thenReturn(order);
+        when(itemMapper.selectListByOrderId(1L)).thenReturn(List.of());
+        when(noticeApi.checkSalesNoticeBySaleOrderIds(List.of(1L))).thenReturn(Map.of(1L, true));
+        var service = new ErpSaleOrderServiceImpl();
+        ReflectionTestUtils.setField(service, "saleOrderMapper", orderMapper);
+        ReflectionTestUtils.setField(service, "saleOrderItemMapper", itemMapper);
+        ReflectionTestUtils.setField(service, "mpsApi", mpsApi);
+        ReflectionTestUtils.setField(service, "salesNoticeApi", noticeApi);
+        assertThrows(ServiceException.class, () -> service.cancelSaleOrder(1L));
+        verify(orderMapper, never()).updateByIdAndStatus(anyLong(), anyInt(), any());
+    }
+    @Test
+    void canceledPlansAllowOrderCancellation() {
+        var orderMapper = mock(ErpSaleOrderMapper.class);
+        var itemMapper = mock(ErpSaleOrderItemMapper.class);
+        var mpsApi = mock(MesProMpsApi.class);
+        var noticeApi = mock(MesWmSalesNoticeApi.class);
+        when(noticeApi.checkSalesNoticeBySaleOrderIds(List.of(1L))).thenReturn(Map.of(1L, false));
+        var order = new ErpSaleOrderDO().setId(1L).setNo("TEST").setStatus(ErpAuditStatus.APPROVE.getStatus()).setOutCount(BigDecimal.ZERO);
+        when(orderMapper.selectByIdForUpdate(1L)).thenReturn(order);
+        when(orderMapper.updateByIdAndStatus(eq(1L), anyInt(), any())).thenReturn(1);
+        when(itemMapper.selectListByOrderId(1L)).thenReturn(List.of(new ErpSaleOrderItemDO().setId(8L)));
+        var plan = new MesProMpsRespDTO(); plan.setStatus(3);
+        when(mpsApi.getMpsListBySaleOrderItemIds(List.of(8L))).thenReturn(List.of(plan));
+        var service = new ErpSaleOrderServiceImpl();
+        ReflectionTestUtils.setField(service, "saleOrderMapper", orderMapper);
+        ReflectionTestUtils.setField(service, "saleOrderItemMapper", itemMapper);
+        ReflectionTestUtils.setField(service, "mpsApi", mpsApi);
+        ReflectionTestUtils.setField(service, "salesNoticeApi", noticeApi);
+        assertDoesNotThrow(() -> service.cancelSaleOrder(1L));
+        verify(orderMapper).updateByIdAndStatus(eq(1L), anyInt(), any());
+    }
+
+    @Test
+    void activeProductionPlanBlocksOrderCancellation() {
+        var orderMapper = mock(ErpSaleOrderMapper.class);
+        var itemMapper = mock(ErpSaleOrderItemMapper.class);
+        var mpsApi = mock(MesProMpsApi.class);
+        var order = new ErpSaleOrderDO().setId(1L).setNo("TEST").setStatus(ErpAuditStatus.APPROVE.getStatus()).setOutCount(BigDecimal.ZERO);
+        when(orderMapper.selectByIdForUpdate(1L)).thenReturn(order);
+        var item = new ErpSaleOrderItemDO().setId(8L);
+        when(itemMapper.selectListByOrderId(1L)).thenReturn(List.of(item));
+        var plan = new MesProMpsRespDTO(); plan.setStatus(1);
+        when(mpsApi.getMpsListBySaleOrderItemIds(List.of(8L))).thenReturn(List.of(plan));
+        var service = new ErpSaleOrderServiceImpl();
+        ReflectionTestUtils.setField(service, "saleOrderMapper", orderMapper);
+        ReflectionTestUtils.setField(service, "saleOrderItemMapper", itemMapper);
+        ReflectionTestUtils.setField(service, "mpsApi", mpsApi);
+        assertThrows(ServiceException.class, () -> service.cancelSaleOrder(1L));
+        verify(orderMapper, never()).updateByIdAndStatus(anyLong(), anyInt(), any());
+    }
+}
diff --git a/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/service/statistics/PurchasePriceMetricsTest.java b/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/service/statistics/PurchasePriceMetricsTest.java
new file mode 100644
index 0000000..a753d7b
--- /dev/null
+++ b/yudao-module-erp/src/test/java/cn/iocoder/yudao/module/erp/service/statistics/PurchasePriceMetricsTest.java
@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.erp.service.statistics;
+
+import org.junit.jupiter.api.Test;
+import java.math.BigDecimal;
+import static org.junit.jupiter.api.Assertions.*;
+
+class PurchasePriceMetricsTest {
+    @Test
+    void comparesLatestPriceToPreviousAndAvoidsDivisionByZero() {
+        assertEquals(new BigDecimal("25.00"), PurchasePriceMetrics.changeRate(new BigDecimal("10"), new BigDecimal("8")));
+        assertNull(PurchasePriceMetrics.changeRate(new BigDecimal("10"), BigDecimal.ZERO));
+        assertNull(PurchasePriceMetrics.changeRate(new BigDecimal("10"), null));
+        assertEquals(new BigDecimal("-20.00"), PurchasePriceMetrics.changeRate(new BigDecimal("8"), new BigDecimal("10")));
+    }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectDowntimeDetailRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectDowntimeDetailRespVO.java
new file mode 100644
index 0000000..84ab668
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/collect/vo/MesCollectDowntimeDetailRespVO.java
@@ -0,0 +1,71 @@
+package cn.iocoder.yudao.module.mes.controller.admin.collect.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 璁惧鍋滄満鏄庣粏锛堟寜閲囬泦闂撮殧鎺ㄧ畻锛夈��
+ *
+ * <p>鍙e緞锛氫袱娆¢噰鏍烽棿闅旇秴杩囧湪绾胯秴鏃堕槇鍊煎嵆瑙嗕负绂荤嚎鍋滄満锛�
+ * 棣栨閲囨牱涔嬪墠涓嶄綔鎺ㄦ柇锛涢�氫俊涓柇鍚屾牱璁″叆鍋滄満锛屼絾涓嶆爣璁颁负鏈烘鏁呴殰銆�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 璁惧鍋滄満鏄庣粏 Response VO")
+@Data
+public class MesCollectDowntimeDetailRespVO {
+
+    @Schema(description = "缁熻寮�濮嬫椂闂�")
+    private LocalDateTime startTime;
+    @Schema(description = "缁熻缁撴潫鏃堕棿")
+    private LocalDateTime endTime;
+    @Schema(description = "鍦ㄧ嚎瓒呮椂闃堝�硷紙鍒嗛挓锛�")
+    private Integer timeoutMinutes;
+    @Schema(description = "缁熻鍖洪棿鎬绘椂闀匡紙鍒嗛挓锛�")
+    private Long totalMinutes;
+    @Schema(description = "鍋滄満鍚堣锛堝垎閽燂級")
+    private Long downtimeMinutes;
+    @Schema(description = "鍋滄満鐜囷紙%锛�")
+    private Double downtimeRate;
+    @Schema(description = "鎸夎澶囨槑缁�")
+    private List<Item> items;
+
+    @Schema(description = "鍗曡澶囧仠鏈烘槑缁�")
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Item {
+        @Schema(description = "璁惧鍙拌处缂栧彿")
+        private Long machineryId;
+        @Schema(description = "璁惧缂栫爜")
+        private String machineryCode;
+        @Schema(description = "璁惧鍚嶇О")
+        private String machineryName;
+        @Schema(description = "鏁伴噰璁惧缂栫爜")
+        private String deviceCode;
+        @Schema(description = "閲囨牱鏁�")
+        private Integer sampleCount;
+        @Schema(description = "鍋滄満娆℃暟")
+        private Integer downtimeCount;
+        @Schema(description = "鍋滄満鍚堣锛堝垎閽燂級")
+        private Long downtimeMinutes;
+        @Schema(description = "鍋滄満鍖洪棿鏄庣粏")
+        private List<Interval> intervals;
+    }
+
+    @Schema(description = "鍋滄満鍖洪棿")
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Interval {
+        @Schema(description = "鍋滄満寮�濮�")
+        private LocalDateTime start;
+        @Schema(description = "鍋滄満缁撴潫")
+        private LocalDateTime end;
+        @Schema(description = "鎸佺画绉掓暟")
+        private Long seconds;
+    }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/MesDvRepairController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/MesDvRepairController.java
index 2f7287d..869543e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/MesDvRepairController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/MesDvRepairController.java
@@ -8,12 +8,14 @@
 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.repair.vo.MesDvRepairDiagnosisRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.dv.repair.vo.MesDvRepairPageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.dv.repair.vo.MesDvRepairRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.dv.repair.vo.MesDvRepairSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.dv.repair.MesDvRepairDO;
 import cn.iocoder.yudao.module.mes.service.dv.machinery.MesDvMachineryService;
+import cn.iocoder.yudao.module.mes.service.dv.repair.MesDvRepairDiagnosisService;
 import cn.iocoder.yudao.module.mes.service.dv.repair.MesDvRepairService;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -53,6 +55,8 @@
 
     @Resource
     private AdminUserApi adminUserApi;
+    @Resource
+    private MesDvRepairDiagnosisService diagnosisService;
 
     @PostMapping("/create")
     @Operation(summary = "鍒涘缓缁翠慨宸ュ崟")
@@ -98,6 +102,15 @@
         return success(new PageResult<>(buildRepairRespVOList(pageResult.getList()), pageResult.getTotal()));
     }
 
+    @GetMapping("/diagnose")
+    @Operation(summary = "璁惧杩滅▼璇婃柇锛堝熀浜庣幇鏈夎澶囬噰闆嗘暟鎹級",
+            description = "璇诲彇瀹炴椂閲囬泦銆佺姸鎬佸巻鍙蹭笌鍛婅锛岀粰鍑鸿瘖鏂缓璁紱缁撹浠呬綔缁翠慨鍙傝�冿紝涓嶆浛浠g幇鍦虹‘璁�")
+    @Parameter(name = "machineryId", description = "璁惧鍙拌处缂栧彿", required = true, example = "1")
+    @PreAuthorize("@ss.hasPermission('mes:dv-repair:query')")
+    public CommonResult<MesDvRepairDiagnosisRespVO> diagnose(@RequestParam("machineryId") Long machineryId) {
+        return success(diagnosisService.diagnose(machineryId));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "瀵煎嚭缁翠慨宸ュ崟 Excel")
     @PreAuthorize("@ss.hasPermission('mes:dv-repair:export')")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/vo/MesDvRepairDiagnosisRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/vo/MesDvRepairDiagnosisRespVO.java
new file mode 100644
index 0000000..879b72d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/vo/MesDvRepairDiagnosisRespVO.java
@@ -0,0 +1,69 @@
+package cn.iocoder.yudao.module.mes.controller.admin.dv.repair.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 绠$悊鍚庡彴 - 璁惧杩滅▼璇婃柇 Response VO
+ *
+ * <p>鍩轰簬鐜版湁璁惧閲囬泦鏁版嵁锛堝疄鏃剁姸鎬� + 鏈�杩戝憡璀� + 鐘舵�佸巻鍙诧級鐢熸垚锛�
+ * 涓嶄緷璧栭澶栫殑澶栭儴璇婃柇鎺ュ彛銆�
+ */
+@Schema(description = "绠$悊鍚庡彴 - 璁惧杩滅▼璇婃柇 Response VO")
+@Data
+public class MesDvRepairDiagnosisRespVO {
+
+    @Schema(description = "璁惧鍙拌处缂栧彿")
+    private Long machineryId;
+    @Schema(description = "璁惧缂栫爜")
+    private String machineryCode;
+    @Schema(description = "璁惧鍚嶇О")
+    private String machineryName;
+
+    @Schema(description = "鏄惁鏈夐噰闆嗘暟鎹�")
+    private Boolean hasCollectData;
+    @Schema(description = "鏈�杩戦噰闆嗘椂闂�")
+    private LocalDateTime lastCollectTime;
+    @Schema(description = "閲囬泦鏁版嵁鏄惁瓒呮椂锛堣秴杩� 5 鍒嗛挓鏃犱笂鎶ワ級")
+    private Boolean collectTimeout;
+
+    @Schema(description = "鏈�杩戣繍琛岀姸鎬侊紙鏁伴噰鍘熷�硷級")
+    private Integer runStatus;
+    @Schema(description = "鏈�杩戣繍琛屾ā寮忥紙鏁伴噰鍘熷�硷級")
+    private Integer operateMode;
+    @Schema(description = "鏈�杩戣繍琛屾椂闀�")
+    private BigDecimal runTime;
+    @Schema(description = "鍏抽敭鎸囨爣蹇収锛氭寚鏍囧悕 -> 鍊�")
+    private Map<String, BigDecimal> metrics;
+
+    @Schema(description = "杩� N 澶╁憡璀︽暟")
+    private Long recentAlarmCount;
+    @Schema(description = "鏈竻闄ゅ憡璀︽暟")
+    private Long activeAlarmCount;
+    @Schema(description = "鏈�杩戝憡璀︽槑缁�")
+    private List<AlarmItem> recentAlarms;
+
+    @Schema(description = "璇婃柇缁撹锛堜緵缁翠慨宸ュ崟鍙傝�冿紝涓嶆浛浠g幇鍦虹‘璁わ級")
+    private String diagnosis;
+    @Schema(description = "椋庨櫓绛夌骇锛歂ORMAL / WARNING / CRITICAL / UNKNOWN")
+    private String riskLevel;
+    @Schema(description = "璇婃柇渚濇嵁锛堥�愭潯璇存槑鍙栨暟鍙e緞锛�")
+    private List<String> evidence;
+
+    @Schema(description = "鍛婅鏄庣粏椤�")
+    @Data
+    public static class AlarmItem {
+        @Schema(description = "鍛婅缂栧彿")
+        private Long id;
+        @Schema(description = "鍛婅淇℃伅")
+        private String message;
+        @Schema(description = "鍛婅鏃堕棿")
+        private LocalDateTime alarmTime;
+        @Schema(description = "鏄惁宸叉竻闄�")
+        private Boolean cleared;
+    }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/statistics/MesDvStatisticsController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/statistics/MesDvStatisticsController.java
index fd4b9f8..7063fb4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/statistics/MesDvStatisticsController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/statistics/MesDvStatisticsController.java
@@ -2,6 +2,7 @@
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.collect.vo.MesCollectDowntimeDetailRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.dv.statistics.vo.MesDvOeeRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.dv.statistics.vo.MesDvStatisticsRespVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryDO;
@@ -14,6 +15,7 @@
 import cn.iocoder.yudao.module.mes.dal.mysql.dv.maintenrecord.MesDvMaintenRecordMapper;
 import cn.iocoder.yudao.module.mes.dal.mysql.dv.repair.MesDvRepairMapper;
 import cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskMapper;
+import cn.iocoder.yudao.module.mes.service.collect.MesCollectQueryService;
 import cn.iocoder.yudao.module.mes.enums.dv.MesDvMachineryStatusEnum;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -53,6 +55,8 @@
     private MesDvMaintenRecordMapper maintenRecordMapper;
     @Resource
     private MesProTaskMapper taskMapper;
+    @Resource
+    private MesCollectQueryService collectQueryService;
 
     @GetMapping("/summary")
     @Operation(summary = "璁惧缁熻姹囨�伙紙鍙拌处/缁翠慨/淇濆吇/绫诲瀷鍒嗗竷锛�")
@@ -112,6 +116,19 @@
         return success(vo);
     }
 
+    @GetMapping("/downtime")
+    @Operation(summary = "璁惧鍋滄満鏄庣粏鎶ヨ〃",
+            description = "鎸夐噰闆嗛棿闅旀帹绠楀仠鏈哄尯闂翠笌鍚堣锛涢�氫俊涓柇鍚屾牱璁″叆鍋滄満锛屼絾涓嶆爣璁颁负鏈烘鏁呴殰")
+    public CommonResult<MesCollectDowntimeDetailRespVO> getDowntimeDetail(
+            @RequestParam(value = "startTime", required = false)
+            @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime startTime,
+            @RequestParam(value = "endTime", required = false)
+            @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime) {
+        LocalDateTime start = startTime != null ? startTime : LocalDateTime.now().minusDays(7);
+        LocalDateTime end = endTime != null ? endTime : LocalDateTime.now();
+        return success(collectQueryService.getDowntimeDetail(start, end));
+    }
+
     @GetMapping("/oee")
     @Operation(summary = "璁惧 OEE 缁熻锛堢鍔ㄧ巼脳鎬ц兘寮�鍔ㄧ巼脳鑹搧鐜囷級")
     public CommonResult<MesDvOeeRespVO> getOee(
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
index ef72ab0..bdeea87 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
@@ -119,6 +119,9 @@
     @Resource
     private MesProWorkOrderParamRecordDetailMapper paramRecordDetailMapper;
 
+    @Resource
+    private cn.iocoder.yudao.module.mes.service.pro.feedback.MesProTaskExecutionService taskExecutionService;
+
     @PostMapping("/create")
     @Operation(summary = "鍒涘缓鐢熶骇鎶ュ伐")
     @PreAuthorize("@ss.hasPermission('mes:pro-feedback:create')")
@@ -163,6 +166,16 @@
         return success(new PageResult<>(buildFeedbackRespVOList(pageResult.getList()), pageResult.getTotal()));
     }
 
+    @GetMapping("/execution")
+    @Operation(summary = "鐢熶骇浠诲姟鎵ц鍙嶉鍒嗘瀽",
+            description = "姹囨�昏鍒掋�佹姤宸ャ�佽澶囬噰闆嗐�佺墿鏂欐秷鑰椾笌浜ゆ湡鍋忓樊锛涘欢鏈熷師鍥犱粎鍒楀彲瑙傛祴淇″彿锛岄渶浜哄伐纭")
+    @Parameter(name = "taskId", description = "浠诲姟缂栧彿", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
+    public CommonResult<cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProTaskExecutionRespVO>
+            getTaskExecution(@RequestParam("taskId") Long taskId) {
+        return success(taskExecutionService.getExecution(taskId));
+    }
+
     @GetMapping("/list-by-task")
     @Operation(summary = "鎸変换鍔¤幏寰楁姤宸ュ巻鍙插垪琛�")
     @Parameter(name = "taskId", description = "浠诲姟缂栧彿", required = true, example = "1024")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProTaskExecutionRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProTaskExecutionRespVO.java
new file mode 100644
index 0000000..6c82c39
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/vo/MesProTaskExecutionRespVO.java
@@ -0,0 +1,100 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 绠$悊鍚庡彴 - 鐢熶骇浠诲姟鎵ц鍙嶉鍒嗘瀽 Response VO
+ *
+ * <p>鎶婅鍒掋�佸疄闄呮姤宸ャ�佽澶囬噰闆嗐�佺墿鏂欐秷鑰椼�佷氦鏈熷亸宸眹鎬诲埌涓�澶勶紝
+ * 渚涜溅闂翠笌璁″垝鍛樺畾浣嶅欢鏈熷師鍥犮�傛墍鏈夋暟鎹潎鏉ヨ嚜鐜版湁琛紝涓嶅仛鎺ㄦ柇鎬цˉ鏁般��
+ */
+@Schema(description = "绠$悊鍚庡彴 - 鐢熶骇浠诲姟鎵ц鍙嶉鍒嗘瀽 Response VO")
+@Data
+public class MesProTaskExecutionRespVO {
+
+    @Schema(description = "浠诲姟缂栧彿")
+    private Long taskId;
+    @Schema(description = "浠诲姟缂栫爜")
+    private String taskCode;
+    @Schema(description = "浠诲姟鍚嶇О")
+    private String taskName;
+    @Schema(description = "鐢熶骇宸ュ崟缂栧彿")
+    private Long workOrderId;
+    @Schema(description = "浠诲姟鐘舵��")
+    private Integer status;
+
+    @Schema(description = "璁″垝鏁伴噺")
+    private BigDecimal plannedQuantity;
+    @Schema(description = "瀹為檯鎶ュ伐鏁伴噺")
+    private BigDecimal producedQuantity;
+    @Schema(description = "鍚堟牸鏁伴噺")
+    private BigDecimal qualifyQuantity;
+    @Schema(description = "鎶ュ簾鏁伴噺")
+    private BigDecimal unqualifyQuantity;
+    @Schema(description = "瀹屾垚鐜囷紙%锛�")
+    private BigDecimal completionRate;
+
+    @Schema(description = "璁″垝寮�濮嬫椂闂�")
+    private LocalDateTime startTime;
+    @Schema(description = "瀹為檯棣栨鎶ュ伐鏃堕棿")
+    private LocalDateTime firstFeedbackTime;
+    @Schema(description = "瀹為檯鏈�鍚庢姤宸ユ椂闂�")
+    private LocalDateTime lastFeedbackTime;
+    @Schema(description = "璁″垝瀹屾垚鏃堕棿")
+    private LocalDateTime finishDate;
+    @Schema(description = "璁″垝宸ユ椂锛堝垎閽燂級")
+    private Integer plannedDuration;
+    @Schema(description = "瀹為檯鑰楁椂锛堝垎閽燂紝棣栨鍒版湯娆℃姤宸ワ級")
+    private Long actualDuration;
+
+    @Schema(description = "鏄惁寤舵湡")
+    private Boolean delayed;
+    @Schema(description = "寤舵湡澶╂暟锛堟鏁拌〃绀鸿秴鏈燂級")
+    private Long delayDays;
+    @Schema(description = "寤舵湡鍘熷洜锛堟寜鍙娴嬩俊鍙风粰鍑虹殑鍊欓�夛紝闇�浜哄伐纭锛�")
+    private List<String> delayCauses;
+
+    @Schema(description = "璁惧杩愯鏁版嵁锛堟寜璁惧姹囨�伙級")
+    private List<DeviceRun> deviceRuns;
+    @Schema(description = "鐗╂枡娑堣�楋紙鎸夌墿鏂欐眹鎬伙級")
+    private List<MaterialConsumption> materialConsumptions;
+
+    @Schema(description = "璁惧杩愯姹囨�婚」")
+    @Data
+    public static class DeviceRun {
+        @Schema(description = "璁惧鍙拌处缂栧彿")
+        private Long machineryId;
+        @Schema(description = "璁惧缂栫爜")
+        private String deviceCode;
+        @Schema(description = "閲囬泦娆℃暟")
+        private Long sampleCount;
+        @Schema(description = "绱杩愯鏃堕暱")
+        private BigDecimal totalRunTime;
+        @Schema(description = "鏈�杩戦噰闆嗘椂闂�")
+        private LocalDateTime lastCollectTime;
+        @Schema(description = "鏈�杩戣繍琛岀姸鎬�")
+        private Integer lastRunStatus;
+        @Schema(description = "鍛婅鏁�")
+        private Long alarmCount;
+    }
+
+    @Schema(description = "鐗╂枡娑堣�楅」")
+    @Data
+    public static class MaterialConsumption {
+        @Schema(description = "鐗╂枡缂栧彿")
+        private Long itemId;
+        @Schema(description = "鐗╂枡缂栫爜")
+        private String itemCode;
+        @Schema(description = "鐗╂枡鍚嶇О")
+        private String itemName;
+        @Schema(description = "娑堣�楁暟閲�")
+        private BigDecimal quantity;
+        @Schema(description = "鍗曚綅")
+        private String unit;
+    }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyRiskSourceController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyRiskSourceController.java
index b301d81..e3bf2f9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyRiskSourceController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyRiskSourceController.java
@@ -8,6 +8,7 @@
 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;
 
 @RestController @RequestMapping("/safety/risk-source") @Validated
@@ -21,4 +22,8 @@
     public CommonResult<Boolean> update(@Valid @RequestBody SafetyRiskSourceSaveReqVO req){if(req.getId()==null)throw cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.invalidParamException("鍗遍櫓婧愮紪鍙蜂笉鑳戒负绌�");service.save(req);return success(true);}
     @DeleteMapping("/delete") @PreAuthorize("@ss.hasPermission('safety:risk:delete')")
     public CommonResult<Boolean> delete(@RequestParam("id") Long id){service.delete(id);return success(true);}
+
+    /** 鐢ㄨ澶囬噰闆嗘暟鎹埛鏂板凡缁戝畾璁惧鐨勫嵄闄╂簮锛岃繑鍥炴湰娆℃姤璀︽竻鍗曘�� */
+    @PostMapping("/refresh") @PreAuthorize("@ss.hasPermission('safety:risk:update')")
+    public CommonResult<List<SafetyRiskSourceDO>> refreshFromCollect(){return success(service.refreshFromCollect());}
 }
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/risk/SafetyRiskSourceSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/risk/SafetyRiskSourceSaveReqVO.java
index 5e23583..be3d7dc 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/risk/SafetyRiskSourceSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/vo/risk/SafetyRiskSourceSaveReqVO.java
@@ -9,6 +9,10 @@
     @NotBlank @Pattern(regexp="MAJOR|HIGH_VOLTAGE|OTHER") private String category;
     @Size(max=160) private String location;
     @NotBlank @Size(max=80) private String metricName;
+    /** 鍏宠仈璁惧缂栧彿锛涘~鍐欏悗鐢辨暟閲囪嚜鍔ㄥ埛鏂板綋鍓嶅�笺�� */
+    @Positive private Long machineryId;
+    /** 鏁伴噰鎸囨爣閿紙data_json 涓殑瀛楁鍚嶏級锛屼笌璁惧缂栧彿閰嶅悎浣跨敤銆� */
+    @Size(max=64) private String metricKey;
     @Size(max=32) private String unit;
     @Digits(integer=14,fraction=6) private BigDecimal lowerLimit;
     @Digits(integer=14,fraction=6) private BigDecimal upperLimit;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java
index 6fff993..f3aff84 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java
@@ -12,6 +12,10 @@
 import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchSalesTargetRespVO;
 import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
 import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
+import cn.iocoder.yudao.module.aftersales.api.AfterSaleTicketApi;
+import cn.iocoder.yudao.module.aftersales.api.dto.AfterSaleTicketRespDTO;
+import cn.iocoder.yudao.module.srm.api.certificate.SrmSupplierCertificateApi;
+import cn.iocoder.yudao.module.srm.api.certificate.dto.SrmSupplierCertificateRespDTO;
 import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
 import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
 import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
@@ -44,9 +48,12 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -66,6 +73,10 @@
     private MdmUnitMeasureApi mdmUnitMeasureApi;
     @Resource
     private SrmSupplierApi srmSupplierApi;
+    @Resource
+    private SrmSupplierCertificateApi srmSupplierCertificateApi;
+    @Resource
+    private AfterSaleTicketApi afterSaleTicketApi;
     @Resource
     private CrmCustomerApi customerApi;
     @Resource
@@ -132,6 +143,42 @@
         return success(buildSalesTargetRespVOList(list));
     }
 
+    @GetMapping("/certificates")
+    @Operation(summary = "鎵规鍘熸潗鏂欏悎瑙勮瘉涔�",
+            description = "鎸夋壒娆$殑閲囪喘鏉ユ簮渚涘簲鍟嗘煡璇㈠悎瑙勮瘉涔︼紱璇佷功杩囨湡鏍囪鐢� SRM 鍒ゅ畾")
+    @Parameter(name = "code", description = "鎵规缂栫爜", required = true, example = "BATCH20250314001")
+    @PreAuthorize("@ss.hasPermission('mes:wm-batch:query')")
+    public CommonResult<List<SrmSupplierCertificateRespDTO>> getCertificateList(@RequestParam("code") @Valid String code) {
+        List<SrmSupplierCertificateRespDTO> result = new ArrayList<>();
+        Set<Long> vendorIds = batchService.getPurchaseSourceList(code).stream()
+                .map(MesWmBatchPurchaseSourceRespVO::getVendorId)
+                .filter(Objects::nonNull).collect(Collectors.toSet());
+        for (Long vendorId : vendorIds) {
+            List<SrmSupplierCertificateRespDTO> list =
+                    srmSupplierCertificateApi.getCertificatesBySupplierId(vendorId).getCheckedData();
+            if (list != null) result.addAll(list);
+        }
+        return success(result);
+    }
+
+    @GetMapping("/aftersales")
+    @Operation(summary = "鎵规鍞悗鏁呴殰璁板綍",
+            description = "鎸夋壒娆¢攢鍞幓鍚戝叧鑱旂殑閿�鍞鍗曞彿鏌ヨ鍞悗宸ュ崟锛岀敤浜庤川閲忚拷婧欢浼稿埌鍞悗鐜妭")
+    @Parameter(name = "code", description = "鎵规缂栫爜", required = true, example = "BATCH20250314001")
+    @PreAuthorize("@ss.hasPermission('mes:wm-batch:query')")
+    public CommonResult<List<AfterSaleTicketRespDTO>> getAfterSaleList(@RequestParam("code") @Valid String code) {
+        List<AfterSaleTicketRespDTO> result = new ArrayList<>();
+        Set<String> saleOrderNos = batchService.getSalesTargetList(code).stream()
+                .map(MesWmBatchSalesTargetRespVO::getSalesOrderCode)
+                .filter(Objects::nonNull).filter(s -> !s.isBlank()).collect(Collectors.toSet());
+        for (String saleOrderNo : saleOrderNos) {
+            List<AfterSaleTicketRespDTO> list =
+                    afterSaleTicketApi.getTicketsBySaleOrderNo(saleOrderNo).getCheckedData();
+            if (list != null) result.addAll(list);
+        }
+        return success(result);
+    }
+
     @GetMapping("/process-trace")
     @Operation(summary = "鎵规宸ュ簭娴佽浆锛堜骇鍑�/鎶曞叆浜嬩欢锛�")
     @Parameter(name = "code", description = "鎵规缂栫爜", required = true, example = "BATCH20250314001")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyRiskSourceDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyRiskSourceDO.java
index 1dacca9..0a1795e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyRiskSourceDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/safety/SafetyRiskSourceDO.java
@@ -14,6 +14,10 @@
     private String category;
     private String location;
     private String metricName;
+    /** 鍏宠仈璁惧鍙拌处缂栧彿锛涗负绌鸿〃绀轰粎浜哄伐褰曞叆锛屼笉鎺ユ暟閲囥�� */
+    private Long machineryId;
+    /** 鏁伴噰鎸囨爣閿細鍙� mes_collect_realtime.data_json 涓殑瀛楁鍚嶏紝濡� current銆乻peed銆� */
+    private String metricKey;
     private String unit;
     @TableField(updateStrategy = FieldStrategy.ALWAYS) private BigDecimal lowerLimit;
     @TableField(updateStrategy = FieldStrategy.ALWAYS) private BigDecimal upperLimit;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectQueryService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectQueryService.java
index c3229b5..23fe617 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectQueryService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/collect/MesCollectQueryService.java
@@ -99,6 +99,68 @@
     }
 
     /**
+     * 璁惧鍋滄満鏄庣粏鎶ヨ〃锛氭寜閲囬泦闂撮殧鎺ㄧ畻姣忓彴璁惧鐨勫仠鏈哄尯闂翠笌鍚堣銆�
+     *
+     * <p>涓庡崟璁惧绂荤嚎鏌ヨ淇濇寔鍚屼竴鍙e緞锛堝湪绾胯秴鏃堕槇鍊笺�佷繚鐣欐湡銆佷竷澶╀笂闄愶級锛�
+     * 渚� OEE 鎶ヨ〃瀹氫綅鍋滄満鐭澘浣跨敤銆�
+     */
+    public cn.iocoder.yudao.module.mes.controller.admin.collect.vo.MesCollectDowntimeDetailRespVO
+            getDowntimeDetail(LocalDateTime start, LocalDateTime end) {
+        LocalDateTime now = LocalDateTime.now();
+        if (start == null || end == null || !start.isBefore(end) || end.isAfter(now)
+                || Duration.between(start, end).compareTo(Duration.ofDays(31)) > 0) {
+            throw invalidParamException("璇烽�夋嫨鏈夋晥鐨勬椂闂磋寖鍥达紝鍗曟鏈�澶氭煡璇笁鍗佷竴澶╋紝缁撴潫鏃堕棿涓嶈兘鏅氫簬褰撳墠鏃堕棿");
+        }
+        if (start.isBefore(now.minusDays(collectProperties.getRetention().getRealtimeDays()))) {
+            throw invalidParamException("鏌ヨ鏃堕棿瓒呭嚭鏁伴噰鍘嗗彶淇濈暀鏈燂紝鏃犳硶鍙潬璁$畻鍋滄満璁板綍");
+        }
+        var result = new cn.iocoder.yudao.module.mes.controller.admin.collect.vo.MesCollectDowntimeDetailRespVO();
+        result.setStartTime(start);
+        result.setEndTime(end);
+        result.setTimeoutMinutes((int) ONLINE_TIMEOUT_MINUTES);
+        long totalMinutes = Duration.between(start, end).toMinutes();
+        result.setTotalMinutes(totalMinutes);
+
+        var machineries = machineryMapper.selectListWithCollectDeviceCode();
+        List<cn.iocoder.yudao.module.mes.controller.admin.collect.vo.MesCollectDowntimeDetailRespVO.Item> items = new ArrayList<>();
+        long sumDowntime = 0L;
+        for (var machinery : machineries) {
+            String deviceCode = machinery.getCollectDeviceCode();
+            var prior = realtimeHistoryMapper.selectOne(new LambdaQueryWrapperX<MesCollectRealtimeHistoryDO>()
+                    .eq(MesCollectRealtimeHistoryDO::getDeviceCode, deviceCode)
+                    .ge(MesCollectRealtimeHistoryDO::getCollectTime, now.minusDays(collectProperties.getRetention().getRealtimeDays()))
+                    .le(MesCollectRealtimeHistoryDO::getCollectTime, start)
+                    .orderByDesc(MesCollectRealtimeHistoryDO::getCollectTime).last("LIMIT 1"));
+            var history = realtimeHistoryMapper.selectList(new LambdaQueryWrapperX<MesCollectRealtimeHistoryDO>()
+                    .eq(MesCollectRealtimeHistoryDO::getDeviceCode, deviceCode)
+                    .gt(MesCollectRealtimeHistoryDO::getCollectTime, start)
+                    .le(MesCollectRealtimeHistoryDO::getCollectTime, end)
+                    .orderByAsc(MesCollectRealtimeHistoryDO::getCollectTime).last("LIMIT 100001"));
+            if (history.size() > 100000) throw invalidParamException("閲囨牱鏁版嵁杩囧锛岃缂╃煭鏌ヨ鏃堕棿鑼冨洿");
+            List<LocalDateTime> samples = new ArrayList<>();
+            int count = 0;
+            if (prior != null) { samples.add(prior.getCollectTime()); count++; }
+            history.forEach(item -> samples.add(item.getCollectTime()));
+            count += history.size();
+            var intervals = CollectOfflinePolicy.calculate(samples, start, end, Duration.ofMinutes(ONLINE_TIMEOUT_MINUTES)).stream()
+                    .map(i -> new cn.iocoder.yudao.module.mes.controller.admin.collect.vo.MesCollectDowntimeDetailRespVO.Interval(
+                            i.start(), i.end(), Duration.between(i.start(), i.end()).getSeconds()))
+                    .toList();
+            long minutes = intervals.stream().mapToLong(i -> i.getSeconds() / 60).sum();
+            sumDowntime += minutes;
+            items.add(new cn.iocoder.yudao.module.mes.controller.admin.collect.vo.MesCollectDowntimeDetailRespVO.Item(
+                    machinery.getId(), machinery.getCode(), machinery.getName(), deviceCode,
+                    count, intervals.size(), minutes, intervals));
+        }
+        items.sort((a, b) -> Long.compare(b.getDowntimeMinutes(), a.getDowntimeMinutes()));
+        result.setItems(items);
+        result.setDowntimeMinutes(sumDowntime);
+        result.setDowntimeRate(totalMinutes > 0 && !items.isEmpty()
+                ? Math.round(sumDowntime * 10000D / (totalMinutes * items.size())) / 100D : 0D);
+        return result;
+    }
+
+    /**
      * 鑾峰彇宸查厤缃暟閲囩紪鐮佺殑璁惧瀹炴椂鐘舵�佸垪琛�
      */
     public List<MesCollectDeviceRespVO> getDeviceList() {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/repair/MesDvRepairDiagnosisService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/repair/MesDvRepairDiagnosisService.java
new file mode 100644
index 0000000..b0ad122
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/repair/MesDvRepairDiagnosisService.java
@@ -0,0 +1,163 @@
+package cn.iocoder.yudao.module.mes.service.dv.repair;
+
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.repair.vo.MesDvRepairDiagnosisRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectAlarmDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectRealtimeDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectRealtimeHistoryDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.machinery.MesDvMachineryDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.collect.MesCollectAlarmMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.collect.MesCollectRealtimeHistoryMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.collect.MesCollectRealtimeMapper;
+import cn.iocoder.yudao.module.mes.service.dv.machinery.MesDvMachineryService;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+import tools.jackson.core.type.TypeReference;
+
+/**
+ * 璁惧杩滅▼璇婃柇銆�
+ *
+ * <p>鍙e緞璇存槑锛氭湰鏈嶅姟鍙鍙栫幇鏈夋暟閲囨暟鎹紙瀹炴椂琛ㄣ�佺姸鎬佸巻鍙层�佸憡璀︼級锛�
+ * 閫氳繃閲囬泦瓒呮椂銆佸憡璀﹀瘑闆嗗害銆佽繍琛岀姸鎬佸紓甯哥瓑淇″彿缁欏嚭璇婃柇寤鸿锛�
+ * 缁撹鐢ㄤ簬缁翠慨宸ュ崟鍙傝�冿紝涓嶆浛浠g幇鍦虹‘璁わ紝涔熶笉鎺ㄦ柇鏈烘鏁呴殰鍘熷洜銆�
+ */
+@Slf4j
+@Service
+public class MesDvRepairDiagnosisService {
+
+    /** 閲囬泦瓒呮椂闃堝�硷紙鍒嗛挓锛夛細瓒呰繃璇ユ椂闀挎棤涓婃姤瑙嗕负閫氫俊涓柇銆� */
+    private static final long COLLECT_TIMEOUT_MINUTES = 5;
+    /** 璇婃柇鍥炵湅澶╂暟銆� */
+    private static final int LOOKBACK_DAYS = 7;
+    /** 瀵嗛泦鍛婅闃堝�笺�� */
+    private static final long ALARM_DENSE_THRESHOLD = 3;
+
+    @Resource private MesDvMachineryService machineryService;
+    @Resource private MesCollectRealtimeMapper realtimeMapper;
+    @Resource private MesCollectRealtimeHistoryMapper historyMapper;
+    @Resource private MesCollectAlarmMapper alarmMapper;
+
+    public MesDvRepairDiagnosisRespVO diagnose(Long machineryId) {
+        MesDvMachineryDO machinery = machineryService.getMachinery(machineryId);
+        if (machinery == null) throw cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil
+                .invalidParamException("璁惧涓嶅瓨鍦�");
+
+        var resp = new MesDvRepairDiagnosisRespVO();
+        resp.setMachineryId(machineryId);
+        resp.setMachineryCode(machinery.getCode());
+        resp.setMachineryName(machinery.getName());
+        List<String> evidence = new ArrayList<>();
+        resp.setEvidence(evidence);
+
+        // 1. 瀹炴椂閲囬泦鐘舵��
+        MesCollectRealtimeDO realtime = realtimeMapper.selectOne(new LambdaQueryWrapperX<MesCollectRealtimeDO>()
+                .eq(MesCollectRealtimeDO::getMachineryId, machineryId)
+                .orderByDesc(MesCollectRealtimeDO::getCollectTime)
+                .last("LIMIT 1"));
+        boolean hasData = realtime != null;
+        resp.setHasCollectData(hasData);
+        if (hasData) {
+            resp.setLastCollectTime(realtime.getCollectTime());
+            resp.setRunStatus(realtime.getSts());
+            resp.setOperateMode(realtime.getOpm());
+            resp.setRunTime(realtime.getOt());
+            resp.setMetrics(parseMetrics(realtime.getDataJson()));
+            boolean timeout = realtime.getCollectTime() == null
+                    || Duration.between(realtime.getCollectTime(), LocalDateTime.now()).toMinutes() >= COLLECT_TIMEOUT_MINUTES;
+            resp.setCollectTimeout(timeout);
+            evidence.add(String.format("瀹炴椂閲囬泦锛氭渶杩戜笂鎶� %s锛岀姸鎬佺爜 %s锛岃繍琛屾ā寮� %s%s",
+                    realtime.getCollectTime(), realtime.getSts(), realtime.getOpm(),
+                    timeout ? String.format("锛堝凡瓒呰繃 %d 鍒嗛挓鏃犳洿鏂帮紝鍒ゅ畾閫氫俊涓柇锛�", COLLECT_TIMEOUT_MINUTES) : ""));
+        } else {
+            resp.setCollectTimeout(true);
+            evidence.add("瀹炴椂閲囬泦锛氳璁惧鏃犱换浣曢噰闆嗚褰曪紝鏃犳硶杩滅▼鍒ゆ柇杩愯鐘舵��");
+        }
+
+        // 2. 鏈�杩戝憡璀�
+        LocalDateTime from = LocalDateTime.now().minusDays(LOOKBACK_DAYS);
+        List<MesCollectAlarmDO> alarms = alarmMapper.selectList(new LambdaQueryWrapperX<MesCollectAlarmDO>()
+                .eq(MesCollectAlarmDO::getMachineryId, machineryId)
+                .ge(MesCollectAlarmDO::getWmTime, from)
+                .orderByDesc(MesCollectAlarmDO::getWmTime)
+                .last("LIMIT 20"));
+        resp.setRecentAlarmCount((long) alarms.size());
+        long active = alarms.stream().filter(a -> a.getClearTime() == null).count();
+        resp.setActiveAlarmCount(active);
+        resp.setRecentAlarms(alarms.stream().map(a -> {
+            var item = new MesDvRepairDiagnosisRespVO.AlarmItem();
+            item.setId(a.getId());
+            item.setMessage(a.getWmMsg());
+            item.setAlarmTime(a.getWmTime());
+            item.setCleared(a.getClearTime() != null);
+            return item;
+        }).collect(Collectors.toList()));
+        if (!alarms.isEmpty()) {
+            evidence.add(String.format("鍛婅锛氳繎 %d 澶� %d 鏉★紝鍏朵腑鏈竻闄� %d 鏉�", LOOKBACK_DAYS, alarms.size(), active));
+        } else {
+            evidence.add(String.format("鍛婅锛氳繎 %d 澶╂棤鍛婅璁板綍", LOOKBACK_DAYS));
+        }
+
+        // 3. 鐘舵�佸巻鍙诧紙鍒ゆ柇鏄惁棰戠箒鍚仠锛�
+        List<MesCollectRealtimeHistoryDO> history = historyMapper.selectList(
+                new LambdaQueryWrapperX<MesCollectRealtimeHistoryDO>()
+                        .eq(MesCollectRealtimeHistoryDO::getMachineryId, machineryId)
+                        .ge(MesCollectRealtimeHistoryDO::getCollectTime, from));
+        if (!history.isEmpty()) {
+            long distinctStatus = history.stream().map(MesCollectRealtimeHistoryDO::getSts)
+                    .filter(Objects::nonNull).distinct().count();
+            evidence.add(String.format("鐘舵�佸巻鍙诧細杩� %d 澶� %d 鏉¢噰鏍凤紝鍑虹幇 %d 绉嶈繍琛岀姸鎬�", LOOKBACK_DAYS, history.size(), distinctStatus));
+            if (distinctStatus >= 3) evidence.add("鐘舵�侀绻佸垏鎹紝寤鸿妫�鏌ュ惎鍋滄帶鍒朵笌宸ヨ壓绋冲畾鎬�");
+        }
+
+        // 4. 缁煎悎鍒ゅ畾
+        String level;
+        String diagnosis;
+        if (!hasData) {
+            level = "UNKNOWN";
+            diagnosis = "鏃犻噰闆嗘暟鎹紝鏃犳硶杩滅▼璇婃柇銆傚缓璁幇鍦烘牳鏌ユ暟閲囩綉鍏充緵鐢典笌閫氳閾捐矾銆�";
+        } else if (Boolean.TRUE.equals(resp.getCollectTimeout())) {
+            level = "CRITICAL";
+            diagnosis = "閲囬泦鏁版嵁宸茶秴鏃讹紝璁惧鍙兘鍋滄満鎴栭�氳涓柇銆傚缓璁厛纭璁惧鏄惁杩愯銆佺綉鍏虫槸鍚﹀湪绾匡紝鍐嶅垽鏂槸鍚﹂渶瑕佹姤淇��";
+        } else if (active > 0) {
+            level = "CRITICAL";
+            diagnosis = String.format("瀛樺湪 %d 鏉℃湭娓呴櫎鍛婅锛岃澶囧浜庡紓甯歌繍琛岀姸鎬併�傚缓璁寜鍛婅淇℃伅鎺掓煡鍚庯紝鍐嶅喅瀹氱淮淇柟妗堛��", active);
+        } else if (alarms.size() >= ALARM_DENSE_THRESHOLD) {
+            level = "WARNING";
+            diagnosis = String.format("杩� %d 澶╁憡璀� %d 鏉★紝铏藉凡娓呴櫎浣嗗彂鐢熼绻併�傚缓璁畨鎺掗闃叉�т繚鍏伙紝閲嶇偣妫�鏌ュ憡璀﹀叧鑱旈儴浠躲��", LOOKBACK_DAYS, alarms.size());
+        } else {
+            level = "NORMAL";
+            diagnosis = "閲囬泦姝e父涓旀棤鏄庢樉鍛婅锛岃澶囪繍琛岀姸鎬佸钩绋炽�傚鐜板満浠嶅弽棣堝紓甯革紝璇疯ˉ鍏呭叿浣撶幇璞″悗鍐嶆璇婃柇銆�";
+        }
+        resp.setRiskLevel(level);
+        resp.setDiagnosis(diagnosis);
+        return resp;
+    }
+
+    /** 瑙f瀽 data_json 涓殑鏁板�煎瀷鎸囨爣锛屾渶澶氫繚鐣� 20 椤癸紝閬垮厤鍝嶅簲杩囧ぇ銆� */
+    Map<String, BigDecimal> parseMetrics(String dataJson) {
+        if (dataJson == null || dataJson.isBlank()) return Map.of();
+        try {
+            Map<String, Object> raw = JsonUtils.parseObjectQuietly(dataJson, new TypeReference<Map<String, Object>>() {});
+            if (raw == null) return Map.of();
+            Map<String, BigDecimal> result = new LinkedHashMap<>();
+            for (var e : raw.entrySet()) {
+                if (result.size() >= 20) break;
+                Object v = e.getValue();
+                if (v instanceof Number n) result.put(e.getKey(), new BigDecimal(n.toString()));
+                else if (v instanceof String s && s.matches("-?\\d+(\\.\\d+)?")) result.put(e.getKey(), new BigDecimal(s));
+            }
+            return result;
+        } catch (Exception e) {
+            log.debug("瑙f瀽璁惧鎸囨爣澶辫触锛歿}", e.getMessage());
+            return Map.of();
+        }
+    }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProTaskExecutionService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProTaskExecutionService.java
new file mode 100644
index 0000000..d564918
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProTaskExecutionService.java
@@ -0,0 +1,180 @@
+package cn.iocoder.yudao.module.mes.service.pro.feedback;
+
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProTaskExecutionRespVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectAlarmDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectRealtimeHistoryDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskIssueDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.collect.MesCollectAlarmMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.collect.MesCollectRealtimeHistoryMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.md.item.MesMdItemMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.md.unitmeasure.MesMdUnitMeasureMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskIssueMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskMapper;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.invalidParamException;
+
+/**
+ * 鐢熶骇浠诲姟鎵ц鍙嶉鍒嗘瀽銆�
+ *
+ * <p>鎶婅鍒掋�佹姤宸ャ�佽澶囬噰闆嗐�佺墿鏂欐秷鑰椼�佷氦鏈熷亸宸眹鎬伙紝鐢ㄤ簬瀹氫綅寤舵湡鍘熷洜銆�
+ * 鍙e緞璇存槑锛�
+ * <ul>
+ *   <li>瀹為檯鑰楁椂 = 棣栨鎶ュ伐鍒版湯娆℃姤宸ワ紙鏃犳姤宸ュ垯涓虹┖锛屼笉鐢ㄨ鍒掑�间唬鏇匡級锛�</li>
+ *   <li>寤舵湡鍒ゅ畾 = 鏈鎶ュ伐鏃堕棿(鎴栧綋鍓嶆椂闂�) 鏅氫簬璁″垝瀹屾垚鏃堕棿锛�</li>
+ *   <li>寤舵湡鍘熷洜鍙垪鍙娴嬩俊鍙凤紙缂烘枡銆佸憡璀︺�佽澶囩绾裤�佹姤宸ユ粸鍚庯級锛屼笉鎺ㄦ柇绠$悊鍘熷洜銆�</li>
+ * </ul>
+ */
+@Slf4j
+@Service
+public class MesProTaskExecutionService {
+
+    @Resource private MesProTaskMapper taskMapper;
+    @Resource private MesProTaskIssueMapper taskIssueMapper;
+    @Resource private MesCollectRealtimeHistoryMapper historyMapper;
+    @Resource private MesCollectAlarmMapper alarmMapper;
+    @Resource private MesMdItemMapper itemMapper;
+    @Resource private MesMdUnitMeasureMapper unitMeasureMapper;
+
+    public MesProTaskExecutionRespVO getExecution(Long taskId) {
+        MesProTaskDO task = taskId == null ? null : taskMapper.selectById(taskId);
+        if (task == null) throw invalidParamException("鐢熶骇浠诲姟涓嶅瓨鍦�");
+
+        var resp = new MesProTaskExecutionRespVO();
+        resp.setTaskId(task.getId());
+        resp.setTaskCode(task.getCode());
+        resp.setTaskName(task.getName());
+        resp.setWorkOrderId(task.getWorkOrderId());
+        resp.setStatus(task.getStatus());
+        resp.setPlannedQuantity(task.getQuantity());
+        resp.setProducedQuantity(task.getProducedQuantity());
+        resp.setQualifyQuantity(task.getQualifyQuantity());
+        resp.setUnqualifyQuantity(task.getUnqualifyQuantity());
+        resp.setStartTime(task.getStartTime());
+        resp.setFirstFeedbackTime(task.getFirstFeedbackTime());
+        resp.setLastFeedbackTime(task.getLastFeedbackTime());
+        resp.setFinishDate(task.getFinishDate());
+        resp.setPlannedDuration(task.getDuration());
+
+        // 瀹屾垚鐜�
+        if (task.getQuantity() != null && task.getQuantity().signum() > 0 && task.getProducedQuantity() != null) {
+            resp.setCompletionRate(task.getProducedQuantity()
+                    .multiply(BigDecimal.valueOf(100))
+                    .divide(task.getQuantity(), 2, RoundingMode.HALF_UP));
+        }
+
+        // 瀹為檯鑰楁椂
+        if (task.getFirstFeedbackTime() != null && task.getLastFeedbackTime() != null) {
+            resp.setActualDuration(Duration.between(task.getFirstFeedbackTime(), task.getLastFeedbackTime()).toMinutes());
+        }
+
+        // 璁惧杩愯鏁版嵁
+        List<MesCollectRealtimeHistoryDO> history = historyMapper.selectList(
+                new LambdaQueryWrapperX<MesCollectRealtimeHistoryDO>()
+                        .eq(MesCollectRealtimeHistoryDO::getTaskId, taskId));
+        List<MesProTaskExecutionRespVO.DeviceRun> deviceRuns = new ArrayList<>();
+        Map<Long, List<MesCollectRealtimeHistoryDO>> byMachinery = history.stream()
+                .filter(h -> h.getMachineryId() != null)
+                .collect(Collectors.groupingBy(MesCollectRealtimeHistoryDO::getMachineryId));
+        for (var e : byMachinery.entrySet()) {
+            List<MesCollectRealtimeHistoryDO> list = e.getValue();
+            var run = new MesProTaskExecutionRespVO.DeviceRun();
+            run.setMachineryId(e.getKey());
+            run.setDeviceCode(list.get(0).getDeviceCode());
+            run.setSampleCount((long) list.size());
+            run.setTotalRunTime(list.stream().map(MesCollectRealtimeHistoryDO::getOt)
+                    .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+            MesCollectRealtimeHistoryDO last = list.stream()
+                    .max(Comparator.comparing(MesCollectRealtimeHistoryDO::getCollectTime,
+                            Comparator.nullsFirst(Comparator.naturalOrder()))).orElse(null);
+            if (last != null) {
+                run.setLastCollectTime(last.getCollectTime());
+                run.setLastRunStatus(last.getSts());
+            }
+            run.setAlarmCount(alarmMapper.selectCount(new LambdaQueryWrapperX<MesCollectAlarmDO>()
+                    .eq(MesCollectAlarmDO::getTaskId, taskId)
+                    .eq(MesCollectAlarmDO::getMachineryId, e.getKey())));
+            deviceRuns.add(run);
+        }
+        resp.setDeviceRuns(deviceRuns);
+
+        // 鐗╂枡娑堣��
+        List<MesProTaskIssueDO> issues = taskIssueMapper.selectList(
+                new LambdaQueryWrapperX<MesProTaskIssueDO>().eq(MesProTaskIssueDO::getTaskId, taskId));
+        Set<Long> itemIds = issues.stream().map(MesProTaskIssueDO::getItemId)
+                .filter(Objects::nonNull).collect(Collectors.toSet());
+        Map<Long, MesMdItemDO> itemMap = itemIds.isEmpty() ? Map.of()
+                : itemMapper.selectBatchIds(itemIds).stream()
+                    .collect(Collectors.toMap(MesMdItemDO::getId, i -> i, (a, b) -> a));
+        Set<Long> unitIds = itemMap.values().stream().map(MesMdItemDO::getUnitMeasureId)
+                .filter(Objects::nonNull).collect(Collectors.toSet());
+        Map<Long, String> unitNameMap = unitIds.isEmpty() ? Map.of()
+                : unitMeasureMapper.selectBatchIds(unitIds).stream()
+                    .collect(Collectors.toMap(MesMdUnitMeasureDO::getId, MesMdUnitMeasureDO::getName, (a, b) -> a));
+        Map<Long, MesProTaskExecutionRespVO.MaterialConsumption> consumptionMap = new LinkedHashMap<>();
+        for (MesProTaskIssueDO issue : issues) {
+            if (issue.getItemId() == null) continue;
+            var mc = consumptionMap.computeIfAbsent(issue.getItemId(), id -> {
+                var item = new MesProTaskExecutionRespVO.MaterialConsumption();
+                item.setItemId(id);
+                MesMdItemDO md = itemMap.get(id);
+                if (md != null) {
+                    item.setItemCode(md.getCode());
+                    item.setItemName(md.getName());
+                    if (md.getUnitMeasureId() != null) item.setUnit(unitNameMap.get(md.getUnitMeasureId()));
+                }
+                item.setQuantity(BigDecimal.ZERO);
+                return item;
+            });
+            BigDecimal used = issue.getUsedQuantity() != null ? issue.getUsedQuantity()
+                    : (issue.getIssuedQuantity() != null ? issue.getIssuedQuantity() : BigDecimal.ZERO);
+            mc.setQuantity(mc.getQuantity().add(used));
+        }
+        resp.setMaterialConsumptions(new ArrayList<>(consumptionMap.values()));
+
+        // 浜ゆ湡鍋忓樊
+        boolean delayed = false;
+        Long delayDays = null;
+        LocalDateTime reference = task.getLastFeedbackTime() != null ? task.getLastFeedbackTime() : LocalDateTime.now();
+        if (task.getFinishDate() != null && reference.isAfter(task.getFinishDate())) {
+            delayed = true;
+            delayDays = Duration.between(task.getFinishDate(), reference).toDays();
+        }
+        resp.setDelayed(delayed);
+        resp.setDelayDays(delayDays);
+
+        // 寤舵湡鍘熷洜锛堝彲瑙傛祴淇″彿锛�
+        List<String> causes = new ArrayList<>();
+        if (delayed) {
+            if (deviceRuns.stream().anyMatch(r -> r.getAlarmCount() != null && r.getAlarmCount() > 0))
+                causes.add("鎵ц鏈熼棿瀛樺湪璁惧鍛婅锛屽彲鑳藉奖鍝嶈繘搴�");
+            if (task.getFirstFeedbackTime() == null)
+                causes.add("浠诲姟灏氭湭棣栨鎶ュ伐锛屽疄闄呭紑宸ユ椂闂寸己澶�");
+            else if (task.getStartTime() != null && task.getFirstFeedbackTime().isAfter(task.getStartTime().plusDays(1)))
+                causes.add("棣栨鎶ュ伐鏃堕棿鏄庢樉鏅氫簬璁″垝寮�濮嬫椂闂�");
+            boolean hasShortage = issues.stream().anyMatch(i ->
+                    i.getIssuedQuantity() != null && i.getUsedQuantity() != null
+                            && i.getUsedQuantity().compareTo(i.getIssuedQuantity()) >= 0);
+            if (hasShortage) causes.add("鎶曟枡閲忓凡鐢ㄥ敖锛屽瓨鍦ㄧ己鏂欏仠宸ュ彲鑳�");
+            if (deviceRuns.isEmpty()) causes.add("鏃犺澶囬噰闆嗘暟鎹紝鏃犳硶鍒ゆ柇璁惧渚у奖鍝�");
+            if (task.getDuration() != null && resp.getActualDuration() != null
+                    && resp.getActualDuration() > task.getDuration())
+                causes.add(String.format("瀹為檯鑰楁椂 %d 鍒嗛挓瓒呰繃璁″垝 %d 鍒嗛挓", resp.getActualDuration(), task.getDuration()));
+        }
+        resp.setDelayCauses(causes);
+        return resp;
+    }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskSourceService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskSourceService.java
index 66df97c..376fe47 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskSourceService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRiskSourceService.java
@@ -3,24 +3,47 @@
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.mes.controller.admin.safety.vo.risk.SafetyRiskSourceSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.collect.MesCollectRealtimeDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.safety.SafetyRiskSourceDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.collect.MesCollectRealtimeMapper;
 import cn.iocoder.yudao.module.mes.dal.mysql.safety.SafetyRiskSourceMapper;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Objects;
+import java.util.*;
+import tools.jackson.core.type.TypeReference;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.invalidParamException;
 
+/**
+ * 瀹夊叏鐢熶骇 - 鍗遍櫓婧愮洃娴嬨��
+ *
+ * <p>鏀寔涓ょ鏁版嵁鏉ユ簮锛�
+ * <ol>
+ *   <li>浜哄伐褰曞叆 currentValue锛氫粎琛ㄧず浜哄伐鎶勫綍鐨勫綋鍓嶅�硷紱</li>
+ *   <li>缁戝畾璁惧锛坢achineryId + metricKey锛夛細鐢辨暟閲囧疄鏃惰〃鑷姩鍙栧�硷紝澶嶇敤鐜版湁璁惧閲囬泦锛屼笉寮曞叆鏂版帴鍙c��</li>
+ * </ol>
+ */
+@Slf4j
 @Service public class SafetyRiskSourceService {
     @Resource private SafetyRiskSourceMapper mapper;
+    @Resource private MesCollectRealtimeMapper realtimeMapper;
+
     public PageResult<SafetyRiskSourceDO> page(PageParam page, String name) {
         return mapper.selectPage(page, new LambdaQueryWrapperX<SafetyRiskSourceDO>().likeIfPresent(SafetyRiskSourceDO::getName,name).orderByDesc(SafetyRiskSourceDO::getId));
     }
+
     @Transactional(rollbackFor=Exception.class)
     public Long save(SafetyRiskSourceSaveReqVO req) {
         SafetyRiskSourceDO old = req.getId()==null ? null : mapper.selectById(req.getId());
         if (req.getId()!=null && old==null) throw invalidParamException("鍗遍櫓婧愪笉瀛樺湪");
+        if (req.getMachineryId()!=null && (req.getMetricKey()==null || req.getMetricKey().isBlank()))
+            throw invalidParamException("缁戝畾璁惧鍚庡繀椤诲~鍐欐暟閲囨寚鏍囬敭");
+        if (req.getMachineryId()==null && req.getMetricKey()!=null && !req.getMetricKey().isBlank())
+            throw invalidParamException("濉啓鏁伴噰鎸囨爣閿墠璇峰厛缁戝畾璁惧");
         String status;
         try { status=SafetyRiskThreshold.evaluate(req.getCurrentValue(),req.getLowerLimit(),req.getUpperLimit()); }
         catch (IllegalArgumentException e) { throw invalidParamException(e.getMessage()); }
@@ -30,5 +53,78 @@
         if (old==null) mapper.insert(row); else mapper.updateById(row);
         return row.getId();
     }
+
     public void delete(Long id) { if (mapper.selectById(id)==null) throw invalidParamException("鍗遍櫓婧愪笉瀛樺湪"); mapper.deleteById(id); }
+
+    /**
+     * 鐢ㄨ澶囬噰闆嗘暟鎹埛鏂版墍鏈夊凡缁戝畾璁惧鐨勫嵄闄╂簮銆�
+     *
+     * <p>鍙栧�奸『搴忥細data_json 涓� metricKey 瀵瑰簲瀛楁锛涙湭鍙栧埌鏃剁疆 UNKNOWN 骞朵繚鐣欎笂娆¤娴嬫椂闂翠笉鍙樸��
+     *
+     * @return 鏈鍒锋柊鍚庡浜� ALARM 鐘舵�佺殑鍗遍櫓婧�
+     */
+    @Transactional(rollbackFor=Exception.class)
+    public List<SafetyRiskSourceDO> refreshFromCollect() {
+        List<SafetyRiskSourceDO> bound = mapper.selectList(new LambdaQueryWrapperX<SafetyRiskSourceDO>()
+                .isNotNull(SafetyRiskSourceDO::getMachineryId));
+        List<SafetyRiskSourceDO> alarms = new ArrayList<>();
+        Map<Long, MesCollectRealtimeDO> cache = new HashMap<>();
+        for (SafetyRiskSourceDO source : bound) {
+            MesCollectRealtimeDO realtime = cache.computeIfAbsent(source.getMachineryId(), id ->
+                    realtimeMapper.selectOne(new LambdaQueryWrapperX<MesCollectRealtimeDO>()
+                            .eq(MesCollectRealtimeDO::getMachineryId, id)
+                            .orderByDesc(MesCollectRealtimeDO::getCollectTime).last("LIMIT 1")));
+            BigDecimal value = realtime == null ? null : extractMetric(realtime, source.getMetricKey());
+            String status;
+            try { status = SafetyRiskThreshold.evaluate(value, source.getLowerLimit(), source.getUpperLimit()); }
+            catch (IllegalArgumentException e) { log.warn("鍗遍櫓婧怺{}]闃堝�奸厤缃潪娉曪細{}", source.getName(), e.getMessage()); continue; }
+            if (value == null) {
+                // 鍙栦笉鍒伴噰闆嗗�硷細涓嶈鐩栧巻鍙茶娴嬫椂闂达紝閬垮厤浼�犳暟鎹�
+                if (!"UNKNOWN".equals(source.getRiskStatus())) {
+                    var upd = new SafetyRiskSourceDO();
+                    upd.setId(source.getId()); upd.setRiskStatus(status);
+                    mapper.updateById(upd);
+                    source.setRiskStatus(status);
+                }
+                continue;
+            }
+            var upd = new SafetyRiskSourceDO();
+            upd.setId(source.getId());
+            upd.setCurrentValue(value);
+            upd.setObservedAt(realtime.getCollectTime() == null ? LocalDateTime.now() : realtime.getCollectTime());
+            upd.setRiskStatus(status);
+            mapper.updateById(upd);
+            source.setCurrentValue(value);
+            source.setObservedAt(upd.getObservedAt());
+            source.setRiskStatus(status);
+            if ("ALARM".equals(status)) alarms.add(source);
+        }
+        return alarms;
+    }
+
+    /** 浠庡疄鏃堕噰闆嗚褰曚腑鎻愬彇鎸囨爣鍊硷紱浼樺厛 data_json锛屽叾娆″鐢ㄥ疄鏃惰〃鐨勬爣鍑嗗瓧娈点�� */
+    BigDecimal extractMetric(MesCollectRealtimeDO realtime, String metricKey) {
+        if (metricKey == null || metricKey.isBlank() || realtime == null) return null;
+        String json = realtime.getDataJson();
+        if (json != null && !json.isBlank()) {
+            try {
+                Map<String, Object> map = JsonUtils.parseObjectQuietly(json, new TypeReference<Map<String, Object>>() {});
+                Object raw = map == null ? null : map.get(metricKey);
+                if (raw != null) {
+                    if (raw instanceof Number n) return new BigDecimal(n.toString());
+                    String text = raw.toString().trim();
+                    if (!text.isEmpty()) return new BigDecimal(text);
+                }
+            } catch (Exception e) {
+                log.debug("瑙f瀽鏁伴噰 data_json 澶辫触锛宮achineryId={}锛歿}", realtime.getMachineryId(), e.getMessage());
+            }
+        }
+        // 鍏煎锛歮etricKey 鐩存帴鍙栧疄鏃惰〃瀛楁锛坥t 杩愯鏃堕暱绛夛級
+        return switch (metricKey) {
+            case "ot" -> realtime.getOt();
+            case "sts" -> realtime.getSts() == null ? null : BigDecimal.valueOf(realtime.getSts());
+            case "opm" -> realtime.getOpm() == null ? null : BigDecimal.valueOf(realtime.getOpm());
+            default -> null;
+        };
+    }
 }
diff --git a/yudao-module-srm-api/src/main/java/cn/iocoder/yudao/module/srm/api/certificate/SrmSupplierCertificateApi.java b/yudao-module-srm-api/src/main/java/cn/iocoder/yudao/module/srm/api/certificate/SrmSupplierCertificateApi.java
new file mode 100644
index 0000000..4ce26c2
--- /dev/null
+++ b/yudao-module-srm-api/src/main/java/cn/iocoder/yudao/module/srm/api/certificate/SrmSupplierCertificateApi.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.srm.api.certificate;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.srm.api.certificate.dto.SrmSupplierCertificateRespDTO;
+
+import java.util.List;
+
+/**
+ * 渚涘簲鍟嗗悎瑙勮瘉涔� API锛堜緵 MES 璐ㄩ噺杩芥函绛夎法妯″潡鍙璋冪敤锛�
+ */
+public interface SrmSupplierCertificateApi {
+
+    String PREFIX = "/rpc-api/srm/supplier-certificate";
+
+    /**
+     * 鎸変緵搴斿晢鏌ヨ璇佷功鍒楄〃
+     *
+     * @param supplierId 渚涘簲鍟嗙紪鍙�
+     * @return 璇佷功鍒楄〃锛堝惈鏄惁杩囨湡鏍囪锛�
+     */
+    CommonResult<List<SrmSupplierCertificateRespDTO>> getCertificatesBySupplierId(Long supplierId);
+}
diff --git a/yudao-module-srm-api/src/main/java/cn/iocoder/yudao/module/srm/api/certificate/dto/SrmSupplierCertificateRespDTO.java b/yudao-module-srm-api/src/main/java/cn/iocoder/yudao/module/srm/api/certificate/dto/SrmSupplierCertificateRespDTO.java
new file mode 100644
index 0000000..7a6e8d5
--- /dev/null
+++ b/yudao-module-srm-api/src/main/java/cn/iocoder/yudao/module/srm/api/certificate/dto/SrmSupplierCertificateRespDTO.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.srm.api.certificate.dto;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * 渚涘簲鍟嗗悎瑙勮瘉涔︼紙璺ㄦā鍧楀彧璇昏鍥撅級
+ */
+@Data
+public class SrmSupplierCertificateRespDTO {
+    private Long id;
+    private Long supplierId;
+    /** 璇佷功绫诲瀷锛堝瓧鍏� srm_supplier_certificate_type锛� */
+    private Integer certificateType;
+    private String certificateName;
+    private String certificateNo;
+    private String issuingAuthority;
+    private LocalDate validStartDate;
+    private LocalDate validEndDate;
+    /** 0 鏈夋晥 1 鍋滅敤 */
+    private Integer status;
+    private Boolean expired;
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/api/certificate/SrmSupplierCertificateApiImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/api/certificate/SrmSupplierCertificateApiImpl.java
new file mode 100644
index 0000000..baf69d5
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/api/certificate/SrmSupplierCertificateApiImpl.java
@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.module.srm.api.certificate;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.srm.api.certificate.dto.SrmSupplierCertificateRespDTO;
+import cn.iocoder.yudao.module.srm.dal.dataobject.SrmSupplierCertificateDO;
+import cn.iocoder.yudao.module.srm.dal.mysql.SrmSupplierCertificateMapper;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDate;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * 渚涘簲鍟嗗悎瑙勮瘉涔� API 瀹炵幇
+ */
+@RestController
+@Validated
+public class SrmSupplierCertificateApiImpl implements SrmSupplierCertificateApi {
+
+    @Resource
+    private SrmSupplierCertificateMapper certificateMapper;
+
+    @Override
+    public CommonResult<List<SrmSupplierCertificateRespDTO>> getCertificatesBySupplierId(Long supplierId) {
+        if (supplierId == null) return success(List.of());
+        List<SrmSupplierCertificateDO> list = certificateMapper.selectList(
+                new LambdaQueryWrapperX<SrmSupplierCertificateDO>()
+                        .eq(SrmSupplierCertificateDO::getSupplierId, supplierId)
+                        .orderByDesc(SrmSupplierCertificateDO::getId));
+        LocalDate today = LocalDate.now();
+        return success(list.stream().map(d -> {
+            var dto = BeanUtils.toBean(d, SrmSupplierCertificateRespDTO.class);
+            dto.setExpired(d.getValidEndDate() != null && d.getValidEndDate().isBefore(today));
+            return dto;
+        }).toList());
+    }
+}
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
index c47cca8..c6eddaa 100644
--- 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
@@ -1,8 +1,13 @@
 package cn.iocoder.yudao.module.srm.controller.admin.statistics;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.srm.controller.admin.statistics.vo.SrmCostAnalysisRespVO;
 import cn.iocoder.yudao.module.srm.controller.admin.statistics.vo.SrmTenderStatisticsRespVO;
+import cn.iocoder.yudao.module.srm.service.statistics.SrmCostAnalysisService;
 import cn.iocoder.yudao.module.srm.service.statistics.SrmStatisticsService;
+import jakarta.validation.Valid;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
@@ -20,6 +25,8 @@
 
     @Resource
     private SrmStatisticsService statisticsService;
+    @Resource
+    private SrmCostAnalysisService costAnalysisService;
 
     @GetMapping("/tender")
     @Operation(summary = "鑾峰彇鎷涙爣缁熻鏁版嵁")
@@ -28,4 +35,22 @@
         return success(statisticsService.getTenderStatistics(year));
     }
 
+    @GetMapping("/cost-analysis")
+    @Operation(summary = "閲囪喘鎴愭湰鍒嗘瀽",
+            description = "鍩轰簬 SRM 鎷涙爣闇�姹傞噺涓庝緵搴斿晢鎶ヤ环鑱氬悎锛氶噰璐噺銆佸姞鏉冨潎浠枫�佹渶浣�/鏈�楂樹环銆佷环鏍煎彉鍔紱涓嶄緷璧� ERP")
+    @PreAuthorize("@ss.hasPermission('srm:statistics:query')")
+    public CommonResult<PageResult<SrmCostAnalysisRespVO>> getCostAnalysis(
+            @Valid PageParam page,
+            @RequestParam(value = "productName", required = false) String productName) {
+        return success(costAnalysisService.page(page, productName));
+    }
+
+    @GetMapping("/cost-trend")
+    @Operation(summary = "鐗╂枡浠锋牸瓒嬪娍", description = "鎸夋湀姹囨�昏鐗╂枡鐨勫钩鍧囨姤浠�")
+    @PreAuthorize("@ss.hasPermission('srm:statistics:query')")
+    public CommonResult<java.util.List<SrmCostAnalysisRespVO.TrendPoint>> getCostTrend(
+            @RequestParam("productId") Long productId) {
+        return success(costAnalysisService.trend(productId));
+    }
+
 }
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/statistics/vo/SrmCostAnalysisRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/statistics/vo/SrmCostAnalysisRespVO.java
new file mode 100644
index 0000000..952c701
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/statistics/vo/SrmCostAnalysisRespVO.java
@@ -0,0 +1,84 @@
+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;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 閲囪喘鎴愭湰鍒嗘瀽 Response VO銆�
+ *
+ * <p>鏁版嵁鏉ユ簮锛歋RM 鎷涙爣鐗╂枡闇�姹傦紙鏁伴噺銆侀浼板崟浠凤級+ 渚涘簲鍟嗘姤浠凤紙鍚◣鍗曚环銆佺◣鐜囷級銆�
+ * 涓嶄緷璧� ERP 閲囪喘璁㈠崟锛岄�傜敤浜庢湭鍚敤 ERP 鐨勯」鐩��
+ */
+@Schema(description = "绠$悊鍚庡彴 - 閲囪喘鎴愭湰鍒嗘瀽 Response VO")
+@Data
+public class SrmCostAnalysisRespVO {
+
+    @Schema(description = "鐗╂枡缂栧彿")
+    private Long productId;
+    @Schema(description = "鐗╂枡缂栫爜")
+    private String productCode;
+    @Schema(description = "鐗╂枡鍚嶇О")
+    private String productName;
+    @Schema(description = "瑙勬牸")
+    private String productSpec;
+    @Schema(description = "鍗曚綅")
+    private String unit;
+
+    @Schema(description = "閲囪喘闇�姹傞噺")
+    private BigDecimal totalQuantity;
+    @Schema(description = "鎶ヤ环娆℃暟")
+    private Integer quoteCount;
+    @Schema(description = "鍙備笌鎶ヤ环鐨勪緵搴斿晢鏁�")
+    private Integer supplierCount;
+
+    @Schema(description = "鍔犳潈骞冲潎鎶ヤ环锛堟寜闇�姹傞噺鍔犳潈锛�")
+    private BigDecimal weightedAvgPrice;
+    @Schema(description = "鏈�浣庢姤浠�")
+    private BigDecimal minPrice;
+    @Schema(description = "鏈�楂樻姤浠�")
+    private BigDecimal maxPrice;
+    @Schema(description = "棰勪及鍗曚环")
+    private BigDecimal estimatedPrice;
+    @Schema(description = "鐩稿棰勪及浠风殑鍋忓樊鐜囷紙%锛�")
+    private BigDecimal deviationRate;
+
+    @Schema(description = "鏈�杩戞姤浠锋椂闂�")
+    private LocalDateTime lastQuoteTime;
+    @Schema(description = "浠锋牸鍙樺姩锛堟渶杩戜袱娆℃姤浠峰樊锛�")
+    private BigDecimal priceChange;
+
+    @Schema(description = "鎶ヤ环鏄庣粏")
+    private List<QuoteItem> quotes;
+
+    @Schema(description = "鎶ヤ环鏄庣粏椤�")
+    @Data
+    public static class QuoteItem {
+        @Schema(description = "渚涘簲鍟嗙紪鍙�")
+        private Long supplierId;
+        @Schema(description = "渚涘簲鍟嗗悕绉�")
+        private String supplierName;
+        @Schema(description = "鎶ヤ环鍗曚环")
+        private BigDecimal quotePrice;
+        @Schema(description = "绋庣巼锛�%锛�")
+        private BigDecimal taxRate;
+        @Schema(description = "浜ゆ湡锛堝ぉ锛�")
+        private Integer deliveryCycle;
+        @Schema(description = "鎶ヤ环鏃堕棿")
+        private LocalDateTime quoteTime;
+    }
+
+    @Schema(description = "浠锋牸瓒嬪娍鐐�")
+    @Data
+    public static class TrendPoint {
+        @Schema(description = "鏈堜唤 yyyy-MM")
+        private String month;
+        @Schema(description = "骞冲潎鎶ヤ环")
+        private BigDecimal avgPrice;
+        @Schema(description = "鎶ヤ环娆℃暟")
+        private Integer count;
+    }
+}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/statistics/SrmCostAnalysisService.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/statistics/SrmCostAnalysisService.java
new file mode 100644
index 0000000..68ecc54
--- /dev/null
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/statistics/SrmCostAnalysisService.java
@@ -0,0 +1,183 @@
+package cn.iocoder.yudao.module.srm.service.statistics;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.srm.controller.admin.statistics.vo.SrmCostAnalysisRespVO;
+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.SrmTenderMaterialDO;
+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.SrmTenderMaterialMapper;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.time.YearMonth;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 閲囪喘鎴愭湰鍒嗘瀽锛堝熀浜� SRM 鎷涙爣闇�姹備笌渚涘簲鍟嗘姤浠凤級銆�
+ *
+ * <p>鍙e緞璇存槑锛�
+ * <ul>
+ *   <li>閲囪喘闇�姹傞噺鍙栨嫑鏍囩墿鏂欓渶姹傛暟閲忓悎璁★紱</li>
+ *   <li>鍔犳潈鍧囦环 = 危(鎶ヤ环鍗曚环 脳 闇�姹傛暟閲�) / 危(闇�姹傛暟閲�)锛屽渚涘簲鍟嗘姤浠蜂竴骞惰鍏ワ紱</li>
+ *   <li>浠锋牸鍙樺姩 = 鏈�杩戜袱娆℃姤浠蜂箣宸紱涓嶈冻涓ゆ鏃朵负绌猴紱</li>
+ *   <li>涓嶄緷璧� ERP 閲囪喘璁㈠崟锛屾湭鍚敤 ERP 鐨勯」鐩悓鏍峰彲鐢ㄣ��</li>
+ * </ul>
+ */
+@Slf4j
+@Service
+public class SrmCostAnalysisService {
+
+    @Resource private SrmTenderMaterialMapper tenderMaterialMapper;
+    @Resource private SrmSupplierQuoteMapper supplierQuoteMapper;
+    @Resource private SrmSupplierMapper supplierMapper;
+
+    public PageResult<SrmCostAnalysisRespVO> page(PageParam page, String productName) {
+        List<SrmTenderMaterialDO> materials = tenderMaterialMapper.selectList(
+                new LambdaQueryWrapperX<SrmTenderMaterialDO>()
+                        .likeIfPresent(SrmTenderMaterialDO::getProductName, productName));
+        if (materials.isEmpty()) return PageResult.empty();
+
+        // 鎸夌墿鏂欒仛鍚堬紙鍚屼竴鐗╂枡鍙兘鍑虹幇鍦ㄥ涓嫑鏍囬」鐩級
+        Map<String, List<SrmTenderMaterialDO>> grouped = materials.stream()
+                .filter(m -> m.getProductId() != null || m.getProductName() != null)
+                .collect(Collectors.groupingBy(
+                        m -> m.getProductId() != null ? "ID:" + m.getProductId() : "NAME:" + m.getProductName(),
+                        LinkedHashMap::new, Collectors.toList()));
+
+        List<SrmCostAnalysisRespVO> rows = new ArrayList<>();
+        for (var entry : grouped.entrySet()) {
+            List<SrmTenderMaterialDO> group = entry.getValue();
+            SrmTenderMaterialDO first = group.get(0);
+            Set<Long> materialIds = group.stream().map(SrmTenderMaterialDO::getId)
+                    .filter(Objects::nonNull).collect(Collectors.toSet());
+            if (materialIds.isEmpty()) continue;
+
+            List<SrmSupplierQuoteDO> quotes = supplierQuoteMapper.selectList(
+                    new LambdaQueryWrapperX<SrmSupplierQuoteDO>()
+                            .in(SrmSupplierQuoteDO::getTenderMaterialId, materialIds));
+            if (quotes.isEmpty()) continue;
+
+            // 闇�姹傛暟閲忔槧灏�
+            Map<Long, BigDecimal> qtyMap = group.stream()
+                    .filter(m -> m.getId() != null)
+                    .collect(Collectors.toMap(SrmTenderMaterialDO::getId,
+                            m -> m.getQuantity() == null ? BigDecimal.ZERO : m.getQuantity(), (a, b) -> a));
+
+            BigDecimal totalQty = qtyMap.values().stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal weightedSum = BigDecimal.ZERO;
+            BigDecimal weightQty = BigDecimal.ZERO;
+            for (SrmSupplierQuoteDO q : quotes) {
+                if (q.getQuotePrice() == null) continue;
+                BigDecimal qty = qtyMap.getOrDefault(q.getTenderMaterialId(), BigDecimal.ZERO);
+                if (qty.signum() <= 0) continue;
+                weightedSum = weightedSum.add(q.getQuotePrice().multiply(qty));
+                weightQty = weightQty.add(qty);
+            }
+
+            var row = new SrmCostAnalysisRespVO();
+            row.setProductId(first.getProductId());
+            row.setProductCode(first.getProductCode());
+            row.setProductName(first.getProductName());
+            row.setProductSpec(first.getProductSpec());
+            row.setUnit(first.getUnit());
+            row.setTotalQuantity(totalQty);
+            row.setEstimatedPrice(first.getEstimatedPrice());
+            row.setQuoteCount(quotes.size());
+            row.setSupplierCount((int) quotes.stream().map(SrmSupplierQuoteDO::getSupplierId)
+                    .filter(Objects::nonNull).distinct().count());
+            row.setWeightedAvgPrice(weightQty.signum() > 0
+                    ? weightedSum.divide(weightQty, 4, RoundingMode.HALF_UP) : null);
+            row.setMinPrice(quotes.stream().map(SrmSupplierQuoteDO::getQuotePrice)
+                    .filter(Objects::nonNull).min(Comparator.naturalOrder()).orElse(null));
+            row.setMaxPrice(quotes.stream().map(SrmSupplierQuoteDO::getQuotePrice)
+                    .filter(Objects::nonNull).max(Comparator.naturalOrder()).orElse(null));
+            if (first.getEstimatedPrice() != null && first.getEstimatedPrice().signum() > 0
+                    && row.getWeightedAvgPrice() != null) {
+                row.setDeviationRate(row.getWeightedAvgPrice().subtract(first.getEstimatedPrice())
+                        .multiply(BigDecimal.valueOf(100))
+                        .divide(first.getEstimatedPrice(), 2, RoundingMode.HALF_UP));
+            }
+
+            // 鎶ヤ环鎺掑簭锛堟寜鍒涘缓鏃堕棿锛�
+            List<SrmSupplierQuoteDO> ordered = quotes.stream()
+                    .filter(q -> q.getQuotePrice() != null)
+                    .sorted(Comparator.comparing(SrmSupplierQuoteDO::getCreateTime,
+                            Comparator.nullsFirst(Comparator.naturalOrder())))
+                    .toList();
+            if (!ordered.isEmpty()) {
+                row.setLastQuoteTime(ordered.get(ordered.size() - 1).getCreateTime());
+                if (ordered.size() >= 2) {
+                    row.setPriceChange(ordered.get(ordered.size() - 1).getQuotePrice()
+                            .subtract(ordered.get(ordered.size() - 2).getQuotePrice()));
+                }
+            }
+
+            // 渚涘簲鍟嗗悕绉�
+            Set<Long> supplierIds = quotes.stream().map(SrmSupplierQuoteDO::getSupplierId)
+                    .filter(Objects::nonNull).collect(Collectors.toSet());
+            Map<Long, String> supplierNames = supplierIds.isEmpty() ? Map.of()
+                    : supplierMapper.selectByIds(supplierIds).stream()
+                        .collect(Collectors.toMap(SrmSupplierDO::getId, SrmSupplierDO::getName, (a, b) -> a));
+            row.setQuotes(quotes.stream().map(q -> {
+                var item = new SrmCostAnalysisRespVO.QuoteItem();
+                item.setSupplierId(q.getSupplierId());
+                item.setSupplierName(supplierNames.get(q.getSupplierId()));
+                item.setQuotePrice(q.getQuotePrice());
+                item.setTaxRate(q.getTaxRate());
+                item.setDeliveryCycle(q.getDeliveryCycle());
+                item.setQuoteTime(q.getCreateTime());
+                return item;
+            }).toList());
+            rows.add(row);
+        }
+
+        // 鎵嬪姩鍒嗛〉
+        rows.sort((a, b) -> {
+            BigDecimal pa = a.getWeightedAvgPrice() == null ? BigDecimal.ZERO : a.getWeightedAvgPrice();
+            BigDecimal pb = b.getWeightedAvgPrice() == null ? BigDecimal.ZERO : b.getWeightedAvgPrice();
+            return pb.compareTo(pa);
+        });
+        int total = rows.size();
+        int from = Math.min((page.getPageNo() - 1) * page.getPageSize(), total);
+        int to = Math.min(from + page.getPageSize(), total);
+        return new PageResult<>(rows.subList(from, to), (long) total);
+    }
+
+    /** 鍗曠墿鏂欐姤浠疯秼鍔匡紙鎸夋湀骞冲潎鎶ヤ环锛� */
+    public List<SrmCostAnalysisRespVO.TrendPoint> trend(Long productId) {
+        if (productId == null) return List.of();
+        List<SrmTenderMaterialDO> materials = tenderMaterialMapper.selectList(
+                new LambdaQueryWrapperX<SrmTenderMaterialDO>().eq(SrmTenderMaterialDO::getProductId, productId));
+        Set<Long> materialIds = materials.stream().map(SrmTenderMaterialDO::getId)
+                .filter(Objects::nonNull).collect(Collectors.toSet());
+        if (materialIds.isEmpty()) return List.of();
+        List<SrmSupplierQuoteDO> quotes = supplierQuoteMapper.selectList(
+                new LambdaQueryWrapperX<SrmSupplierQuoteDO>()
+                        .in(SrmSupplierQuoteDO::getTenderMaterialId, materialIds));
+        Map<YearMonth, List<BigDecimal>> byMonth = new TreeMap<>();
+        for (SrmSupplierQuoteDO q : quotes) {
+            if (q.getQuotePrice() == null || q.getCreateTime() == null) continue;
+            byMonth.computeIfAbsent(YearMonth.from(q.getCreateTime()), k -> new ArrayList<>())
+                    .add(q.getQuotePrice());
+        }
+        List<SrmCostAnalysisRespVO.TrendPoint> result = new ArrayList<>();
+        byMonth.forEach((month, prices) -> {
+            var p = new SrmCostAnalysisRespVO.TrendPoint();
+            p.setMonth(month.toString());
+            p.setCount(prices.size());
+            p.setAvgPrice(prices.stream().reduce(BigDecimal.ZERO, BigDecimal::add)
+                    .divide(BigDecimal.valueOf(prices.size()), 4, RoundingMode.HALF_UP));
+            result.add(p);
+        });
+        return result;
+    }
+}

--
Gitblit v1.9.3