From be8a12f3c9c5c0b9db9f8144ab644fcb20c1af5e Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期二, 01 七月 2025 16:58:32 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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 b4aaf6b..226c054 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1892,7 +1892,20 @@
Integer stano = staProtocol.getStaNo();
if (staProtocol.getSiteId() == 1004 || staProtocol.getSiteId()==1020){
// 鍒ゆ柇鏄惁婊¤冻鍙栬揣鏉′欢
+ if (!staProtocol.isPakMkRun()) {
+ devpThread.setErrorDev(staProtocol.getSiteId(), "寮傚父鍥為��鏍囪锛岄渶瑕佸洖閫�");
+ return null;
+ }
if (!staProtocol.isLoading()) {
+ devpThread.setErrorDev(staProtocol.getSiteId(), "鏃犵墿");
+ return null;
+ }
+ if (!staProtocol.isInEnable()) {
+ devpThread.setErrorDev(staProtocol.getSiteId(), "绛夊緟鍙叆淇″彿");
+ return null;
+ }
+ if (!staProtocol.isStaOk()) {
+ devpThread.setErrorDev(staProtocol.getSiteId(), "绛夊緟閾炬潯灏辩华");
return null;
}
// 灏哄妫�娴嬪紓甯�
@@ -1967,6 +1980,7 @@
staProtocol.setWorkNo(9999);
staProtocol.setStaNo(staProtocol.getStaNo()+1);
devpThread.setPakMk(staProtocol.getSiteId(), false);
+ devpThread.setPakMkRun(staProtocol.getSiteId(), false);
devpThread.setErrorDev(staProtocol.getSiteId(), errMsg);
MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
try{
@@ -1978,6 +1992,7 @@
}
return null;
}
+ return null;
}
return taskWrk;
}
--
Gitblit v1.9.1