From 056cf9d0311e1345017ab4c52c5946144fb4ccb8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 14 十月 2024 15:03:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/RgvController.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index bb6cee0..3be5b88 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -5,6 +5,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.RgvStatusType;
+import com.zy.asrs.domain.param.CrnOperatorParam;
import com.zy.asrs.domain.param.RgvOperatorParam;
import com.zy.asrs.domain.vo.RgvMsgTableVo;
import com.zy.asrs.domain.vo.RgvStateTableVo;
@@ -59,6 +60,14 @@
@Autowired
private LocMastService locMastService;
+ @ManagerAuth(memo = "瑙ｉ攣灏忚溅")
+ @PostMapping("/lock")
+ public R lock(CrnOperatorParam param){
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, param.getRgvNo());
+ rgvThread.setPakMk(true);
+ return R.ok();
+ }
+
@PostMapping("/table/rgv/state")
@ManagerAuth(memo = "RGV淇℃伅琛�")
public R rgvStateTable(){
@@ -84,10 +93,12 @@
vo.setStatus1(rgvProtocol.getStatusType1().desc); // 宸ヤ綅1鐘舵��
vo.setLoading1(rgvProtocol.getLoaded1()==1?"鏈夌墿":"鏃犵墿"); // 宸ヤ綅1鏈夌墿
vo.setRgvPos(rgvProtocol.getRgvPos());
- vo.setWalkPos(rgvProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
- vo.setWorkNo2(rgvProtocol.getTaskNo2()); // 宸ヤ綅2浠诲姟鍙�
- vo.setStatus2(rgvProtocol.getStatusType2().desc); // 宸ヤ綅2鐘舵��
- vo.setLoading2(rgvProtocol.getLoaded2()==1?"鏈夌墿":"鏃犵墿"); // 宸ヤ綅2鏈夌墿
+ vo.setRgvPos1(rgvProtocol.getRgvPosI());
+ vo.setWalkPos(rgvProtocol.getWalkPos()==1?"鍦ㄥ畾浣�":"涓嶅湪瀹氫綅");
+ vo.setPakMk(rgvThread.isPakMk()?"鏃犻攣":"閿佸畾");
+// vo.setWorkNo2(rgvProtocol.getTaskNo2()); // 宸ヤ綅2浠诲姟鍙�
+// vo.setStatus2(rgvProtocol.getStatusType2().desc); // 宸ヤ綅2鐘舵��
+// vo.setLoading2(rgvProtocol.getLoaded2()==1?"鏈夌墿":"鏃犵墿"); // 宸ヤ綅2鏈夌墿
vo.setWarnCode(String.valueOf(rgvProtocol.getAlarm()));
if (rgvProtocol.getAlarm() > 0) {
@@ -165,11 +176,11 @@
command.setTaskMode1(RgvTaskModeType.FETCH_PUT); // 浠诲姟妯″紡: 鍙栨斁璐�
command.setSourceStaNo1(param.getSourceStaNo1()); // 婧愮珯
command.setDestinationStaNo1(param.getStaNo1()); // 鐩爣绔�
- command.setAckFinish2((short) 0); // 浠诲姟瀹屾垚纭浣�
- command.setTaskNo2((short) 0); // 宸ヤ綔鍙�
- command.setTaskMode2(RgvTaskModeType.FETCH_PUT); // 浠诲姟妯″紡: 鍙栨斁璐�
- command.setSourceStaNo2(param.getSourceStaNo2()); // 婧愮珯
- command.setDestinationStaNo2(param.getStaNo2()); // 鐩爣绔�
+// command.setAckFinish2((short) 0); // 浠诲姟瀹屾垚纭浣�
+// command.setTaskNo2((short) 0); // 宸ヤ綔鍙�
+// command.setTaskMode2(RgvTaskModeType.FETCH_PUT); // 浠诲姟妯″紡: 鍙栨斁璐�
+// command.setSourceStaNo2(param.getSourceStaNo2()); // 婧愮珯
+// command.setDestinationStaNo2(param.getStaNo2()); // 鐩爣绔�
command.setCommand((short) 0);
return rgvControl(command)? R.ok(): R.error();
@@ -214,6 +225,8 @@
return rgvControl(command)? R.ok(): R.error();
}
+
+
@ManagerAuth(memo = "浠诲姟瀹屾垚")
@PostMapping("/operator/taskComplete")
@@ -284,7 +297,7 @@
Command.setCommand((short) 0); // 浠诲姟瀹屾垚纭浣�
// 寤舵椂鍙戦��
Thread.sleep(1000L);
- if (MessageQueue.offer(SlaveType.Rgv, rgv.getId(), new Task(2, Command))) {
+ if (MessageQueue.offer(SlaveType.Rgv, rgv.getId(), new Task(4, Command))) {
return R.ok();
} else {
throw new CoolException("鍛戒护涓嬪彂澶辫触");
@@ -310,7 +323,7 @@
if (rgvProtocol == null) {
throw new CoolException("RGV涓嶅湪绾�");
}
- if (MessageQueue.offer(SlaveType.Rgv, rgv.getId(), new Task(2, command))) {
+ if (MessageQueue.offer(SlaveType.Rgv, rgv.getId(), new Task(4, command))) {
return true;
} else {
throw new CoolException("鍛戒护涓嬪彂澶辫触");
--
Gitblit v1.9.1