From 9fa73c998ffe1ba6d0d79d3c1dbd5a911403c2cc Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 10 四月 2025 22:43:28 +0800
Subject: [PATCH] 1

---
 src/main/resources/application.yml |  559 +++++++------------------------------------------------
 1 files changed, 72 insertions(+), 487 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0277ec1..7014689 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,17 +7,19 @@
   application:
     name: @pom.build.finalName@
   datasource:
-    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://10.10.10.40:1433;databasename=tzskasrs
-    username: sa
-#    password: Zoneyung@zy56$
-    password: sa@123
+    hikari:
+      validation-timeout: 3000
+      connection-test-query: select 1
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/fyxc_shuttle?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
+    password: root
   mvc:
     static-path-pattern: /**
   redis:
     host: 127.0.0.1
     port: 6379
-    database: 0
+    database: 6
 #    password: 123456
 
 mybatis-plus:
@@ -29,7 +31,7 @@
 
 
 logging:
-  path: /stock/out/@pom.build.finalName@/logs
+  path: ./stock/out/@pom.build.finalName@/logs
 
 super:
   pwd: xltys1995
@@ -37,516 +39,99 @@
 swagger:
   enable: false
 
-wms:
-  url: localhost:8081/tzskwms
-
-robot:
-  url: http://10.10.10.41:7002
-
-erp:
-  db:
-    driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    ur: jdbc:sqlserver://10.10.10.209:1433;databasename=POY_ASRS
-    username: poy-asrs
-    password: Poy@2022
+pythonCalcPath: D:\\path\\cpu.py
+pythonCalcSimilarity: D:\\path\\similarity.py
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
-  # 鍙屾繁
-  doubleDeep: true
-  # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 32
-
-  # 杈撻�佺嚎
+  #  # 鍥涘悜绌挎杞�1
+  #  shuttle[0]:
+  #    id: 1
+  #    ip: 192.168.10.81
+  #    port: 8888
+  #    rack: 0
+  #    slot: 0
+  #    threadImpl: NyShuttleThread
+  # 鍥涘悜绌挎杞�2
+  shuttle[0]:
+    id: 2
+    ip: 192.168.10.83
+    port: 8888
+    rack: 0
+    slot: 0
+    threadImpl: NyShuttleThread
+  # 鎻愬崌鏈�1
+  lift[0]:
+    id: 1
+    ip: 192.168.10.51
+    port: 102
+    threadImpl: NyLiftThread
+    row: 2
+    bay: 3
+    standByRow: 2
+    standByBay: 1
+    staRow: 2
+    staBay: 1
   devp[0]:
     id: 1
-    ip: 10.10.10.51
+    ip: 192.168.10.51
     port: 102
     rack: 0
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 100
-      backSta: 101
-      barcode: ${wcs-slave.barcode[0].id}
+      staNo: 1012
+      backSta: 1011
       led: ${wcs-slave.led[0].id}
     # 鍏ュ簱鍙�2
     inSta[1]:
-      staNo: 103
-      backSta: 102
-      barcode: ${wcs-slave.barcode[1].id}
-      led: ${wcs-slave.led[0].id}
+      staNo: 1014
+      backSta: 1013
+      led: ${wcs-slave.led[1].id}
     # 鍏ュ簱鍙�3
     inSta[2]:
-      staNo: 105
-      backSta: 104
-      barcode: ${wcs-slave.barcode[2].id}
-      led: ${wcs-slave.led[0].id}
+      staNo: 1022
+      backSta: 1021
+      led: ${wcs-slave.led[2].id}
     # 鍏ュ簱鍙�4
     inSta[3]:
-      staNo: 200
-      backSta: 201
-      barcode: ${wcs-slave.barcode[3].id}
-      led: ${wcs-slave.led[0].id}
-    # 鍏ュ簱鍙�5
-    inSta[4]:
-      staNo: 203
-      backSta: 202
-      barcode: ${wcs-slave.barcode[4].id}
-      led: ${wcs-slave.led[0].id}
-    # 鍏ュ簱鍙�6
-    inSta[5]:
-      staNo: 205
-      backSta: 204
-      barcode: ${wcs-slave.barcode[5].id}
-      led: ${wcs-slave.led[0].id}
-    # 鍏ュ簱鍙�7
-    inSta[6]:
-      staNo: 346
-      backSta: 345
-      barcode: ${wcs-slave.barcode[8].id}
-      led: ${wcs-slave.led[0].id}
-    # 绌烘澘鍏ュ簱鍙�1
-    emptyInSta[0]:
-      staNo: 100
-      backSta: 101
-      barcode: ${wcs-slave.barcode[0].id}
-      led: ${wcs-slave.led[0].id}
-    # 绌烘澘鍏ュ簱鍙�2
-    emptyInSta[1]:
-      staNo: 103
-      backSta: 102
-      barcode: ${wcs-slave.barcode[1].id}
-      led: ${wcs-slave.led[0].id}
-    # 绌烘澘鍏ュ簱鍙�3
-    emptyInSta[2]:
-      staNo: 105
-      backSta: 104
-      barcode: ${wcs-slave.barcode[2].id}
-      led: ${wcs-slave.led[0].id}
-    # 绌烘澘鍏ュ簱鍙�4
-    emptyInSta[3]:
-      staNo: 200
-      backSta: 201
-      barcode: ${wcs-slave.barcode[3].id}
-      led: ${wcs-slave.led[0].id}
-    # 绌烘澘鍏ュ簱鍙�5
-    emptyInSta[4]:
-      staNo: 203
-      backSta: 202
-      barcode: ${wcs-slave.barcode[4].id}
-      led: ${wcs-slave.led[0].id}
-    # 绌烘澘鍏ュ簱鍙�6
-    emptyInSta[5]:
-      staNo: 205
-      backSta: 204
-      barcode: ${wcs-slave.barcode[5].id}
-      led: ${wcs-slave.led[0].id}
-    # 绌烘澘鍏ュ簱鍙�7
-    emptyInSta[6]:
-      staNo: 346
-      backSta: 345
-      barcode: ${wcs-slave.barcode[8].id}
-      led: ${wcs-slave.led[0].id}
+      staNo: 1025
+      backSta: 1024
+      led: ${wcs-slave.led[3].id}
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 101
-      led: ${wcs-slave.led[1].id}
-    # 鍑哄簱鍙�2
+      staNo: 1012
     outSta[1]:
-      staNo: 100
-      led: ${wcs-slave.led[1].id}
-    # 鍑哄簱鍙�3
+      staNo: 1014
     outSta[2]:
-      staNo: 103
-      led: ${wcs-slave.led[1].id}
-    # 鍑哄簱鍙�4
+      staNo: 1022
     outSta[3]:
-      staNo: 105
-      led: ${wcs-slave.led[1].id}
-    # 鍑哄簱鍙�5
-    outSta[4]:
-      staNo: 200
-      led: ${wcs-slave.led[1].id}
-    # 鍑哄簱鍙�6
-    outSta[5]:
-      staNo: 203
-      led: ${wcs-slave.led[1].id}
-    # 鍑哄簱鍙�7
-    outSta[6]:
-      staNo: 205
-      led: ${wcs-slave.led[1].id}
-    # 鍑哄簱鍙�8
-    outSta[7]:
-      staNo: 346
-      led: ${wcs-slave.led[1].id}
-    # 鎷f枡鍑哄簱鍙�
-    pickInSta[0]:
-      staNo: 100
-      backSta: 101
-      barcode: ${wcs-slave.barcode[0].id}
-      led: ${wcs-slave.led[0].id}
-    pickInSta[1]:
-      staNo: 103
-      backSta: 102
-      barcode: ${wcs-slave.barcode[1].id}
-      led: ${wcs-slave.led[0].id}
-    pickInSta[2]:
-      staNo: 105
-      backSta: 104
-      barcode: ${wcs-slave.barcode[2].id}
-      led: ${wcs-slave.led[0].id}
-    pickInSta[3]:
-      staNo: 200
-      backSta: 201
-      barcode: ${wcs-slave.barcode[3].id}
-      led: ${wcs-slave.led[0].id}
-    pickInSta[4]:
-      staNo: 203
-      backSta: 202
-      barcode: ${wcs-slave.barcode[4].id}
-      led: ${wcs-slave.led[0].id}
-    pickInSta[5]:
-      staNo: 205
-      backSta: 204
-      barcode: ${wcs-slave.barcode[5].id}
-      led: ${wcs-slave.led[0].id}
-    pickInSta[6]:
-      staNo: 346
-      backSta: 345
-      barcode: ${wcs-slave.barcode[8].id}
-      led: ${wcs-slave.led[0].id}
-#    # 璐ф灦鍏ュ簱绔欑偣
-#    rackInStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 105
-#      row: 4
-#      bay: 6
-#      lev: 1
-#    # 璐ф灦鍏ュ簱绔欑偣
-#    rackInStn[1]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 106
-#      row: 4
-#      bay: 6
-#      lev: 3
-#    # 璐ф灦鍏ュ簱绔欑偣
-#    rackInStn[2]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 107
-#      row: 4
-#      bay: 6
-#      lev: 6
-#    # 璐ф灦鍏ュ簱绔欑偣
-#    rackInStn[3]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 108
-#      row: 4
-#      bay: 6
-#      lev: 6
-#    # 璐ф灦鍑哄簱绔欑偣
-#    rackOutStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 100
-#      row: 15
-#      bay: 2
-#      lev: 1
-#    # 璐ф灦鍑哄簱绔欑偣
-#    rackOutStn[1]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 104
-#      row: 4
-#      bay: 6
-#      lev: 1
-#    # 璐ф灦鍑哄簱绔欑偣
-#    rackOutStn[2]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 105
-#      row: 4
-#      bay: 6
-#      lev: 3
-#    # 璐ф灦鍑哄簱绔欑偣
-#    rackOutStn[3]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 108
-#      row: 4
-#      bay: 6
-#      lev: 6
-
-  # 鏉$爜鎵弿浠�
-  barcode[0]:
-    id: 1
-    ip: 10.10.10.102
-    port: 51236
-  # 鏉$爜鎵弿浠�
-  barcode[1]:
-    id: 2
-    ip: 10.10.10.102
-    port: 51236
-  # 鏉$爜鎵弿浠�
-  barcode[2]:
-    id: 3
-    ip: 10.10.10.102
-    port: 51236
-  # 鏉$爜鎵弿浠�
-  barcode[3]:
-    id: 4
-    ip: 10.10.10.102
-    port: 51236
-  # 鏉$爜鎵弿浠�
-  barcode[4]:
-    id: 5
-    ip: 10.10.10.102
-    port: 51236
-  # 鏉$爜鎵弿浠�
-  barcode[5]:
-    id: 6
-    ip: 10.10.10.102
-    port: 51236
-  # 鏉$爜鎵弿浠�
-  barcode[6]:
-    id: 7
-    ip: 10.10.10.102
-    port: 51236
-  # 鏉$爜鎵弿浠�
-  barcode[7]:
-    id: 8
-    ip: 10.10.10.102
-    port: 51236
-  # 鏉$爜鎵弿浠�
-  barcode[8]:
-    id: 9
-    ip: 10.10.10.102
-    port: 51236
-  # 鏉$爜鎵弿浠�
-  barcode[9]:
-    id: 10
-    ip: 10.10.10.102
-    port: 51236
-
-   # LED1
+      staNo: 1025
+  # LED1
   led[0]:
     id: 1
-    ip: 10.10.10.241
+    ip: 192.168.10.62
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 102
   # LED2
   led[1]:
     id: 2
-    ip: 10.10.10.242
+    ip: 192.168.10.63
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 201
-
-  # 鍥涘悜绌挎杞�1
-  shuttle[0]:
-    id: 1
-    ip: 10.10.10.101
-    port: 8888
-    rack: 0
-    slot: 0
-  # 鍥涘悜绌挎杞�2
-  shuttle[1]:
-    id: 2
-    ip: 10.10.10.102
-    port: 8888
-    rack: 0
-    slot: 0
-  # 鍥涘悜绌挎杞�3
-  shuttle[2]:
+  # LED3
+  led[2]:
     id: 3
-    ip: 10.10.10.103
-    port: 8888
-    rack: 0
-    slot: 0
-  # 鍥涘悜绌挎杞�4
-  shuttle[3]:
+    ip: 192.168.10.64
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+  # LED4
+  led[3]:
     id: 4
-    ip: 10.10.10.104
-    port: 8888
-    rack: 0
-    slot: 0
-  # 鍥涘悜绌挎杞�5
-  shuttle[4]:
-    id: 5
-    ip: 10.10.10.105
-    port: 8888
-    rack: 0
-    slot: 0
-  # 鍥涘悜绌挎杞�6
-  shuttle[5]:
-    id: 6
-    ip: 10.10.10.106
-    port: 8888
-    rack: 0
-    slot: 0
-  # 鍥涘悜绌挎杞�7
-  shuttle[6]:
-    id: 7
-    ip: 10.10.10.107
-    port: 8888
-    rack: 0
-    slot: 0
-  # 鍥涘悜绌挎杞�8
-  shuttle[7]:
-    id: 8
-    ip: 10.10.10.108
-    port: 8888
-    rack: 0
-    slot: 0
-  # 鍥涘悜绌挎杞�9
-  shuttle[8]:
-    id: 9
-    ip: 10.10.10.109
-    port: 8888
-    rack: 0
-    slot: 0
-  # 鍥涘悜绌挎杞�10
-  shuttle[9]:
-    id: 10
-    ip: 10.10.10.110
-    port: 8888
-    rack: 0
-    slot: 0
-  # 鎻愬崌鏈�1
-  lift[0]:
-    id: 1
-    ip: 10.10.10.131
-    port: 102
-    staRow: 13
-    staBay: 22
-    sta[0]:
-      staNo: 101
-      lev: 1
-      liftNo: ${wcs-slave.lift[0].id}
-    sta[1]:
-      staNo: 102
-      lev: 2
-      liftNo: ${wcs-slave.lift[0].id}
-    sta[2]:
-      staNo: 103
-      lev: 3
-      liftNo: ${wcs-slave.lift[0].id}
-    sta[3]:
-      staNo: 104
-      lev: 4
-      liftNo: ${wcs-slave.lift[0].id}
-    sta[4]:
-      staNo: 105
-      lev: 5
-      liftNo: ${wcs-slave.lift[0].id}
-    sta[5]:
-      staNo: 106
-      lev: 6
-      liftNo: ${wcs-slave.lift[0].id}
-    sta[6]:
-      staNo: 107
-      lev: 7
-      liftNo: ${wcs-slave.lift[0].id}
-    sta[7]:
-      staNo: 108
-      lev: 8
-      liftNo: ${wcs-slave.lift[0].id}
-    sta[8]:
-      staNo: 109
-      lev: 9
-      liftNo: ${wcs-slave.lift[0].id}
-    sta[9]:
-      staNo: 110
-      lev: 10
-      liftNo: ${wcs-slave.lift[0].id}
-  # 鎻愬崌鏈�2
-  lift[1]:
-    id: 2
-    ip: 10.10.10.132
-    port: 102
-    staRow: 13
-    staBay: 38
-    sta[0]:
-      staNo: 201
-      lev: 1
-      liftNo: ${wcs-slave.lift[1].id}
-    sta[1]:
-      staNo: 202
-      lev: 2
-      liftNo: ${wcs-slave.lift[1].id}
-    sta[2]:
-      staNo: 203
-      lev: 3
-      liftNo: ${wcs-slave.lift[1].id}
-    sta[3]:
-      staNo: 204
-      lev: 4
-      liftNo: ${wcs-slave.lift[1].id}
-    sta[4]:
-      staNo: 205
-      lev: 5
-      liftNo: ${wcs-slave.lift[1].id}
-    sta[5]:
-      staNo: 206
-      lev: 6
-      liftNo: ${wcs-slave.lift[1].id}
-    sta[6]:
-      staNo: 207
-      lev: 7
-      liftNo: ${wcs-slave.lift[1].id}
-    sta[7]:
-      staNo: 208
-      lev: 8
-      liftNo: ${wcs-slave.lift[1].id}
-    sta[8]:
-      staNo: 209
-      lev: 9
-      liftNo: ${wcs-slave.lift[1].id}
-    sta[9]:
-      staNo: 210
-      lev: 10
-      liftNo: ${wcs-slave.lift[1].id}
-  # 鎻愬崌鏈�3
-  lift[2]:
-    id: 3
-    ip: 10.10.10.133
-    port: 102
-    staRow: 13
-    staBay: 57
-    sta[0]:
-      staNo: 301
-      lev: 1
-      liftNo: ${wcs-slave.lift[2].id}
-    sta[1]:
-      staNo: 302
-      lev: 2
-      liftNo: ${wcs-slave.lift[2].id}
-    sta[2]:
-      staNo: 303
-      lev: 3
-      liftNo: ${wcs-slave.lift[2].id}
-    sta[3]:
-      staNo: 304
-      lev: 4
-      liftNo: ${wcs-slave.lift[2].id}
-    sta[4]:
-      staNo: 305
-      lev: 5
-      liftNo: ${wcs-slave.lift[2].id}
-    sta[5]:
-      staNo: 306
-      lev: 6
-      liftNo: ${wcs-slave.lift[2].id}
-    sta[6]:
-      staNo: 307
-      lev: 7
-      liftNo: ${wcs-slave.lift[2].id}
-    sta[7]:
-      staNo: 308
-      lev: 8
-      liftNo: ${wcs-slave.lift[2].id}
-    sta[8]:
-      staNo: 309
-      lev: 9
-      liftNo: ${wcs-slave.lift[2].id}
-    sta[9]:
-      staNo: 310
-      lev: 10
-      liftNo: ${wcs-slave.lift[2].id}
\ No newline at end of file
+    ip: 192.168.10.65
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+
+
+
+

--
Gitblit v1.9.1