From 472f78f1dd84302abc3a92ef69d6671d0979d678 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 10 一月 2025 14:33:57 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 dbabc87..7aca912 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -213,6 +213,9 @@
                             if (taskWrk.getStatus() != 2){
                                 continue;
                             }
+                            if (!staProtocol.isPakMk()){
+                                continue;
+                            }
                             //鑾峰彇鍫嗗灈鏈虹珯鐐�
                             StaDesc staDesc = new StaDesc();
                             if (devp.getId() <= 1){
@@ -222,9 +225,7 @@
                                 staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                                         .eq("crn_no", taskWrk.getCrnNo()).eq("type_no",1).lt("stn_no", 400).ge("stn_no", 250));
                             }
-                            if (!staProtocol.isPakMk()){
-                                continue;
-                            }
+
                             staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
                             staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
                             MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));

--
Gitblit v1.9.1