From 0dab5a05ed6e734a83c43f8e6e5ef1b07115f48d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 10 十二月 2024 10:50:54 +0800
Subject: [PATCH] #path similarity
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasShuttleController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasShuttleController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasShuttleController.java
index 0433698..62f5e5e 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasShuttleController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasShuttleController.java
@@ -176,6 +176,23 @@
shuttleThread.reset(null);
return R.ok();
+ } else if (param.getShuttleTaskMode().equals("requestWaiting")) {
+ //鐢宠纭
+ Device device = deviceService.getOne(new LambdaQueryWrapper<Device>()
+ .eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val())
+ .eq(Device::getStatus, 1)
+ .eq(Device::getDeviceNo, shuttleNo));
+ if (device == null) {
+ return R.error("璁惧涓嶅瓨鍦�");
+ }
+
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
+ if (shuttleThread == null) {
+ return R.error("璁惧绂荤嚎");
+ }
+
+ shuttleThread.requestWaiting();
+ return R.ok();
}
Task task = new Task();
@@ -186,12 +203,12 @@
task.setPriority(10);
task.setOriginSite(null);
task.setOriginLoc(sourceLoc);
- task.setDestSite(targetSite);
+ task.setDestSite(null);
task.setDestLoc(targetLoc);
task.setIoTime(new Date());
task.setStartTime(new Date());
task.setStatus(1);
- task.setMemo("manual");
+ task.setMemo(targetSite);
task.setShuttleNo(param.getShuttleNo());
if (param.getShuttleTaskMode().equals("takeMove")) {
--
Gitblit v1.9.1