From a4fdbb852841fcc9bcc78676e4551efcff384494 Mon Sep 17 00:00:00 2001
From: LSH <1>
Date: 星期六, 08 六月 2024 11:17:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 70deceb..53e5797 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -48,6 +48,7 @@
* 鍫嗗灈鏈烘槸鍚﹀湪鍥炲師鐐硅繍鍔ㄤ腑鏍囪
*/
private boolean backHpFlag = false;
+ private boolean backHpFlagTwo = false;
public SiemensCrnThread(CrnSlave slave) {
this.slave = slave;
@@ -231,6 +232,9 @@
crnProtocol.setForkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 22));
crnProtocol.setLoadedTwo(siemensNet.getByteTransform().TransInt16(result.Content, 24));
+ crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 26));
+ crnProtocol.setWalkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 28));
+
crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 30));
crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 32));
@@ -248,9 +252,9 @@
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
// 澶嶄綅淇″彿
- if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
- log.error("-------------------------------------------绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}, 杞借揣鍙�:{}]==>> 鐘舵�佷负10锛岀瓑寰呯‘璁わ紒锛�",
- slave.getId(),crnProtocol.getTaskNo(), crnProtocol.getLoaded()==1 ? "鏈夌墿" : "鏃犵墿");
+ if (!Cools.isEmpty(crnProtocol.getStatusType()) && (crnProtocol.getStatusType().equals(CrnStatusType.WAITING) || crnProtocol.getStatusType().equals(CrnStatusType.SEPARATE_WAITING))) {
+ log.error("-------------------------宸ヤ綅1-------------------------绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}, 杞借揣鍙�:{}]==>> 鐘舵�佷负{}锛岀瓑寰呯‘璁わ紒锛�",
+ slave.getId(),crnProtocol.getTaskNo(), crnProtocol.getLoaded()==1 ? "鏈夌墿" : "鏃犵墿",crnProtocol.getStatusType());
if (resetFlag) {
if(crnProtocol.getTaskNo()==9999){
backHpFlag = false;
@@ -261,14 +265,20 @@
resetFlag = false;
}
}
+ }
+
+ // 澶嶄綅淇″彿
+ if (!Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && (crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING) || crnProtocol.getStatusTypeTwo().equals(CrnStatusType.SEPARATE_WAITING))) {
+ log.error("-------------------------宸ヤ綅2-------------------------绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}, 杞借揣鍙�:{}]==>> 鐘舵�佷负{}锛岀瓑寰呯‘璁わ紒锛�",
+ slave.getId(),crnProtocol.getTaskNoTwo(), crnProtocol.getLoadedTwo()==1 ? "鏈夌墿" : "鏃犵墿",crnProtocol.getStatusTypeTwo());
if (resetFlagTwo) {
- if(crnProtocol.getTaskNo()==9999){
- backHpFlag = false;
+ if(crnProtocol.getTaskNoTwo()==9999){
+ backHpFlagTwo = false;
}
CrnCommand crnCommand = new CrnCommand();
crnCommand.setAckFinish((short)1);
if (write5(crnCommand)) {
- resetFlag = false;
+ resetFlagTwo = false;
}
}
}
--
Gitblit v1.9.1