From 9638bf27e6a70d6a6c0321d79b6eab722d8149b1 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 27 十二月 2022 08:07:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 +-
src/main/resources/application.yml | 59 ++++++++++++++++++-----------
2 files changed, 39 insertions(+), 24 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 85b2613..4c8e014 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -366,8 +366,8 @@
// if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()) {
-// WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
- WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue());
+ WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
+// WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue());
if (wrkMast == null) {
// 鏃犳嫞鏂欐暟鎹�
continue;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d088790..08eff50 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -143,8 +143,8 @@
# 鍫嗗灈鏈�5
crn[4]:
id: 5
- ip: 10.10.10.111
- port: 102
+ ip: 10.10.10.5
+ port: 6000
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -167,8 +167,8 @@
# 鍫嗗灈鏈�6
crn[5]:
id: 6
- ip: 10.10.10.111
- port: 102
+ ip: 10.10.10.6
+ port: 6000
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -191,8 +191,8 @@
# 鍫嗗灈鏈�7
crn[6]:
id: 7
- ip: 10.10.10.111
- port: 102
+ ip: 10.10.10.7
+ port: 6000
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -252,6 +252,21 @@
staNo: 117
barcode: ${wcs-slave.barcode[2].id}
led: ${wcs-slave.led[2].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 101
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 109
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[2]:
+ staNo: 117
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[2].id}
# 鍑哄簱鍙�1
outSta[0]:
@@ -265,14 +280,7 @@
outSta[2]:
staNo: 100
led: ${wcs-slave.led[0].id}
-# # 鎷ｆ枡鍏ュ簱鍙�1
-# pickSta[0]:
-# staNo: 126
-# barcode: ${wcs-slave.barcode[0].id}
-# # 鎷ｆ枡鍏ュ簱鍙�2
-# pickSta[1]:
-# staNo: 134
-# barcode: ${wcs-slave.barcode[0].id}
+
# 杈撻�佺嚎2
devp[1]:
id: 2
@@ -313,6 +321,21 @@
staNo: 213
barcode: ${wcs-slave.barcode[5].id}
led: ${wcs-slave.led[9].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 201
+ barcode: ${wcs-slave.barcode[3].id}
+ led: ${wcs-slave.led[5].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 207
+ barcode: ${wcs-slave.barcode[4].id}
+ led: ${wcs-slave.led[7].id}
+ # 鎷ｆ枡鍏ュ簱鍙�3
+ pickSta[2]:
+ staNo: 213
+ barcode: ${wcs-slave.barcode[5].id}
+ led: ${wcs-slave.led[9].id}
# 鍑哄簱鍙�1
outSta[0]:
staNo: 205
@@ -325,14 +348,6 @@
outSta[2]:
staNo: 217
led: ${wcs-slave.led[10].id}
-# # 鎷ｆ枡鍏ュ簱鍙�1
-# pickSta[0]:
-# staNo: 011
-# barcode: ${wcs-slave.barcode[0].id}
-# # 鎷ｆ枡鍏ュ簱鍙�2
-# pickSta[1]:
-# staNo: 011
-# barcode: ${wcs-slave.barcode[0].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
--
Gitblit v1.9.1