From 9f19d3a24f8474bf6f9eb9401888c44b34b381e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 十一月 2024 14:29:50 +0800
Subject: [PATCH] 第一次改动(检验任务与样品关联,附件与样品关联,报告与样品关联)
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 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 5a96cec..174116f 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
@@ -1,13 +1,16 @@
package com.yuanchu.mom.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.mom.dto.InsOderDto;
-import com.yuanchu.mom.dto.OrderThingDto;
-import com.yuanchu.mom.dto.SampleOrderDto;
-import com.yuanchu.mom.dto.SampleProductDto;
+import com.yuanchu.mom.dto.*;
import com.yuanchu.mom.pojo.InsOrder;
+import com.yuanchu.mom.pojo.InsSample;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -18,16 +21,34 @@
*/
public interface InsOrderService extends IService<InsOrder> {
- //鑾峰彇妫�楠屼笅鍗曟暟鎹�
+ //鑾峰彇鍗曚綅妫�楠屼笅鍗曟暟鎹�
Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto);
- //淇敼妫�楠屼笅鍗曟暟鎹�
- int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId);
-
- int addInsOrder(List<SampleProductDto> list, InsOrder insOrder);
+ int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing, List<MultipartFile> files);
Map<String, Object> getInsOrder(Integer id);
int upInsOrderOfState(InsOrder insOrder);
+ int upInsOrderOfState2(InsOrder insOrder);
+
+ Map<String, Object> getInsOrderAndSample(Integer sampleId, String laboratory);
+
+ Map<String, Object> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto);
+
+ Map<String, Object> costStatistics(IPage<CostStatisticsDto> page, CostStatisticsDto costStatisticsDto);
+
+ Map<String, Object> costStatistics2(CostStatisticsDto costStatisticsDto);
+
+ Map<String, Object> selectSampleDefects(Page page, String inspectionItems, String orderNumber);
+
+ int updateStatus(Integer id);
+
+ List<SampleProductDto3> labelPrinting(String ids);
+
+ Map<String, List<InsSample>> checkNumber(String ids);
+
+ void export(CostStatisticsDto costStatisticsDto,HttpServletResponse response)throws IOException, ServletException;
+
+ int addNumber(List<InsSample> insSamples);
}
--
Gitblit v1.9.3