From ee6e7a5260183a0ac977d6ff21fe3de6f70d3bdd Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 18 六月 2024 16:56:40 +0800 Subject: [PATCH] # --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java index 85004c5..1226aa3 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java @@ -86,6 +86,21 @@ continue; } + BasShuttle basShuttle = basShuttleService.getOne(new LambdaQueryWrapper<BasShuttle>() + .eq(BasShuttle::getShuttleNo, device.getDeviceNo()) + .eq(BasShuttle::getHostId, device.getHostId())); + if (basShuttle == null) { + continue;//灏忚溅鍩虹鏁版嵁涓嶅瓨鍦� + } + + if (!Cools.isEmpty(basShuttle.getDisableLev())) { + List<Integer> disableLev = JSON.parseArray(basShuttle.getDisableLev(), Integer.class); + //妫�鏌ュ皬杞︽槸鍚︾鐢ㄨ妤煎眰 + if (disableLev.contains(Utils.getLev(locNo))) { + continue;//灏忚溅绂佺敤璇ユゼ灞傝烦杩囪杞� + } + } + //妫�娴嬫槸鍚﹀瓨鍦ㄥ厖鐢典换鍔� Task taskCharge = taskService.selectChargeWorking(Integer.valueOf(device.getDeviceNo())); if (taskCharge != null) { -- Gitblit v1.9.1