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流程中报告编号使用正式报告编号替代委托编号
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
index ae6b0b4..20475eb 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
@@ -146,14 +146,7 @@
/*鏂板7.8鎶ュ憡缁撴灉*/
ProcessReport processReport = new ProcessReport();
processReport.setInspectionOrderId(inspectionOrder.getInsOrderId());
- processReport.setInsReportCode(inspectionOrder.getEntrustCode());//鎶ュ憡缂栧彿=濮旀墭缂栧彿
- //椤垫暟
- try {
- com.aspose.words.Document doc = new com.aspose.words.Document(path);
- processReport.setPages(doc.getPageCount()+"");
- } catch (Exception e) {
- }
- processReport.setNumber("1");//鍙戦�佷唤鏁伴粯璁�1
+ processReport.setInsReportCode(insReport.getCode());//鎶ュ憡缂栧彿浣跨敤姝ｅ紡鎶ュ憡缂栧彿
processReport.setSend(inspectionOrder.getCommissionUnit());//鍙戝線浣曞=濮旀墭鍗曚綅
processReport.setMethod(inspectionOrder.getSend()==1?"鑷彇":"鍏朵粬");//鍙戦�佹柟寮�
processReport.setSendTime(insReport.getRatifyTime().toLocalDate());//鍙戦�佹棩鏈�
@@ -247,9 +240,17 @@
inspectionOrderDetailService.saveBatch(InspectionOrder.getOrderDetailList());
//淇敼7.9鎶ュ憡缁撴灉
- ProcessReport processReport = processReportService.getOne(Wrappers.<ProcessReport>lambdaQuery().eq(ProcessReport::getInspectionOrderId, InspectionOrder.getInspectionOrderId()));
- processReport.setInsReportCode(InspectionOrder.getEntrustCode());//鎶ュ憡缂栧彿=濮旀墭缂栧彿
- processReportService.updateById(processReport);
+ ProcessReport processReport = processReportService.getOne(Wrappers.<ProcessReport>lambdaQuery()
+ .eq(ProcessReport::getInspectionOrderId, InspectionOrder.getInsOrderId())
+ .last("limit 1"));
+ InsReport insReport = insReportService.getOne(Wrappers.<InsReport>lambdaQuery()
+ .eq(InsReport::getInsOrderId, InspectionOrder.getInsOrderId())
+ .orderByDesc(InsReport::getId)
+ .last("limit 1"));
+ if (processReport != null && insReport != null) {
+ processReport.setInsReportCode(insReport.getCode());//鎶ュ憡缂栧彿浣跨敤姝ｅ紡鎶ュ憡缂栧彿
+ processReportService.updateById(processReport);
+ }
return true;
}
@@ -401,6 +402,7 @@
template.write(os);
os.flush();
os.close();
+ inputStream.close();
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("瀵煎嚭澶辫触");
--
Gitblit v1.9.3