From 0d394d745cb1ff26359a8f6c35c8169b4e658c3e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 11 一月 2021 15:30:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 21 ++++++++++++++-------
src/main/webapp/views/crn.html | 8 ++++----
src/main/java/com/zy/asrs/controller/CrnController.java | 11 +++++++++--
src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java | 10 ++++++++--
4 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 0c202b1..6b5eede 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -127,8 +127,15 @@
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)?"鍚�":"鏄�"); // 鍗囬檷瀹氫綅
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 e1e514f..8540ebb 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
@@ -29,6 +29,12 @@
// 鍗囬檷鍘熺偣
private String yOrigin = "-";
+ // 浼镐綅楂樹綆
+ private String liftPos = "-";
+
+ // 绔欏彴楂樹綆
+ private String sitePos = "-";
+
// 璧拌瀹氫綅
private String xLocation = "-";
@@ -38,8 +44,8 @@
// 璐у弶浣嶇疆
private String forkOffset = "-";
- // 杞借揣鍙颁綅缃�
- private String liftPos = "-";
+// // 杞借揣鍙颁綅缃�
+// private String liftPos = "-";
// 鎬ュ仠
private String stop = "-";
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 5bfc407..77fbbc0 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -243,15 +243,15 @@
log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
- if (command.getTaskNo() == 0) {
+ if (command.getTaskNo() == 0 && command.getAckFinish() == 0) {
command.setTaskNo((short) 9999);
}
command.setCrnNo(slave.getId());
short[] array = new short[9];
- if (!command.getTaskModeType().equals(CrnTaskModeType.CLEAR)) {
+ if (command.getAckFinish() == 0) {
array[0] = 5;
} else {
- array[0] = 7;
+ array[0] = 0;
}
array[1] = command.getSourcePosZ();
array[2] = command.getSourcePosY();
@@ -263,10 +263,17 @@
array[8] = command.getDestinationStaNo();
// 浣滀笟淇℃伅
OperateResult result = siemensNet.Write("DB1000.0", array);
- // 浠诲姟鍙�
- OperateResult result1 = siemensNet.Write("DB1000.24", command.getTaskNo());
+ // 浠诲姟鍙� + 瀹屾垚浣�
+ short[] array2 = new short[2];
+ array2[0] = command.getTaskNo();
+ array2[1] = command.getAckFinish();
+ OperateResult result1 = siemensNet.Write("DB1000.24", array2);
+
// 缁撴潫浣�
- OperateResult result2 = siemensNet.Write("DB1000.28.1", true);
+ if (command.getAckFinish() == 0) {
+ OperateResult result2 = siemensNet.Write("DB1000.28.1", true);
+ }
+
// 鏃ュ織璁板綍
try {
if (command.getAckFinish() != 1) {
@@ -292,7 +299,7 @@
}
} catch (Exception ignore) {}
- if (result.IsSuccess && result1.IsSuccess && result2.IsSuccess) {
+ if (result.IsSuccess && result1.IsSuccess) {
log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 397ed7d..891ce5d 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -70,8 +70,8 @@
<th>鏈夌墿</th>
<th>鍒�</th>
<th>灞�</th>
- <th>璧拌鍘熺偣</th>
- <th>鍗囬檷鍘熺偣</th>
+ <th>浼镐綅楂樹綆</th>
+ <th>绔欏彴楂樹綆</th>
<th>璐у弶浣嶇疆</th>
<th>璧拌瀹氫綅</th>
<th>鍗囬檷瀹氫綅</th>
@@ -287,8 +287,8 @@
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].xorigin);
- setVal(tr.children("td").eq(7), table[i-1].yorigin);
+ 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].xlocation);
setVal(tr.children("td").eq(10), table[i-1].ylocation);
--
Gitblit v1.9.1