From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理:辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单:标签打印功能调整 3.人员:培训计划导入导出添加【培训大类】字段 4.业务管理:报检新增【物料属性】字段选择,其余页面添加【物料属性】查询条件以及数据回显

---
 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