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/controller/InsOrderPlanController.java | 73 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 31 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
index fa371e8..6fcd611 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
@@ -9,6 +9,10 @@
import com.ruoyi.inspect.dto.InsOrderPlanProductDto;
import com.ruoyi.inspect.dto.InsProductBindingDto;
import com.ruoyi.inspect.dto.SaveInsContextDto;
+import com.ruoyi.inspect.dto.SaveOrderDevicesDto;
+import com.ruoyi.inspect.dto.SaveTemplateContextDto;
+import com.ruoyi.inspect.dto.VerifyPlanDto;
+import com.ruoyi.inspect.dto.WriteInspectionConditionDto;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.pojo.InsOrderFactoryVerify;
import com.ruoyi.inspect.pojo.InsOrderFile;
@@ -93,8 +97,8 @@
@ApiOperation(value = "澶嶆牳妫�楠屼换鍔�")
@PostMapping("/verifyPlan")
- public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell, Integer userId) {
- return Result.success(insOrderPlanService.rawMaterialVerifyPlan(orderId, laboratory, type, tell, userId));
+ public Result<?> verifyPlan(@RequestBody VerifyPlanDto verifyPlanDto) {
+ return Result.success(insOrderPlanService.rawMaterialVerifyPlan(verifyPlanDto));
}
@ApiOperation(value = "鏍￠獙妫�楠屼换鍔℃彁浜�")
@@ -106,16 +110,35 @@
@ApiOperation(value = "妫�楠屼换鍔℃彁浜�")
@PostMapping("/submitPlan")
- public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode) {
- int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode);
+ public Result<?> submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, Boolean registerInsResults) {
+ int num = insOrderPlanService.submitPlan(orderId, laboratory, verifyUser, entrustCode, registerInsResults);
return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
}
@ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�")
@PostMapping("/saveInsContext")
public Result<?> saveInsContext(@RequestBody SaveInsContextDto saveInsContextDto) {
- Map<String, Object> param2 = JSON.parseObject(saveInsContextDto.getParam(), Map.class);
- insOrderPlanService.saveInsContext(param2, saveInsContextDto.getCurrentTable(), saveInsContextDto.getSampleId(), saveInsContextDto.getOrderId(), saveInsContextDto.getSonLaboratory());
+ insOrderPlanService.saveInsContext(saveInsContextDto);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鎸夋ā鏉垮潗鏍囦繚瀛樻柊鑱氬師濮嬭褰�")
+ @PostMapping("/saveTemplateContext")
+ public Result<?> saveTemplateContext(@RequestBody SaveTemplateContextDto saveTemplateContextDto) {
+ insOrderPlanService.saveTemplateContext(saveTemplateContextDto);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鏌ヨ妫�楠屽崟閫夋嫨鐨勮澶�")
+ @GetMapping("/orderDevices")
+ public Result<?> getOrderDevices(Integer orderId) {
+ return Result.success(insOrderPlanService.getOrderDeviceIds(orderId));
+ }
+
+ @ApiOperation(value = "淇濆瓨妫�楠屽崟閫夋嫨鐨勮澶�")
+ @PutMapping("/orderDevices")
+ public Result<?> saveOrderDevices(@RequestBody SaveOrderDevicesDto saveOrderDevicesDto) {
+ insOrderPlanService.saveOrderDevices(saveOrderDevicesDto);
return Result.success();
}
@@ -152,10 +175,10 @@
return Result.success(map);
}
- @ApiOperation(value = "濉啓娓╁害涓庢箍搴�")
+ @ApiOperation(value = "濉啓娓╁害")
@PostMapping("/write")
- public Result<?> write(@RequestBody InsOrder insOrder) {
- return Result.success(insProductService.write(insOrder));
+ public Result<?> write(@RequestBody WriteInspectionConditionDto dto) {
+ return Result.success(insProductService.write(dto));
}
@@ -177,40 +200,27 @@
return Result.success(insOrderPlanService.getRepetitionTag(id, laboratory, cableTag));
}
- @ApiOperation("鑾峰彇涓嶅悎鏍兼暟鎹�")
- @GetMapping("/getInsProductUnqualified")
- public Result<?> getInsProductUnqualified(InsOrderPlanProductDto insOrderPlanProductDto) {
- return Result.success(insOrderPlanService.getInsProductUnqualified(insOrderPlanProductDto));
- }
-
@ApiOperation("鏂板涓嶅悎鏍煎娴嬩俊鎭�")
@PostMapping("/addUnqualifiedRetest")
- public Result<?> addDisqualificationRetest(@RequestBody Map<String, Object> params) {
- // 鑾峰彇妫�楠屽璞＄殑id
- List<Integer> ids = (List<Integer>) params.get("ids");
- return Result.success(insOrderPlanService.addDisqualificationRetest(ids));
+ public Result<?> addDisqualificationRetest(@RequestBody List<InsProduct> insProductsList) {
+ return Result.success(insOrderPlanService.addDisqualificationRetest(insProductsList));
}
@ApiOperation("鑾峰彇涓嶅悎鏍煎娴嬫暟鎹�")
@GetMapping("/getInsProductUnqualifiedRetest")
- public Result<?> getInsProductUnqualifiedRetest(Integer id, Integer type, String laboratory, String cableTag, String rawMaterialTag, String retestTag) {
- return Result.success(insOrderPlanService.getInsProductUnqualifiedRetest(id, type, laboratory, cableTag, rawMaterialTag, retestTag));
+ public Result<?> getInsProductUnqualifiedRetest(InsOrderPlanProductDto insOrderPlanProductDto) {
+ return Result.success(insOrderPlanService.getInsProductUnqualifiedRetest(insOrderPlanProductDto));
}
/**
*
- * @param param 妯℃澘鍐呭
- * @param currentTable 褰撳墠妯℃澘id
- * @param sampleId 褰撳墠鏍峰搧id
- * @param orderId 褰撳墠璁㈠崟id
- * @param sonLaboratory 瀛愯瘯楠屽
* @return
*/
- @ApiOperation(value = "淇濆瓨涓嶅悎鏍煎娴嬫楠屽唴瀹�")
+ @ApiOperation(value = "淇濆瓨 涓嶅悎鏍煎娴嬫楠屽唴瀹�")
@PostMapping("/saveUnqualifiedContext")
- public Result<?> saveUnqualifiedContext(String param, Integer currentTable, Integer sampleId, Integer orderId, String sonLaboratory) {
- Map<String, Object> param2 = JSON.parseObject(param, Map.class);
- insOrderPlanService.saveUnqualifiedContext(param2, currentTable, sampleId, orderId, sonLaboratory);
+ public Result<?> saveUnqualifiedContext(@RequestBody SaveInsContextDto saveInsContextDto) {
+ Map<String, Object> param2 = JSON.parseObject(saveInsContextDto.getParam(), Map.class);
+ insOrderPlanService.saveUnqualifiedContext(param2, saveInsContextDto.getCurrentTable(), saveInsContextDto.getSampleId(), saveInsContextDto.getOrderId(), saveInsContextDto.getSonLaboratory());
return Result.success();
}
@@ -257,7 +267,8 @@
@GetMapping("/getBindingProductByProductId")
public Result<List<InsProduct>> getBindingProductByProductId(Integer productId) {
return Result.success(insProductService.list(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getBindingProductId, productId)));
+ .eq(InsProduct::getBindingProductId, productId)
+ .orderByAsc(InsProduct::getSort)));
}
--
Gitblit v1.9.3