From 4375805e5769179d7684a3af3e9132be68c38321 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 10 九月 2024 09:21:20 +0800
Subject: [PATCH] #fs

---
 src/main/resources/application.yml |  462 --------------------------------------------------------
 1 files changed, 7 insertions(+), 455 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index eebedc9..9b95660 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,8 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://127.0.0.1:1433;databasename=srjtasrs
+#    url: jdbc:sqlserver://10.10.10.201:1433;databasename=ahyxasrs
+    url: jdbc:sqlserver://192.168.4.15:1433;databasename=ahyxasrs
     username: sa
     password: sa@123
   mvc:
@@ -17,17 +18,13 @@
     host: localhost
     port: 6379
     database: 0
-#    password: xltys1995
 
 mybatis-plus:
   mapper-locations: classpath:mapper/*.xml
-#  global-config:
-#    field-strategy: 0
-#  configuration:
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 logging:
   path: /stock/out/@pom.build.finalName@/logs
+  enableEveryThreadLog: true
 
 super:
   pwd: xltys1995
@@ -35,467 +32,22 @@
 swagger:
   enable: false
 
-wms:
-  url: localhost:8080/jtwms
-
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
-  # 鍙屾繁
-  doubleDeep: true
-  # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24
-  # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
-  groupCount: 4
-  # 鍫嗗灈鏈�1
-  crn[0]:
-    id: 1
-    ip: 192.168.18.13
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 102
-      row: 3
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 201
-      row: 3
-      bay: 1
-      lev: 2
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 100
-      row: 2
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 200
-      row: 2
-      bay: 1
-      lev: 2
-  # 鍫嗗灈鏈�2
-  crn[1]:
-    id: 2
-    ip: 192.168.18.21
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 105
-      row: 7
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 203
-      row: 7
-      bay: 1
-      lev: 2
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 103
-      row: 6
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 202
-      row: 6
-      bay: 1
-      lev: 1
-  # 鍫嗗灈鏈�3
-  crn[2]:
-    id: 3
-    ip: 192.168.18.29
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 108
-      row: 11
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 205
-      row: 11
-      bay: 1
-      lev: 2
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 106
-      row: 10
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 204
-      row: 10
-      bay: 1
-      lev: 2
-  # 鍫嗗灈鏈�4
-  crn[3]:
-    id: 4
-    ip: 192.168.18.37
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 111
-      row: 15
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 207
-      row: 15
-      bay: 1
-      lev: 2
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 109
-      row: 14
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 206
-      row: 14
-      bay: 1
-      lev: 2
-  # 鍫嗗灈鏈�5
-  crn[4]:
-    id: 5
-    ip: 192.168.18.45
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 114
-      row: 19
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 209
-      row: 19
-      bay: 1
-      lev: 2
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 112
-      row: 18
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 208
-      row: 18
-      bay: 1
-      lev: 2
-  # 鍫嗗灈鏈�6
-  crn[5]:
-    id: 6
-    ip: 192.168.18.53
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 117
-      row: 23
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 211
-      row: 23
-      bay: 1
-      lev: 2
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 115
-      row: 22
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 210
-      row: 22
-      bay: 1
-      lev: 2
-
-  # RGV绌挎杞�1
-  rgv[0]:
-    id: 1
-    ip: 192.168.18.77
-    port: 502
-    rack: 0
-    slot: 0
-    #RGV鍏ュ簱婧愮珯鐐�
-    rgvInSStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 100
-    rgvInSStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 101
-    #RGV鍑哄簱婧愮珯鐐�
-    rgvOutSStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 110
-    rgvOutSStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 112
-    #RGV鐩爣绔欑偣
-    rgvDestStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 102
-    rgvDestStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 103
-  # RGV绌挎杞�2
-  rgv[1]:
-    id: 2
-    ip: 192.168.18.79
-    port: 502
-    rack: 0
-    slot: 0
-    #RGV鍏ュ簱婧愮珯鐐�
-    rgvInSStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 100
-    rgvInSStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 101
-    #RGV鍑哄簱婧愮珯鐐�
-    rgvOutSStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 110
-    rgvOutSStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 112
-    #RGV鐩爣绔欑偣
-    rgvDestStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 102
-    rgvDestStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 103
-
   # 杈撻�佺嚎
   devp[0]:
     id: 1
-    ip: 192.168.18.71
+    ip: 10.10.10.100
     port: 102
     rack: 0
     slot: 0
-    # WMS鍏ュ簱鍙�1
-    inWmsSta[0]:
-      staNo: 145
-    # 绌烘澘鍏ュ簱鍙�1
-    emptyInSta[0]:
-      staNo: 122
-    # 鎷嗗灈鍙犵洏鍙�1
-    emptyInSta2[0]:
-      staNo: 118
-    # 鎷嗗灈鍙犵洏鍙�2
-    emptyInSta2[1]:
-      staNo: 119
-    # 鎷嗗灈鍙犵洏鍙�3
-    emptyInSta2[2]:
-      staNo: 120
-    # 鎷嗗灈鍙犵洏鍙�4
-    emptyInSta2[3]:
-      staNo: 121
-    # 鍑哄簱鍙�1
-    outSta[0]:
-      staNo: 122
-    # 鎷f枡鍏ュ簱鍙�1
-    pickSta2[0]:
-      staNo: 118
-    # 鎷f枡鍏ュ簱鍙�1
-    pickSta2[1]:
-      staNo: 119
-    # 鎷f枡鍏ュ簱鍙�1
-    pickSta2[2]:
-      staNo: 120
-    # 鎷f枡鍏ュ簱鍙�1
-    pickSta2[3]:
-      staNo: 121
-    # 鎷f枡鍏ュ簱鍙�1
-    pickSta[0]:
-      staNo: 122
-    # Rgv鍑哄簱鍙�1
-    outRgvSta[0]:
-      staNo: 102
-    # Rgv鍑哄簱鍙�1
-    outRgvSta[1]:
-      staNo: 105
-    # Rgv鍑哄簱鍙�1
-    outRgvSta[2]:
-      staNo: 108
-    # Rgv鍑哄簱鍙�1
-    outRgvSta[3]:
-      staNo: 111
-    # Rgv鍑哄簱鍙�1
-    outRgvSta[4]:
-      staNo: 114
-    # Rgv鍑哄簱鍙�1
-    outRgvSta[5]:
-      staNo: 117
-    # Rgv鍏ュ簱鍙�1
-    inRgvSta[0]:
-      staNo: 118
-    # Rgv鍏ュ簱鍙�1
-    inRgvSta[1]:
-      staNo: 119
-    # Rgv鍏ュ簱鍙�1
-    inRgvSta[2]:
-      staNo: 120
-    # Rgv鍏ュ簱鍙�1
-    inRgvSta[3]:
-      staNo: 121
-    # Rgv鍏ュ簱鍙�1
-    inRgvSta[4]:
-      staNo: 122
-    # Rgv鍏ュ簱鍙�1
-    inRgvSta[5]:
-      staNo: 123
-
   # 杈撻�佺嚎
   devp[1]:
     id: 2
-    ip: 192.168.18.81
+    ip: 10.10.10.30
     port: 102
     rack: 0
     slot: 0
-    # 鍏ュ簱鍙�1
-    inSta[0]:
-      staNo: 217
-      barcode: ${wcs-slave.barcode[0].id}
-      led: ${wcs-slave.led[2].id}
-    # 鍏ュ簱鍙�1
-    inSta[1]:
-      staNo: 221
-      barcode: ${wcs-slave.barcode[1].id}
-      led: ${wcs-slave.led[1].id}
-    # WMS鍏ュ簱鍙�1
-    inWmsSta[0]:
-      staNo: 212
-    # 绌烘澘鍏ュ簱鍙�1
-    emptyInSta[0]:
-      staNo: 212
-    # 鍑哄簱鍙�1
-    outSta[0]:
-      staNo: 212
-    # 鍑哄簱鍙�1
-    outSta[1]:
-      staNo: 213
-    # 鎷f枡鍏ュ簱鍙�1
-    pickSta[0]:
-      staNo: 212
-    # 2妤肩爜鍨涗綅缃�
-    driveSta[0]:
-      staNo: 215
-      barcode: ${wcs-slave.barcode[3].id}
-    # 2妤肩爜鍨涗綅缃�
-    driveSta[1]:
-      staNo: 219
-      barcode: ${wcs-slave.barcode[4].id}
 
-  # 鏉$爜鎵弿浠�
-  barcode[0]:
-    id: 1
-    ip: 10.10.10.52
-    port: 51236
-  # 鏉$爜鎵弿浠�
-  barcode[1]:
-    id: 2
-    ip: 10.10.10.52
-    port: 51236
-  # 鏉$爜鎵弿浠�
-  barcode[2]:
-    id: 3
-    ip: 10.10.10.52
-    port: 51236
-  # 鏉$爜鎵弿浠�
-  barcode[3]:
-    id: 4
-    ip: 10.10.10.52
-    port: 51236
-  # 鏉$爜鎵弿浠�
-  barcode[4]:
-    id: 5
-    ip: 10.10.10.52
-    port: 51236
-   # LED1
-  led[0]:
-    id: 1
-    ip: 192.168.18.5
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 144
-  # LED2
-  led[1]:
-    id: 2
-    ip: 192.168.18.6
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[1].id}
-    staArr: 221
-  # LED3
-  led[2]:
-    id: 3
-    ip: 192.168.18.7
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[1].id}
-    staArr: 217
\ No newline at end of file
+wms:
+  url: localhost:8080/yxwms
\ No newline at end of file

--
Gitblit v1.9.1