From d7458cb8e91c48375a54d4ccdb84a7e0b4e06534 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 26 七月 2024 12:45:19 +0800
Subject: [PATCH] 雪花算法重复id优化+关掉异步进程+优化加班工时生成条件
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java | 11 ++++++++++-
1 files changed, 10 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 d5f7bc6..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);
@@ -34,7 +37,13 @@
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);
+
+ void export(CostStatisticsDto costStatisticsDto,HttpServletResponse response)throws IOException, ServletException;
}
--
Gitblit v1.9.3