From fbd4ecb70baf2e671876ca809a81f6e6fe7342ee Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期日, 20 九月 2026 19:52:50 +0800
Subject: [PATCH] feat(inspect): 新增检测标准方法报告文本功能并优化报告生成 - 委托编号生成逻辑调整为下单时生成并校验唯一性,避免审核时重复 - 新增标准模板价格字段及对应的数据模型和数据库映射 - 订单费用详情查询逻辑重构为基于模板价格计算方式 - 新增标准模板与设备绑定关系的数据结构和管理功能 - 委托编号唯一性校验逻辑增强
---
inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java | 20 ++++++++++++--------
1 files changed, 12 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..5b504f4 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
@@ -41,18 +41,22 @@
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);
/**
* 閫�鍥炲埌妫�楠屼换鍔�
--
Gitblit v1.9.3