From 25dc8eace099a8265cecfa952209b835eb9a346d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 13 十一月 2024 17:14:28 +0800
Subject: [PATCH] 检验下单选择样品的时候不用原本那个接口,去掉两层,直接从天线和无源器件开始选
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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..640c48b 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);
@@ -43,14 +47,22 @@
Map<String,Object> getFileList(Page page, InsOrderFile insOrderFile);
- int uploadFile(Integer orderId, MultipartFile file);
-
- Map<String,Object> getReportModel(Integer sampleId);
-
- Map<String,Object> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass);
+ int uploadFile(Integer orderId, MultipartFile file,String sonLaboratory);
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