From 5275d6800306c00ed400d2433140e17696c1fb0f Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期四, 13 七月 2023 09:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs6' into bfwcs6
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 5978508..1a2bfc5 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -9,6 +9,7 @@
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.common.utils.News;
import com.zy.core.DevpThread;
@@ -176,6 +177,12 @@
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
+ }else if (staProtocol.getSiteId().equals(300)){
+ BasDevpMapper basDevpMapper = SpringUtils.getBean(BasDevpMapper.class);
+ BasDevp basDevp = basDevpMapper.selectByDevNo(300);
+ if (!basDevp.getWrkNo().equals(basDevp.getWrkNo1())){
+ staProtocol.setPakMk(true);
+ }
}
}
}
--
Gitblit v1.9.1