From f5646b75344aff023817472a5a13f75dbfe05c28 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 10 二月 2023 11:00:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/DevpSlave.java | 4 ++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 17 +++++++++++++++++
src/main/resources/application.yml | 13 +++++++++++++
3 files changed, 34 insertions(+), 0 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 14ca97b..23d6d98 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -101,10 +101,27 @@
for (DevpSlave.Sta inSta : devp.getInSta()) {
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
+
if (barcodeThread == null) {
continue;
}
String barcode = barcodeThread.getBarcode();
+
+ //101绔欐湁3涓壂鐮佸櫒锛屽綋0鎵爜鍣ㄦ病鏈夋暟鎹椂锛岃幏鍙�9銆�10涓や釜鎵爜鍣ㄦ暟鎹�
+ if(inSta.getStaNo().equals(101) && !Cools.isEmpty(barcode)){
+ BarcodeThread barcodeThread1 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode1());
+ if (barcodeThread1 != null) {
+ barcode = barcodeThread1.getBarcode();
+ }
+
+ if(!Cools.isEmpty(barcode)) {
+ BarcodeThread barcodeThread2 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode2());
+ if (barcodeThread2 != null) {
+ barcode = barcodeThread2.getBarcode();
+ }
+ }
+ }
+
if (!Cools.isEmpty(barcode)) {
log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
diff --git a/src/main/java/com/zy/core/model/DevpSlave.java b/src/main/java/com/zy/core/model/DevpSlave.java
index ad33be5..df80422 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -34,6 +34,10 @@
private Integer barcode;
+ private Integer barcode1;
+
+ private Integer barcode2;
+
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 074254d..8375fc0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -188,6 +188,8 @@
inSta[0]:
staNo: 101
barcode: ${wcs-slave.barcode[0].id}
+ barcode1: ${wcs-slave.barcode[8].id}
+ barcode2: ${wcs-slave.barcode[9].id}
# 鍏ュ簱鍙�2
inSta[1]:
staNo: 111
@@ -345,6 +347,17 @@
id: 8
ip: 10.10.10.59
port: 51236
+ # 鏉＄爜鎵弿浠�9
+ barcode[8]:
+ id: 8
+ ip: 10.10.10.59
+ port: 51236
+ # 鏉＄爜鎵弿浠�10
+ barcode[9]:
+ id: 8
+ ip: 10.10.10.59
+ port: 51236
+
# LED1
led[0]:
id: 1
--
Gitblit v1.9.1