From 8b8a2086509e28bb902166aa35e4c287eb906621 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 30 六月 2025 15:28:39 +0800
Subject: [PATCH] #禁止跨层
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
index e51f7c7..66eacea 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -101,6 +101,10 @@
*/
public synchronized void generateInboundWrk() {
try {
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskCtg,7));
+ if (!Cools.isEmpty(tasks)){
+ return;
+ }
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
List<Device> list = deviceService.list(new LambdaQueryWrapper<Device>()
.eq(Device::getDeviceType, DeviceCtgType.CONVEYOR.val())
@@ -168,6 +172,7 @@
if (staProtocol.isAutoing() && staProtocol.isLoading()
&& staProtocol.isInEnable()
&& !staProtocol.isEmptyMk() && (workNo == 0 || (workNo >= 9990 && workNo <= 9999))
+ && staProtocol.getIsIn() == (short)1
&& staProtocol.isPakMk()
) {
@@ -811,7 +816,7 @@
// }
//妫�娴嬭揣鐗╂槸鍚﹀彲鍑�
- boolean checkLocPathIsAvailable = navigateUtils.checkLocPathIsAvailable(task.getDestLoc(), task.getHostId());
+ boolean checkLocPathIsAvailable = navigateUtils.checkLocPathIsAvailable(task.getOriginLoc(), task.getHostId());
if(!checkLocPathIsAvailable) {
continue;
}
@@ -946,12 +951,12 @@
}
//鎼滅储鍏朵粬妤煎眰鍏呯數妗�
- List<ShuttleChargeSta> list2 = shuttleChargeStaService.list(new LambdaQueryWrapper<ShuttleChargeSta>()
- .notIn(ShuttleChargeSta::getDeviceLev, lev)
- .eq(ShuttleChargeSta::getStatus, 1));
- if (!list2.isEmpty()) {
- allChargeLoc.addAll(list2);
- }
+// List<ShuttleChargeSta> list2 = shuttleChargeStaService.list(new LambdaQueryWrapper<ShuttleChargeSta>()
+// .notIn(ShuttleChargeSta::getDeviceLev, lev)
+// .eq(ShuttleChargeSta::getStatus, 1));
+// if (!list2.isEmpty()) {
+// allChargeLoc.addAll(list2);
+// }
//娌℃湁鎵惧埌鍏呯數妗�
if (allChargeLoc.isEmpty()) {
@@ -1306,7 +1311,7 @@
public synchronized void analyzeLadenMoveTask() {
for (Task task : taskService.selectWaitAnalyzeLadenMoveTask()) {
//妫�娴嬭揣鐗╂槸鍚﹀彲鍑�
- boolean checkLocPathIsAvailable = navigateUtils.checkLocPathIsAvailable(task.getDestLoc(), task.getHostId());
+ boolean checkLocPathIsAvailable = navigateUtils.checkLocPathIsAvailable(task.getOriginLoc(), task.getHostId());
if(!checkLocPathIsAvailable) {
continue;
}
--
Gitblit v1.9.1