From 37281ae5fa9e93d27252fd99f7afec74a23e666c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 31 八月 2023 15:43:43 +0800
Subject: [PATCH] # 显示屏
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 912044c..78a1bbd 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -38,6 +38,11 @@
private CrnProtocol crnProtocol;
private boolean resetFlag = false;
+ /**
+ * 鍫嗗灈鏈烘槸鍚﹀湪鍥炲師鐐硅繍鍔ㄤ腑鏍囪
+ */
+ private boolean backHpFlag = false;
+
public SiemensCrnThread(CrnSlave slave) {
this.slave = slave;
}
@@ -79,6 +84,10 @@
command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
write(command);
+ break;
+ case 4:
+ Integer data = (Integer) task.getData();
+ siemensNet.Write("DB100.276", data.shortValue());
break;
default:
break;
@@ -142,7 +151,7 @@
*/
private void readStatus(){
try {
- OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 70);
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 65);
if (result.IsSuccess) {
if (null == crnProtocol) {
crnProtocol = new CrnProtocol();
@@ -162,18 +171,23 @@
crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
- crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 30));
- crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
- crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 34));
- crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 36));
- crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 38));
- crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 40));
+ crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
+ crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 36));
+ crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
+ crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
+ crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
+ crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
+ crnProtocol.setBarcodeResult(siemensNet.getByteTransform().TransBool(result.Content, 56));
+ crnProtocol.setBarcode(siemensNet.getByteTransform().TransString(result.Content, 58,6,"UTF-8"));
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
// 澶嶄綅淇″彿
if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
if (resetFlag) {
+ if(crnProtocol.getTaskNo()==9999){
+ backHpFlag = false;
+ }
CrnCommand crnCommand = new CrnCommand();
crnCommand.setAckFinish((short)1);
if (write(crnCommand)) {
@@ -223,7 +237,7 @@
log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
- convertRow(command);
+ //convertRow(command);
command.setCrnNo(slave.getId());
short[] array = new short[12];
array[0] = command.getAckFinish();
@@ -239,10 +253,12 @@
array[10] = command.getDestinationStaNo();
array[11] = command.getCommand();
OperateResult result = siemensNet.Write("DB100.0", array);
-
+ if (command.getAckFinish() == 0){
+ OperateResult result2 = siemensNet.Write("DB100.20", command.getBarcode());
+ }
if (command.getAckFinish() == 0) {
short commandFinish = 1;
- result = siemensNet.Write("DB100.22", commandFinish);
+ result = siemensNet.Write("DB100.18", commandFinish);
}
try {
--
Gitblit v1.9.1