From 0debf5b7bb0246eaef1397975cdb16f4adb9e8d9 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 29 十月 2026 14:36:31 +0800
Subject: [PATCH] refactor(inspection-order): 1.检验委托单绑定机制支持多次下单 2.合格率统计口径调整 3.外购铜导体推送入库MES增加米重 4.报告英文字段调整
---
cnas-process/src/main/java/com/ruoyi/process/controller/InspectionOrderController.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/InspectionOrderController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/InspectionOrderController.java
index 63b226d..f7540cf 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/InspectionOrderController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/InspectionOrderController.java
@@ -5,6 +5,8 @@
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.inspect.dto.InsPlaceOrderDto;
import com.ruoyi.process.dto.InspectionOrderDto;
+import com.ruoyi.process.dto.InspectionOrderBindingDto;
+import com.ruoyi.process.pojo.InspectionOrderAttachment;
import com.ruoyi.process.pojo.InspectionOrder;
import com.ruoyi.process.service.InspectionOrderService;
import io.swagger.annotations.Api;
@@ -15,6 +17,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
* <p>
@@ -57,6 +60,26 @@
@GetMapping("/pageUnboundInspectionOrder")
public Result<IPage<InspectionOrder>> pageUnboundInspectionOrder(InspectionOrder inspectionOrder, Page page) {
return Result.success(inspectionOrderService.pageUnboundInspectionOrder(page, inspectionOrder));
+ }
+
+ @ApiOperation(value = "鏌ヨ鍙噸澶嶇粦瀹氱殑妫�楠屽鎵樺崟")
+ @GetMapping("/pageSelectableInspectionOrder")
+ public Result<IPage<InspectionOrder>> pageSelectableInspectionOrder(InspectionOrder inspectionOrder, Page page) {
+ return Result.success(inspectionOrderService.pageUnboundInspectionOrder(page, inspectionOrder));
+ }
+
+ @ApiOperation(value = "鏌ヨ妫�楠屽鎵樺崟鐨勫巻娆′笅鍗曡褰�")
+ @GetMapping("/pageInspectionOrderBindings")
+ public Result<IPage<InspectionOrderBindingDto>> pageInspectionOrderBindings(Page page, Integer inspectionOrderId,
+ Boolean includeDeleted) {
+ return Result.success(inspectionOrderService.pageInspectionOrderBindings(page, inspectionOrderId, includeDeleted));
+ }
+
+ @ApiOperation(value = "鏌ヨ妫�楠屽鎵樺崟闄勪欢")
+ @GetMapping("/listInspectionOrderAttachments")
+ public Result<List<InspectionOrderAttachment>> listInspectionOrderAttachments(Integer inspectionOrderId,
+ Long bindingId) {
+ return Result.success(inspectionOrderService.listInspectionOrderAttachments(inspectionOrderId, bindingId));
}
@ApiOperation(value = "鑾峰彇鎴愬搧涓嬪崟鍏宠仈鐨勫鎵樺崟淇℃伅")
@@ -119,13 +142,28 @@
return Result.success(inspectionOrderService.uploadInspectionOrderFile(file, inspectionOrderId));
}
+ @ApiOperation(value = "鎸変笅鍗曡褰曚笂浼犲鎵樺崟闄勪欢")
+ @PreAuthorize("@ss.hasPermi('add:insOrder')")
+ @PostMapping("/uploadInspectionOrderBindingFile")
+ public Result uploadInspectionOrderBindingFile(MultipartFile file, Long bindingId) {
+ return Result.success(inspectionOrderService.uploadInspectionOrderBindingFile(file, bindingId));
+ }
+
+ @ApiOperation(value = "閲嶈瘯鍚屾姝ｅ紡鎶ュ憡鍒版楠屽鎵樺崟")
+ @PreAuthorize("@ss.hasPermi('add:insOrder')")
+ @PostMapping("/retryInspectionOrderReportSync")
+ public Result retryInspectionOrderReportSync(Integer insReportId) {
+ inspectionOrderService.syncReportFile(insReportId);
+ return Result.success(true);
+ }
+
/**
* 瀵煎嚭妫�楠屽鎵樺崟
* @return
*/
@ApiOperation(value = "瀵煎嚭妫�楠屽鎵樺崟")
@GetMapping("/exportInspectionOrder")
- public void exportInspectionOrder(Integer inspectionOrderId, HttpServletResponse response){
- inspectionOrderService.exportInspectionOrder(inspectionOrderId, response);
+ public void exportInspectionOrder(Integer inspectionOrderId, Long bindingId, HttpServletResponse response){
+ inspectionOrderService.exportInspectionOrder(inspectionOrderId, bindingId, response);
}
}
--
Gitblit v1.9.3