From 82ce59218139d9fefeae7b9e5fbc88b499ff023f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 13:35:06 +0800
Subject: [PATCH] feat(inspect): 新增新聚检验订单编辑功能并优化报告生成流程 - 新增 updateNewJuInsOrder 接口支持新聚检验订单修改 - 增加文件上传大小限制至200MB，请求大小限制至400MB - 在设备信息中新增出厂编号字段显示 - 优化温湿度处理逻辑，报告中仅显示温度信息 - 新增印章管理功能，支持MA标志章、报告章和骑缝章配置 - 完善检验报告生成流程，增加多种报告类型常量定义 - 优化附件上传功能，增加空值检查和返回值处理 - 调整委托编号生成逻辑，完善新聚订单可编辑性判断 - 更新CNAS流程中报告编号使用正式报告编号替代委托编号
---
inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 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..9029a60 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;
/**
@@ -20,7 +22,7 @@
Map<String,Object> pageInsReport(Page page, ReportPageDto reportPageDto);
- void wordToPdf(String path,String sealUrl, boolean isRawMater);
+ void wordToPdf(String path, String maSealUrl, String seamSealUrl, boolean isRawMater);
int inReport(String url, Integer id);
@@ -33,24 +35,29 @@
int examineReport(Integer id, Integer isExamine, String examineTell, Integer userId);
//鎵瑰噯
- int ratifyReport(Integer id, Integer isRatify, String ratifyTell);
+ int ratifyReport(Integer id, Integer isRatify, String ratifyTell, String sealIds,
+ Integer maSealId, Integer reportSealId, Integer seamSealId);
int wordInsertUrl(Map<String, Object> map, String url);
String downAll(String ids);
+ /**
+ * 鍗曚唤鎶ュ憡 Word 涓嬭浇锛宺eportType锛�0妫�娴嬫姤鍛婏紝1妫�楠屾姤鍛婏紱createOrderUser 鐢ㄤ簬澶嶇敤鎶ュ憡缂栧埗鐨勬暟鎹寖鍥淬��
+ */
+ void download(Integer id, Integer reportType, Integer createOrderUser, HttpServletResponse response);
+
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 +65,11 @@
* @return
*/
boolean sendBackTask(Integer id);
+
+ /**
+ * 鎶ュ憡瀵煎嚭
+ * @param dto
+ * @param response
+ */
+ void reportAllExport(ReportPageDto dto, HttpServletResponse response) throws UnsupportedEncodingException;
}
--
Gitblit v1.9.3