From 6a939851b9561fea92ec29c59fa9e47ab9467ff7 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 14 一月 2026 17:48:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns
---
inspect-server/src/main/java/com/ruoyi/inspect/service/DataAnalysisService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/DataAnalysisService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/DataAnalysisService.java
index 20e4a0c..329880b 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/DataAnalysisService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/DataAnalysisService.java
@@ -3,6 +3,7 @@
import com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto;
import com.ruoyi.inspect.dto.DataAnalysisDto;
+import com.ruoyi.inspect.dto.MaterialPropTableDTO;
import com.ruoyi.inspect.vo.DeviationAnalyzeVo;
import com.ruoyi.inspect.vo.RawProductAnalysisVo;
@@ -18,18 +19,24 @@
public interface DataAnalysisService {
/**
- * 鏌ヨ鍘熸潗鏂欐煴鐘剁粺璁�
+ * 鏌ヨ鐗╂枡灞炴�ф煴鐘剁粺璁�
* @return
*/
List<Map<String, Object>> getRawPassRateByBarChart(DataAnalysisDto dataAnalysisDto);
/**
- * 鏌ヨ鍘熸潗鏂欏悎鏍肩巼楗肩姸鍥�
+ * 鏌ヨ鐗╂枡灞炴�у悎鏍肩巼楗肩姸鍥�
* @param dataAnalysisDto
* @return
*/
Map<String, Object> getRawPassRateByCake(DataAnalysisDto dataAnalysisDto);
+ /**
+ * 鏌ヨ鐗╂枡灞炴�у悎鏍肩巼楗肩姸鍥�
+ * @param dataAnalysisDto
+ * @return
+ */
+ List<MaterialPropTableDTO> getMaterialPropTable(DataAnalysisDto dataAnalysisDto);
/**
* 鏌ヨ妫�楠岄」鍚嶇О
--
Gitblit v1.9.3