From e29a9f245ff4e57a40bbab1c0acc3cbc31d3ac2b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 21 四月 2025 11:13:13 +0800
Subject: [PATCH] #出库找待机位优化
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasShuttleController.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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 7b00292..0433698 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
@@ -17,6 +17,7 @@
import com.zy.asrs.wcs.core.entity.TaskCtg;
import com.zy.asrs.wcs.core.kernel.AnalyzeService;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
+import com.zy.asrs.wcs.core.model.enums.TaskCtgType;
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
import com.zy.asrs.wcs.core.service.BasShuttleService;
import com.zy.asrs.wcs.core.service.MotionService;
@@ -142,7 +143,7 @@
//鑾峰彇鎵嬪姩浠诲姟绫诲瀷
TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
- .eq(TaskCtg::getFlag, "MANUAL")
+ .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.MANUAL))
.eq(TaskCtg::getStatus, 1));
if (taskCtg == null) {
return R.error();
@@ -193,7 +194,7 @@
task.setMemo("manual");
task.setShuttleNo(param.getShuttleNo());
- if (param.getShuttleTaskMode().equals("taskMove")) {
+ if (param.getShuttleTaskMode().equals("takeMove")) {
task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
}
boolean result = taskService.save(task);
@@ -222,7 +223,6 @@
//璺戝簱绯荤粺
@PreAuthorize("hasAuthority('core:basShuttle:operator')")
@PostMapping("/basShuttle/moveLoc")
- @Transactional
public synchronized R shuttleMoveLoc(@RequestBody ShuttleMoveLocParam param) {
Device device = deviceService.getOne(new LambdaQueryWrapper<Device>()
.eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val())
@@ -251,4 +251,31 @@
return R.ok();
}
+ //璺戝簱绯荤粺鍏抽棴
+ @PreAuthorize("hasAuthority('core:basShuttle:operator')")
+ @PostMapping("/basShuttle/moveLocClose")
+ public synchronized R shuttleMoveLocClose(@RequestBody ShuttleMoveLocParam param) {
+ Device device = deviceService.getOne(new LambdaQueryWrapper<Device>()
+ .eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val())
+ .eq(Device::getStatus, 1)
+ .eq(Device::getHostId, getHostId())
+ .eq(Device::getDeviceNo, param.getShuttleNo()));
+ if (device == null) {
+ return R.error();
+ }
+
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
+ if (shuttleThread == null) {
+ return R.error();
+ }
+
+ ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
+ if (shuttleProtocol == null) {
+ return R.error();
+ }
+
+ shuttleThread.enableMoveLoc(null, false);
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1