From 13c2b426704d4ec12e4c263d054cec2f1416be39 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 22 十一月 2022 12:28:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 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 ca4c351..9e28c38 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1070,6 +1070,12 @@
if (steProtocol == null) { continue; }
if (steProtocol.isIdle()) {
+ //灏忚溅鍙兘缁戝畾涓�绗斾綔涓氫腑浠诲姟
+ WrkMast wrkMast1 = wrkMastMapper.selectSteNoData(steNo);
+ if(wrkMast1 != null){
+ continue;
+ }
+
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
SteCommand steCommand = new SteCommand();
steCommand.setSteNo(steNo); // 绌挎杞︾紪鍙�
@@ -1261,6 +1267,12 @@
SteProtocol steProtocol = steThread.getSteProtocol();
if (steProtocol == null) { return; }
if (steProtocol.isIdle()) {
+
+ //灏忚溅鍙兘缁戝畾涓�绗斾綔涓氫腑浠诲姟
+ WrkMast wrkMast1 = wrkMastMapper.selectSteNoData(steNo);
+ if(wrkMast1 != null){
+ return;
+ }
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
SteCommand steCommand = new SteCommand();
@@ -1689,6 +1701,12 @@
if (steProtocol == null) { return; }
if (steProtocol.isIdle()) {
+ //灏忚溅鍙兘缁戝畾涓�绗斾綔涓氫腑浠诲姟
+ WrkMast wrkMast1 = wrkMastMapper.selectSteNoData(steNo);
+ if(wrkMast1 != null){
+ return;
+ }
+
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
SteCommand steCommand = new SteCommand();
steCommand.setSteNo(steNo); // 绌挎杞︾紪鍙�
@@ -1884,6 +1902,12 @@
if (steProtocol == null) { return; }
if (steProtocol.isIdle()) {
+ //灏忚溅鍙兘缁戝畾涓�绗斾綔涓氫腑浠诲姟
+ WrkMast wrkMast1 = wrkMastMapper.selectSteNoData(steNo);
+ if(wrkMast1 != null){
+ return;
+ }
+
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
SteCommand steCommand = new SteCommand();
steCommand.setSteNo(steNo); // 绌挎杞︾紪鍙�
@@ -1897,7 +1921,7 @@
if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
log.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", steNo, JSON.toJSON(steCommand));
} else {
- log.error("绌挎杞﹀懡浠や笅鍙戞垚鍔熻灏忚溅浠� 杩滅偣 ====>> 寰呮満浣嶏紝IoType={}, 绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getIoType(), steNo, JSON.toJSON(steCommand));
+ log.error("绌挎杞﹀懡浠や笅鍙戞垚鍔熻灏忚溅浠� 杩滅偣 ====>> 寰呮満浣�,缁戝畾绌挎杞�,IoType={}, 绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getIoType(), steNo, JSON.toJSON(steCommand));
// 淇敼宸ヤ綔妗ｇ姸鎬� 缁戝畾绌挎杞�
wrkMast.setSteNo(steNo);
wrkMast.setModiTime(new Date());
@@ -1916,6 +1940,12 @@
if (!basSteService.updatePakMk(steNo, "Y")) {
log.error("淇敼绌挎杞︿綔涓氱姸鎬� 澶辫触锛侊紒锛岀┛姊溅={}", steNo);
+ return;
+ }
+
+ //灏忚溅鍙兘缁戝畾涓�绗斾綔涓氫腑浠诲姟
+ WrkMast wrkMast1 = wrkMastMapper.selectSteNoData(steNo);
+ if(wrkMast1 != null){
return;
}
@@ -1952,6 +1982,12 @@
if (steProtocol == null) { return; }
if (steProtocol.isIdle()) {
+ //灏忚溅鍙兘缁戝畾涓�绗斾綔涓氫腑浠诲姟
+ WrkMast wrkMast1 = wrkMastMapper.selectSteNoData(steNo);
+ if(wrkMast1 != null){
+ return;
+ }
+
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
SteCommand steCommand = new SteCommand();
steCommand.setSteNo(steNo); // 绌挎杞︾紪鍙�
@@ -1988,6 +2024,12 @@
if (steProtocol == null) { return; }
if (steProtocol.isIdle()) {
+ //灏忚溅鍙兘缁戝畾涓�绗斾綔涓氫腑浠诲姟
+ WrkMast wrkMast1 = wrkMastMapper.selectSteNoData(steNo);
+ if(wrkMast1 != null){
+ return;
+ }
+
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
SteCommand steCommand = new SteCommand();
steCommand.setSteNo(steNo); // 绌挎杞︾紪鍙�
--
Gitblit v1.9.1