From 1e9c546bb09141c75559f0850a254d6f1d538005 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 06 一月 2022 10:17:26 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 26 +++++--------
src/main/java/com/zy/asrs/controller/CrnController.java | 29 +++-----------
src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java | 30 +++------------
3 files changed, 22 insertions(+), 63 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index ad76d25..52fadad 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -26,7 +26,6 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.CrnLiftPosType;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.enums.SlaveType;
@@ -118,36 +117,20 @@
continue;
}
vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
-// if (crnProtocol.getTaskNo()>0) {
-// WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
-// if (wrkMast != null) {
-// vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
-// }
-// } else {
-//
-// }
vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵��
- if (crnProtocol.statusType == com.zy.core.enums.CrnStatusType.WAITING) {
- vo.setStatus("绛夊緟纭");
- } else {
- vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵��
- }
+ vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵��
vo.setLoading(crnProtocol.getLoaded()==1?"鏈夌墿":"鏃犵墿"); // 鏈夌墿
vo.setBay(crnProtocol.getBay()); // 鍒�
vo.setLev(crnProtocol.getLevel()); // 灞�
- vo.setLiftPos(crnProtocol.getLiftPosType().desc);
+
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
- vo.setXLocation(crnProtocol.getWalkPos() == 1?"鏄�":"鍚�"); // 璧拌瀹氫綅
- vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"鍚�":"鏄�"); // 鍗囬檷瀹氫綅
+ vo.setLiftPos(crnProtocol.getLiftPosType().desc);
+ vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
+ vo.setWarnCode(String.valueOf(crnProtocol.getAlarm()));
if (crnProtocol.getAlarm() > 0) {
BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
- vo.setAlarm1(crnError==null?"鏈煡寮傚父":crnError.getErrName());
+ vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName());
}
-// vo.setAlarm1(String.valueOf(crnProtocol.getAlarm1()));
-// vo.setAlarm2(String.valueOf(crnProtocol.getAlarm2()));
-// vo.setAlarm3(String.valueOf(crnProtocol.getAlarm3()));
-// vo.setAlarm4(String.valueOf(crnProtocol.getAlarm4()));
-
}
return R.ok().add(list);
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
index b8f744d..4e9f53a 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
@@ -29,23 +29,14 @@
// 鍗囬檷鍘熺偣
private String yOrigin = "-";
- // 浼镐綅楂樹綆
- private String liftPos = "-";
-
- // 绔欏彴楂樹綆
- private String sitePos = "-";
-
- // 璧拌瀹氫綅
- private String xLocation = "-";
-
- // 鍗囬檷瀹氫綅
- private String yLocation = "-";
-
// 璐у弶浣嶇疆
private String forkOffset = "-";
-// // 杞借揣鍙颁綅缃�
-// private String liftPos = "-";
+ // 杞借揣鍙颁綅缃�
+ private String liftPos = "-";
+
+ // 璧拌瀹氫綅
+ private String walkPos = "-";
// 鎬ュ仠
private String stop = "-";
@@ -69,15 +60,6 @@
private String warnCode = "-";
// 鍨傜洿鏁呴殰鐮�
- private String alarm1 = "-";
-
- // 姘村钩鏁呴殰鐮�
- private String alarm2 = "-";
-
- // 鍙夌墮鏁呴殰鐮�
- private String alarm3 = "-";
-
- // 鐘舵�佹晠闅滅爜
- private String alarm4 = "-";
+ private String alarm = "-";
}
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 957777c..e4db383 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -90,13 +90,11 @@
<th>鏈夌墿</th>
<th>鍒�</th>
<th>灞�</th>
- <th>浼镐綅楂樹綆</th>
- <th>绔欏彴楂樹綆</th>
- <th>璐у弶浣嶇疆</th>
- <th>鍨傜洿鏁呴殰</th>
- <th>姘村钩鏁呴殰</th>
- <th>鍙夌墮鏁呴殰</th>
- <th>鐘舵�佹晠闅�</th>
+ <th>璐у弶瀹氫綅</th>
+ <th>杞借揣鍙板畾浣�</th>
+ <th>璧拌鍦ㄥ畾浣�</th>
+ <th>鏁呴殰浠ｇ爜</th>
+ <th>鏁呴殰鎻忚堪</th>
</tr>
</thead>
<tbody>
@@ -310,13 +308,11 @@
setVal(tr.children("td").eq(3), table[i-1].loading);
setVal(tr.children("td").eq(4), table[i-1].bay);
setVal(tr.children("td").eq(5), table[i-1].lev);
- setVal(tr.children("td").eq(6), table[i-1].liftPos);
- setVal(tr.children("td").eq(7), table[i-1].sitePos);
- setVal(tr.children("td").eq(8), table[i-1].forkOffset);
- setVal(tr.children("td").eq(9), table[i-1].alarm1);
- setVal(tr.children("td").eq(10), table[i-1].alarm2);
- setVal(tr.children("td").eq(11), table[i-1].alarm3);
- setVal(tr.children("td").eq(12), table[i-1].alarm4);
+ setVal(tr.children("td").eq(6), table[i-1].forkOffset);
+ setVal(tr.children("td").eq(7), table[i-1].liftPos);
+ setVal(tr.children("td").eq(8), table[i-1].walkPos);
+ setVal(tr.children("td").eq(9), table[i-1].warnCode);
+ setVal(tr.children("td").eq(10), table[i-1].alarm);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -512,8 +508,6 @@
var html = "";
for (var i = 0; i < line; i ++){
html += " <tr>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
--
Gitblit v1.9.1