From a439542ebcd5466ebc544741bca13d82955580ce Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 22 二月 2022 16:18:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 15 +++++++++++++++
src/main/resources/application.yml | 5 +++--
2 files changed, 18 insertions(+), 2 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 80947ba..d32e861 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -303,6 +303,21 @@
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鎷ｆ枡鍏ュ簱鍙�
for (DevpSlave.Sta pickSta : devp.getPickSta()) {
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
+ if (barcodeThread == null) {
+ continue;
+ }
+ String barcode = barcodeThread.getBarcode();
+ if(!Cools.isEmpty(barcode)) {
+ log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
+ if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+ continue;
+ }
+ } else {
+ continue;
+ }
+
// 鑾峰彇鎷ｆ枡鍏ュ簱绔欎俊鎭�
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 65187d2..3c687bd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -180,7 +180,8 @@
staNo: 182
# 鎷ｆ枡鍏ュ簱鍙�
pickSta[0]:
- staNo: 172
+ staNo: 173
+ barcode: ${wcs-slave.barcode[0].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
@@ -199,4 +200,4 @@
ip: 10.10.10.61
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 182
\ No newline at end of file
+ staArr: 182
--
Gitblit v1.9.1