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/service/impl/WrkMastServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 17e957c..6280cd9 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -44,8 +44,8 @@
}
@Override
- public List<WrkMast> selectNoShuttleWrkByLev(Integer lev) {
- return this.baseMapper.selectNoShuttleWrkByLev("%" + lev);
+ public List<WrkMast> selectWrkByLev(Integer lev) {
+ return this.baseMapper.selectWrkByLev("%" + lev);
}
@Override
@@ -61,6 +61,11 @@
@Override
public WrkMast selectChargeWorking(Integer shuttleNo) {
return this.baseMapper.selectChargeWorking(shuttleNo);
+ }
+
+ @Override
+ public WrkMast selectChargeWorkingByChargeSta(Integer chargeSta) {
+ return this.baseMapper.selectChargeWorkingByChargeSta(chargeSta);
}
@Override
@@ -80,8 +85,8 @@
, WrkStsType.OUTBOUND_LIFT_RUN_COMPLETE.sts
, WrkStsType.NEW_MOVE.sts
- , WrkStsType.MOVE_SITE.sts
- , WrkStsType.MOVE_SITE_COMPLETE.sts
+ , WrkStsType.MOVE_NEARBY.sts
+ , WrkStsType.MOVE_NEARBY_COMPLETE.sts
, WrkStsType.MOVE_IN_LIFT.sts
, WrkStsType.MOVE_IN_LIFT_COMPLETE.sts
, WrkStsType.MOVE_LIFT_RUN.sts
@@ -117,7 +122,7 @@
}
@Override
- public WrkMast selectLiftWrkMast(Integer liftNo) {
+ public List<WrkMast> selectLiftWrkMast(Integer liftNo) {
return this.baseMapper.selectLiftWrkMast(liftNo);
}
}
--
Gitblit v1.9.1