From 70818a17fd9e251f663ffe40002bb279511c2dcd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 02 一月 2021 11:23:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 0c02526..c0c1558 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -129,7 +129,12 @@
vo.setXLocation(crnProtocol.getWalkPos() == 1?"鏄�":"鍚�"); // 璧拌瀹氫綅
vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"鍚�":"鏄�"); // 鍗囬檷瀹氫綅
// vo.setStop(crnProtocol.getCrnError1().controlStop||crnProtocol.getCrnError1().mainStop||crnProtocol.getCrnError1().remoteStop?"鏄�":"鍚�"); // 鎬ュ仠
- vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1())); // 寮傚父鐮�
+ if (vo.getCrnNo() == 2) {
+ vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()-1000)); // 寮傚父鐮�
+ } else {
+ vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1())); // 寮傚父鐮�
+ }
+
}
return R.ok().add(list);
}
@@ -398,23 +403,39 @@
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); // 浠诲姟妯″紡
+ if (crn.getId() == 1) {
+ // 鍙湁鍑虹幇鎸囧畾寮傚父鎵嶈繘琛屽浣�
+ 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("鍛戒护涓嬪彂澶辫触");
+ }
+ }
+ } else if (crn.getId() == 2) {
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(crn.getId()); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskMode(CrnTaskModeType.CANCEL);
+ crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
// 寤舵椂鍙戦��
- Thread.sleep(3000L);
- if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, command))) {
+ 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