From e3fcf332eff28c90c31dc5f982035d50691fa9c3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 27 八月 2020 15:32:18 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 38 +++++++++++-------
src/main/java/com/zy/core/MainProcess.java | 2
src/main/java/com/zy/asrs/controller/CrnController.java | 13 ++++--
src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java | 19 ++++++++-
4 files changed, 48 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index de0fd9b..f2b4615 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -16,6 +16,7 @@
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;
@@ -107,13 +108,15 @@
vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
}
vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵��
- vo.setWarn(""); // 鎶ヨ todo
- vo.setLoading(crnProtocol.getLoaded()==1?"Y":"N"); // 鏈夌墿
+ vo.setLoading(crnProtocol.getLoaded()==1?"鏈夌墿":"鏃犵墿"); // 鏈夌墿
vo.setBay(crnProtocol.getBay()); // 鍒�
vo.setLev(crnProtocol.getLevel()); // 灞�
- vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
- vo.setLiftPos(crnProtocol.getLiftPosType().desc); // 杞借揣鍙颁綅缃�
- vo.setWorkNo(crnProtocol.getAlarm1()); // 寮傚父鐮�
+ vo.setXOrigin(crnProtocol.getBay()==1?"鏄�":"鍚�"); // 璧拌鍘熺偣
+ vo.setYOrigin(crnProtocol.getLevel()==1?"鏄�":"鍚�"); // 鍗囬檷鍘熺偣
+ vo.setXLocation(crnProtocol.getWalkPos() == 1?"鏄�":"鍚�"); // 璧拌瀹氫綅
+ vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"鍚�":"鏄�"); // 鍗囬檷瀹氫綅
+ vo.setStop(crnProtocol.getCrnTemp1().stop?"鏄�":"鍚�"); // 鎬ュ仠
+ vo.setWorkNo(crnProtocol.getAlarm()); // 寮傚父鐮�
list.add(vo);
}
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 e2cd14b..fac93ba 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
@@ -14,9 +14,6 @@
// 妯″紡
private String statusType;
- // 鎶ヨ
- private String warn;
-
// 鏈夌墿
private String loading;
@@ -26,11 +23,26 @@
// 灞�
private Short lev;
+ // 璧拌鍘熺偣
+ private String xOrigin;
+
+ // 鍗囬檷鍘熺偣
+ private String yOrigin;
+
+ // 璧拌瀹氫綅
+ private String xLocation;
+
+ // 鍗囬檷瀹氫綅
+ private String yLocation;
+
// 璐у弶浣嶇疆
private String forkOffset;
// 杞借揣鍙颁綅缃�
private String liftPos;
+
+ // 鎬ュ仠
+ private String stop;
// 鍒楀潗鏍�
private String bayCoor;
@@ -51,4 +63,5 @@
private String warnCode;
+
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 9a4fdff..56700ac 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -37,7 +37,7 @@
// 闂撮殧
Thread.sleep(1500);
- log.info("WCS 宸ヤ綔涓� .....................");
+// log.info("WCS 宸ヤ綔涓� .....................");
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile();
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 7f74fb4..63584a2 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -27,11 +27,11 @@
<span> </span>
<input id="crn1" disabled="disabled">
</div>
-<!-- <div class="crn-command-item">-->
-<!-- <label>2#</label>-->
-<!-- <span> </span>-->
-<!-- <input id="crn2" disabled="disabled">-->
-<!-- </div>-->
+ <div class="crn-command-item">
+ <label>2#</label>
+ <span> </span>
+ <input id="crn2" disabled="disabled">
+ </div>
</div>
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
<div class="crn-state">
@@ -42,12 +42,14 @@
<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>
@@ -245,18 +247,22 @@
crnStateTableFullRows = table.length;
}
for (var i=1;i<=table.length;i++){
+ console.log(table);
+ // todo:luxiaotao
var tr = tableEl.find("tr").eq(i);
setVal(tr.children("td").eq(0), table[i-1].crnNo);
setVal(tr.children("td").eq(1), table[i-1].workNo);
setVal(tr.children("td").eq(2), table[i-1].statusType);
setVal(tr.children("td").eq(3), table[i-1].status);
- setVal(tr.children("td").eq(4), table[i-1].warn);
- setVal(tr.children("td").eq(5), table[i-1].loading);
- setVal(tr.children("td").eq(6), table[i-1].bay);
- setVal(tr.children("td").eq(7), table[i-1].lev);
- setVal(tr.children("td").eq(8), table[i-1].forkOffset);
- setVal(tr.children("td").eq(9), table[i-1].liftPos);
- setVal(tr.children("td").eq(10), table[i-1].warnCode);
+ setVal(tr.children("td").eq(4), table[i-1].loading);
+ setVal(tr.children("td").eq(5), table[i-1].bay);
+ setVal(tr.children("td").eq(6), table[i-1].lev);
+ setVal(tr.children("td").eq(7), table[i-1].xorigin);
+ setVal(tr.children("td").eq(8), table[i-1].yorigin);
+ setVal(tr.children("td").eq(9), table[i-1].xlocation);
+ setVal(tr.children("td").eq(10), table[i-1].ylocation);
+ setVal(tr.children("td").eq(11), table[i-1].stop);
+ setVal(tr.children("td").eq(12), table[i-1].warnCode);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -457,6 +463,8 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
" </tr>\n";
}
$('#crn-state-table tbody').after(html);
--
Gitblit v1.9.1