From d2d40f1b4e2b740043f09b70efd8d5c9742ccc2e Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期日, 30 十一月 2025 10:19:19 +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 c2e4fd4..3e22f86 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -186,9 +186,6 @@
                     log.error("鐗╂枡鐮佹壂鐮佸け璐�");
                     back = true;
                 }
-                if(barcode.equals("0")){
-                    continue;
-                }
                 // 閫�鍥�
                 if (back) {
                     News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
@@ -225,6 +222,7 @@
                         && staProtocol.isPakMk()
                         && staProtocol.getWorkNo() == 0
                 ) {
+
                     if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode)) {
 //                        News.error(JSON.toJSONString(staProtocol));
                         News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
@@ -244,6 +242,9 @@
                         log.error("杈撻�佺嚎涓嬪彂1锛�"+wrkNo+","+inSta.getBackSta());
                         continue;
                     }
+                    if(barcode.equals("0")){
+                        continue;
+                    }
 //                    if (staProtocol.getSiteId()!= 159){
 //                        if( Cools.isEmpty(barcodeMat) || "NG".endsWith(barcodeMat) || "NoRead".equals(barcodeMat) || "00000000".equals(barcodeMat)) {
 //                            News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcodeMat(), barcodeMat);

--
Gitblit v1.9.1