From 00bdf480d4973c0e297cb263d1499edb91526a20 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 06 十二月 2022 10:07:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++---
1 files changed, 3 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 8b1a9d6..951a8d1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -117,8 +117,8 @@
continue;
}
String barcode = barcodeThread.getBarcode();
-
- if (!Cools.isEmpty(barcode) && staProtocol.getWorkNo() != 9998) {
+ //9998閫�鍥烇紝9996绌烘澘
+ if (!Cools.isEmpty(barcode) && (staProtocol.getWorkNo() != 9998 || staProtocol.getWorkNo() != 9996)) {
log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
staProtocol.setWorkNo((short) 9998);
@@ -377,7 +377,7 @@
}
String barcode = barcodeThread.getBarcode();
- if(!Cools.isEmpty(barcode) && staProtocol.getWorkNo() != 9998) {
+ if(!Cools.isEmpty(barcode) && (staProtocol.getWorkNo() != 9998 || staProtocol.getWorkNo() != 9996)) {
log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
staProtocol.setWorkNo((short) 9998);
--
Gitblit v1.9.1