From 60b3a67586494fefd9501c29a00d35675b1dbdcf Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 23 十月 2024 16:36:33 +0800
Subject: [PATCH] *

---
 src/main/resources/application.yml |  232 +++++++++++++++++++++++-----------------------------------
 1 files changed, 92 insertions(+), 140 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6a3039d..0b667df 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=ahyxasrs
+    url: jdbc:sqlserver://127.0.0.1:50751;databasename=gdhmasrs
+#    url: jdbc:sqlserver://127.0.0.1:50948;databasename=gdhmasrs
     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,147 +32,102 @@
 swagger:
   enable: false
 
-wms:
-  url: localhost:8080/yxwms
+constant-parameters:
+  perimeter: 1737000
 
 # 涓嬩綅鏈洪厤缃�
 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: 10.10.10.120
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 153
-      staNoOther: 152
-      row: 4
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 100
-      staNoOther: 101
-      row: 1
-      bay: 1
-      lev: 1
-  # 鍫嗗灈鏈�2
-  crn[1]:
-    id: 2
-    ip: 10.10.10.130
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 145
-      staNoOther: 144
-      row: 8
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 148
-      staNoOther: 149
-      row: 5
-      bay: 1
-      lev: 1
-  # 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
-
   # 杈撻�佺嚎
   devp[0]:
     id: 1
-    ip: 10.10.10.100
-    port: 102
+    ip: 192.168.4.250
+    port: 502
     rack: 0
     slot: 0
-    # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
-    singleSta[0]:
-      staNo: 153
-    # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
-    singleSta[1]:
-      staNo: 145
-    # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
-    inSingleSta[0]:
-      staNo: 174
-    # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
-    emptyInSingleSta[0]:
-      staNo: 104
-
-  # 鏉$爜鎵弿浠�
-  barcode[0]:
-    id: 1
-    ip: 10.10.10.52
-    port: 51236
-  # 鏉$爜鎵弿浠�
-  barcode[1]:
+  # 杈撻�佺嚎
+  devp[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]:
+    ip: 192.168.4.250
+    port: 502
+    rack: 0
+    slot: 0
+  # RGV绌挎杞�1
+  rgv[0]:
     id: 1
-    ip: 192.168.18.5
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 144
\ No newline at end of file
+    ip: 172.17.196.3
+    port: 502
+    rack: 0
+    slot: 0
+    demo: false
+  # RGV绌挎杞�1
+  rgv[1]:
+    id: 2
+    ip: 172.17.196.6
+    port: 502
+    rack: 0
+    slot: 0
+    demo: false
+  # RGV绌挎杞�1
+  rgv[2]:
+    id: 3
+    ip: 172.17.196.9
+    port: 502
+    rack: 0
+    slot: 0
+    demo: false
+  # RGV绌挎杞�1
+  rgv[3]:
+    id: 4
+    ip: 172.17.196.12
+    port: 502
+    rack: 0
+    slot: 0
+    demo: false
+  # RGV绌挎杞�1
+  rgv[4]:
+    id: 5
+    ip: 172.17.196.15
+    port: 502
+    rack: 0
+    slot: 0
+    demo: false
+  # RGV绌挎杞�1
+  rgv[5]:
+    id: 6
+    ip: 172.17.196.18
+    port: 502
+    rack: 0
+    slot: 0
+    demo: false
+  # RGV绌挎杞�1
+  rgv[6]:
+    id: 7
+    ip: 172.17.196.21
+    port: 502
+    rack: 0
+    slot: 0
+    demo: false
+  # RGV绌挎杞�1
+  rgv[7]:
+    id: 8
+    ip: 172.17.196.25
+    port: 502
+    rack: 0
+    slot: 0
+    demo: false
+  # RGV绌挎杞�1
+  rgv[8]:
+    id: 9
+    ip: 172.17.196.28
+    port: 502
+    rack: 0
+    slot: 0
+    demo: false
+  # RGV绌挎杞�1
+  rgv[9]:
+    id: 10
+    ip: 172.17.196.31
+    port: 502
+    rack: 0
+    slot: 0
+    demo: false
\ No newline at end of file

--
Gitblit v1.9.1