From ebb63d5ac2fb6c822e9d0541d4b86c7d71f21bdb Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 18 四月 2024 15:44:22 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasShuttleController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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 0d519de..8255384 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
@@ -150,11 +150,33 @@
return R.error();
}
+ String sourceLoc = null;//婧愬簱浣�
String targetLoc = null;//浠诲姟鐩爣(鍊熺敤瀛楁)
String targetSite = param.getShuttleTaskMode();//浠诲姟绫诲瀷(鍊熺敤瀛楁)
if (param.getShuttleTaskMode().equals("moveLoc")) {
//杩佺Щ浠诲姟
targetLoc = param.getTargetLocNo();
+ } else if (param.getShuttleTaskMode().equals("takeMove")) {
+ //鍙栨斁璐т换鍔�
+ targetLoc = param.getTargetLocNo();
+ sourceLoc = param.getSourceLocNo();
+ } else if (param.getShuttleTaskMode().equals("reset")) {
+ //澶嶄綅
+ 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.reset(null);
+ return R.ok();
}
Task task = new Task();
@@ -164,7 +186,7 @@
task.setTaskCtg(taskCtg.getId());
task.setPriority(10);
task.setOriginSite(null);
- task.setOriginLoc(null);
+ task.setOriginLoc(sourceLoc);
task.setDestSite(targetSite);
task.setDestLoc(targetLoc);
task.setIoTime(new Date());
--
Gitblit v1.9.1