From bcc80a6833abe9f24abdb978f7c7f01b664a574f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 18 二月 2025 14:48:45 +0800
Subject: [PATCH] 优化调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 27 +++++++++++++++++++--------
1 files changed, 19 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 640c48b..20e5f5e 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,6 +3,7 @@
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.InsProductResultDtos;
import com.yuanchu.mom.dto.SubmitPlanDto;
import com.yuanchu.mom.pojo.InsOrderFile;
import com.yuanchu.mom.pojo.InsOrderUser;
@@ -32,32 +33,38 @@
//鐢佃矾璇曢獙鐨勪繚瀛樻楠屽唴瀹�
List<Integer> saveInsContext2(InsProductResultDto insProductResultDtos);
- Map<String, Object> doInsOrder(Integer id, String laboratory);
+ Map<String, Object> doInsOrder(Integer sampleId, String laboratory);
- int upPlanUser(Integer userId, Integer orderId,String sonLaboratory);
+ int upPlanUser(Integer userId, Integer sampleId,String sonLaboratory);
- int verifyPlan(Integer orderId, String laboratory, Integer type, String tell) throws IOException;
+ int verifyPlan(Integer sampleId, String laboratory, Integer type, String tell) throws IOException;
+
+ //绾犳澶嶆牳閿欒鐨勬儏鍐�
+ int verifyPlan2(Integer sampleId, String laboratory, Integer type, String tell) throws IOException;
int submitPlan(SubmitPlanDto submitPlanDto);
+
+ //鎾ら攢鎻愪氦
+ int cancelSubmitPlan(Integer orderStateId);
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);
+ List<String> checkSubmitPlan(Integer sampleId, String laboratory);
Map<String,Object> getFileList(Page page, InsOrderFile insOrderFile);
- int uploadFile(Integer orderId, MultipartFile file,String sonLaboratory);
+ Object uploadFile(Integer orderId, MultipartFile file,String sonLaboratory,Integer sampleId);
- List<String> upPlanUser2(Integer orderId);
+ List<String> upPlanUser2(Integer sampleId);
int deleteInsContext(InsProductResultVo insProductResultVo);
//鎵爜鎶ユ(鍏ュ簱)
- int scanInsOrderState(String sonLaboratory, String sampleCode,String trees);
+ int scanInsOrderState(String sonLaboratory, String sampleCode,String trees,String entrustCode);
//鎵爜鍑哄簱
- int outInsOrderState(String sonLaboratory, String sampleCode);
+ int outInsOrderState(String sonLaboratory, String sampleCode,String entrustCode);
List<InsOrderUser> getInsOrderUserList(Integer insOrderStateId);
@@ -65,4 +72,8 @@
Object preview(Integer id) throws Exception;
int saveInsContext3(InsProductResult insProductResult);
+
+ int saveInsContext2s(InsProductResultDtos insProductResultDtos);
+
+
}
--
Gitblit v1.9.3