From 7b36962c3dd3468b150b3de25a045f28f332c924 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 16 十一月 2023 16:30:08 +0800
Subject: [PATCH] #ESS系统
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 668749f..0859375 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2292,7 +2292,7 @@
*/
public void agvRestockIntoByHangingWire() {
//妫�娴�350鍜�351鎵爜鍣�
- int[] barcodeStaNo = {10, 11};//10 => 350绔欐壂鐮佸櫒,11 => 351绔欐壂鐮佸櫒
+ int[] barcodeStaNo = {11, 12};//11 => 350绔欐壂鐮佸櫒,12 => 351绔欐壂鐮佸櫒
for (int staNo : barcodeStaNo) {
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, staNo);
@@ -2301,15 +2301,22 @@
}
String barcode = barcodeThread.getBarcode();
if(!Cools.isEmpty(barcode)) {
+ if (barcode.contains("NoRead")) {
+ continue;
+ }
+
String agvStaNo = null;
- if (staNo == 10) {
+ if (staNo == 11) {
agvStaNo = "303-1";
}else {
agvStaNo = "304-1";
}
//閫氱煡AGV鍙栬揣
- agvRestockCall(agvStaNo, barcode);
- log.info(staNo + "鍙锋壂鐮佸櫒锛岄�氱煡AGV鍙栬揣锛屾潯鐮佸彿锛�" + barcode);
+ boolean result = agvRestockCall(agvStaNo, barcode);
+ if (result) {
+ barcodeThread.setBarcode("");
+ }
+ log.info(barcodeThread.getSlave().getId() + "鍙锋壂鐮佸櫒锛岄�氱煡AGV鍙栬揣锛屾潯鐮佸彿锛�" + barcode);
}
}
}
--
Gitblit v1.9.1