From 31ccc9cd47f96cea6e4e13b078187fd3201c4666 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 04 九月 2026 16:35:24 +0800
Subject: [PATCH] feat(report): 更新检测报告模板并优化报告生成功能 - 优化设备信息展示格式,支持多设备列表显示 - 统一检测报告和检验报告使用新版模板格式

---
 inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
index 0959257..7c50a7c 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
@@ -43,16 +43,15 @@
 
     int upAll(MultipartFile file) throws IOException;
 
-    void isRawMaterial(InsOrder insOrder);
+    /**
+     *
+     * @param insOrder 妫�楠屽崟淇℃伅
+     * @param registerInsResults 鏄惁鐧昏妫�楠岀粨鏋�
+     * @param hasExemption 鏄惁鍏嶆
+     */
+    void isRawMaterial(InsOrder insOrder,Boolean registerInsResults,Boolean hasExemption);
 
     Long getUnqualifiedCount(InsOrder insOrder);
-
-    /**
-     * 绉诲簱鎿嶄綔
-     * @param one
-     * @return
-     */
-    String moveRawMaterial(IfsInventoryQuantity one);
 
     /**
      * 閫�鍥炲埌妫�楠屼换鍔�

--
Gitblit v1.9.3