From 432aa30874196937f6250b34c7ef6fb62dbaf984 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 29 三月 2025 15:52:14 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |  201 ++++++++++++++++++++++++-------------------------
 1 files changed, 99 insertions(+), 102 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9b7d942..4219aad 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://192.168.4.15:1433;databasename=gdykasrs
+    url: jdbc:sqlserver://localhost:1433;databasename=fyxcasrs
     username: sa
     password: sa@123
   mvc:
@@ -34,20 +34,20 @@
   enable: false
 
 wms:
-  url: 127.0.0.1:8080/lktwms
+  url: 127.0.0.1:8080/fyxcwms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
   doubleDeep: true
   # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 1,4,11,14,21,24
+  doubleLocs: 14,16
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   groupCount: 4
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 10.10.10.10
+    ip: 192.168.10.10
     port: 102
     rack: 0
     slot: 0
@@ -57,165 +57,162 @@
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 103
+      staNo: 1112
       row: 2
-      bay: 1
+      bay: 2
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 104
+      staNo: 1112
+      row: 2
+      bay: 2
+      lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1114
       row: 3
-      bay: 1
-      lev: 1
-  # 鍫嗗灈鏈�2
-  crn[1]:
-    id: 2
-    ip: 192.168.4.250
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 203
-      row: 12
-      bay: 1
+      bay: 30
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
+    crnOutStn[1]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 204
-      row: 13
-      bay: 1
+      staNo: 1114
+      row: 3
+      bay: 30
       lev: 1
-  # 鍫嗗灈鏈�3
-  crn[2]:
-    id: 3
-    ip: 10.10.10.10
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
+    crnInStn[2]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 303
-      row: 22
-      bay: 1
-      lev: 1
+      staNo: 1122
+      row: 2
+      bay: 2
+      lev: 4
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
+    crnOutStn[2]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      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
+      staNo: 1122
+      row: 2
+      bay: 2
+      lev: 4
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
+    crnInStn[3]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 303
-      row: 22
-      bay: 1
-      lev: 1
+      staNo: 1124
+      row: 3
+      bay: 30
+      lev: 4
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
+    crnOutStn[3]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 304
-      row: 23
-      bay: 1
-      lev: 1
+      staNo: 1124
+      row: 3
+      bay: 30
+      lev: 4
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[4]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1131
+      row: 3
+      bay: 30
+      lev: 8
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[4]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1131
+      row: 3
+      bay: 30
+      lev: 8
   # 杈撻�佺嚎1
   devp[0]:
     id: 1
-    ip: 192.168.4.250
+    ip: 192.168.10.66
     port: 102
     rack: 0
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 101
+      staNo: 1112
       barcode: ${wcs-slave.barcode[0].id}
-      backSta: 100
+      backSta: 1111
       led: ${wcs-slave.led[1].id}
-    # 绌烘澘鍏ュ簱鍙�1
-    emptyInSta[0]:
-      staNo: 101
+    # 鍏ュ簱鍙�1
+    inSta[1]:
+      staNo: 1114
       barcode: ${wcs-slave.barcode[0].id}
-      backSta: 100
+      backSta: 1113
       led: ${wcs-slave.led[1].id}
-    # 鎷f枡鍏ュ簱鍙�1
-    pickSta[0]:
-      staNo: 101
+    # 鍏ュ簱鍙�1
+    inSta[2]:
+      staNo: 1122
       barcode: ${wcs-slave.barcode[0].id}
+      backSta: 1121
       led: ${wcs-slave.led[1].id}
-    # 鍑哄簱鍙�1
+    # 鍏ュ簱鍙�1
+    inSta[3]:
+      staNo: 1124
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 1123
+      led: ${wcs-slave.led[1].id}
     outSta[0]:
-      staNo: 106
-      led: ${wcs-slave.led[0].id}
+      staNo: 1111
+      led: ${wcs-slave.led[1].id}
+    outSta[1]:
+      staNo: 1121
+      led: ${wcs-slave.led[1].id}
+    outSta[2]:
+      staNo: 1113
+      led: ${wcs-slave.led[1].id}
+    outSta[3]:
+      staNo: 1123
+      led: ${wcs-slave.led[1].id}
+
 
   # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
     ip: 10.10.10.121
     port: 51236
-  # 鏉$爜鎵弿浠�2
-  barcode[1]:
-    id: 2
-    ip: 10.10.10.122
-    port: 51236
-  # 鏉$爜鎵弿浠�3
-  barcode[2]:
-    id: 3
-    ip: 10.10.10.123
-    port: 51236
    # LED1
   led[0]:
     id: 1
-    ip: 10.10.10.249
+    ip: 10.10.10.101
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 101
+    staArr: 100
   # LED2
   led[1]:
     id: 2
-    ip: 10.10.10.248
+    ip: 10.10.10.102
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 108
+    staArr: 106
   # LED3
   led[2]:
     id: 3
-    ip: 10.10.10.247
+    ip: 10.10.10.103
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 117
+    staArr: 107
   # LED4
   led[3]:
     id: 4
-    ip: 10.10.10.246
+    ip: 10.10.10.104
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 126
+    staArr: 152
   # LED5
   led[4]:
     id: 5
-    ip: 10.10.10.245
+    ip: 10.10.10.105
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 134
\ No newline at end of file
+    staArr: 156
+  # LED6
+  led[5]:
+    id: 6
+    ip: 10.10.10.106
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 160,159
\ No newline at end of file

--
Gitblit v1.9.1