From d772a8c0b226e55dfc28fdfe6e41a2c491317ed8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 01 九月 2020 15:54:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 73e1070..ee31492 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -117,7 +117,7 @@
vo.setXLocation(crnProtocol.getWalkPos() == 1?"鏄�":"鍚�"); // 璧拌瀹氫綅
vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"鍚�":"鏄�"); // 鍗囬檷瀹氫綅
vo.setStop(crnProtocol.getCrnTemp1().stop?"鏄�":"鍚�"); // 鎬ュ仠
- vo.setWorkNo(crnProtocol.getAlarm()); // 寮傚父鐮�
+ vo.setWarnCode(String.valueOf(crnProtocol.getAlarm())); // 寮傚父鐮�
list.add(vo);
}
return R.ok().add(list);
@@ -141,9 +141,9 @@
CrnMsgTableVo vo = new CrnMsgTableVo();
vo.setCrnNo(crn.getId()); // 鍫嗗灈鏈哄彿
vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
if (null != crnError) {
- vo.setError(crnError.getErrorCode() + crnError.getErrName());
+ vo.setError(crnError.getErrName());
}
if (crnProtocol.getTaskNo()>0) {
WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
--
Gitblit v1.9.1