From b09b781d22a81eab459c63053a54df4761e770c5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 17 七月 2024 18:24:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java | 6 +++++-
1 files changed, 5 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 b5da779..f00cc68 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
@@ -22,7 +22,7 @@
//淇敼妫�楠屼笅鍗曟暟鎹�
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);
@@ -34,7 +34,11 @@
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);
}
--
Gitblit v1.9.3