From e59b660b580fd96447b213679d55202529370028 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 23 十二月 2024 14:20:00 +0800
Subject: [PATCH] 报告调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 980339d..e76c725 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;
@@ -40,6 +41,9 @@
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);
@@ -47,17 +51,17 @@
Map<String,Object> getFileList(Page page, InsOrderFile insOrderFile);
- int uploadFile(Integer orderId, MultipartFile file,String sonLaboratory,Integer sampleId);
+ Object uploadFile(Integer orderId, MultipartFile file,String sonLaboratory,Integer sampleId);
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);
@@ -66,4 +70,7 @@
int saveInsContext3(InsProductResult insProductResult);
+ int saveInsContext2s(InsProductResultDtos insProductResultDtos);
+
+
}
--
Gitblit v1.9.3