From b06bc7c7c0f685406ce6557e179586336f6a00f3 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 20 二月 2023 18:44:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 2
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 31 ++++++++-------
src/main/resources/application.yml | 30 +++++++++++---
3 files changed, 41 insertions(+), 22 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 e9c7014..b411325 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -387,20 +387,20 @@
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;
-// }
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ 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;
+ }
// 鑾峰彇鎷ｆ枡鍏ュ簱绔欎俊鎭�
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
@@ -418,6 +418,9 @@
// WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue());
if (wrkMast == null) {
+ wrkMast = wrkMastMapper.selectPickStep(barcode);
+ }
+ if (wrkMast == null) {
// 鏃犳嫞鏂欐暟鎹�
continue;
}
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 53b8d97..45bb3cf 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -27,7 +27,7 @@
public class BarcodeThread implements Runnable, ThreadHandler {
private Slave slave;
- private String barcode;
+ private String barcode = "";
private Socket socket;
private DataOutputStream dataOutputStream;
private DataInputStream dataInputStream;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0e4a7ad..14c07e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -187,11 +187,15 @@
# 鍏ュ簱鍙�1
inSta[0]:
staNo: 101
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[6].id}
+ barcode1: ${wcs-slave.barcode[7].id}
+ barcode2: ${wcs-slave.barcode[8].id}
# 鍏ュ簱鍙�2
inSta[1]:
staNo: 104
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[9].id}
+ barcode1: ${wcs-slave.barcode[10].id}
+ barcode2: ${wcs-slave.barcode[11].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 101
@@ -207,11 +211,15 @@
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 101
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[6].id}
+ barcode1: ${wcs-slave.barcode[7].id}
+ barcode2: ${wcs-slave.barcode[8].id}
# 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
staNo: 104
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[9].id}
+ barcode1: ${wcs-slave.barcode[10].id}
+ barcode2: ${wcs-slave.barcode[11].id}
# 杈撻�佺嚎2
devp[1]:
id: 2
@@ -343,19 +351,27 @@
# 鏉＄爜鎵弿浠�8,104
barcode[7]:
id: 8
- ip: 10.10.10.59
+ ip: 10.10.10.107
port: 51236
# 鏉＄爜鎵弿浠�9,101
barcode[8]:
id: 9
- ip: 10.10.10.59
+ ip: 10.10.10.108
port: 51236
# 鏉＄爜鎵弿浠�10,101
barcode[9]:
id: 10
- ip: 10.10.10.59
+ ip: 10.10.10.109
port: 51236
+ barcode[10]:
+ id: 11
+ ip: 10.10.10.110
+ port: 51236
+ barcode[11]:
+ id: 12
+ ip: 10.10.10.111
+ port: 51236
# LED1
led[0]:
id: 1
--
Gitblit v1.9.1