From a5fd6b72f8342f0228321849b04c822feba2d2a0 Mon Sep 17 00:00:00 2001 From: taisheng <taisheng@qq.com> Date: 星期三, 02 七月 2025 09:42:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs' into shuttle_rcs --- src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java index 9dd9c7e..983cb84 100644 --- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java +++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java @@ -28,14 +28,14 @@ List<WrkMast> selectBy2125(); - //鏌ヨ鎸囧畾妤煎眰寰呭垎閰嶈溅杈嗙殑浠诲姟 - List<WrkMast> selectNoShuttleWrkByLev(String lev); + //鏌ヨ鎸囧畾妤煎眰浠诲姟 + List<WrkMast> selectWrkByLev(String lev); List<WrkMast> selectShuttleWrkByLev(String lev); List<WrkMast> selectShuttleOutWrkByLev(String lev); - WrkMast selectLiftWrkMast(Integer liftNo); + List<WrkMast> selectLiftWrkMast(Integer liftNo); List<WrkMast> selectLocToLocWrkMast();//鏌ヨ搴撲綅绉昏浆宸ヤ綔妗� -- Gitblit v1.9.1