From ddf4e077b77a990c6b7960eb77f2b95e2d475a0b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 26 四月 2024 15:39:50 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |   58 +++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 36133a9..80543e2 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=jxfyasrs
+    url: jdbc:sqlserver://192.168.4.15:1433;databasename=sxjzasrs
     username: sa
     password: sa@123
   mvc:
@@ -34,7 +34,7 @@
   enable: false
 
 wms:
-  url: 192.168.4.121:8081/fywms
+  url: 127.0.0.1:8080/sxjzwms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
@@ -47,7 +47,7 @@
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 10.10.10.1
+    ip: 10.10.10.100
     port: 102
     rack: 0
     slot: 0
@@ -57,21 +57,21 @@
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 010
+      staNo: 111
       row: 1
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 007
+      staNo: 109
       row: 2
       bay: 1
       lev: 1
   # 鍫嗗灈鏈�2
   crn[1]:
     id: 2
-    ip: 10.10.10.2
+    ip: 10.10.10.110
     port: 102
     rack: 0
     slot: 0
@@ -81,45 +81,69 @@
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 006
+      staNo: 107
       row: 4
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 003
+      staNo: 102
       row: 5
+      bay: 2
+      lev: 1
+  # 鍫嗗灈鏈�3
+  crn[2]:
+    id: 3
+    ip: 10.10.10.110
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 107
+      row: 4
       bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 102
+      row: 5
+      bay: 2
       lev: 1
 
   # 杈撻�佺嚎1
   devp[0]:
     id: 1
-    ip: 10.10.10.100
+    ip: 10.10.10.120
     port: 102
     rack: 0
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 002
+      staNo: 101
       barcode: ${wcs-slave.barcode[0].id}
-      backSta: 001
+      backSta: 1
       led: ${wcs-slave.led[0].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 002
+      staNo: 101
       barcode: ${wcs-slave.barcode[0].id}
-      backSta: 001
+      backSta: 1
       led: ${wcs-slave.led[0].id}
     # 鎷f枡鍏ュ簱鍙�1
     pickSta[0]:
-      staNo: 002
+      staNo: 101
       barcode: ${wcs-slave.barcode[0].id}
       led: ${wcs-slave.led[0].id}
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 012
+      staNo: 105
       led: ${wcs-slave.led[1].id}
 
   # 鏉$爜鎵弿浠�1
@@ -134,11 +158,11 @@
     ip: 10.10.10.249
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 101
+    staArr: 2
   # LED2
   led[1]:
     id: 2
     ip: 10.10.10.248
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 109
\ No newline at end of file
+    staArr: 11
\ No newline at end of file

--
Gitblit v1.9.1