From 9cd13322f7c94353465d883a46d977dd4a8ebda5 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 06 十一月 2025 15:08:18 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 27aa6a4..9e470b1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2888,7 +2888,7 @@
                     if (Cools.isEmpty(taskWrk1)){
                         continue;
                     }
-                    if (taskWrk1.getIoType() == 3 && taskWrk1.getWrkSts()<3){
+                    if (taskWrk1.getIoType() == 1 && taskWrk1.getWrkSts()<3){
                         taskWrk = taskWrk1;
                         break;
                     }
@@ -2998,7 +2998,7 @@
                     }
 
                     // 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
-                    if (staProtocol.isAutoing() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")) {
+                    if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")) {
                         // 鍫嗗灈鏈烘帶鍒惰繃婊�
                         if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE)) {
                             devpThread.setErrorDev(staProtocol.getSiteId(), "鍫嗗灈鏈洪潪绌洪棽");

--
Gitblit v1.9.1