From 4f4ae801fbd52546ee65353b43af7b41f37d9a44 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 20 十一月 2024 16:27:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
---
src/main/java/com/zy/asrs/service/WrkMastService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index 3814bd2..ebcb626 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -15,6 +15,12 @@
List<WrkMast> selectToBeHistoryData();
//鏌ヨ鎸囧畾妤煎眰寰呭垎閰嶈溅杈嗙殑浠诲姟
- List<LocMast> selectNoShuttleWrkByLev(Integer lev);
+ List<WrkMast> selectNoShuttleWrkByLev(Integer lev);
+
+ //鏌ヨ鎸囧畾妤煎眰宸插垎閰嶈溅杈嗙殑浠诲姟
+ List<WrkMast> selectShuttleWrkByLev(Integer lev);
+
+ //鏌ヨ鎸囧畾妤煎眰宸插垎閰嶈溅杈嗙殑鍑哄簱浠诲姟
+ List<WrkMast> selectShuttleOutWrkByLev(Integer lev);
}
--
Gitblit v1.9.1