From 61f34419e094f2363276d614a960b379cc456482 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 20 五月 2025 10:37:15 +0800
Subject: [PATCH] 业务代码合并
---
inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java | 31 +++++++++++++++++++++----------
1 files changed, 21 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..ab022c5 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,13 @@
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.common.core.domain.Result;
import com.ruoyi.inspect.pojo.InsOrder;
+import com.ruoyi.inspect.pojo.InsSample;
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 +25,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 +39,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();
@@ -112,4 +109,18 @@
* @param response
*/
void rawAllInsOrderExport(SampleOrderDto sampleOrderDto, HttpServletResponse response);
+
+ /**
+ * 淇敼鏍峰搧鍨嬪彿
+ * @param insSample
+ */
+ void updateSampleModel(InsSample insSample);
+
+ /**
+ * 鏌ヨ褰撳墠鏃堕棿鏄惁娌℃湁璇ユ娴嬮」鐨勬娊鏍疯鍒�
+ * @param sampleList
+ * @param insOrder
+ * @return
+ */
+ Result judgeNotSpotCheckOrder(List<SampleProductDto> sampleList, InsOrder insOrder);
}
--
Gitblit v1.9.3