From f9a4e6ce9b400a30aeac6d91831e8785368ea839 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 06 九月 2024 16:48:57 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |  357 +++-------------------------------------------------------
 1 files changed, 22 insertions(+), 335 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0e4a7ad..1240f17 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://localhost:1433;databasename=nbjfasrs
-#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=nbjfasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdzbasrs
     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:8080/wms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
@@ -48,367 +47,55 @@
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 10.10.10.10
+    ip: 10.10.10.100
     port: 102
     rack: 0
     slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
+    offset: 1
     demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�1 鍙充笂
+    # 鍫嗗灈鏈哄叆搴撶珯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
+      staNo: 1001
       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 鍙充笂
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�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
+      staNo: 1002
+      row: 3
       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
+  devp[0]:
+    id: 1
     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
+      staNo: 1001
       barcode: ${wcs-slave.barcode[0].id}
-    # 鍏ュ簱鍙�2
-    inSta[1]:
-      staNo: 104
-      barcode: ${wcs-slave.barcode[1].id}
-    # 绌烘澘鍏ュ簱鍙�1
-    emptyInSta[0]:
-      staNo: 101
-    # 绌烘澘鍏ュ簱鍙�2
-    emptyInSta[1]:
-      staNo: 104
-    # 鍑哄簱鍙�1
+      backSta: 1001
+      led: ${wcs-slave.led[0].id}
     outSta[0]:
-      staNo: 100
-    # 鍑哄簱鍙�2
-    outSta[1]:
-      staNo: 103
-    # 鎷f枡鍏ュ簱鍙�1
-    pickSta[0]:
-      staNo: 101
-      barcode: ${wcs-slave.barcode[0].id}
-    # 鎷f枡鍏ュ簱鍙�2
-    pickSta[1]:
-      staNo: 104
-      barcode: ${wcs-slave.barcode[1].id}
-  # 杈撻�佺嚎2
-  devp[1]:
-    id: 2
-    ip: 10.10.10.90
-    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}
+      staNo: 1002
 
 
-  # 鏉$爜鎵弿浠�1 宸︿笅 1妤煎紑濮�,111
+  # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
-    ip: 10.10.10.100
-    port: 51236
-  # 鏉$爜鎵弿浠�2, 114
-  barcode[1]:
-    id: 2
-    ip: 10.10.10.101
-    port: 51236
-  # 鏉$爜鎵弿浠�3, 201
-  barcode[2]:
-    id: 3
-    ip: 10.10.10.102
-    port: 51236
-  # 鏉$爜鎵弿浠�4,204
-  barcode[3]:
-    id: 4
-    ip: 10.10.10.103
-    port: 51236
-  # 鏉$爜鎵弿浠�5,301
-  barcode[4]:
-    id: 5
-    ip: 10.10.10.104
-    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: 51236
-  # 鏉$爜鎵弿浠�8,104
-  barcode[7]:
-    id: 8
-    ip: 10.10.10.59
-    port: 51236
-  # 鏉$爜鎵弿浠�9,101
-  barcode[8]:
-    id: 9
-    ip: 10.10.10.59
-    port: 51236
-  # 鏉$爜鎵弿浠�10,101
-  barcode[9]:
-    id: 10
-    ip: 10.10.10.59
+    ip: 10.10.10.5
     port: 51236
 
   # LED1
   led[0]:
     id: 1
-    ip: 10.10.10.201
+    ip: 10.10.10.151
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 100
-  # LED2
-  led[1]:
-    id: 2
-    ip: 10.10.10.202
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 110
-  # LED3
-  led[2]:
-    id: 3
-    ip: 10.10.10.203
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 103
-  # LED4
-  led[3]:
-    id: 4
-    ip: 10.10.10.204
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 113
-  # LED5
-  led[4]:
-    id: 5
-    ip: 10.10.10.205
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 200
-  # LED6
-  led[5]:
-    id: 6
-    ip: 10.10.10.206
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 203
-  # LED7
-  led[6]:
-    id: 7
-    ip: 10.10.10.207
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 300
-  # LED8
-  led[7]:
-    id: 8
-    ip: 10.10.10.208
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 303
\ No newline at end of file
+    staArr: 1002

--
Gitblit v1.9.1