From 0a4438e34d8f726b9cf6251a5b447883b0b8da36 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 08 一月 2026 09:47:50 +0800
Subject: [PATCH] 堆垛机出库站状态判断
---
src/main/java/com/zy/core/properties/SlaveProperties.java | 7 +++
src/main/java/com/zy/service/impl/MainServiceImpl.java | 22 +++++++++-
src/main/resources/application-dev.yml | 62 ++++++++++++++++---------------
src/main/resources/application-prod.yml | 2 +
4 files changed, 60 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java
index 52badea..e3c2345 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -31,6 +31,13 @@
private int groupCount;
+ /**
+ * 妫�鏌ュ爢鍨涙満鍑哄簱绔欑姸鎬�
+ * true: 妫�鏌ュ嚭搴撶珯鐘舵�侊紙榛樿鍊硷級
+ * false: 涓嶆鏌ワ紝榛樿鍑哄簱绔欏彲鐢�
+ */
+ private boolean checkOutStationStatus = true;
+
private List<CrnSlave> crn = new ArrayList<>();
private List<DevpSlave> devp = new ArrayList<>();
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index 83a4e94..a90e75a 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -678,9 +678,25 @@
// continue;
}
- // 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
- if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
- && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
+ boolean outStationAvailable = true;
+ // 鏄惁妫�鏌ュ爢鍨涙満鍑哄簱绔欑姸鎬侊紙true: 妫�鏌ワ紝false: 涓嶆鏌ワ級
+ if (slaveProperties.isCheckOutStationStatus()) {
+ // 妫�鏌ュ嚭搴撶珯鐘舵��
+ outStationAvailable =
+ //鑷姩
+ staProtocol.isAutoing()
+ //!鏈夌墿
+ && !staProtocol.isLoading()
+ //鑳藉嚭
+ && staDetl.getCanouting() != null
+ && staDetl.getCanouting().equals("Y")
+ //宸ヤ綔鍙�
+ && staProtocol.getWorkNo() == 0
+ //鍙嚭
+ && staProtocol.isOutEnable();
+ }
+ // 鍑哄簱绔欏彲鐢ㄦ椂缁х画鎵ц
+ if (outStationAvailable) {
// 鍫嗗灈鏈烘帶鍒惰繃婊�
if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
// continue;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index b621de3..c4b2797 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -44,6 +44,8 @@
doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24,25,28,29,32
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
+ # 鏄惁妫�鏌ュ爢鍨涙満鍑哄簱绔欑姸鎬侊紙true: 妫�鏌ワ紝false: 涓嶆鏌ワ級
+ checkOutStationStatus: true
# 鍫嗗灈鏈�1
crn[0]:
@@ -457,27 +459,27 @@
# 鍏ュ簱鍙�5
inSta[0]:
staNo: 1002
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[4].id}
backSta: 1001
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[3].id}
# 鍑哄簱鍙�5
outSta[0]:
staNo: 1001
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[3].id}
# 鍏ュ簱鍙�6
inSta[1]:
staNo: 1004
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[5].id}
backSta: 1003
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[3].id}
# 鍑哄簱鍙�6
outSta[1]:
staNo: 1003
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[3].id}
# 鍏ュ簱鍙�7
inSta[2]:
staNo: 1006
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[6].id}
backSta: 1005
led: ${wcs-slave.led[4].id}
# 鍑哄簱鍙�7
@@ -487,61 +489,61 @@
# 鍏ュ簱鍙�8
inSta[3]:
staNo: 1008
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[7].id}
backSta: 1007
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[5].id}
# 鍑哄簱鍙�8
outSta[3]:
staNo: 1007
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[5].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 1002
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[4].id}
backSta: 1001
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[3].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
staNo: 1004
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[5].id}
backSta: 1003
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[3].id}
# 绌烘澘鍏ュ簱鍙�3
emptyInSta[2]:
staNo: 1006
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[6].id}
backSta: 1005
led: ${wcs-slave.led[4].id}
# 绌烘澘鍏ュ簱鍙�4
emptyInSta[3]:
staNo: 1008
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[7].id}
backSta: 1007
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[5].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 1002
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[4].id}
backSta: 1001
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[3].id}
# 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
staNo: 1004
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[5].id}
backSta: 1003
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[3].id}
# 鎷ｆ枡鍏ュ簱鍙�3
pickSta[2]:
staNo: 1006
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[6].id}
backSta: 1005
led: ${wcs-slave.led[4].id}
# 鎷ｆ枡鍏ュ簱鍙�4
pickSta[3]:
staNo: 1008
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[7].id}
backSta: 1007
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[5].id}
@@ -589,7 +591,7 @@
# LED1
led[0]:
id: 1
- ip: 10.10.10.160
+ ip: 10.10.10.203
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 101
@@ -597,7 +599,7 @@
# LED2
led[1]:
id: 2
- ip: 10.10.10.161
+ ip: 10.10.10.204
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 104
@@ -605,7 +607,7 @@
# LED3
led[2]:
id: 3
- ip: 10.10.10.162
+ ip: 10.10.10.205
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 106
@@ -613,7 +615,7 @@
# LED4
led[3]:
id: 4
- ip: 10.10.10.163
+ ip: 10.10.10.206
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 107
@@ -621,7 +623,7 @@
# LED5
led[4]:
id: 5
- ip: 10.10.10.164
+ ip: 10.10.10.207
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 107
@@ -629,7 +631,7 @@
# LED6
led[5]:
id: 6
- ip: 10.10.10.165
+ ip: 10.10.10.208
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 107
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index b621de3..b3f34cb 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -44,6 +44,8 @@
doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24,25,28,29,32
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
+ # 鏄惁妫�鏌ュ爢鍨涙満鍑哄簱绔欑姸鎬侊紙true: 妫�鏌ワ紝false: 涓嶆鏌ワ級
+ checkOutStationStatus: true
# 鍫嗗灈鏈�1
crn[0]:
--
Gitblit v1.9.1