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 | 76 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 19 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 9cab43d..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
@@ -15,6 +15,7 @@
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.dto.InsOrderDeviceRecordDto;
import com.ruoyi.inspect.mapper.InsProductResultMapper;
+import com.ruoyi.inspect.mapper.InsSampleMapper;
import com.ruoyi.inspect.pojo.*;
import com.ruoyi.inspect.service.InsOrderService;
import com.ruoyi.inspect.service.InsReportService;
@@ -23,14 +24,9 @@
import com.ruoyi.process.dto.InspectionOrderExportDto;
import com.ruoyi.process.mapper.InspectionOrderMapper;
import com.ruoyi.process.mapper.ProcessOrderDeviceMapper;
-import com.ruoyi.process.pojo.InspectionOrder;
-import com.ruoyi.process.pojo.InspectionOrderDetail;
-import com.ruoyi.process.pojo.ProcessOrderDevice;
-import com.ruoyi.process.pojo.ProcessReport;
-import com.ruoyi.process.service.InspectionOrderDetailService;
-import com.ruoyi.process.service.InspectionOrderService;
-import com.ruoyi.process.service.ProcessOrderDeviceService;
-import com.ruoyi.process.service.ProcessReportService;
+import com.ruoyi.process.mapper.ProcessSampleMapper;
+import com.ruoyi.process.pojo.*;
+import com.ruoyi.process.service.*;
import com.ruoyi.system.mapper.UserMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
@@ -70,6 +66,8 @@
@Resource
private InsOrderService insOrderService;
@Resource
+ private InsSampleMapper insSampleMapper;
+ @Resource
private InsReportService insReportService;
@Value("${wordUrl}")
private String wordUrl;
@@ -83,6 +81,12 @@
private ProcessOrderDeviceService processOrderDeviceService;
@Resource
private UserMapper userMapper;
+ @Resource
+ private ProcessSampleService processSampleService;
+ @Resource
+ private ProcessSampleMapper processSampleMapper;
+ @Resource
+ private ProcessDealService processDealService;
/**
@@ -142,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());//鍙戦�佹棩鏈�
@@ -158,6 +155,27 @@
processReportService.save(processReport);
/*鏂板7.1濮旀墭鍗曞搴旂殑璁惧浣跨敤璁板綍*/
addDeviceRecord(inspectionOrder,insReport.getWriteUserId());
+ /*鏂板7.4鏍峰搧鎺ユ敹*/
+ List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
+ .eq(InsSample::getInsOrderId, inspectionOrder.getInsOrderId()));
+ if (insSamples.size()>0){
+ List<ProcessSample> processSamples = new ArrayList<>();
+ for (InsSample insSample : insSamples) {
+ ProcessSample processSample = new ProcessSample();
+ processSample.setReceiveDate(inspectionOrder.getSampleData());//鏀舵牱鏃ユ湡=棰嗘牱鏃ユ湡
+ processSample.setSampleCode(insSample.getSampleCode());//鏍峰搧缂栧彿
+ processSample.setSampleName(insSample.getSample());//鏍峰搧鍚嶇О
+ processSample.setNum(1);//鏍峰搧鏁伴噺=1
+ processSample.setSampleSupplier(inspectionOrder.getCommissionUnit());//鏉ユ牱鍗曚綅
+ LocalDate plusMonths = inspectionOrder.getSampleData() == null ? null : inspectionOrder.getSampleData().plusMonths(1);
+ processSample.setLeaveDate(plusMonths);//鐣欐牱鏃ユ湡=鏀舵牱鏃ユ湡寰�鍚庡欢涓�涓湀
+ processSample.setSampleState(inspectionOrder.getSampleStatus());//鏍峰搧鐘舵��
+ processSample.setDealTime(plusMonths);//閫�鏍锋棩鏈�=鐣欐牱鏃ユ湡
+ processSample.setInspectionOrderId(inspectionOrder.getInspectionOrderId());//濮旀墭鍗昳d
+ processSamples.add(processSample);
+ }
+ processSampleService.saveBatch(processSamples);
+ }
return true;
}
@@ -222,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;
}
@@ -245,6 +271,17 @@
//鍒犻櫎瀵瑰簲鐨勮澶囦娇鐢ㄨ褰�
processOrderDeviceService.remove(Wrappers.<ProcessOrderDevice>lambdaQuery()
.eq(ProcessOrderDevice::getInspectionOrderId, inspectionOrderId));
+ //鍒犻櫎瀵瑰簲鐨�7.4鐨勬牱鍝佺敵璇�
+ List<ProcessSample> processSamples = processSampleMapper.selectList(Wrappers.<ProcessSample>lambdaQuery()
+ .eq(ProcessSample::getInspectionOrderId, inspectionOrderId));
+ if (processSamples.size()>0){
+ List<Integer> list = processSamples.stream().map(ProcessSample::getId).collect(Collectors.toList());
+ processDealService.remove(Wrappers.<ProcessDeal>lambdaQuery()
+ .in(ProcessDeal::getProcessSampleId,list));
+ }
+ //鍒犻櫎瀵瑰簲7.4鐨勬牱鍝佹帴鏀�
+ processSampleService.remove(Wrappers.<ProcessSample>lambdaQuery()
+ .eq(ProcessSample::getInspectionOrderId,inspectionOrderId));
return true;
}
@@ -365,6 +402,7 @@
template.write(os);
os.flush();
os.close();
+ inputStream.close();
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("瀵煎嚭澶辫触");
--
Gitblit v1.9.3