From 20429fd1425ed5a3dfdfd493b9fdb1dcf7236fd8 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 28 十二月 2023 15:18:04 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |  203 ++++++++++++++++++++++++++++++++------------------
 1 files changed, 129 insertions(+), 74 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 45ee0c8..6bd3e0b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 9090
+  port: 9091
   servlet:
     context-path: /@pom.build.finalName@
 
@@ -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=gdykasrs
     username: sa
     password: sa@123
   mvc:
@@ -34,20 +34,20 @@
   enable: false
 
 wms:
-  url: localhost:8081/lywms
+  url: 127.0.0.1:8080/lktwms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
   doubleDeep: true
   # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 1,4,5,8,9,12,13,16
+  doubleLocs: 1,4,11,14,21,24
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   groupCount: 4
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 10.10.10.101
+    ip: 10.10.10.10
     port: 102
     rack: 0
     slot: 0
@@ -58,20 +58,20 @@
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 103
-      row: 3
+      row: 2
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 101
-      row: 2
+      staNo: 104
+      row: 3
       bay: 1
       lev: 1
   # 鍫嗗灈鏈�2
   crn[1]:
     id: 2
-    ip: 10.10.10.111
+    ip: 192.168.4.250
     port: 102
     rack: 0
     slot: 0
@@ -82,20 +82,20 @@
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 203
-      row: 7
+      row: 12
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 201
-      row: 6
+      staNo: 204
+      row: 13
       bay: 1
       lev: 1
   # 鍫嗗灈鏈�3
   crn[2]:
     id: 3
-    ip: 10.10.10.121
+    ip: 10.10.10.10
     port: 102
     rack: 0
     slot: 0
@@ -105,119 +105,174 @@
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 304
-      row: 11
+      staNo: 303
+      row: 22
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 301
-      row: 10
+      staNo: 304
+      row: 23
+      bay: 1
+      lev: 1
+  # 鍫嗗灈鏈�4
+  crn[3]:
+    id: 4
+    ip: 10.10.10.10
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 303
+      row: 22
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 304
+      row: 23
       bay: 1
       lev: 1
 
-  # 杈撻�佺嚎
+  # RGV绌挎杞�1
+  rgv[0]:
+    id: 1
+    ip: 192.168.4.250
+    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.4.250
+    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
+  # 杈撻�佺嚎1
   devp[0]:
     id: 1
-    ip: 10.10.10.50
+    ip: 192.168.4.250
     port: 102
     rack: 0
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 103
+      staNo: 101
       barcode: ${wcs-slave.barcode[0].id}
-    # 鍏ュ簱鍙�2
-    inSta[1]:
-      staNo: 203
-      barcode: ${wcs-slave.barcode[1].id}
-    # 鍏ュ簱鍙�3
-    inSta[2]:
-      staNo: 305
-      barcode: ${wcs-slave.barcode[2].id}
+      backSta: 100
+      led: ${wcs-slave.led[1].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 103
-    # 绌烘澘鍏ュ簱鍙�2
-    emptyInSta[1]:
-      staNo: 203
-    # 绌烘澘鍏ュ簱鍙�3
-    emptyInSta[2]:
-      staNo: 305
-    # 鍑哄簱鍙�1
-    outSta[0]:
-      staNo: 102
-    # 鍑哄簱鍙�2
-    outSta[1]:
-      staNo: 202
-    # 鍑哄簱鍙�3
-    outSta[2]:
-      staNo: 303
+      staNo: 101
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 100
+      led: ${wcs-slave.led[1].id}
     # 鎷f枡鍏ュ簱鍙�1
     pickSta[0]:
-      staNo: 103
+      staNo: 101
       barcode: ${wcs-slave.barcode[0].id}
-    # 鎷f枡鍏ュ簱鍙�2
-    pickSta[1]:
-      staNo: 203
-      barcode: ${wcs-slave.barcode[1].id}
-    # 鎷f枡鍏ュ簱鍙�3
-    pickSta[2]:
-      staNo: 305
-      barcode: ${wcs-slave.barcode[2].id}
-  # 鏉$爜鎵弿浠�
+      led: ${wcs-slave.led[1].id}
+    # 鍑哄簱鍙�1
+    outSta[0]:
+      staNo: 106
+      led: ${wcs-slave.led[0].id}
+
+  # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
-    ip: 10.10.10.52
+    ip: 10.10.10.121
     port: 51236
+  # 鏉$爜鎵弿浠�2
   barcode[1]:
     id: 2
-    ip: 10.10.10.52
+    ip: 10.10.10.122
     port: 51236
+  # 鏉$爜鎵弿浠�3
   barcode[2]:
     id: 3
-    ip: 10.10.10.52
+    ip: 10.10.10.123
     port: 51236
    # LED1
   led[0]:
     id: 1
-    ip: 10.10.10.201
+    ip: 10.10.10.249
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 102
+    staArr: 101
   # LED2
   led[1]:
     id: 2
-    ip: 10.10.10.202
+    ip: 10.10.10.248
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 103
+    staArr: 108
   # LED3
   led[2]:
     id: 3
-    ip: 10.10.10.203
+    ip: 10.10.10.247
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 202
+    staArr: 117
   # LED4
   led[3]:
     id: 4
-    ip: 10.10.10.204
+    ip: 10.10.10.246
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 203
+    staArr: 126
   # LED5
   led[4]:
     id: 5
-    ip: 10.10.10.205
+    ip: 10.10.10.245
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 303
-  # LED6
-  led[5]:
-    id: 5
-    ip: 10.10.10.206
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 305
\ No newline at end of file
+    staArr: 134
\ No newline at end of file

--
Gitblit v1.9.1