From cc775722a5e22390bbae832e070fc2ec1ce760ce Mon Sep 17 00:00:00 2001
From: dubin <dubin>
Date: 星期三, 20 八月 2025 14:14:16 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 13 ++++++++-----
1 files changed, 8 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 2d1f0c6..c2a287c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -194,7 +194,8 @@
&& staProtocol.isLoading()
&& staProtocol.isInEnable()
&& !staProtocol.isEmptyMk()
- && staProtocol.isPakMk()) {
+ && staProtocol.isPakMk()
+ && staProtocol.getWorkNo()==9999) {
if (Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
@@ -493,9 +494,10 @@
if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
continue;
}
- } else {
- continue;
}
+ /*else {
+ continue;
+ }*/
if (!Cools.isEmpty(barcode)) {
@@ -503,9 +505,10 @@
if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
continue;
}
- } else {
- continue;
}
+ /* else {
+ continue;
+ }*/
}
--
Gitblit v1.9.1