From 37797fcba30227b72db81c46e8fbb320c9bde21d Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 23 四月 2025 18:07:21 +0800
Subject: [PATCH] 完成调试
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 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 8fb20a4..4c738c0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -287,16 +287,6 @@
* 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗ｏ紝宸ヤ綔鐘舵�� 1 ==>> 2
*/
public synchronized void generateStoreWrkFile0(Integer mark) {
- // 鏍规嵁杈撻�佺嚎plc閬嶅巻
-
- 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")) {
- log.info("妯″紡涓嶅1");
- return;
- }
// 鑾峰彇鍏ュ簱绔欎俊鎭�
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
StaProtocol staProtocol = devpThread.getStation().get(1135);
@@ -319,7 +309,14 @@
if (wrkMast == null) {
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")) {
+ log.info("妯″紡涓嶅1");
+ return;
+ }
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
--
Gitblit v1.9.1