From dd91c85493463db1968e6e7a61c841d20f948cf6 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 14 十一月 2023 16:37:48 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   10 +++++++---
 1 files changed, 7 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 bc48349..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,8 +2301,12 @@
             }
             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";
@@ -2312,7 +2316,7 @@
                 if (result) {
                     barcodeThread.setBarcode("");
                 }
-                log.info(staNo + "鍙锋壂鐮佸櫒锛岄�氱煡AGV鍙栬揣锛屾潯鐮佸彿锛�" + barcode);
+                log.info(barcodeThread.getSlave().getId() + "鍙锋壂鐮佸櫒锛岄�氱煡AGV鍙栬揣锛屾潯鐮佸彿锛�" + barcode);
             }
         }
     }

--
Gitblit v1.9.1