From 9e75705b8dd4bc9867009cd28442ccb2b6c7d91b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 14 十月 2021 11:49:48 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |  176 +++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 125 insertions(+), 51 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cca1a52..bf6ac68 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,9 +7,8 @@
   application:
     name: @pom.build.finalName@
   datasource:
-    # sql-server
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsasrs
+    url: jdbc:sqlserver://localhost:1433;databasename=htasrs
     username: sa
     password: sa@123
   mvc:
@@ -26,7 +25,7 @@
 #    field-strategy: 0
 
 logging:
-  path: /stock/out/logs
+  path: /stock/out/@pom.build.finalName@/logs
 
 super:
   pwd: xltys1995
@@ -36,97 +35,172 @@
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
+  # 鍙屾繁
+  doubleDeep: true
+  # 鍙屾繁搴撲綅鎺掑彿
+  doubleLocs: 1,4,5,8
+  # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+  groupCount: 4
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 192.168.3.39
-    port: 5015
+    ip: 192.168.10.10
+    port: 102
     rack: 0
-    slot: 0
+    slot: 1
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
+    demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 4
+      staNo: 205
       row: 2
-      bay: 1
+      bay: 65
+      lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 118
+      row: 2
+      bay: 0
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 2
-      row: 1
-      bay: 1
+      staNo: 203
+      row: 3
+      bay: 65
       lev: 1
-    # 鍫嗗灈鏈�2
-    crn[1]:
-      id: 1
-      ip: 192.168.3.40
-      port: 5015
-      rack: 0
-      slot: 0
-      # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=0
-      offset: 1
-      # 鍫嗗灈鏈哄叆搴撶珯鐐�
-      crnInStn[0]:
-        devpPlcId: ${wcs-slave.devp[0].id}
-        staNo: 8
-        row: 2
-        bay: 1
-        lev: 1
-      # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-      crnOutStn[0]:
-        devpPlcId: ${wcs-slave.devp[0].id}
-        staNo: 6
-        row: 1
-        bay: 1
-        lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 120
+      row: 3
+      bay: 0
+      lev: 1
+  # 鍫嗗灈鏈�2
+  crn[1]:
+    id: 2
+    ip: 192.168.10.20
+    port: 102
+    rack: 0
+    slot: 1
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 202
+      row: 6
+      bay: 65
+      lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 124
+      row: 6
+      bay: 0
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 200
+      row: 7
+      bay: 65
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 100
+      row: 7
+      bay: 0
+      lev: 1
   # 杈撻�佺嚎
   devp[0]:
     id: 1
-    ip: 192.168.3.65
-    port: 6000
+    ip: 192.168.10.100
+    port: 102
     rack: 0
     slot: 1
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 3
+      staNo: 301
       barcode: ${wcs-slave.barcode[0].id}
-    # 鍏ュ簱鍙�2
+#    # 鍏ュ簱鍙�2
+#    inSta[1]:
+#      staNo: 202
+#      barcode: ${wcs-slave.barcode[1].id}
     inSta[1]:
-      staNo: 7
-      barcode: ${wcs-slave.barcode[0].id}
+      staNo: 110
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 3
+      staNo: 301
     # 绌烘澘鍏ュ簱鍙�2
+#    emptyInSta[1]:
+#      staNo: 202
+    # 绌烘澘鍏ュ簱鍙�3
     emptyInSta[1]:
-      staNo: 7
+      staNo: 126
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 1
+      staNo: 200
     # 鍑哄簱鍙�2
     outSta[1]:
-      staNo: 5
+      staNo: 203
+    # 鍑哄簱鍙�3
+    outSta[2]:
+      staNo: 103
     # 鎷f枡鍏ュ簱鍙�
     pickSta[0]:
-      staNo: 2
+      staNo: 127
+    # 鎷f枡鍏ュ簱鍙�
+    pickSta[1]:
+      staNo: 128
   # 鏉$爜鎵弿浠�
   barcode[0]:
     id: 1
-    ip: 192.168.2.150
+    ip: 192.168.10.130
     port: 51236
-  # LED
+#  # 鏉$爜鎵弿浠�
+#  barcode[1]:
+#    id: 2
+#    ip: 192.168.10.131
+#    port: 51236
+  # LED1
   led[0]:
     id: 1
-    ip: 192.168.1.1
-    port: 8888
+    ip: 192.168.10.211
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 113
+  # LED2
+  led[1]:
+    id: 2
+    ip: 192.168.10.221
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 109
+  # LED3
+  led[2]:
+    id: 3
+    ip: 192.168.10.231
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 103
+  # LED4
+  led[3]:
+    id: 4
+    ip: 192.168.10.231
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 129
   # 纾呯О
   scale[0]:
     id: 1
-    ip: 192.168.1.1
-    port: 8888
+    ip: 192.168.10.135
+    port: 2
 
 
 

--
Gitblit v1.9.1