From 5d1aa071ca6f385a8ec9bb2b5135d259f0f225eb Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 04 十二月 2025 10:59:45 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/Utils.java |  551 +++++++++++--------------------------------------------
 1 files changed, 110 insertions(+), 441 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 1ef6d12..b474b9e 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -1,59 +1,36 @@
 package com.zy.asrs.utils;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.core.common.Arith;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
-import com.zy.asrs.entity.BasShuttle;
-import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.BasCrnp;
 import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.mapper.WrkMastMapper;
-import com.zy.asrs.service.BasShuttleService;
-import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.BasCrnpService;
 import com.zy.asrs.service.WrkMastService;
-import com.zy.asrs.service.impl.MainServiceImpl;
-import com.zy.common.model.NavigateNode;
-import com.zy.common.model.enums.NavigationMapType;
-import com.zy.common.service.CommonService;
-import com.zy.common.utils.NavigateMapData;
-import com.zy.common.utils.NavigatePositionConvert;
-import com.zy.common.utils.NavigateUtils;
-import com.zy.common.utils.ShuttleDispatchUtils;
-import com.zy.core.Slave;
-import com.zy.core.cache.MessageQueue;
+import com.zy.common.utils.RedisUtil;
 import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.ShuttleRunDirection;
-import com.zy.core.enums.ShuttleTaskModeType;
+import com.zy.core.enums.CrnModeType;
+import com.zy.core.enums.RedisKeyType;
 import com.zy.core.enums.SlaveType;
-import com.zy.core.model.ShuttleSlave;
-import com.zy.core.model.Task;
-import com.zy.core.model.command.ShuttleAssignCommand;
-import com.zy.core.model.command.ShuttleCommand;
-import com.zy.core.model.protocol.NyShuttleProtocol;
-import com.zy.core.model.protocol.ShuttleProtocol;
-import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.NyShuttleThread;
-import com.zy.core.thread.ShuttleThread;
+import com.zy.core.model.protocol.CrnProtocol;
+import com.zy.core.thread.CrnThread;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Set;
 
-/**
- * Created by vincent on 2020/8/27
- */
 public class Utils {
 
-    public static final List<Integer> FIRST_GROUP_ROW_LIST = new ArrayList<Integer>() {{
-        add(1);add(2);add(3);add(4);
-    }};
-    public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{
-        add(5);add(6);add(7);add(8);add(9);add(10);add(11);
-    }};
-
+    private static final String LOC_NO_FLAG = "-";
     private static final DecimalFormat fmt = new DecimalFormat("##0.00");
 
     public static float scale(Float f){
@@ -77,174 +54,13 @@
         }
     }
 
-    public static Integer getGroupRow(String locNo, Boolean pakin){
-        int row = getRow(locNo);
-        return getGroupRow(row, pakin);
-    }
-
-    public static List<String> getGroupLocNo(String locNo){
-        int row = getRow(locNo);
-        List<String> result = new ArrayList<>();
-        if (FIRST_GROUP_ROW_LIST.contains(row)) {
-            for (Integer groupRow : FIRST_GROUP_ROW_LIST) {
-                result.add(zerofill(String.valueOf(groupRow), 2) + locNo.substring(2));
-            }
-        } else if (SECOND_GROUP_ROW_LIST.contains(row)) {
-            for (Integer groupRow : SECOND_GROUP_ROW_LIST) {
-                result.add(zerofill(String.valueOf(groupRow), 2) + locNo.substring(2));
-            }
-        }
-        return result;
-    }
-
-    public static Integer getGroupRow(Integer row, Boolean pakin) {
-        if (FIRST_GROUP_ROW_LIST.contains(row)) {
-            return 4;
-        } else if (SECOND_GROUP_ROW_LIST.contains(row)) {
-            return 5;
-        } else {
-            return 0;
-        }
-//        if (pakin) {
-//            if (FIRST_GROUP_ROW_LIST.contains(row)) {
-//                return 2;
-//            } else if (SECOND_GROUP_ROW_LIST.contains(row)) {
-//                return 18;
-//            } else {
-//                return 0;
-//            }
-//        } else {
-//            if (FIRST_GROUP_ROW_LIST.contains(row)) {
-//                return 12;
-//            } else if (SECOND_GROUP_ROW_LIST.contains(row)) {
-//                return 30;
-//            } else {
-//                return 0;
-//            }
-//        }
-    }
-
-    /**
-     * 鍒ゆ柇搴撲綅鏄惁涓虹┛姊簱浣�
-     * @param locNo
-     * @return
-     */
-    public static Boolean isShuttle(String locNo) {
-        int row = Utils.getRow(locNo);
-        if (row >= 2 && row <= 12) {
-            return Boolean.TRUE;
-        }
-        return Boolean.FALSE;
-    }
-
-    // -------------------------------------------------------------------------------------------------------------------
-
-
-
-    /**
-     * 鍒ゆ柇鏄惁涓烘繁搴撲綅
-     */
-    public static boolean isDeepLoc(SlaveProperties slaveProperties, String locNo){
-        if (slaveProperties.isDoubleDeep()) {
-            int row = getRow(locNo);
-            return slaveProperties.getDoubleLocs().contains(row);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * 鍒ゆ柇鏄惁涓烘繁搴撲綅
-     */
-    public static boolean isDeepLoc(SlaveProperties slaveProperties, Integer row){
-        if (slaveProperties.isDoubleDeep()) {
-            return slaveProperties.getDoubleLocs().contains(row);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * 鍒ゆ柇鏄惁涓烘祬搴撲綅
-     */
-    public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo){
-        if (slaveProperties.isDoubleDeep()) {
-            int row = getRow(locNo);
-            return !slaveProperties.getDoubleLocs().contains(row);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * 鍒ゆ柇鏄惁涓烘祬搴撲綅
-     */
-    public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row){
-        if (slaveProperties.isDoubleDeep()) {
-            return !slaveProperties.getDoubleLocs().contains(row);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * 鑾峰彇 娣卞簱浣嶅搴旂殑娴呭簱浣嶅彿
-     */
-    public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
-        int row = getRow(deepLoc);
-        int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
-        int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
-        return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
-    }
-
-
-    /**
-     * 鑾峰彇 娣卞簱浣嶆帓瀵瑰簲鐨勬祬搴撲綅鎺�
-     */
-    public static Integer getShallowRow(SlaveProperties slaveProperties, Integer deepRow) {
-        int remainder = (int) Arith.remainder(deepRow, slaveProperties.getGroupCount());
-        return remainder == 1 ? (deepRow + 1) : (deepRow - 1);
-    }
-
-    /**
-     * 鑾峰彇 娴呭簱浣嶅搴旂殑娣卞簱浣嶅彿
-     */
-    public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
-        int row = getRow(shallowLoc);
-        int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
-        int targetRow;
-        if (remainder == 2) {
-            targetRow = row - 1;
-        } else if (remainder == 1) {
-            targetRow = row + 1;
-        } else {
-            throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
-        }
-        return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
-    }
-
-    /**
-     * 鑾峰彇 娴呭簱浣嶆帓瀵瑰簲鐨勬繁搴撲綅鎺�
-     */
-    public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
-        int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
-        int targetRow;
-        if (remainder == 2) {
-            targetRow = shallowRow - 1;
-        } else if (remainder == 1) {
-            targetRow = shallowRow + 1;
-        } else {
-            throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
-        }
-        return targetRow;
-    }
-
     /**
      * 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
      */
     public static int getRow(String locNo) {
         if (!Cools.isEmpty(locNo)) {
-            return Integer.parseInt(locNo.substring(0, 2));
+            String[] split = locNo.split(LOC_NO_FLAG);
+            return Integer.parseInt(split[0]);
         }
         throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
     }
@@ -254,7 +70,8 @@
      */
     public static int getBay(String locNo) {
         if (!Cools.isEmpty(locNo)) {
-            return Integer.parseInt(locNo.substring(2, 5));
+            String[] split = locNo.split(LOC_NO_FLAG);
+            return Integer.parseInt(split[1]);
         }
         throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
     }
@@ -264,272 +81,124 @@
      */
     public static int getLev(String locNo) {
         if (!Cools.isEmpty(locNo)) {
-            return Integer.parseInt(locNo.substring(5, 7));
+            String[] split = locNo.split(LOC_NO_FLAG);
+            return Integer.parseInt(split[2]);
         }
         throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
     }
 
-    /**
-     * 閫氳繃鎺掑垪灞傛嫾鎺ュ嚭搴撲綅鍙�
-     */
-    public static String append(int row, int bay, int lev) {
-        return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
-    }
-
-
-    /**
-     * 褰撴绱㈠埌鍙屾繁搴撲綅鐨勬祬搴撲綅鏃讹紝濡傛灉娣卞簱浣嶆棤璐э紝鍒欐斁鍏ュ搴旂殑娣卞簱浣�
-     */
-    public static void toDeepIfEmptyByShallow(String shallowLoc) {
-        int row = getRow(shallowLoc);
-        int remainder = (int) Arith.remainder(row, 4);
-        int targetRow = 0;
-        if (remainder == 2) {
-            targetRow = row - 1;
-        } else if (remainder == 3) {
-            targetRow = row + 1;
-        } else {
-            throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
-        }
-        String targetLoc = zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
-
-    }
-
     public static String getLocNo(Number row, Number bay, Number lev) {
-        return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
+        return row + LOC_NO_FLAG + bay + LOC_NO_FLAG + lev;
     }
 
-    //鍑哄叆搴撶珯鐐瑰彿杞崲瀵瑰簲妤煎眰
-    public static Integer outInStaNoToLev(Integer distSta) {
-        Integer distLev = 1;//鐩爣妤煎眰
-        switch (distSta) {
-            case 102:
-                distLev = 2;//杈撻�佺嚎妤煎眰
-            case 105:
-                distLev = 1;//涓�妤�
-            case 106:
-                distLev = 3;//浜屾ゼ
-            case 107:
-                distLev = 4;//涓夋ゼ
-            case 108:
-                distLev = 5;//鍥涙ゼ
+    public static boolean isJSON(String value) {
+        try {
+            JSONObject jsonData = JSON.parseObject(value);
+            if (jsonData == null) {
+                return false;
+            }
+            return true;
+        } catch (Exception e) {
+            return false;
         }
-        return distLev;
     }
 
-    //妤煎眰杞崲瀵瑰簲鍑哄叆搴撶珯鐐瑰彿
-    public static Integer levToOutInStaNo(Integer lev) {
-        Integer staNo = null;//绔欑偣鍙�
-        switch (lev) {
-            case 1:
-                staNo = 105;
-                break;
-            case 2://杈撻�佺嚎灞�
-                staNo = 105;
-                break;
-            case 3:
-                staNo = 106;
-                break;
-            case 4:
-                staNo = 107;
-                break;
-            case 5:
-                staNo = 108;
-                break;
+    //鑾峰彇璁惧鏃ュ織閲囬泦鏃堕棿
+    public static int getDeviceLogCollectTime() {
+        int defaultTime = 200;
+        try {
+            RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+            if (redisUtil == null) {
+                return defaultTime;
+            }
+
+            Object object = redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
+            if (object == null) {
+                return defaultTime;
+            }
+
+            HashMap<String, String> systemConfigMap = (HashMap<String, String>) object;
+            String deviceLogCollectTime = systemConfigMap.get("deviceLogCollectTime");
+            if(deviceLogCollectTime == null){
+                return defaultTime;
+            }
+
+            return Integer.parseInt(deviceLogCollectTime);
+        }catch (Exception e){
+            e.printStackTrace();
         }
-        return staNo;
+        return defaultTime;
     }
 
-    //鎻愬崌鏈轰綅缃弽棣堣浆鎹㈠嚭鍏ュ簱绔欑偣搴撲綅鍙�
-    public static String liftArrivalToOutInStaLocNo(Short liftArrival) {
-        String locNo = null;
-        switch (liftArrival) {
-            case 1:
-                locNo = "1800201";
-                break;
-            case 4:
-                locNo = "1800202";
-                break;
-            case 8:
-                locNo = "1800203";
-                break;
-            case 16:
-                locNo = "1800204";
-                break;
-        }
-        return locNo;
-    }
+    //鑾峰彇鍏ュ簱浠诲姟鍙敤鎺�
+    public static List<Integer> getInTaskEnableRow() {
+        List<Integer> list = new ArrayList<>();
+        try {
+            RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+            WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
+            BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
 
-    public static void main(String[] args) {
-        System.out.println(JSON.toJSONString(getGroupOutsideLoc("0200101")));
-    }
+            Integer currentCircleTaskCrnNo = null;
+            Object object = redisUtil.get(RedisKeyType.CURRENT_CIRCLE_TASK_CRN_NO.key);
+            if (object != null) {
+                currentCircleTaskCrnNo = Integer.parseInt(String.valueOf(object));
+            }
 
-    // 澶栦晶鏂瑰悜鐨勮揣浣�  浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜 ===>> 鍙嶄箣
-    public static List<String> getGroupOutsideLoc(String locNo){
-        int row = getRow(locNo);
-        List<String> result = new ArrayList<>();
-        if (SECOND_GROUP_ROW_LIST.contains(row)) {
-            for (Integer integer : SECOND_GROUP_ROW_LIST) {
-                if (integer < row) {
-                    result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-                } else {
-                    break;
+            Wrapper<BasCrnp> wrapper = new EntityWrapper<BasCrnp>()
+                    .eq("in_enable", "Y")
+                    .eq("status", 1);
+
+            if (currentCircleTaskCrnNo != null) {
+                currentCircleTaskCrnNo = currentCircleTaskCrnNo + 1;
+                BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", currentCircleTaskCrnNo));
+                List<WrkMast> currentCrnTask = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", currentCircleTaskCrnNo));
+                if (currentCrnTask.size() <= 1) {
+                    if (basCrnp != null) {
+                        String controlRowsStr = basCrnp.getControlRows();
+                        if(!Cools.isEmpty(controlRowsStr)){
+                            List<Integer> rows = JSON.parseArray(controlRowsStr, Integer.class);
+                            list.addAll(rows);
+                            wrapper.ne("crn_no", currentCircleTaskCrnNo);
+                        }
+                    }
                 }
             }
-        } else if (FIRST_GROUP_ROW_LIST.contains(row)) {
-            List<Integer> clone = Arrays.asList(new Integer[FIRST_GROUP_ROW_LIST.size()]);
-            Collections.copy(clone, FIRST_GROUP_ROW_LIST);
-            Collections.reverse(clone);
-            for (Integer integer : clone) {
-                if (integer > row) {
-                    result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
-                } else {
-                    break;
-                }
-            }
-        } else {
-//            throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
-        }
-        if (!Cools.isEmpty(result)) {
-            Collections.reverse(result);
-        }
-        return result;
-    }
 
-    //鑾峰彇闄ょ櫧鍚嶅崟澶栫殑鎸囧畾妤煎眰鍏ㄩ儴绌挎杞y鍧愭爣鐐�
-    public static List<int[]> getShuttlePoints(Integer whiteShuttle, Integer lev) {
-        BasShuttleService basShuttleService = SpringUtils.getBean(BasShuttleService.class);
-        SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
-        ArrayList<int[]> list = new ArrayList<>();
-        for (ShuttleSlave slave : slaveProperties.getShuttle()) {
-            if (slave.getId().intValue() == whiteShuttle) {
-                continue;//璺宠繃鐧藉悕鍗�
+            HashMap<Integer, Integer> map = new HashMap<>();
+            List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
+            List<BasCrnp> basCrnps = basCrnpService.selectList(wrapper);
+
+            for (WrkMast wrkMast : wrkMasts) {
+                Integer crnNo = wrkMast.getCrnNo();
+                map.put(crnNo, map.getOrDefault(crnNo, 0) + 1);
             }
 
-            //鑾峰彇绌挎杞︽墍鍦ㄨ妭鐐逛綅缃�
-            NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, slave.getId());
-            if (shuttleThread == null) {
-                continue;
-            }
-            NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
-            if (shuttleProtocol == null) {
-                continue;
-            }
-
-            String currentLocNo = shuttleProtocol.getCurrentLocNo();
-
-            if (currentLocNo == null) {
-                //灏忚溅娌℃湁搴撲綅鍙锋暟鎹紝浠庢暟鎹簱涓彇
-                BasShuttle basShuttle = basShuttleService.selectById(slave.getId());
-                if (basShuttle == null || basShuttle.getPoint() == null) {
+            List<BasCrnp> enabledCrnps = new ArrayList<>();
+            for (BasCrnp basCrnp : basCrnps) {
+                CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
+                if (crnThread == null) {
                     continue;
                 }
-                NyShuttleProtocol.NyShuttlePointClass shuttlePoint = JSON.parseObject(basShuttle.getPoint(), NyShuttleProtocol.NyShuttlePointClass.class);
-                currentLocNo = NavigatePositionConvert.nyXyzToLocNo(shuttlePoint.getX(), shuttlePoint.getY(), shuttlePoint.getZ());
+                CrnProtocol crnProtocol = crnThread.getStatus();
+                if (crnProtocol.getMode() != CrnModeType.AUTO.id) {
+                    continue;
+                }
+                enabledCrnps.add(basCrnp);
             }
 
-            if (lev != Utils.getLev(currentLocNo)) {
-                continue;//妤煎眰涓嶅悓
-            }
+            enabledCrnps.sort(Comparator.comparingInt(o -> map.getOrDefault(o.getCrnNo(), 0)));
 
-            if (shuttleProtocol.getCurrentLocNo() == null) {
-                continue;
+            for (BasCrnp basCrnp : enabledCrnps) {
+                String controlRowsStr = basCrnp.getControlRows();
+                if (Cools.isEmpty(controlRowsStr)) {
+                    continue;
+                }
+                List<Integer> rows = JSON.parseArray(controlRowsStr, Integer.class);
+                list.addAll(rows);
             }
-            int[] xyPosition = NavigatePositionConvert.positionToXY(shuttleProtocol.getCurrentLocNo());//閫氳繃搴撲綅鍙疯幏鍙杧y鍧愭爣
-            list.add(xyPosition);
+        }catch (Exception e){
+            e.printStackTrace();
         }
         return list;
     }
-
-    //鎼滅储涓�鏉℃病鏈夊皬杞︾殑绌哄贩閬擄紝骞惰皟搴﹀皬杞�
-    public static boolean searchEmptyGroupToMoveShuttle(int z, Integer currentShuttleId, NyShuttleThread shuttleThread) {
-        LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
-        WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
-        CommonService commonService = SpringUtils.getBean(CommonService.class);
-        ShuttleDispatchUtils shuttleDispatchUtils = SpringUtils.getBean(ShuttleDispatchUtils.class);
-
-        if (shuttleThread == null) {
-            return false;
-        }
-        NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
-        if (shuttleProtocol == null) {
-            return false;
-        }
-
-        NavigateMapData mapData = new NavigateMapData(z);//鑾峰彇鍦板浘鏁版嵁
-        int[][] data = mapData.getData(-1, null, currentShuttleId == null ? null : Utils.getShuttlePoints(0, z));//杞藉叆鍏ㄩ儴杞﹁締
-
-        int distY = -1;
-        int distX = -1;
-        int distZ = -1;
-        //鑾峰彇閬胯搴撲綅
-        String distLocNo = null;
-        for (int y = 20; y <= 56; y++) {
-            boolean searchFlag = true;
-            for (int x = 10; x <= 11; x++) {
-                if (data[x][y] < 0 || data[x][y] == 66) {
-                    searchFlag = false;//璇ュ贩閬撴湁绂佺敤鑺傜偣鎴栨湁灏忚溅
-                    break;
-                }
-            }
-
-            if (searchFlag) {
-                //鎼滅储鍑虹┖宸烽亾
-                distY = y;
-                distX = 11;
-                distZ = z;
-
-                //鑾峰彇閬胯搴撲綅
-                String locNo = NavigatePositionConvert.xyzToLocNo(distX, distY, distZ);
-                LocMast distLocMast = locMastService.queryByLoc(locNo);
-                if (distLocMast == null) {
-                    continue;
-                }
-
-                //鍒ゆ柇璇ュ簱浣嶆槸鍚﹀瓨鍦ㄥ伐浣滄。
-                EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
-                wrapper.eq("loc_no", locNo);
-                WrkMast wrkMast = wrkMastService.selectOne(wrapper);
-                if (wrkMast != null) {
-                    continue;//瀛樺湪宸ヤ綔妗h烦杩囪搴撲綅
-                }
-
-                distLocNo = locNo;
-                break;
-            }
-        }
-
-        if (distLocNo != null) {
-            //璋冨害灏忚溅鍒伴伩璁╀綅缃�
-            return shuttleDispatchUtils.dispatchShuttle(commonService.getWorkNo(7), distLocNo, shuttleProtocol.getShuttleNo().intValue());
-        }
-        return false;
-    }
-
-    //妫�娴嬫ゼ灞傛槸鍚︽湁绌挎杞�
-    public static boolean checkLevHasShuttle(Integer lev) {
-        SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
-        for (ShuttleSlave shuttle : slaveProperties.getShuttle()) {
-            //鑾峰彇鍥涘悜绌挎杞︾嚎绋�
-            NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttle.getId());
-            if (shuttleThread == null) {
-                continue;
-            }
-            NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
-            if (shuttleProtocol == null) {
-                continue;
-            }
-            String currentLocNo = shuttleProtocol.getCurrentLocNo();
-            if (currentLocNo == null) {
-                continue;
-            }
-
-            if (lev == Utils.getLev(currentLocNo)) {
-                return true;//鎸囧畾妤煎眰鏈夌┛姊溅
-            }
-        }
-
-        return false;//鎸囧畾妤煎眰娌℃湁绌挎杞�
-    }
-
 }

--
Gitblit v1.9.1