From a7cab611bd98a45c51b0aa96116a0a790f0c97cb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 17 一月 2022 15:23:54 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |  174 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 118 insertions(+), 56 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d287af3..8c59dcd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,9 +8,9 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://localhost:1433;databasename=htasrs
+    url: jdbc:sqlserver://47.97.1.152:51433;databasename=xgmasrs
     username: sa
-    password: sa@123
+    password: Zoneyung@zy56$
   mvc:
     static-path-pattern: /**
   redis:
@@ -33,107 +33,169 @@
 swagger:
   enable: false
 
+wms:
+  url: localhost:8080/xgmwms
+
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
   doubleDeep: true
   # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 1,4,5,8
+  doubleLocs: 1,4,5,8,9,12,13,16,17,20
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   groupCount: 4
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 192.168.0.20
-    port: 2000
-    rack: 0
-    slot: 1
+    ip: 192.168.10.10
+    port: 102
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
+    demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 5
+      staNo: 100
       row: 2
-      bay: 0
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 6
-      row: 1
-      bay: 0
-      lev: 1
-  # 鍫嗗灈鏈�2
-  crn[1]:
-    id: 2
-    ip: 192.168.0.10
-    port: 2000
-    rack: 0
-    slot: 1
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 107
-      row: 4
-      bay: 0
+      bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 101
       row: 3
-      bay: 0
+      bay: 1
+      lev: 1
+  # 鍫嗗灈鏈�2
+  crn[1]:
+    id: 2
+    ip: 192.168.10.20
+    port: 102
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 102
+      row: 6
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 103
+      row: 7
+      bay: 1
+      lev: 1
+  # 鍫嗗灈鏈�3
+  crn[2]:
+    id: 3
+    ip: 192.168.10.20
+    port: 102
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 104
+      row: 10
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 105
+      row: 11
+      bay: 1
+      lev: 1
+  # 鍫嗗灈鏈�4
+  crn[3]:
+    id: 4
+    ip: 192.168.10.20
+    port: 102
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 106
+      row: 14
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 107
+      row: 15
+      bay: 1
+      lev: 1
+  # 鍫嗗灈鏈�5
+  crn[4]:
+    id: 5
+    ip: 192.168.10.20
+    port: 102
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 108
+      row: 18
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 109
+      row: 19
+      bay: 1
       lev: 1
   # 杈撻�佺嚎
   devp[0]:
     id: 1
-    ip: 192.168.6.120
+    ip: 192.168.10.100
     port: 102
     rack: 0
     slot: 1
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 1
+      staNo: 176
       barcode: ${wcs-slave.barcode[0].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 1
+      staNo: 176
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 2
+      staNo: 170
+    # 鍑哄簱鍙�2
+    outSta[1]:
+      staNo: 180
     # 鎷f枡鍏ュ簱鍙�
     pickSta[0]:
-      staNo: 3
+      staNo: 176
   # 鏉$爜鎵弿浠�
   barcode[0]:
     id: 1
-    ip: 192.168.6.150
-    port: 51236
-  # 鏉$爜鎵弿浠�
-  barcode[1]:
-    id: 2
-    ip: 192.168.6.151
-    port: 51236
-  # 鍙拌溅
-  car[0]:
-    id: 1
-    ip: 192.168.10.150
+    ip: 192.168.10.130
     port: 51236
   # LED1
   led[0]:
     id: 1
-    ip: 192.168.10.61
+    ip: 192.168.10.211
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 109,113,103,200,203 # todo:luxiaotao
-  # 纾呯О
-#  scale[0]:
-#    id: 1
-#    ip: 192.168.10.152
-#    port: 8888
+    staArr: 170
+  # LED2
+  led[1]:
+    id: 2
+    ip: 192.168.10.221
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 180
 
 
 

--
Gitblit v1.9.1