From 627f9f28c8a19d9deae694c11c10dec1d4593270 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 06 六月 2024 16:58:28 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasShuttleController.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 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 8255384..39d86d7 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
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.framework.common.BaseRes;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.common.SnowflakeIdWorker;
@@ -27,7 +26,6 @@
import com.zy.asrs.wcs.rcs.News;
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
import com.zy.asrs.wcs.rcs.entity.Device;
-import com.zy.asrs.wcs.rcs.entity.DeviceType;
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;
@@ -142,7 +140,7 @@
Integer shuttleNo = param.getShuttleNo();
- //鑾峰彇杩佺Щ浠诲姟绫诲瀷
+ //鑾峰彇鎵嬪姩浠诲姟绫诲瀷
TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
.eq(TaskCtg::getFlag, "MANUAL")
.eq(TaskCtg::getStatus, 1));
@@ -194,6 +192,10 @@
task.setStatus(1);
task.setMemo("manual");
task.setShuttleNo(param.getShuttleNo());
+
+ if (param.getShuttleTaskMode().equals("takeMove")) {
+ task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
+ }
boolean result = taskService.save(task);
if (!result) {
return R.error();
@@ -245,14 +247,7 @@
return R.error("灏忚溅蹇欑涓�");
}
- shuttleProtocol.setMoveLoc(true);//寮�鍚窇搴�
- shuttleProtocol.setMoveType(param.getMoveType());
- shuttleProtocol.setXStart(param.getStartX());
- shuttleProtocol.setXTarget(param.getTargetX());
- shuttleProtocol.setXCurrent(param.getStartX());
- shuttleProtocol.setYStart(param.getStartY());
- shuttleProtocol.setYTarget(param.getTargetY());
- shuttleProtocol.setYCurrent(param.getStartY());
+ shuttleThread.enableMoveLoc(param, true);
return R.ok();
}
--
Gitblit v1.9.1