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/RawMaterialOrderService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java
index 3cc8a95..7164013 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java
@@ -43,7 +43,7 @@
      */
     IPage<IfsInventoryQuantityDto> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page, IfsInventoryQuantityDto ifsInventoryQuantityDto);
 
-    int inspectionReport(List<Long> ids);
+    int inspectionReport(List<Long> ids,String orderType,String materialProp);
 
     int revokeInspectionReport(Long id);
 
@@ -156,4 +156,6 @@
     Result importSplitOrderData(MultipartFile file, Long ifsId, HttpServletRequest request);
 
     boolean confirmSplitOrder(OrderSplitDTO orderSplitDTO);
+
+    Long getOrderCountByIfsId(Long ifsId);
 }

--
Gitblit v1.9.3