From 99755eea33cf009c36507df468c244f3be5b34c9 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 28 二月 2025 17:27:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr
---
inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
index 07dd05d..e666245 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.pojo.InsUnqualifiedRetestProduct;
import com.ruoyi.inspect.dto.*;
+import com.ruoyi.inspect.vo.InsOrderPrintingVo;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
@@ -21,13 +23,13 @@
public interface InsOrderService extends IService<InsOrder> {
//鑾峰彇鍗曚綅妫�楠屼笅鍗曟暟鎹�
- Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto);
+ IPage<SampleOrderDto> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto);
//淇敼妫�楠屼笅鍗曟暟鎹�
int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId,String sonLaboratory);
- int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing);
+ int addInsOrder(List<SampleProductDto> list, InsOrder insOrder);
Map<String, Object> getInsOrder(Integer id);
@@ -35,18 +37,11 @@
Map<String, Object> getInsOrderAndSample(Integer id, String laboratory);
- Map<String, Object> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto);
+ IPage<SampleProductDto2> 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);
-
- void export(CostStatisticsDto costStatisticsDto,HttpServletResponse response)throws IOException, ServletException;
// 鑾峰彇ifs搴撳瓨淇℃伅
void getIfsOrder();
--
Gitblit v1.9.3