From dbe068260c6897ec9b16bdb01831af39019ea5b9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 十一月 2022 09:19:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 2
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2
src/main/resources/application.yml | 87 ++++++++++++-------------------------------
3 files changed, 27 insertions(+), 64 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 3134932..ec362bd 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -732,9 +732,9 @@
log.error("璋冩暣宸ヤ綔妗ｄ紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
}
//20220719 Add锛屽鏋滄祬搴撲綅鐘舵�佷负P/R锛屽伐浣滅姸鎬佷负14/15,璇存槑娴呭簱浣嶅凡缁忕┖浜嗭紝鍙互鎵ц鍏ュ簱浠诲姟
- continue;
}
}
+ continue;
}
if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
// 姝ゆ爣璁伴伩鍏嶅娆℃墽琛岀Щ搴撲换鍔�
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 141502b..fd12dab 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -140,7 +140,7 @@
SlaveProperties slaveProperties = new SlaveProperties();
slaveProperties.setDoubleDeep(true);
slaveProperties.setGroupCount(2);
- System.out.println(getDeepLoc(slaveProperties, "3100101"));
+ System.out.println(getShallowLoc(slaveProperties, "3200101"));
}
/**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0976afa..0dffd8c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -36,7 +36,7 @@
enable: false
wms:
- url: localhost:8080/bfwms
+ url: localhost:8081/ynwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -58,19 +58,12 @@
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 107
- row: 4
- bay: 4
- lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 108
- row: 4
- bay: 5
+ staNo: 105
+ row: 2
+ bay: 1
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
@@ -86,29 +79,15 @@
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 111
- row: 11
- bay: 5
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 211
- row: 12
- bay: 5
+ row: 17
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 104
- row: 11
- bay: 4
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 204
- row: 12
- bay: 4
+ staNo: 114
+ row: 18
+ bay: 1
lev: 1
# 鍫嗗灈鏈�3
crn[2]:
@@ -123,16 +102,16 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 207
- row: 18
- bay: 4
+ staNo: 119
+ row: 31
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 208
- row: 18
- bay: 5
+ staNo: 117
+ row: 30
+ bay: 1
lev: 1
# 绌挎杞�1
ste[0]:
@@ -178,45 +157,36 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 103
+ staNo: 102
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
+ backSta: 102
led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�1
inSta[1]:
- staNo: 203
+ staNo: 202
barcode: ${wcs-slave.barcode[1].id}
- backSta: 200
- led: ${wcs-slave.led[2].id}
+ backSta: 201
+ led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 103
+ staNo: 102
barcode: ${wcs-slave.barcode[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[1]:
- staNo: 203
+ staNo: 202
barcode: ${wcs-slave.barcode[1].id}
# 鍑哄簱鍙�1
outSta[0]:
staNo: 100
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 200
- # 鎷ｆ枡鍑哄簱鍙�
- pickOutSta[0]:
- staNo: 300
+ staNo: 101
# 鎷ｆ枡鍑哄簱鍙�
pickInSta[0]:
- staNo: 103
+ staNo: 102
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
+ backSta: 102
led: ${wcs-slave.led[0].id}
- # 鎷ｆ枡鍑哄簱鍙�
- pickInSta[1]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 200
- led: ${wcs-slave.led[2].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
@@ -241,10 +211,3 @@
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 300
- # LED1
- led[2]:
- id: 3
- ip: 10.10.10.207
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 200
--
Gitblit v1.9.1