From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面:月度统计时间调整为上月26到本月25;班次支持右键添加批注 2.外购下单:KJNS域订单免检自动更新批次属性;外购下单-全部页新增【更新IFS批次属性】按钮,支持更新已提交订单的批次属性 3.资源要求-设备:设备核查计划:核查负责人回显问题修复;设备使用授权:检验项目导出数据错误问题修复
---
inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java | 24 ++++++++++++++++--------
1 files changed, 16 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 c082507..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
@@ -8,7 +8,9 @@
import com.ruoyi.inspect.pojo.InsReport;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.util.Map;
/**
@@ -41,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);
/**
* 閫�鍥炲埌妫�楠屼换鍔�
@@ -58,4 +59,11 @@
* @return
*/
boolean sendBackTask(Integer id);
+
+ /**
+ * 鎶ュ憡瀵煎嚭
+ * @param dto
+ * @param response
+ */
+ void reportAllExport(ReportPageDto dto, HttpServletResponse response) throws UnsupportedEncodingException;
}
--
Gitblit v1.9.3