From 6ec25c0e89ea9a416ab8d8b5abeb23de2b621c35 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 28 八月 2025 16:32:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/RouteUtils.java | 11 +++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 13 +++-
src/main/resources/application.yml | 109 ++++++++++++++++++++++++++----------
3 files changed, 97 insertions(+), 36 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 138e4e3..fcc6307 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -750,6 +750,7 @@
if ((wrkMast.getIoType() != 12 && wrkMast.getIoType() < 100) || wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null) {
continue;
}
+
// 鍒ゆ柇鍚婅溅鏄惁瀹為檯宸插畬鎴愶紝涓旂數鑴戠姸鎬佸湪move涓紝浠ュ鐢佃剳杩涜鏇存柊宸ヤ綔妗�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast.getCrnNo());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
@@ -818,7 +819,7 @@
} else {
staProtocolOut = staProtocolOut.clone();
}
- if(staProtocolOut.getWorkNo() != null &&staProtocolOut.getStaNo() == 4006){
+ if(staProtocolOut.getWorkNo() != null && staProtocolOut.getStaNo() == 4006){
WrkMast wrkMastOut = wrkMastMapper.selectByWrkNo(staProtocolOut.getWorkNo());
WrkMast wrkMast = wrkMastMapper.selectByWrkNo(9997);
if(wrkMast == null){
@@ -2699,7 +2700,9 @@
if (rgvProtocol.getStatusType() == RgvStatusType.IDLE &&
rgvProtocol.getModeType() == RgvModeType.AUTO
&& !rgvProtocol.isLoaded1ing() //鐜板満淇敼锛氬彔鐩樻満锛屼笉婊￠兘绠楁棤鐗╋紝鎬庝箞鍒ゆ柇闇�瑕佽窡鐢垫帶瀵规帴
- && (rgvProtocol.getTaskNo1()==0)
+ && rgvProtocol.getTaskNo1()==0
+ && !rgvProtocol.isLoaded2ing()
+ && rgvProtocol.getTaskNo2()==0
&&rgvThread.isPakMk()
) {
BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
@@ -2715,7 +2718,9 @@
if (rgvProtocolOther.getStatusType() == RgvStatusType.IDLE
&& rgvProtocolOther.getModeType() == RgvModeType.AUTO
&& !rgvProtocolOther.isLoaded1ing()
- && (rgvProtocolOther.getTaskNo1()==0)
+ && rgvProtocolOther.getTaskNo1()==0
+ && !rgvProtocolOther.isLoaded2ing()
+ && rgvProtocolOther.getTaskNo2()==0
&&rgvThreadOther.isPakMk()
){
//瀵瑰伐浣滄。杩涜鍒ゆ柇
@@ -3492,7 +3497,7 @@
// if (staNos.contains(wrkMastSta.getStaStart())) {//闈炲叆搴撳彛锛堝嚭搴撳彛锛夐檺鍒�
// continue;
// }
-// boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //鍛戒护涓嬪彂
+// boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta,null); //鍛戒护涓嬪彂
// wrkEnable = true;
// if (sign){
// wrkMastSta.setWrkSts(1);
diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index c43386e..c161495 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -30,7 +30,16 @@
// RGV杞ㄩ亾姝ｅ簭锛堜粠涓婂埌涓嬶級
public static final List<Integer> TRACK_POSITION_POSITIVE_SEQUENCE = Arrays.asList(
- 1004,1007,1010,1014,1018,1021,1024,1028,1031,1035
+ 1004,
+ 1007,
+ 1010,
+ 1014,
+ 1018,
+ 1021,
+ 1024,
+ 1028,
+ 1031,
+ 1035
);
// 鍙嶅簭锛堢洿鎺ュ弽杞敓鎴愶級
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 31bac27..ba72fab 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -293,58 +293,105 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 106
+ staNo: 1044
barcode: ${wcs-slave.barcode[0].id}
barcodeMat: ${wcs-slave.barcode[3].id}
- backSta: 105
+ backSta: 1041
led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 106
+ staNo: 1038
barcode: ${wcs-slave.barcode[0].id}
- backSta: 105
+ backSta: 1038
led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 159
+ staNo: 1036
barcode: ${wcs-slave.barcode[2].id}
led: ${wcs-slave.led[5].id}
- backSta: 160
+ backSta: 1037
# 鍏ュ簱鍙�1
inSta[1]:
- staNo: 107
+ staNo: 1103
barcode: ${wcs-slave.barcode[1].id}
barcodeMat: ${wcs-slave.barcode[4].id}
- backSta: 108
+ backSta: 1041
led: ${wcs-slave.led[2].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[1]:
- staNo: 107
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 108
- led: ${wcs-slave.led[2].id}
- inSta[2]:
- staNo: 159
- barcode: ${wcs-slave.barcode[2].id}
- barcodeMat: ${wcs-slave.barcode[5].id}
- backSta: 160
- led: ${wcs-slave.led[5].id}
-# # 鎷ｆ枡鍏ュ簱鍙�1
-# pickSta[1]:
-# staNo: 107
-# barcode: ${wcs-slave.barcode[1].id}
-# led: ${wcs-slave.led[1].id}
-# backSta: 108
+# inSta[2]:
+# staNo: 159
+# barcode: ${wcs-slave.barcode[2].id}
+# barcodeMat: ${wcs-slave.barcode[5].id}
+# backSta: 160
+# led: ${wcs-slave.led[5].id}
+
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 100
+ staNo: 1041
+ led: ${wcs-slave.led[0].id}
+
+
+ # 杈撻�佺嚎1
+ devp[1]:
+ id: 2
+ ip: 10.10.10.50
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 2035
+ barcode: ${wcs-slave.barcode[0].id}
+ barcodeMat: ${wcs-slave.barcode[3].id}
+ backSta: 2034
+ led: ${wcs-slave.led[1].id}
+# # 绌烘澘鍏ュ簱鍙�1
+# emptyInSta[0]:
+# staNo: 106
+# barcode: ${wcs-slave.barcode[0].id}
+# backSta: 105
+# led: ${wcs-slave.led[1].id}
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[0]:
+# staNo: 159
+# barcode: ${wcs-slave.barcode[2].id}
+# led: ${wcs-slave.led[5].id}
+# backSta: 160
+ # 鍏ュ簱鍙�1
+ inSta[1]:
+ staNo: 4001
+ barcode: ${wcs-slave.barcode[1].id}
+ barcodeMat: ${wcs-slave.barcode[4].id}
+ backSta: 4003
+ led: ${wcs-slave.led[2].id}
+# # 绌烘澘鍏ュ簱鍙�1
+# emptyInSta[1]:
+# staNo: 107
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 108
+# led: ${wcs-slave.led[2].id}
+# inSta[2]:
+# staNo: 159
+# barcode: ${wcs-slave.barcode[2].id}
+# barcodeMat: ${wcs-slave.barcode[5].id}
+# backSta: 160
+# led: ${wcs-slave.led[5].id}
+ # # 鎷ｆ枡鍏ュ簱鍙�1
+ # pickSta[1]:
+ # staNo: 107
+ # barcode: ${wcs-slave.barcode[1].id}
+ # led: ${wcs-slave.led[1].id}
+ # backSta: 108
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 2033
led: ${wcs-slave.led[0].id}
outSta[1]:
- staNo: 152
+ staNo: 4006
led: ${wcs-slave.led[3].id}
- outSta[2]:
- staNo: 156
- led: ${wcs-slave.led[4].id}
+# outSta[2]:
+# staNo: 156
+# led: ${wcs-slave.led[4].id}
+
# 鏉＄爜鎵弿浠�1
barcode[0]:
--
Gitblit v1.9.1