From 36c6d6b39e2b76080480c5bc90a412d711b76144 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 19 六月 2024 15:54:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/Utils.java | 36 ------------------------------------
1 files changed, 0 insertions(+), 36 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/Utils.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/Utils.java
index 6c3b59b..d03039a 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/Utils.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/Utils.java
@@ -207,40 +207,4 @@
return true;//鏈変换鍔＄粦瀹�
}
- /**
- * 鑾峰彇璺濈鐩爣搴撲綅鏈�杩戠殑鎻愬崌鏈�
- */
- public static Device getRecentTransferLift(String locNo, Integer shuttleNo) {
- BasLiftService basLiftService = SpringUtils.getBean(BasLiftService.class);
- DeviceService deviceService = SpringUtils.getBean(DeviceService.class);
- if (basLiftService == null) {
- return null;
- }
-
- Integer distance = Integer.MAX_VALUE;
- Long liftDeviceId = null;
- for (BasLift basLift : basLiftService.list(new LambdaQueryWrapper<BasLift>()
- .eq(BasLift::getStatus, 1)
- .eq(BasLift::getTransfer, 1))) {
- int lev = Utils.getLev(locNo);
- String liftLocNo = Utils.getLocNo(basLift.getRow(), basLift.getBay(), lev);
- List<NavigateNode> nodeList = NavigateUtils.calc(locNo, liftLocNo, NavigationMapType.NONE.id, Utils.getShuttlePoints(shuttleNo, Utils.getLev(locNo)));
- Integer originPathAllDistance = NavigateUtils.getOriginPathAllDistance(nodeList);//鎬昏窛绂�
- if (originPathAllDistance < distance) {
- distance = originPathAllDistance;
- liftDeviceId = basLift.getDeviceId();
- }
- }
-
- if (liftDeviceId == null) {
- return null;
- }
-
- Device device = deviceService.getById(liftDeviceId);
- if (device == null) {
- return null;
- }
- return device;
- }
-
}
--
Gitblit v1.9.1