From 1f15333b0a97a327865f7aab8f1e3f9ba8fc16f8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 18 十月 2024 12:45:59 +0800
Subject: [PATCH] 电路站点报告调试+总报告ing
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
index 0bd7690..8ccd69b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
@@ -3,12 +3,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.InsProductResultDto;
+import com.yuanchu.mom.dto.SubmitPlanDto;
import com.yuanchu.mom.pojo.InsOrderFile;
+import com.yuanchu.mom.pojo.InsOrderUser;
import com.yuanchu.mom.pojo.InsProduct;
+import com.yuanchu.mom.pojo.InsProductResult;
import com.yuanchu.mom.vo.InsProductResultVo;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -32,9 +36,9 @@
int upPlanUser(Integer userId, Integer orderId,String sonLaboratory);
- int verifyPlan(Integer orderId, String laboratory, Integer type, String tell);
+ int verifyPlan(Integer orderId, String laboratory, Integer type, String tell) throws IOException;
- int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode);
+ int submitPlan(SubmitPlanDto submitPlanDto);
List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request);
List<InsProduct> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request,Integer num);
@@ -45,12 +49,20 @@
int uploadFile(Integer orderId, MultipartFile file);
- Map<String,Object> getReportModel(Integer sampleId);
-
- Map<String,Object> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass);
-
List<String> upPlanUser2(Integer orderId);
int deleteInsContext(InsProductResultVo insProductResultVo);
+ //鎵爜鎶ユ(鍏ュ簱)
+ int scanInsOrderState(String sonLaboratory, String sampleCode,String trees);
+
+ //鎵爜鍑哄簱
+ int outInsOrderState(String sonLaboratory, String sampleCode);
+
+ List<InsOrderUser> getInsOrderUserList(Integer insOrderStateId);
+
+ //棰勮鏂囦欢
+ Object preview(Integer id) throws Exception;
+
+ int saveInsContext3(InsProductResult insProductResult);
}
--
Gitblit v1.9.3