From bd58043d19100f2d3c794ea32a2103b38b597478 Mon Sep 17 00:00:00 2001
From: ynhfasrs <ynhfasrs@qq.com>
Date: 星期一, 26 五月 2025 14:58:52 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 b9eee2f..06b5c39 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -152,7 +152,7 @@
                             && staProtocol.isInEnable()
                             && !staProtocol.isEmptyMk()
                             && staProtocol.isPakMk()
-                            && (staProtocol.getWorkNo() == 9999 && staProtocol.getWorkNo() == 9998)
+                            && (staProtocol.getWorkNo() == 9999 || staProtocol.getWorkNo() == 9998)
                     ) {
                         // 鑾峰彇鏉$爜鎵弿浠俊鎭�
                         BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());

--
Gitblit v1.9.1