From 725d7512b15a1e303d89e409f3f6a11cbcd0f5e9 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 03 九月 2025 08:54:23 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    6 +-----
 1 files changed, 1 insertions(+), 5 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 c9c56aa..8fea465 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -561,8 +561,6 @@
 
     public synchronized void generateStoreWrkFile(Integer mark) {
         String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();
-        final Set<String> INVALID_BARCODES = new HashSet<>(Arrays.asList("NG", "NoRead", "00000000"));
-
         for (DevpSlave devp : slaveProperties.getDevp()) {
             for (DevpSlave.Sta inSta : devp.getInSta()) {
 
@@ -647,7 +645,6 @@
                             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                         }
 
-                        continue;
                     } else {
                         // 灏哄/閲嶉噺/鎵爜寮傚父妫�娴�
                         if (staProtocol == null) continue;
@@ -664,7 +661,7 @@
                         else if (staProtocol.isBarcodeErr()) { errMsg = "鎵爜澶辫触"; back = true; }
 
                         // 灏哄寮傚父鍥為��
-                        if (back && staProtocol.getWorkNo() <9999) {
+                        if (back && staProtocol.getWorkNo() == 9998) {
 //                            log.info("errmsg: " + errMsg);
                             MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
 
@@ -674,7 +671,6 @@
                             devpThread.setPakMk(staProtocol.getSiteId(), false);
                             MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                             log.error("杈撻�佺嚎涓嬪彂1锛�" + wrkNo + "," + inSta.getBackSta());
-                            continue;
                         }
 
 //                        // 鍏ュ簱鏉′欢婊¤冻锛屽紑濮嬭姹傚叆搴撳湴鍧�

--
Gitblit v1.9.1