From 691f0d4c4836c75fefa1d3b7fba4a72153751dd4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 09 七月 2025 13:38:37 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java |   41 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 36 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..0422e92 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -3,12 +3,16 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.core.common.Cools;
+import com.core.exception.CoolException;
 import com.zy.asrs.entity.WrkMast;
 import com.zy.asrs.mapper.WrkMastMapper;
 import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.utils.Utils;
+import com.zy.core.enums.WrkIoType;
 import com.zy.core.enums.WrkStsType;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service("wrkMastService")
@@ -44,8 +48,30 @@
     }
 
     @Override
-    public List<WrkMast> selectNoShuttleWrkByLev(Integer lev) {
-        return this.baseMapper.selectNoShuttleWrkByLev("%" + lev);
+    public List<WrkMast> selectWrkByLev(Integer lev) {
+        ArrayList<WrkMast> currentLevList = new ArrayList<>();
+        List<WrkMast> wrkMasts = this.baseMapper.selectList(new EntityWrapper<WrkMast>());
+        for (WrkMast wrkMast : wrkMasts) {
+            int wrkLev;
+            if (wrkMast.getIoType() == WrkIoType.IN.id) {
+                wrkLev = Utils.getLev(wrkMast.getLocNo());
+            } else if (wrkMast.getIoType() == WrkIoType.OUT.id) {
+                wrkLev = Utils.getLev(wrkMast.getSourceLocNo());
+            } else if (wrkMast.getIoType() == WrkIoType.SHUTTLE_MOVE.id) {
+                wrkLev = Utils.getLev(wrkMast.getLocNo());
+            } else if (wrkMast.getIoType() == WrkIoType.LOC_MOVE.id) {
+                wrkLev = Utils.getLev(wrkMast.getLocNo());
+            } else if (wrkMast.getIoType() == WrkIoType.SHUTTLE_CHARGE.id) {
+                wrkLev = Utils.getLev(wrkMast.getLocNo());
+            } else {
+                throw new CoolException("鏈煡浠诲姟绫诲瀷");
+            }
+
+            if (wrkLev == lev) {
+                currentLevList.add(wrkMast);
+            }
+        }
+        return currentLevList;
     }
 
     @Override
@@ -61,6 +87,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 +111,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 +148,7 @@
     }
 
     @Override
-    public WrkMast selectLiftWrkMast(Integer liftNo) {
+    public List<WrkMast> selectLiftWrkMast(Integer liftNo) {
         return this.baseMapper.selectLiftWrkMast(liftNo);
     }
 }

--
Gitblit v1.9.1