From 80cf36c5d25e9d4623c3f5337332466fb6794d62 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 20 九月 2022 13:30:01 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |  260 +++++++++++++++++++++++++++++++++++----------------
 1 files changed, 176 insertions(+), 84 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1adcbd7..103d441 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://localhost:1433;databasename=htasrs
+    url: jdbc:sqlserver://192.168.4.15:1433;databasename=stasrs
     username: sa
     password: sa@123
   mvc:
@@ -33,181 +33,273 @@
 swagger:
   enable: false
 
+wms:
+  url: localhost:8081/lywms
+
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
   doubleDeep: true
   # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 1,4,5,8
+  doubleLocs: 1,4,5,8,9,12,13,16
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   groupCount: 4
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 192.168.10.10
+    ip: 10.10.10.101
     port: 102
     rack: 0
-    slot: 1
+    slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 205
-      row: 2
-      bay: 65
+      staNo: 103
+      row: 3
+      bay: 1
       lev: 1
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[1]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 118
+      staNo: 101
       row: 2
-      bay: 0
+      bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 203
-      row: 3
-      bay: 65
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 120
-      row: 3
-      bay: 0
+      staNo: 101
+      row: 2
+      bay: 1
       lev: 1
   # 鍫嗗灈鏈�2
   crn[1]:
     id: 2
-    ip: 192.168.10.20
+    ip: 10.10.10.111
     port: 102
     rack: 0
-    slot: 1
+    slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 202
-      row: 6
-      bay: 65
+      staNo: 203
+      row: 7
+      bay: 1
       lev: 1
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�2
     crnInStn[1]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 124
+      staNo: 201
       row: 6
-      bay: 0
+      bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 200
-      row: 7
-      bay: 65
+      staNo: 201
+      row: 6
+      bay: 1
       lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[1]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 100
+      staNo: 203
       row: 7
-      bay: 0
+      bay: 1
+      lev: 1
+  # 鍫嗗灈鏈�3
+  crn[2]:
+    id: 3
+    ip: 10.10.10.121
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 304
+      row: 11
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 301
+      row: 10
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 301
+      row: 10
+      bay: 1
+      lev: 1
+  # 鍫嗗灈鏈�4
+  crn[3]:
+    id: 4
+    ip: 10.10.10.121
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 401
+      row: 14
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 401
+      row: 14
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 401
+      row: 14
+      bay: 1
       lev: 1
   # 杈撻�佺嚎
   devp[0]:
     id: 1
-    ip: 192.168.10.100
+    ip: 10.10.10.50
     port: 102
     rack: 0
-    slot: 1
+    slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 205
+      staNo: 103
       barcode: ${wcs-slave.barcode[0].id}
     # 鍏ュ簱鍙�2
     inSta[1]:
-      staNo: 202
+      staNo: 203
       barcode: ${wcs-slave.barcode[1].id}
+    # 鍏ュ簱鍙�3
     inSta[2]:
-      staNo: 110
+      staNo: 305
+      barcode: ${wcs-slave.barcode[2].id}
+    # 鍏ュ簱鍙�4
+    inSta[3]:
+      staNo: 401
+      barcode: ${wcs-slave.barcode[3].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 205
+      staNo: 103
     # 绌烘澘鍏ュ簱鍙�2
     emptyInSta[1]:
-      staNo: 202
+      staNo: 203
     # 绌烘澘鍏ュ簱鍙�3
     emptyInSta[2]:
-      staNo: 126
+      staNo: 305
+    # 绌烘澘鍏ュ簱鍙�4
+    emptyInSta[3]:
+      staNo: 401
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 200
+      staNo: 102
     # 鍑哄簱鍙�2
     outSta[1]:
-      staNo: 203
+      staNo: 202
     # 鍑哄簱鍙�3
     outSta[2]:
-      staNo: 103
-    # 鎷f枡鍏ュ簱鍙�
+      staNo: 303
+    # 鍑哄簱鍙�4
+    outSta[3]:
+      staNo: 402
+    # 鎷f枡鍏ュ簱鍙�1
     pickSta[0]:
-      staNo: 127
-    # 鎷f枡鍏ュ簱鍙�
+      staNo: 102
+      barcode: ${wcs-slave.barcode[0].id}
+    # 鎷f枡鍏ュ簱鍙�2
     pickSta[1]:
-      staNo: 128
+      staNo: 202
+      barcode: ${wcs-slave.barcode[1].id}
+    # 鎷f枡鍏ュ簱鍙�3
+    pickSta[2]:
+      staNo: 303
+      barcode: ${wcs-slave.barcode[2].id}
+    # 鎷f枡鍏ュ簱鍙�4
+    pickSta[3]:
+      staNo: 402
+      barcode: ${wcs-slave.barcode[3].id}
   # 鏉$爜鎵弿浠�
   barcode[0]:
     id: 1
-    ip: 192.168.10.130
+    ip: 10.10.10.52
     port: 51236
-  # 鏉$爜鎵弿浠�
   barcode[1]:
     id: 2
-    ip: 192.168.10.131
+    ip: 10.10.10.52
     port: 51236
-  # LED1
+  barcode[2]:
+    id: 3
+    ip: 10.10.10.52
+    port: 51236
+  barcode[3]:
+    id: 4
+    ip: 10.10.10.52
+    port: 51236
+   # LED1
   led[0]:
     id: 1
-    ip: 192.168.10.211
+    ip: 10.10.10.201
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 113
+    staArr: 102
   # LED2
   led[1]:
     id: 2
-    ip: 192.168.10.221
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 109
-  # LED3
-  led[2]:
-    id: 3
-    ip: 192.168.10.231
+    ip: 10.10.10.202
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
     staArr: 103
-  # 纾呯О
-  scale[0]:
-    id: 1
-    ip: 192.168.10.135
-    port: 2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  # LED3
+  led[2]:
+    id: 3
+    ip: 10.10.10.203
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 202
+  # LED4
+  led[3]:
+    id: 4
+    ip: 10.10.10.204
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 203
+  # LED5
+  led[4]:
+    id: 5
+    ip: 10.10.10.205
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 303
+  # LED6
+  led[5]:
+    id: 6
+    ip: 10.10.10.206
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 305
+  # LED7
+  led[6]:
+    id: 7
+    ip: 10.10.10.207
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 402

--
Gitblit v1.9.1