From 371272c50c94b364aed0efec4871aefa85ff0a27 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 11 一月 2021 14:43:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 86 ++++++++++++++++++++++--------------------
1 files changed, 45 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 9f424bf..0c202b1 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -7,6 +7,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.CrnStatusType;
+import com.zy.asrs.domain.param.CrnDemoParam;
import com.zy.asrs.domain.param.CrnOperatorParam;
import com.zy.asrs.domain.vo.CommandLogVo;
import com.zy.asrs.domain.vo.CrnMsgTableVo;
@@ -31,6 +32,7 @@
import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.properties.SlaveProperties;
+import com.zy.core.properties.SystemProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -108,15 +110,20 @@
continue;
}
vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
- if (crnProtocol.getTaskNo()>0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
- if (wrkMast != null) {
- vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
- }
+// if (crnProtocol.getTaskNo()>0) {
+// WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+// if (wrkMast != null) {
+// vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
+// }
+// } else {
+//
+// }
+ vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵��
+ if (crnProtocol.getTaskFinish() == 1) {
+ vo.setStatus("绛夊緟纭");
} else {
- vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵��
}
- vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵��
vo.setLoading(crnProtocol.getLoaded()==1?"鏈夌墿":"鏃犵墿"); // 鏈夌墿
vo.setBay(crnProtocol.getBay()); // 鍒�
vo.setLev(crnProtocol.getLevel()); // 灞�
@@ -125,8 +132,9 @@
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
vo.setXLocation(crnProtocol.getWalkPos() == 1?"鏄�":"鍚�"); // 璧拌瀹氫綅
vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"鍚�":"鏄�"); // 鍗囬檷瀹氫綅
- vo.setStop(crnProtocol.getCrnError1().controlStop||crnProtocol.getCrnError1().mainStop||crnProtocol.getCrnError1().remoteStop?"鏄�":"鍚�"); // 鎬ュ仠
+// vo.setStop(crnProtocol.getCrnError1().controlStop||crnProtocol.getCrnError1().mainStop||crnProtocol.getCrnError1().remoteStop?"鏄�":"鍚�"); // 鎬ュ仠
vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1())); // 寮傚父鐮�
+
}
return R.ok().add(list);
}
@@ -320,23 +328,23 @@
return crnControl(command)?R.ok():R.error();
}
- @ManagerAuth(memo = "鍧愭爣绉诲姩")
- @PostMapping("/operator/coorMove")
- public R crnCoorMove(CrnOperatorParam param){
- CrnCommand command = new CrnCommand();
- command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
- command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode(CrnTaskModeType.OFFSET_MOVE); // 浠诲姟妯″紡
- command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓
- command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪
- command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰
- command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
- staNoProcess(param, command);
- return crnControl(command)?R.ok():R.error();
- }
+// @ManagerAuth(memo = "鍧愭爣绉诲姩")
+// @PostMapping("/operator/coorMove")
+// public R crnCoorMove(CrnOperatorParam param){
+// CrnCommand command = new CrnCommand();
+// command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+// command.setTaskMode(CrnTaskModeType.OFFSET_MOVE); // 浠诲姟妯″紡
+// command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓
+// command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪
+// command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰
+// command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
+// command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
+// command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+// staNoProcess(param, command);
+// return crnControl(command)?R.ok():R.error();
+// }
@ManagerAuth(memo = "浠诲姟瀹屾垚")
@PostMapping("/operator/taskComplete")
@@ -395,23 +403,19 @@
if (crnProtocol == null) {
throw new CoolException("鍫嗗灈鏈轰笉鍦ㄧ嚎");
}
- // 鍙湁鍑虹幇鎸囧畾寮傚父鎵嶈繘琛屽浣�
- if (crnProtocol.getCrnError3().leftTakeNoneErr
- || crnProtocol.getCrnError3().rightTakeNoneErr
- || crnProtocol.getCrnError3().leftTakeThenLoadErr
- || crnProtocol.getCrnError3().rightTakeThenLoadErr) {
- CrnCommand command = new CrnCommand();
- command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
- command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
- // 寤舵椂鍙戦��
- Thread.sleep(3000L);
- if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, command))) {
- return R.ok();
- } else {
- throw new CoolException("鍛戒护涓嬪彂澶辫触");
- }
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(crn.getId()); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskMode(CrnTaskModeType.CLEAR);
+ crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ // 寤舵椂鍙戦��
+ Thread.sleep(1000L);
+ if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, crnCommand))) {
+ return R.ok();
+ } else {
+ throw new CoolException("鍛戒护涓嬪彂澶辫触");
}
+
+
}
}
--
Gitblit v1.9.1