From 99a13ac3e2c52881577cbf4a69ccc17f349eeec7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 四月 2024 09:22:12 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasShuttleController.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 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 905f5ec..3f70cf7 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.Task;
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.TaskStsType;
import com.zy.asrs.wcs.core.service.BasShuttleService;
import com.zy.asrs.wcs.core.service.MotionService;
@@ -30,7 +31,6 @@
import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
import com.zy.asrs.wcs.rcs.service.DeviceService;
-import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
import com.zy.asrs.wcs.system.controller.BaseController;
import com.zy.asrs.wcs.utils.ExcelUtil;
@@ -60,8 +60,6 @@
private MotionService motionService;
@Autowired
private DeviceService deviceService;
- @Autowired
- private DeviceTypeService deviceTypeService;
@PreAuthorize("hasAuthority('core:basShuttle:list')")
@PostMapping("/basShuttle/page")
@@ -152,11 +150,16 @@
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();
}
Task task = new Task();
@@ -166,7 +169,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());
@@ -202,16 +205,8 @@
@PostMapping("/basShuttle/moveLoc")
@Transactional
public synchronized R shuttleMoveLoc(@RequestBody ShuttleMoveLocParam param) {
- DeviceType deviceType = deviceTypeService.getOne(new LambdaQueryWrapper<DeviceType>()
- .eq(DeviceType::getFlag, String.valueOf(SlaveType.Shuttle))
- .eq(DeviceType::getStatus, 1)
- .eq(DeviceType::getHostId, getHostId()));
- if (deviceType == null) {
- return R.error();
- }
-
Device device = deviceService.getOne(new LambdaQueryWrapper<Device>()
- .eq(Device::getDeviceType, deviceType.getId())
+ .eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val())
.eq(Device::getStatus, 1)
.eq(Device::getHostId, getHostId())
.eq(Device::getDeviceNo, param.getShuttleNo()));
--
Gitblit v1.9.1