From 22d9b27f913cc47d54b361870f62aa81b4c8fd85 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 三月 2023 14:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xzjlwcs' into xzjlwcs
---
src/main/java/com/zy/asrs/controller/ShuttleController.java | 4 +-
src/main/resources/application.yml | 88 +++++++++----------------------------------
2 files changed, 21 insertions(+), 71 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index fb88e02..9b3e677 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -63,7 +63,7 @@
continue;
}
ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
- if (shuttleProtocol == null) {
+ if (shuttleProtocol == null || shuttleProtocol.getShuttleNo()==null) {
continue;
}
vo.setTaskNo(shuttleProtocol.getTaskNo().intValue()); // 浠诲姟鍙�
@@ -114,7 +114,7 @@
}
}
vo.setSpeed(shuttleProtocol.getCurrentMoveServoSpeed()); // 閫熷害
- vo.setPakMk(shuttleProtocol.getPakMk().toString()); // 浣滀笟鏍囪
+ vo.setPakMk(shuttleProtocol.getPakMk()?"Y" : "N"); // 浣滀笟鏍囪
}
return R.ok().add(list);
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 295f6fd..9c49328 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -18,7 +18,7 @@
host: localhost
port: 6379
database: 0
-# password: xltys1995
+ password: 123456
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
@@ -109,6 +109,7 @@
row: 4
bay: 6
lev: 6
+
# 绌挎杞�1
ste[0]:
id: 1
@@ -116,6 +117,7 @@
port: 502
rack: 0
slot: 0
+
# 杈撻�佺嚎
devp[0]:
id: 1
@@ -125,55 +127,27 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 102
- barcode: ${wcs-slave.barcode[0].id}
+ staNo: 101
backSta: 100
+ barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�1
- inSta[1]:
- staNo: 201
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 200
- led: ${wcs-slave.led[1].id}
- # 鍏ュ簱鍙�1
- inSta[2]:
- staNo: 301
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 300
- led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 102
+ backSta: 100
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[1]:
- staNo: 201
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[1].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[2]:
- staNo: 301
- barcode: ${wcs-slave.barcode[2].id}
- led: ${wcs-slave.led[2].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 102
- led: ${wcs-slave.led[3].id}
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 202
- led: ${wcs-slave.led[4].id}
- # 鍑哄簱鍙�2
- outSta[2]:
- staNo: 302
- led: ${wcs-slave.led[5].id}
+ staNo: 104
+ led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍑哄簱鍙�
pickInSta[0]:
staNo: 100
barcode: ${wcs-slave.barcode[0].id}
backSta: 100
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[0].id}
+
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
@@ -184,11 +158,7 @@
id: 2
ip: 10.10.10.105
port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[2]:
- id: 3
- ip: 10.10.10.106
- port: 51236
+
# LED1
led[0]:
id: 1
@@ -203,34 +173,7 @@
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 201
- # LED3
- led[2]:
- id: 3
- ip: 10.10.10.243
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 301
- # LED1
- led[3]:
- id: 4
- ip: 10.10.10.241
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 100
- # LED2
- led[4]:
- id: 5
- ip: 10.10.10.242
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 200
- # LED3
- led[5]:
- id: 6
- ip: 10.10.10.243
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 300
+
# 鍥涘悜绌挎杞�1
shuttle[0]:
id: 1
@@ -238,3 +181,10 @@
port: 502
rack: 0
slot: 0
+ # 鍥涘悜绌挎杞�1
+ shuttle[1]:
+ id: 2
+ ip: 192.168.4.22
+ port: 502
+ rack: 0
+ slot: 0
\ No newline at end of file
--
Gitblit v1.9.1