From 3ae364164cb9d85acce0b53a1ba5c70a80991308 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 03 七月 2024 22:21:49 +0800
Subject: [PATCH] 温度循环+报告英文换行+检验只有一项的设备查询+光纤配置报告换页+温度湿度

---
 inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 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 8092635..f947c9c 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,11 +1,9 @@
 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 java.util.List;
@@ -24,6 +22,21 @@
     //淇敼妫�楠屼笅鍗曟暟鎹�
     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);
 
+    Map<String, Object> getInsOrder(Integer id);
+
+    int upInsOrderOfState(InsOrder insOrder);
+
+    Map<String, Object> getInsOrderAndSample(Integer id, String laboratory);
+
+    Map<String, Object> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto);
+
+    Map<String, Object> costStatistics(IPage<CostStatisticsDto> page, CostStatisticsDto costStatisticsDto);
+
+    Map<String, Object> selectSampleDefects(Page page, String inspectionItems, String orderNumber);
+
+    int updateStatus(Integer id);
+
+    List<SampleProductDto3> labelPrinting(String ids);
 }

--
Gitblit v1.9.3