From 186432933336d96c19402c5aee61064df4a7390a Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 16 七月 2025 16:43:09 +0800
Subject: [PATCH] 完成调试
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 64 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 31 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 238f2da..a4d588b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -307,39 +307,41 @@
&& staProtocol.isPakMk()) {
News.warnNoLog("" + mark + " - 0" + " - 寮�濮嬫墽琛�");
// 鍒ゆ柇閲嶅宸ヤ綔妗�
- WrkMast wrkMast = wrkMastMapper.selectPakInStep11(1135);
- if (wrkMast == null) {
+ List<WrkMast> wrkMasts = wrkMastMapper.selectPakInStep11(1135);
+ if (Cools.isEmpty(wrkMasts)) {
return;
}
- if (wrkMast.getPltType().shortValue() != staProtocol.getFinishWorkNo()) {
- News.watchInfo(wrkMast.getWrkNo() + "浠诲姟-2.5F鍏ュ簱", "宸ヤ綔妗ｅ拰瀹岀粨宸ヤ綔鍙蜂笉鍖归厤锛寋}锛寋}", wrkMast.getPltType(), staProtocol.getFinishWorkNo());
- return;
- }
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "2.5F_Mode"));
- if (Cools.isEmpty(config) || config.getValue().equals("false")) {
- return;
- }
- if (!config.getValue().equalsIgnoreCase("1")) {
- News.watchInfo(wrkMast.getWrkNo() + "浠诲姟-2.5F鍏ュ簱", "妯″紡涓嶅1");
- return;
- }
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
-
- // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
- staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
- staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
- log.error("杈撻�佺嚎涓嬪彂3锛�" + wrkMast.getWrkNo() + "," + wrkMast.getStaNo());
- if (result) {
- // 鏇存柊宸ヤ綔涓绘。
- wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細2.璁惧涓婅蛋
- wrkMast.setModiTime(new Date());
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- News.error("" + mark + " - 1" + " - 鏇存柊宸ヤ綔妗ｅけ璐ワ紒锛侊紒 [宸ヤ綔鍙凤細{}]", wrkMast.getWrkNo());
+ for (WrkMast wrkMast : wrkMasts) {
+ if (wrkMast.getPltType().shortValue() != staProtocol.getFinishWorkNo()) {
+ News.watchInfo(wrkMast.getWrkNo() + "浠诲姟-2.5F鍏ュ簱", "宸ヤ綔妗ｅ拰瀹岀粨宸ヤ綔鍙蜂笉鍖归厤锛寋}锛寋}", wrkMast.getPltType(), staProtocol.getFinishWorkNo());
+ continue;
}
- } else {
- News.error("" + mark + " - 2" + " - 鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", 1);
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "2.5F_Mode"));
+ if (Cools.isEmpty(config) || config.getValue().equals("false")) {
+ continue;
+ }
+ if (!config.getValue().equalsIgnoreCase("1")) {
+ News.watchInfo(wrkMast.getWrkNo() + "浠诲姟-2.5F鍏ュ簱", "妯″紡涓嶅1");
+ continue;
+ }
+ // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+
+ // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
+ staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
+ staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ log.error("杈撻�佺嚎涓嬪彂3锛�" + wrkMast.getWrkNo() + "," + wrkMast.getStaNo());
+ if (result) {
+ // 鏇存柊宸ヤ綔涓绘。
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細2.璁惧涓婅蛋
+ wrkMast.setModiTime(new Date());
+ if (wrkMastMapper.updateById(wrkMast) == 0) {
+ News.error("" + mark + " - 1" + " - 鏇存柊宸ヤ綔妗ｅけ璐ワ紒锛侊紒 [宸ヤ綔鍙凤細{}]", wrkMast.getWrkNo());
+ }
+ } else {
+ News.error("" + mark + " - 2" + " - 鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", 1);
+ }
}
} else {
@@ -1276,7 +1278,7 @@
}
break;
}
- }else {
+ } else {
News.watchError(wrkMast.getWrkNo() + "浠诲姟-鍫嗗灈鏈哄嚭搴�", "鍫嗗灈鏈虹珯鐐圭姸鎬侀渶瑕佹弧瓒筹細鑷姩銆佸彲鍑�, 绔欑偣缂栧彿={}", staProtocol.getSiteId());
}
}
--
Gitblit v1.9.1