From 3a69206f92a89fa7454c5f21a769ac594d99c023 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 24 二月 2023 22:09:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 ++++--
src/main/java/com/zy/asrs/controller/MonitorController.java | 2 +-
src/main/resources/application.yml | 50 +++++++++++++++++++++++++-------------------------
3 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index cb92484..3f9b38e 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -104,7 +104,7 @@
// 鑾峰彇杈撻�佺嚎plc绾跨▼
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
- String ledContent = ledThread.getWorkNos().toString();
+ String ledContent = Cools.isEmpty(ledThread) ? "" : ledThread.getWorkNos().toString();
// ledContent = "ask鐨勬ā鍧楄惃婊″ぇ绠椾簡钀ㄦ弧澶т簡\n 鏄獦澧冨埌鍩冨強鍡插鍡瞈n 钀ㄨ揪濮嗘墦寮�钀ㄦ弧澶у嚡鎾掗害褰撳姵钀ㄦ弧澶ц�佸笀";
return R.ok(
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 c046653..f4a3778 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -108,14 +108,16 @@
}
String barcode = barcodeThread.getBarcode();
+
+
//101绔欐湁3涓壂鐮佸櫒锛屽綋0鎵爜鍣ㄦ病鏈夋暟鎹椂锛岃幏鍙�9銆�10涓や釜鎵爜鍣ㄦ暟鎹�
- if(inSta.getStaNo().equals(101) && !Cools.isEmpty(barcode)){
+ if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) && Cools.isEmpty(barcode)){
BarcodeThread barcodeThread1 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode1());
if (barcodeThread1 != null) {
barcode = barcodeThread1.getBarcode();
}
- if(!Cools.isEmpty(barcode)) {
+ if(Cools.isEmpty(barcode)) {
BarcodeThread barcodeThread2 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode2());
if (barcodeThread2 != null) {
barcode = barcodeThread2.getBarcode();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5c62025..6bda912 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -347,85 +347,85 @@
barcode[6]:
id: 7
ip: 10.10.10.106
- port: 51236
+ port: 2002
# 鏉＄爜鎵弿浠�8,104
barcode[7]:
id: 8
ip: 10.10.10.107
- port: 51236
+ port: 2002
# 鏉＄爜鎵弿浠�9,101
barcode[8]:
id: 9
ip: 10.10.10.108
- port: 51236
+ port: 2002
# 鏉＄爜鎵弿浠�10,101
barcode[9]:
id: 10
ip: 10.10.10.109
- port: 51236
+ port: 2002
barcode[10]:
id: 11
ip: 10.10.10.110
- port: 51236
+ port: 2002
barcode[11]:
id: 12
ip: 10.10.10.111
- port: 51236
+ port: 2002
# LED1
led[0]:
id: 1
- ip: 10.10.10.201
+ ip: 10.10.10.221
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 100
# LED2
led[1]:
id: 2
- ip: 10.10.10.202
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 110
- # LED3
- led[2]:
- id: 3
- ip: 10.10.10.203
+ ip: 10.10.10.222
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 103
+ # LED3
+ led[2]:
+ id: 3
+ ip: 10.10.10.223
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 110
# LED4
led[3]:
id: 4
- ip: 10.10.10.204
+ ip: 10.10.10.224
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staArr: 113
# LED5
led[4]:
id: 5
- ip: 10.10.10.205
+ ip: 10.10.10.225
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staArr: 200
# LED6
led[5]:
id: 6
- ip: 10.10.10.206
+ ip: 10.10.10.226
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staArr: 203
# LED7
led[6]:
id: 7
- ip: 10.10.10.207
+ ip: 10.10.10.227
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staArr: 300
# LED8
led[7]:
id: 8
- ip: 10.10.10.208
+ ip: 10.10.10.228
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staArr: 303
\ No newline at end of file
--
Gitblit v1.9.1