From f46a8c26ec22377ecb4d777b0a72b6cac48cb879 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 18 八月 2022 09:40:12 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |   65 ++++++++++++++++++++++----------
 1 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f288f06..9392b07 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=hylyasrs
+    url: jdbc:sqlserver://192.168.4.15:1433;databasename=gzynasrs
     username: sa
     password: sa@123
   mvc:
@@ -39,16 +39,18 @@
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
-  doubleDeep: true
+  doubleDeep: false
   # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 1,4,5,8,9,12,13,16
+  doubleLocs:
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
-  groupCount: 4
+  groupCount: 2
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
     ip: 10.10.10.10
     port: 8888
+    rack: 0
+    slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
     demo: false
@@ -56,15 +58,33 @@
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 103
-      row: 3
+      row: 1
       bay: 1
+      lev: 1
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 108
+      row: 1
+      bay: 19
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 101
+      staNo: 107
       row: 2
       bay: 1
+      lev: 1
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 108
+      row: 1
+      bay: 19
+      lev: 1
+    crnOutStn[2]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 109
+      row: 2
+      bay: 19
       lev: 1
 
   # 杈撻�佺嚎
@@ -83,7 +103,7 @@
       staNo: 103
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 102
+      staNo: 104
 #    # 鎷f枡鍏ュ簱鍙�1
 #    pickSta[0]:
 #      staNo: 103
@@ -93,19 +113,19 @@
     id: 1
     ip: 10.10.10.52
     port: 51236
-   # LED1
-  led[0]:
-    id: 1
-    ip: 10.10.10.60
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 110
-
-  #socket
-  socket[0]:
-    id: 1
-    ip: 10.10.10.100
-    port: 10001
+#   # LED1
+#  led[0]:
+#    id: 1
+#    ip: 10.10.10.60
+#    port: 5005
+#    devpPlcId: ${wcs-slave.devp[0].id}
+#    staArr: 110
+#
+#  #socket
+#  socket[0]:
+#    id: 1
+#    ip: 10.10.10.100
+#    port: 10001
 
 # tcp鏈嶅姟绔厤缃�
 tcp:
@@ -124,4 +144,7 @@
   #涓婁笅琛屾棩蹇楁墦鍗�
   printPacLog: true
   #鏉$爜闀垮害
-  barcodeLen: 8
\ No newline at end of file
+  barcodeLen: 8
+
+test:
+  url: 127.0.0.1:8080/test
\ No newline at end of file

--
Gitblit v1.9.1