From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示
---
inspect-server/src/main/java/com/yuanchu/mom/service/ReportService.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/ReportService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/ReportService.java
index c4bd75b..e9ecc0a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/ReportService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/ReportService.java
@@ -1,6 +1,9 @@
package com.yuanchu.mom.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.dto.InsOrderUserDto;
import com.yuanchu.mom.pojo.Schedule;
import java.util.List;
@@ -24,8 +27,11 @@
List<Schedule> ScheduleByMe(String date);
//棣栭〉-->鍚勭珯鐐瑰伐鏃�
- Map<String,Double> manHourByStation(String startTime,String endTime);
+ String manHourByStation(String startTime,String endTime,String sonLaboratory);
//棣栭〉-->鍚勭珯鐐瑰伐鏃舵瘡涓汉鎵�鍗犵櫨鍒嗘瘮
- Map<String, Map<String, Double>> manHourByPerson(String startTime, String endTime);
+ Map<Object, Double> manHourByPerson(String startTime, String endTime,String sonLaboratory);
+
+ //鏌ヨ绔欑偣鐨勬楠屾椂闀�
+ Map<String, IPage<InsOrderUserDto>> timeByStation(String startTime, String endTime, Page page, String sonLaboratory);
}
--
Gitblit v1.9.3