From 73b83bb63cc69218630ad9b0e119bdad477eeff0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 19 八月 2024 15:07:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 9 -
src/main/java/com/zy/core/MainProcess.java | 47 +------
src/main/resources/application.yml | 297 -------------------------------------------------
3 files changed, 6 insertions(+), 347 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 de5891e..da5d307 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2203,9 +2203,6 @@
public synchronized void crn5InTask(){
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
- if (crnSlave.getId() != 5){
- continue;
- }
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
@@ -2306,9 +2303,6 @@
public synchronized void crn5StnToOutStn() {
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
- if (crnSlave.getId() != 5){
- continue;
- }
// 閬嶅巻鍫嗗灈鏈哄嚭搴撶珯
for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
// 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
@@ -2452,9 +2446,6 @@
public synchronized void crn5TaskCreate() throws IOException {
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
- if (crnSlave.getId() != 5){
- continue;
- }
for (CrnSlave.CrnStn crnStn : crnSlave.getCrnInStn()) {
// 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index ea253b2..48f0782 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -41,49 +41,14 @@
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
- // 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
- mainService.generateStoreWrkFile(); // 缁勬墭
-// mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
- // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
- mainService.stnToCrnStnPick();
- // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
- mainService.crnStnToOutStn();
- // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
- mainService.crnIoExecute();
- // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
- mainService.storeFinished();
- // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
- mainService.recCrnErr();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
- mainService.storeEmptyPlt(); // 绌烘澘鍏ュ簱
- // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
- mainService.ledExecute();
- // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
- mainService.ledReset();
-
- //鎵弿纰熺洏鏈鸿嚜鍔ㄥ叆搴撶┖鎵樼洏
- mainService.autoEmptyIn();
- //鎵弿鎷嗙洏鏈鸿嚜鍔ㄥ嚭搴撶┖鎵樼洏
- mainService.autoEmptyOut();
-
//浜屾湡
-// //绌烘《搴撲换鍔＄敓鎴�
-// mainService.crn5TaskCreate();
-// //绌烘《搴撳叆搴�
-// mainService.crn5InTask();
-// //绌烘《鍑哄簱瀹屾垚
-// mainService.crn5StnToOutStn();
- //rgv浠诲姟
- mainService.RGVTaskCreate();
- //rgv1,3浠诲姟瀹屾垚
- mainService.RGVTaskput();
- mainService.RGVTaskOver();
+ //绌烘《搴撲换鍔＄敓鎴�
+ mainService.crn5TaskCreate();
+ //绌烘《搴撳叆搴�
+ mainService.crn5InTask();
+ //绌烘《鍑哄簱瀹屾垚
+ mainService.crn5StnToOutStn();
- //rgv2浠诲姟瀹屾垚
- mainService.RGV2Taskput();
- mainService.RGV2TaskOver();
- //浜屾湡缁勬墭
- mainService.generateStoreWrkFile2();
} catch (Exception e) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6a53a84..5731eb2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -82,68 +82,6 @@
row: 2
bay: 1
lev: 2
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.110
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯1
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1013
- row: 7
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯2
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1025
- row: 6
- bay: 1
- lev: 2
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1010
- row: 6
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1019
- row: 7
- bay: 1
- lev: 2
- # 鍫嗗灈鏈�3
-# crn[2]:
-# id: 5
-# ip: 10.10.10.120
-# port: 102
-# rack: 0
-# slot: 0
-# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# offset: 2
-# demo: false
-# # 鍫嗗灈鏈哄叆搴撶珯1
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[2].id}
-# staNo: 5001
-# row: 9
-# bay: 2
-# lev: 1
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[2].id}
-# staNo: 5002
-# row: 9
-# bay: 1
-# lev: 1
# 杈撻�佺嚎1
devp[0]:
id: 1
@@ -157,247 +95,12 @@
barcode: ${wcs-slave.barcode[0].id}
backSta: 1001
led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 1012
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 1011
- led: ${wcs-slave.led[3].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 3007
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 3007
- led: ${wcs-slave.led[4].id}
- # 鍏ュ簱鍙�4
- inSta[3]:
- staNo: 3012
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 3012
- led: ${wcs-slave.led[5].id}
- outSta[0]:
- staNo: 1006
- led: ${wcs-slave.led[1].id}
- outSta[1]:
- staNo: 1010
- led: ${wcs-slave.led[2].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 1002
- led: ${wcs-slave.led[0].id}
- emptyInSta[1]:
- staNo: 1012
- led: ${wcs-slave.led[3].id}
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 1002
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 1001
- led: ${wcs-slave.led[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 1012
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 1011
- led: ${wcs-slave.led[3].id}
- # 鎷ｆ枡鍏ュ簱鍙�3
- pickSta[2]:
- staNo: 3007
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 3007
- led: ${wcs-slave.led[4].id}
- # 鎷ｆ枡鍏ュ簱鍙�4
- pickSta[3]:
- staNo: 3012
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 3012
- led: ${wcs-slave.led[5].id}
- # 鎷嗙洏鏈哄嚭绌烘墭
- autoEmptyOut[0]:
- staNo: 1007
- # 鎷嗙洏鏈哄叆绌烘墭
- autoEmptyIn[0]:
- staNo: 1007
- # 杈撻�佺嚎2
- devp[1]:
- id: 2
- ip: 10.10.10.10
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 2106
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 2105
- led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 2106
- led: ${wcs-slave.led[0].id}
- # 杈撻�佺嚎3
- devp[2]:
- id: 3
- ip: 10.10.10.30
- port: 102
- rack: 0
- slot: 0
- # 杈撻�佺嚎4
- devp[3]:
- id: 4
- ip: 10.10.10.33
- port: 102
- rack: 0
- slot: 0
- autoEmptyOut[0]:
- staNo: 4007
- # 杈撻�佺嚎5
- devp[4]:
- id: 5
- ip: 10.10.10.55
- port: 102
- rack: 0
- slot: 0
- autoEmptyOut[0]:
- staNo: 4016
- # 杈撻�佺嚎5
- devp[5]:
- id: 6
- ip: 10.10.10.14
- port: 102
- rack: 0
- slot: 0
- # 杈撻�佺嚎5
- devp[6]:
- id: 7
- ip: 10.10.10.20
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 3006
- barcode: ${wcs-slave.barcode[3].id}
- backSta: 3007
- led: ${wcs-slave.led[4].id}
- # 鍏ュ簱鍙�1
- inSta[1]:
- staNo: 3011
- barcode: ${wcs-slave.barcode[4].id}
- backSta: 3012
- led: ${wcs-slave.led[5].id}
-
-# # RGV1
- rgv[0]:
- id: 2
- ip: 10.10.10.130
- port: 102
- rack: 0
- slot: 0
- inStn[0]:
- sourceStaNo: 4007
- sourcePlcId: 4
- staNo: 2103
- staPlcId: 2
- inStn[1]:
- sourceStaNo: 2003
- sourcePlcId: 2
- inStn[2]:
- sourceStaNo: 2102
- sourcePlcId: 2
- staNo: 2103
- staPlcId: 2
- inStn[3]:
- sourceStaNo: 4016
- sourcePlcId: 5
- staNo: 2103
- staPlcId: 2
- outStn[0]:
- staNo: 2103
- staPlcId: 2
- outStn[1]:
- staNo: 2301
- staPlcId: 2
- # RGV2
- rgv[1]:
- id: 1
- ip: 10.10.10.133
- port: 102
- rack: 0
- slot: 0
- inStn[0]:
- sourceStaNo: 2114
- sourcePlcId: 6
- inStn[1]:
- sourceStaNo: 2401
- sourcePlcId: 6
- inStn[2]:
- sourceStaNo: 1014
- sourcePlcId: 1
- inStn[3]:
- sourceStaNo: 1017
- sourcePlcId: 1
- outStn[0]:
- staNo: 1020
- staPlcId: 1
- outStn[1]:
- staNo: 1023
- staPlcId: 1
- outStn[2]:
- staNo: 2013
- staPlcId: 6
- outStn[3]:
- staNo: 2401
- staPlcId: 6
- # RGV1
- rgv[2]:
- id: 3
- ip: 10.10.10.135
- port: 102
- rack: 0
- slot: 0
- inStn[0]:
- sourceStaNo: 2402
- sourcePlcId: 6
- staNo: 3001
- staPlcId: 7
- inStn[1]:
- sourceStaNo: 3001
- sourcePlcId: 7
- staNo: 2402
- staPlcId: 6
- outStn[0]:
- staNo: 2402
- staPlcId: 6
- outStn[1]:
- staNo: 3001
- staPlcId: 7
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
ip: 10.10.10.5
- port: 51236
- # 鏉＄爜鎵弿浠�2
- barcode[1]:
- id: 2
- ip: 10.10.10.6
- port: 51236
- # 鏉＄爜鎵弿浠�3
- barcode[2]:
- id: 3
- ip: 10.10.10.3
- port: 51236
- # 鏉＄爜鎵弿浠�4
- barcode[3]:
- id: 4
- ip: 10.10.10.3
- port: 51236
- # 鏉＄爜鎵弿浠�4
- barcode[4]:
- id: 5
- ip: 10.10.10.3
port: 51236
# LED1
--
Gitblit v1.9.1