From c9a7198eb87bcd7ac8d2b21d6cf9d977e726fdd2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 23 七月 2024 10:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
index f00cc68..b6adc4e 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
@@ -6,6 +6,9 @@
 import com.yuanchu.mom.dto.*;
 import com.yuanchu.mom.pojo.InsOrder;
 
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -20,7 +23,7 @@
     Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto);
 
     //淇敼妫�楠屼笅鍗曟暟鎹�
-    int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId);
+    int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId,String sonLaboratory);
 
     int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing);
 
@@ -41,4 +44,6 @@
     int updateStatus(Integer id);
 
     List<SampleProductDto3> labelPrinting(String ids);
+
+    void export(CostStatisticsDto costStatisticsDto,HttpServletResponse response)throws IOException, ServletException;
 }

--
Gitblit v1.9.3