From 132db34b1ae71bf985d306ab38b8db37fac2e1eb Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 25 二月 2023 10:44:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 f4a3778..6777879 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -111,25 +111,30 @@
//101绔欐湁3涓壂鐮佸櫒锛屽綋0鎵爜鍣ㄦ病鏈夋暟鎹椂锛岃幏鍙�9銆�10涓や釜鎵爜鍣ㄦ暟鎹�
- if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) && Cools.isEmpty(barcode)){
+ if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) && ( "NoRead".equals(barcode) || Cools.isEmpty(barcode) )){
BarcodeThread barcodeThread1 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode1());
if (barcodeThread1 != null) {
barcode = barcodeThread1.getBarcode();
}
- if(Cools.isEmpty(barcode)) {
+ if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) {
BarcodeThread barcodeThread2 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode2());
if (barcodeThread2 != null) {
barcode = barcodeThread2.getBarcode();
+
}
}
+// if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) {
+// barcode = "";
+// continue;
+// }
}
- if (!Cools.isEmpty(barcode)) {
+ if (!Cools.isEmpty(barcode) && !"NoRead".equals(barcode)) {
log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
- if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
- continue;
- }
+// if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+// continue;
+// }
} else {
continue;
}
@@ -210,6 +215,7 @@
param.setIoType(1);
param.setSourceStaNo(inSta.getStaNo());
param.setLocType1(locTypeDto.getLocType1());
+// param.setFull(staProtocol.isFull());
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/rpc/pakin/loc/v1")
--
Gitblit v1.9.1