From 6384d2fc361207ecf4697d17be08f5c22ce57597 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 24 八月 2020 13:33:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 28e4358..de0fd9b 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -9,7 +9,9 @@
import com.zy.asrs.domain.vo.CommandLogVo;
import com.zy.asrs.domain.vo.CrnMsgTableVo;
import com.zy.asrs.domain.vo.CrnStateTableVo;
+import com.zy.asrs.entity.BasCrnError;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.service.WrkMastService;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -45,6 +47,9 @@
private SlaveProperties slaveProperties;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private BasCrnErrorMapper basCrnErrorMapper;
+
@ManagerAuth(memo = "杩涜涓殑鍛戒护")
@PostMapping("/command/ongoing")
@@ -99,7 +104,7 @@
vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
}
} else {
- vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO.getDesc(): CrnStatusType.UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
}
vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵��
vo.setWarn(""); // 鎶ヨ todo
@@ -108,6 +113,7 @@
vo.setLev(crnProtocol.getLevel()); // 灞�
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
vo.setLiftPos(crnProtocol.getLiftPosType().desc); // 杞借揣鍙颁綅缃�
+ vo.setWorkNo(crnProtocol.getAlarm1()); // 寮傚父鐮�
list.add(vo);
}
return R.ok().add(list);
@@ -131,6 +137,10 @@
CrnMsgTableVo vo = new CrnMsgTableVo();
vo.setCrnNo(crn.getId()); // 鍫嗗灈鏈哄彿
vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
+ if (null != crnError) {
+ vo.setError(crnError.getErrorCode() + crnError.getErrName());
+ }
if (crnProtocol.getTaskNo()>0) {
WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
if (wrkMast != null) {
@@ -141,7 +151,7 @@
vo.setLocNo(wrkMast.getLocNo()); // 鐩爣搴撲綅
}
} else {
- vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO.getDesc(): CrnStatusType.UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
}
list.add(vo);
@@ -344,10 +354,10 @@
throw new CoolException("鍫嗗灈鏈轰笉鍦ㄧ嚎");
}
// 鍙湁鍑虹幇鎸囧畾寮傚父鎵嶈繘琛屽浣�
- if (crnProtocol.getCrnError2().leftTakeNoneErr
- || crnProtocol.getCrnError2().rightTakeNoneErr
- || crnProtocol.getCrnError2().leftPutLoadErr
- || crnProtocol.getCrnError2().rightPutLoadErr) {
+ 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); // 浠诲姟瀹屾垚纭浣�
--
Gitblit v1.9.1