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/service/InspectionOrderService.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/InspectionOrderService.java b/cnas-process/src/main/java/com/ruoyi/process/service/InspectionOrderService.java
index ccca4a8..c205a4e 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/InspectionOrderService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/InspectionOrderService.java
@@ -5,10 +5,13 @@
import com.baomidou.mybatisplus.extension.service.IService;
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 org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
* <p>
@@ -61,6 +64,11 @@
*/
IPage<InspectionOrder> pageUnboundInspectionOrder(Page page, InspectionOrder inspectionOrder);
+ IPage<InspectionOrderBindingDto> pageInspectionOrderBindings(Page page, Integer inspectionOrderId,
+ Boolean includeDeleted);
+
+ List<InspectionOrderAttachment> listInspectionOrderAttachments(Integer inspectionOrderId, Long bindingId);
+
/**
* 鑾峰彇鎴愬搧涓嬪崟鍒濆鍖栨墍闇�鐨勫鎵樺崟淇℃伅銆�
*/
@@ -94,10 +102,12 @@
*/
boolean uploadInspectionOrderFile(MultipartFile file, Integer inspectionOrderId);
+ boolean uploadInspectionOrderBindingFile(MultipartFile file, Long bindingId);
+
/**
* 瀵煎嚭妫�楠屽鎵樺崟
* @param inspectionOrderId
* @param response
*/
- void exportInspectionOrder(Integer inspectionOrderId, HttpServletResponse response);
+ void exportInspectionOrder(Integer inspectionOrderId, Long bindingId, HttpServletResponse response);
}
--
Gitblit v1.9.3