From a14a26c04bc5863248b9a9d387610a143c3a4efd Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 27 九月 2024 08:51:34 +0800
Subject: [PATCH] 电路站点报告ing
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 600e748..94e9cb8 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
@@ -4,11 +4,13 @@
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.InsProductResultDto;
import com.yuanchu.mom.pojo.InsOrderFile;
+import com.yuanchu.mom.pojo.InsOrderUser;
import com.yuanchu.mom.pojo.InsProduct;
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;
@@ -23,7 +25,7 @@
boolean claimInsOrderPlan(InsOrderPlanDTO entity);
//鏅�氱殑淇濆瓨妫�楠屽唴瀹�
- void saveInsContext(Map<String, Object> insContext);
+ void saveInsContext(Map<String, Object> insContext,Integer num);
//鐢佃矾璇曢獙鐨勪繚瀛樻楠屽唴瀹�
List<Integer> saveInsContext2(InsProductResultDto insProductResultDtos);
@@ -32,11 +34,12 @@
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(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, String note,String term);
List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request);
+ List<InsProduct> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request,Integer num);
List<String> checkSubmitPlan(Integer orderId, String laboratory);
@@ -44,13 +47,18 @@
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 deleteInsContext2(String frequency, Integer productId, String often);
+ //鎵爜鎶ユ(鍏ュ簱)
+ 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;
}
--
Gitblit v1.9.3