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/AppleLocOperationHandler.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/AppleLocOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
index 1e9198d..f81b24f 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
@@ -81,12 +81,12 @@
                     if (staProtocol.getWorkNo() == 0) {
                         continue;
                     }
-                    if (!staProtocol.isLoading()) {
-                        News.error("{}锛氱珯鐐癸細{}锛屾棤鐗�", config.getMark(), staProtocol.getSiteId());
+                    if (!staProtocol.isAutoing()) {
+                        //News.error("{}锛氱珯鐐癸細{}锛岄潪鑷姩", config.getMark(), staProtocol.getSiteId());
                         continue;
                     }
-                    if (!staProtocol.isAutoing()) {
-                        News.error("{}锛氱珯鐐癸細{}锛岄潪鑷姩", config.getMark(), staProtocol.getSiteId());
+                    if (!staProtocol.isLoading()) {
+                        News.error("{}锛氱珯鐐癸細{}锛屾棤鐗�", config.getMark(), staProtocol.getSiteId());
                         continue;
                     }
                     String barcode = staProtocol.getBarcode();
@@ -100,7 +100,7 @@
                         continue;
                     }
                     if (job.getJobSts() != ConveyorStateType.STARTUP.getStatus()) {
-                        if (job.getJobSts() == ConveyorStateType.INBOUND.getStatus()){
+                        if (job.getJobSts() == ConveyorStateType.INBOUND.getStatus()) {
                             continue;
                         }
                         News.error("{}锛氱珯鐐癸細{}锛屼换鍔$姸鎬佷笉瀵癸紝{}", config.getMark(), staProtocol.getSiteId(), JSON.toJSON(job));

--
Gitblit v1.9.1