From 31f3dcc7c566174cbdec4f41a9a96e58a1be9a4e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 17 十二月 2024 16:20:12 +0800
Subject: [PATCH] 统计2.0+首页2.0+检验下单型号过滤修改

---
 inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java |    8 +++++---
 1 files changed, 5 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..1d62a95 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;
@@ -47,17 +48,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 +67,5 @@
 
     int saveInsContext3(InsProductResult insProductResult);
 
+    int saveInsContext2s(InsProductResultDtos insProductResultDtos);
 }

--
Gitblit v1.9.3