From 10ac21082bbbe92dabecdda1a98fe4539f746037 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 14 四月 2026 09:10:38 +0800
Subject: [PATCH] 1

---
 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java
index 6532e8a..c71bb1b 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java
@@ -73,16 +73,16 @@
                         staProtocol = staProtocol.clone();
                     }
                     // 鍒ゆ柇鏄惁婊¤冻鏉′欢
+                    if (!staProtocol.isAutoing()) {
+                        //News.error("{}锛氱珯鐐癸細{}锛岄潪鑷姩", config.getMark(), staProtocol.getSiteId());
+                        continue;
+                    }
                     if (staProtocol.getWorkNo() == 0 && staProtocol.isLoading()) {
                         News.error("{},杈撻�佺嚎涓婃湁璐ф棤浠诲姟鍙凤紝闇�瑕佷汉宸ュ鐞嗙珯鐐癸細{}", config.getMark(), staProtocol.getSiteId());
                         continue;
                     }
                     if (staProtocol.getWorkNo() > 0 && !staProtocol.isLoading()) {
                         News.error("{},杈撻�佺嚎涓婃棤璐ф湁浠诲姟鍙凤紝闇�瑕佷汉宸ュ鐞嗙珯鐐癸細{}", config.getMark(), staProtocol.getSiteId());
-                        continue;
-                    }
-                    if (!staProtocol.isAutoing()) {
-                        News.error("{}锛氱珯鐐癸細{}锛岄潪鑷姩", config.getMark(), staProtocol.getSiteId());
                         continue;
                     }
                     if (!staProtocol.isInEnable()) {
@@ -95,7 +95,7 @@
                         continue;
                     }
                     if (jobByJobNo.getJobSts() != ConveyorStateType.INBOUND.getStatus()) {
-                        if (jobByJobNo.getJobSts() == ConveyorStateType.SENDTASK.getStatus()){
+                        if (jobByJobNo.getJobSts() == ConveyorStateType.SENDTASK.getStatus()) {
                             continue;
                         }
                         News.error("{}锛氱珯鐐癸細{}锛屼换鍔$姸鎬佷笉瀵癸紝{}", config.getMark(), staProtocol.getSiteId(), JSON.toJSON(jobByJobNo));

--
Gitblit v1.9.1