From 17307572321cae05581f1cdaba4702a188ea7f4e Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 31 八月 2024 17:39:19 +0800
Subject: [PATCH] 对照协议调整
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 9 +++------
src/main/java/com/zy/core/enums/CrnStatusType.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 32 ++++++++++++++++++++++++++++----
src/main/java/com/zy/core/CrnThread.java | 2 ++
src/main/java/com/zy/core/thread/MelsecCrnThread.java | 7 ++++++-
5 files changed, 40 insertions(+), 12 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 e723309..79ac93f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -565,7 +565,15 @@
wrkMast.setCrnEndTime(new Date());
if (wrkMastMapper.updateById(wrkMast) != 0) {
// 澶嶄綅鍫嗗灈鏈�
- crnThread.setResetFlag(true);
+ Short mode = crnProtocol.getMode();
+ if (mode == 1) {
+ crnThread.setResetFlag(true);
+ } else if (mode == 2) {
+ crnThread.setResetFlagTwo(true);
+ } else if (mode == 3) {
+ crnThread.setResetFlag(true);
+ crnThread.setResetFlagTwo(true);
+ }
} else {
News.error("" + mark + " - 1" + " - 鏇存柊宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负14澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast.getWrkNo());
}
@@ -1262,10 +1270,18 @@
}
// 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
- News.warnNoLog("" + mark + " - 0" + " - 寮�濮嬫墽琛屽宸ヤ綔妗ｇ殑瀹屾垚鎿嶄綔");
+ News.warn("" + mark + " - 0" + " - 寮�濮嬫墽琛屽宸ヤ綔妗ｇ殑瀹屾垚鎿嶄綔");
if (crnProtocol.getTaskNo() == 9999) {
// 鍫嗗灈鏈哄浣�
- crnThread.setResetFlag(true);
+ Short mode = crnProtocol.getMode();
+ if (mode == 1) {
+ crnThread.setResetFlag(true);
+ } else if (mode == 2) {
+ crnThread.setResetFlagTwo(true);
+ } else if (mode == 3) {
+ crnThread.setResetFlag(true);
+ crnThread.setResetFlagTwo(true);
+ }
} else {
// 鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
WrkMast wrkMast = wrkMastMapper.selectPakInStep3(crnProtocol.getTaskNo().intValue());
@@ -1286,7 +1302,15 @@
if (wrkMastMapper.updateById(wrkMast) > 0) {
// 鍫嗗灈鏈哄浣�
News.warnNoLog("" + mark + " - 2" + " - 淇敼鎴愬姛鍚庡浣嶅爢鍨涙満 : 鍫嗗灈鏈哄彿={}", crnThread.getCrnProtocol().getCrnNo());
- crnThread.setResetFlag(true);
+ Short mode = crnProtocol.getMode();
+ if (mode == 1) {
+ crnThread.setResetFlag(true);
+ } else if (mode == 2) {
+ crnThread.setResetFlagTwo(true);
+ } else if (mode == 3) {
+ crnThread.setResetFlag(true);
+ crnThread.setResetFlagTwo(true);
+ }
}
}
diff --git a/src/main/java/com/zy/core/CrnThread.java b/src/main/java/com/zy/core/CrnThread.java
index 7b4ded6..8ab3a68 100644
--- a/src/main/java/com/zy/core/CrnThread.java
+++ b/src/main/java/com/zy/core/CrnThread.java
@@ -8,6 +8,8 @@
void setResetFlag(boolean flag);
+ void setResetFlagTwo(boolean flag);
+
void setBackHpFlag(boolean flag);
/**
diff --git a/src/main/java/com/zy/core/enums/CrnStatusType.java b/src/main/java/com/zy/core/enums/CrnStatusType.java
index 79c4b51..f02ed99 100644
--- a/src/main/java/com/zy/core/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/core/enums/CrnStatusType.java
@@ -13,7 +13,7 @@
ORIGIN_GO(7, "鍥炲師鐐�"),
ORIGIN_BACK(8, "鍥炲弽鍘熺偣"),
MOVING(9, "璧拌涓�"),
- WAITING(90, "浠诲姟瀹屾垚绛夊緟WCS纭"),
+ WAITING(10, "浠诲姟瀹屾垚绛夊緟WCS纭"),
PAUSE(11, "浠诲姟鏆傚仠"),
SOS(99, "鎶ヨ"),
UNKNOW(100, "鍏朵粬"),
diff --git a/src/main/java/com/zy/core/thread/MelsecCrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
index 0310a88..32e28df 100644
--- a/src/main/java/com/zy/core/thread/MelsecCrnThread.java
+++ b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
@@ -35,7 +35,8 @@
*/
@Data
@Slf4j
-public class MelsecCrnThread implements Runnable, ThreadHandler, CrnThread {
+public class MelsecCrnThread implements Runnable, ThreadHandler, CrnThread
+{
private MelsecMcNet melsecMcNet;
private CrnSlave slave;
@@ -473,4 +474,8 @@
}
+ @Override
+ public void setResetFlagTwo(boolean flag) {
+
+ }
}
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 5139256..a3dcf6f 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -39,6 +39,7 @@
private CrnSlave slave;
private CrnProtocol crnProtocol;
private boolean resetFlag = false;
+ private boolean resetFlagTwo = false;
/**
* 鍫嗗灈鏈烘槸鍚﹀湪鍥炲師鐐硅繍鍔ㄤ腑鏍囪
@@ -186,11 +187,9 @@
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
-
if (crnProtocol.getMode() == 1) {
// 澶嶄綅淇″彿
if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
- System.out.println(crnProtocol);
if (resetFlag) {
if (crnProtocol.getTaskNo() == 9999) {
backHpFlag = false;
@@ -205,8 +204,7 @@
} else if (crnProtocol.getMode() == 2) {
// 澶嶄綅淇″彿
if (!Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING)) {
-
- if (resetFlag) {
+ if (resetFlagTwo) {
if (crnProtocol.getTaskNo() == 9999) {
backHpFlag = false;
}
@@ -220,8 +218,7 @@
} else if (crnProtocol.getMode() == 3) {
// 澶嶄綅淇″彿
if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING) && !Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING)) {
- System.out.println(crnProtocol);
- if (resetFlag) {
+ if (resetFlag && resetFlagTwo) {
if (crnProtocol.getTaskNo() == 9999) {
backHpFlag = false;
}
--
Gitblit v1.9.1