From ccbcfdb4241951a36c1d2fe1e0bca6e8b8deb719 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 19 九月 2022 12:48:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++----
src/main/webapp/views/ste.html | 8 ++++----
src/main/java/com/zy/core/enums/SteTaskModeType.java | 4 ++--
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 17 +++++++++++++++++
4 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 1cb922a..2994deb 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -404,13 +404,13 @@
if (basCrnp.getInEnable().equals("Y")) {
// 鍏ュ簱
if (this.crnStnToLoc(crn, crnProtocol)) {
- crnProtocol.setLastIo("O");
}
+ crnProtocol.setLastIo("O");
} else if (basCrnp.getOutEnable().equals("Y")) {
// 鍑哄簱
if (this.locToCrnStn(crn, crnProtocol)) {
- crnProtocol.setLastIo("I");
}
+ crnProtocol.setLastIo("I");
}
}
// 濡傛灉鏈�杩戜竴娆℃槸鍑哄簱妯″紡
@@ -418,13 +418,13 @@
if (basCrnp.getOutEnable().equals("Y")) {
// 鍑哄簱
if (this.locToCrnStn(crn, crnProtocol)) {
- crnProtocol.setLastIo("I");
}
+ crnProtocol.setLastIo("I");
} else if (basCrnp.getInEnable().equals("Y")) {
// 鍏ュ簱
if (this.crnStnToLoc(crn, crnProtocol)) {
- crnProtocol.setLastIo("O");
}
+ crnProtocol.setLastIo("O");
}
}
}
diff --git a/src/main/java/com/zy/core/enums/SteTaskModeType.java b/src/main/java/com/zy/core/enums/SteTaskModeType.java
index 55bf278..3ed25fe 100644
--- a/src/main/java/com/zy/core/enums/SteTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/SteTaskModeType.java
@@ -75,11 +75,11 @@
case 3:
case 11:
case 18:
- return SteTaskModeType.OUT_LEFT; // 鍙�
+ return SteTaskModeType.OUT_RIGHT; // 鍙�
case 4:
case 12:
case 19:
- return SteTaskModeType.OUT_RIGHT; // 宸�
+ return SteTaskModeType.OUT_LEFT; // 宸�
default:
throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 844b702..56bb030 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,6 +5,7 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
+import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasDevp;
@@ -12,6 +13,7 @@
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
+import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
@@ -38,6 +40,7 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
+ private int barcodeSize = 2;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
add(100);add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);add(109);
add(110);add(111);
@@ -155,6 +158,20 @@
}
}
+ //璇绘潯鐮�
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.100",(short)(barcodeSize*8));
+ if (result2.IsSuccess) {
+ for (int i = 0; i < barcodeSize; i++) {
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ }
+ }
+
+ }
+
if (result.IsSuccess && result0.IsSuccess && result1.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
diff --git a/src/main/webapp/views/ste.html b/src/main/webapp/views/ste.html
index fcfa9be..3edb7d3 100644
--- a/src/main/webapp/views/ste.html
+++ b/src/main/webapp/views/ste.html
@@ -107,10 +107,10 @@
<div class="button-group">
<button class="item" onclick="steOperator(17)">鑱旀満</button>
<button class="item" onclick="steOperator(18)">鑴辨満</button>
- <button class="item" onclick="steOperator(1)">宸﹀嚭搴�</button>
- <button class="item" onclick="steOperator(2)">鍙冲嚭搴�</button>
- <button class="item" onclick="steOperator(3)">宸﹀叆搴�</button>
- <button class="item" onclick="steOperator(4)">鍙冲叆搴�</button>
+ <button class="item" onclick="steOperator(1)">鍚戝乏鍑哄簱</button>
+ <button class="item" onclick="steOperator(2)">鍚戝彸鍑哄簱</button>
+ <button class="item" onclick="steOperator(3)">浠庡乏鍏ュ簱</button>
+ <button class="item" onclick="steOperator(4)">浠庡彸鍏ュ簱</button>
<!-- <button class="item" onclick="steOperator(5)">宸︾Щ搴�</button>-->
<!-- <button class="item" onclick="steOperator(6)">鍙崇Щ搴�</button>-->
<button class="item" onclick="steOperator(8)">鍘诲乏绔�</button>
--
Gitblit v1.9.1