From 3d66f39f6fa20f13a13c7dd81aea3407eeb6d5b6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 11 一月 2021 15:33:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 29f65a1..6b5eede 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -119,21 +119,28 @@
//
// }
vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵��
- vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵��
+ if (crnProtocol.getTaskFinish() == 1) {
+ vo.setStatus("绛夊緟纭");
+ } else {
+ vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵��
+ }
vo.setLoading(crnProtocol.getLoaded()==1?"鏈夌墿":"鏃犵墿"); // 鏈夌墿
vo.setBay(crnProtocol.getBay()); // 鍒�
vo.setLev(crnProtocol.getLevel()); // 灞�
- vo.setXOrigin(crnProtocol.getBay()==1?"鏄�":"鍚�"); // 璧拌鍘熺偣
- vo.setYOrigin(crnProtocol.getLevel()==1?"鏄�":"鍚�"); // 鍗囬檷鍘熺偣
+ vo.setLiftPos(crnProtocol.getLiftPosType().desc);
+ if (crnProtocol.getPlatformHigh()) {
+ vo.setSitePos("绔欏彴楂樹綅");
+ }
+ if (crnProtocol.getPlatformLow()) {
+ vo.setSitePos("绔欏彴楂樹綅");
+ }
+// vo.setXOrigin(crnProtocol.getBay()==1?"鏄�":"鍚�"); // 璧拌鍘熺偣
+// vo.setYOrigin(crnProtocol.getLevel()==1?"鏄�":"鍚�"); // 鍗囬檷鍘熺偣
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?"鏄�":"鍚�"); // 鎬ュ仠
- if (vo.getCrnNo() == 2) {
- vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()-1000)); // 寮傚父鐮�
- } else {
- vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1())); // 寮傚父鐮�
- }
+ vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1())); // 寮傚父鐮�
}
return R.ok().add(list);
--
Gitblit v1.9.1