From 9a9314110bfd44dd60b6b266bb483a713b8db97e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 05 一月 2022 16:10:09 +0800
Subject: [PATCH] Merge branch 'xgmwcs' of http://47.97.1.152:5880/r/zy-wcs into xgmwcs
---
src/main/java/com/zy/asrs/controller/CrnController.java | 29 ++++-------------------------
1 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 1911e3e..ad76d25 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -127,42 +127,21 @@
//
// }
vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵��
- if (crnProtocol.getTaskFinish() == 1) {
+ if (crnProtocol.statusType == com.zy.core.enums.CrnStatusType.WAITING) {
vo.setStatus("绛夊緟纭");
} else {
vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵��
- if (crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.PUT_COMPLETE)) {
- vo.setStatus("姝ｅ湪浣滀笟");
- }
}
vo.setLoading(crnProtocol.getLoaded()==1?"鏈夌墿":"鏃犵墿"); // 鏈夌墿
vo.setBay(crnProtocol.getBay()); // 鍒�
vo.setLev(crnProtocol.getLevel()); // 灞�
vo.setLiftPos(crnProtocol.getLiftPosType().desc);
- if (crnProtocol.getPlatformHigh()) {
- vo.setSitePos("绔欏彴楂樹綅");
- }
- if (crnProtocol.getPlatformLow()) {
- vo.setSitePos("绔欏彴楂樹綅");
- }
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
vo.setXLocation(crnProtocol.getWalkPos() == 1?"鏄�":"鍚�"); // 璧拌瀹氫綅
vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"鍚�":"鏄�"); // 鍗囬檷瀹氫綅
- if (crnProtocol.getAlarm1() > 0) {
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
+ if (crnProtocol.getAlarm() > 0) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
vo.setAlarm1(crnError==null?"鏈煡寮傚父":crnError.getErrName());
- }
- if (crnProtocol.getAlarm2() > 0) {
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm2());
- vo.setAlarm2(crnError==null?"鏈煡寮傚父":crnError.getErrName());
- }
- if (crnProtocol.getAlarm3() > 0) {
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm3());
- vo.setAlarm3(crnError==null?"鏈煡寮傚父":crnError.getErrName());
- }
- if (crnProtocol.getAlarm4() > 0) {
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm4());
- vo.setAlarm4(crnError==null?"鏈煡寮傚父":crnError.getErrName());
}
// vo.setAlarm1(String.valueOf(crnProtocol.getAlarm1()));
// vo.setAlarm2(String.valueOf(crnProtocol.getAlarm2()));
@@ -335,7 +314,7 @@
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode(CrnTaskModeType.SITE_MOVE); // 浠诲姟妯″紡
+ command.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡
command.setSourcePosX(param.getSourceStaNo()); // 婧愬簱浣嶆帓
command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
command.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
--
Gitblit v1.9.1