From 502246ee4961c85827b7f14e2b9b8e0f2edfdfbc Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 07 五月 2025 10:24:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 4844ff3..ece8da6 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -130,7 +130,7 @@
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
vo.setLiftPos(crnProtocol.getLiftPosType().desc);
vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
- vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));
+ vo.setWarnCode(String.valueOf(crnProtocol.getAlarm()));
if (crnProtocol.getAlarm() > 0) {
BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName());
@@ -165,9 +165,9 @@
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
vo.setLiftPos(crnProtocol.getLiftPosType().desc);
vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
- vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));
- if (crnProtocol.getAlarm1() > 0) {
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
+ vo.setWarnCode(String.valueOf(crnProtocol.getAlarm()));
+ if (crnProtocol.getAlarm() > 0) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName());
}
return R.ok().add(vo);
@@ -288,8 +288,13 @@
vo.setLocNo(wrkMast.getLocNo()); // 鐩爣搴撲綅
}
} else {
- vo.setDeviceStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ if (Cools.isEmpty(crnProtocol.modeType)){
+ vo.setDeviceStatus(CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ } else {
+ vo.setDeviceStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ }
}
+ vo.setLaneNo(crnProtocol.getLaneNo()); //
vo.setXspeed(crnProtocol.getXSpeed()); // 璧拌閫熷害锛坢/min)
vo.setYspeed(crnProtocol.getYSpeed()); // 鍗囬檷閫熷害锛坢/min)
vo.setZspeed(crnProtocol.getZSpeed()); // 鍙夌墮閫熷害锛坢/min)
@@ -297,8 +302,11 @@
vo.setYdistance(crnProtocol.getYDistance()); // 鍗囬檷璺濈(Km)
vo.setXduration(crnProtocol.getXDuration()); // 璧拌鏃堕暱(H)
vo.setYduration(crnProtocol.getYDuration()); // 鍗囬檷鏃堕暱(H)
-
- vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵��
+ if (Cools.isEmpty(crnProtocol.modeType)){
+ vo.setStatusType(CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ } else {
+ vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵��
+ }
vo.setWrkStatus(crnProtocol.getStatusType().id); // 浠诲姟鐘舵��
vo.setLoading((crnProtocol.getLoaded() != null && crnProtocol.getLoaded() == 1) ? "鏈夌墿" : "鏃犵墿"); // 鏈夌墿
vo.setBay(crnProtocol.getBay()); // 鍒�
@@ -307,9 +315,9 @@
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
vo.setLiftPos(crnProtocol.getLiftPosType().desc);
vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
- vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));
- if (crnProtocol.getAlarm1() > 0) {
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
+ vo.setWarnCode(String.valueOf(crnProtocol.getAlarm()));
+ if (crnProtocol.getAlarm() > 0) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName());
}
vo.setInEnable(basCrnp.getInEnable());
--
Gitblit v1.9.1