From 7e1e714c49a20468fcc7c7c37d4f65142abb2528 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 20 五月 2025 11:19:12 +0800
Subject: [PATCH] #电视机增加批号
---
src/main/resources/application.yml | 667 ++++++++++++++++++++++++++++---------------------------
1 files changed, 340 insertions(+), 327 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 18fbecc..1985a5a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://10.10.10.200:1433;databasename=nbjfasrs
-# url: jdbc:sqlserver://192.168.4.15:1433;databasename=nbjfasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdqdasrs
username: sa
password: sa@123
mvc:
@@ -29,13 +28,13 @@
path: /stock/out/@pom.build.finalName@/logs
super:
- pwd: xltys1995
+ pwd: asrs2023
swagger:
enable: false
wms:
- url: localhost:8088/jfwms
+ url: localhost:8088/mdqdwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -48,384 +47,398 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
+ ip: 10.10.10.100
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯1
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1003
+ row: 2
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1022
+ row: 3
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1006
+ row: 3
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1016
+ 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
+ ip: 10.10.10.1
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 1002
+ 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}
+ # 鎷f枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 1002
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 1001
+ led: ${wcs-slave.led[0].id}
+ # 鎷f枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 1012
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 1011
+ led: ${wcs-slave.led[3].id}
+ # 鎷f枡鍏ュ簱鍙�3
+ pickSta[2]:
+ staNo: 3007
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 3007
+ led: ${wcs-slave.led[4].id}
+ # 鎷f枡鍏ュ簱鍙�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鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�1 鍙充笂
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 2
- bay: 84
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�2 宸︿笂
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 116
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�3 宸︿笂 2妤�
- crnInStn[2]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 205
- row: 2
- bay: 1
- lev: 4
- # 鍫嗗灈鏈哄叆搴撶珯鐐� 宸︿笂 3妤�
- crnInStn[3]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 305
- row: 2
- bay: 1
- lev: 7
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�1 鍙充笂
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 2
- bay: 84
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�2 宸︿笂
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 116
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�3 宸︿笂 2妤�
- crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 205
- row: 2
- bay: 1
- lev: 4
- # 鍫嗗灈鏈哄嚭搴撶珯鐐� 宸︿笂 3妤�
- crnOutStn[3]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 305
- row: 2
- bay: 1
- lev: 7
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 2106
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 2105
+ led: ${wcs-slave.led[4].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 2106
+ led: ${wcs-slave.led[4].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鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�1 鍙充笅
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- row: 7
- bay: 84
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�2 宸︿笅
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 112
- row: 7
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�3 宸︿笅 2妤�
- crnInStn[2]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 202
- row: 7
- bay: 1
- lev: 4
- # 鍫嗗灈鏈哄叆搴撶珯鐐�4 宸︿笅 3妤�
- crnInStn[3]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 302
- row: 7
- bay: 1
- lev: 7
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�1 鍙充笅
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- row: 7
- bay: 84
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�2 宸︿笅
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 112
- row: 7
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�3 宸︿笅 2妤�
- crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 202
- row: 7
- bay: 1
- lev: 4
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�3 宸︿笅 3妤�
- crnOutStn[3]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 302
- row: 7
- bay: 1
- lev: 7
- # 杈撻�佺嚎1
- devp[0]:
- id: 1
- ip: 10.10.10.97
- port: 102
- rack: 0
- slot: 0
# 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 101
- barcode: ${wcs-slave.barcode[6].id}
- barcode1: ${wcs-slave.barcode[7].id}
- barcode2: ${wcs-slave.barcode[8].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 104
- barcode: ${wcs-slave.barcode[9].id}
- barcode1: ${wcs-slave.barcode[10].id}
- barcode2: ${wcs-slave.barcode[11].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 101
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 104
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 100
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 103
- # 鎷f枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 101
- barcode: ${wcs-slave.barcode[6].id}
- barcode1: ${wcs-slave.barcode[7].id}
- barcode2: ${wcs-slave.barcode[8].id}
- # 鎷f枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 104
- barcode: ${wcs-slave.barcode[9].id}
- barcode1: ${wcs-slave.barcode[10].id}
- barcode2: ${wcs-slave.barcode[11].id}
- # 杈撻�佺嚎2
- devp[1]:
+ inSta7[0]:
+ staNo: 3006
+ barcode: ${wcs-slave.barcode[3].id}
+ backSta: 3007
+ led: ${wcs-slave.led[4].id}
+ # 鍏ュ簱鍙�1
+ inSta7[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.90
+ ip: 10.10.10.130
port: 102
rack: 0
slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 111
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 114
- barcode: ${wcs-slave.barcode[1].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 201
- barcode: ${wcs-slave.barcode[2].id}
- # 鍏ュ簱鍙�4
- inSta[3]:
- staNo: 204
- barcode: ${wcs-slave.barcode[3].id}
- # 鍏ュ簱鍙�5
- inSta[4]:
- staNo: 301
- barcode: ${wcs-slave.barcode[4].id}
- # 鍏ュ簱鍙�6
- inSta[5]:
- staNo: 304
- barcode: ${wcs-slave.barcode[5].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 111
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 114
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 201
- # 绌烘澘鍏ュ簱鍙�4
- emptyInSta[3]:
- staNo: 204
- # 绌烘澘鍏ュ簱鍙�5
- emptyInSta[4]:
- staNo: 301
- # 绌烘澘鍏ュ簱鍙�6
- emptyInSta[5]:
- staNo: 304
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 110
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 113
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 200
- # 鍑哄簱鍙�4
- outSta[3]:
- staNo: 203
- # 鍑哄簱鍙�5
- outSta[4]:
- staNo: 300
- # 鍑哄簱鍙�6
- outSta[5]:
- staNo: 303
- # 鎷f枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 111
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷f枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 114
- barcode: ${wcs-slave.barcode[1].id}
- # 鎷f枡鍏ュ簱鍙�3
- pickSta[2]:
- staNo: 201
- barcode: ${wcs-slave.barcode[2].id}
- # 鎷f枡鍏ュ簱鍙�4
- pickSta[3]:
- staNo: 204
- barcode: ${wcs-slave.barcode[3].id}
- # 鎷f枡鍏ュ簱鍙�5
- pickSta[4]:
- staNo: 301
- barcode: ${wcs-slave.barcode[4].id}
- # 鎷f枡鍏ュ簱鍙�6
- pickSta[5]:
- staNo: 304
- barcode: ${wcs-slave.barcode[5].id}
+ 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 宸︿笅 1妤煎紑濮�,111
+ # 鏉$爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.100
+ ip: 10.10.10.5
port: 51236
- # 鏉$爜鎵弿浠�2, 114
+ # 鏉$爜鎵弿浠�2
barcode[1]:
id: 2
- ip: 10.10.10.101
+ ip: 10.10.10.6
port: 51236
- # 鏉$爜鎵弿浠�3, 201
+ # 鏉$爜鎵弿浠�3
barcode[2]:
id: 3
- ip: 10.10.10.102
+ ip: 10.10.10.3
port: 51236
- # 鏉$爜鎵弿浠�4,204
+ # 鏉$爜鎵弿浠�4
barcode[3]:
id: 4
- ip: 10.10.10.103
+ ip: 10.10.10.3
port: 51236
- # 鏉$爜鎵弿浠�5,301
+ # 鏉$爜鎵弿浠�4
barcode[4]:
id: 5
- ip: 10.10.10.104
+ ip: 10.10.10.3
port: 51236
- # 鏉$爜鎵弿浠�6,304
- barcode[5]:
- id: 6
- ip: 10.10.10.105
- port: 51236
- # 鏉$爜鎵弿浠�7,101
- barcode[6]:
- id: 7
- ip: 10.10.10.106
- port: 2002
- # 鏉$爜鎵弿浠�8,101
- barcode[7]:
- id: 8
- ip: 10.10.10.107
- port: 2002
- # 鏉$爜鎵弿浠�9,101
- barcode[8]:
- id: 9
- ip: 10.10.10.108
- port: 2002
- # 鏉$爜鎵弿浠�10,104
- barcode[9]:
- id: 10
- ip: 10.10.10.109
- port: 2002
-
- barcode[10]:
- id: 11
- ip: 10.10.10.110
- port: 2002
- barcode[11]:
- id: 12
- ip: 10.10.10.111
- port: 2002
# LED1
led[0]:
id: 1
- ip: 10.10.10.221
+ ip: 10.10.10.151
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 100
+ staArr: 1002
# LED2
led[1]:
id: 2
- ip: 10.10.10.222
+ ip: 10.10.10.152
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 103
+ staArr: 1004
# LED3
led[2]:
id: 3
- ip: 10.10.10.223
+ ip: 10.10.10.153
port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 110
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1008
# LED4
led[3]:
id: 4
- ip: 10.10.10.224
+ ip: 10.10.10.154
port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 113
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1012
# LED5
led[4]:
id: 5
- ip: 10.10.10.225
+ ip: 10.10.10.206
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 200
+ staArr: 2106
# LED6
led[5]:
id: 6
- ip: 10.10.10.226
+ ip: 10.10.10.206
port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 203
- # LED7
- led[6]:
- id: 7
- ip: 10.10.10.227
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 300
- # LED8
- led[7]:
- id: 8
- ip: 10.10.10.228
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 303
\ No newline at end of file
+ devpPlcId: ${wcs-slave.devp[6].id}
+ staArr: 3012
\ No newline at end of file
--
Gitblit v1.9.1