From e49208f2514ccf950164a2d6d590d85f7cecb46a Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期五, 07 六月 2024 16:26:28 +0800 Subject: [PATCH] # --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasShuttleController.java | 28 +++++++++++++++++++++++++++- 1 files changed, 27 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 39d86d7..d248998 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 @@ -222,7 +222,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 +250,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