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/asrs/service/impl/MainServiceImpl.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 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 db17d04..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());
}
@@ -725,7 +733,9 @@
flag = true;
}
if (!flag) {
- News.errorNoLog("" + mark + " - 1" + " - 3" + " - 鍫嗗灈鏈哄叆搴撶珯淇℃伅(浠ヤ笅闇�瑕佸叏true):"
+ System.out.println(staProtocol);
+ //TODO
+ News.error("" + mark + " - 1" + " - 3" + " - 鍫嗗灈鏈哄叆搴撶珯淇℃伅(浠ヤ笅闇�瑕佸叏true):"
+ "鑷姩淇″彿" + staProtocol.isAutoing() + "鏈夌墿淇″彿" + staProtocol.isLoading()
+ "宸ヤ綔鍙�>0" + staProtocol.getWorkNo() + "鍙叆淇″彿" + staProtocol.isInEnable()
+ "鑳藉叆淇″彿锛坵ms璁剧疆锛�.equals(\"Y\")" + staDetl.getCanining());
@@ -1260,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());
@@ -1284,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);
+ }
}
}
--
Gitblit v1.9.1