From d6e4dfb1ac4c9bc1cff025d6215cd5023fd7a17e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 02 十二月 2023 13:23:27 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |  111 +++++++++++++++++++++++++++++++------------------------
 1 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1b42313..f86372d 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=jkxcasrs
+    url: jdbc:sqlserver://192.168.4.15:1433;databasename=mdqdasrs
     username: sa
     password: sa@123
   mvc:
@@ -28,22 +28,22 @@
   path: /stock/out/@pom.build.finalName@/logs
 
 super:
-  pwd: xltys1995
+  pwd: asrs2023
 
 swagger:
   enable: false
 
 wms:
-  url: localhost:8080/jkxcwms
+  url: localhost:8080/mdqdwms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
-  doubleDeep: false
+  doubleDeep: true
   # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 1
+  doubleLocs: 1,4,5,8
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
-  groupCount: 2
+  groupCount: 4
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
@@ -57,29 +57,39 @@
     # 鍫嗗灈鏈哄叆搴撶珯1
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 102
-      row: 1
+      staNo: 1003
+      row: 2
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
     crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 101
-      row: 1
-      bay: 1
-      lev: 1
-    # 绌烘墭鍏ュ簱绔欑偣
-    emptyCrnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 102
-      row: 1
-      bay: 1
-      lev: 1
-    # 绌烘墭鍑哄簱绔欑偣
-    emptyCrnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 101
-      row: 1
+      staNo: 1006
+      row: 3
+      bay: 1
+      lev: 1
+  # 鍫嗗灈鏈�2
+  crn[1]:
+    id: 2
+    ip: 10.10.10.111
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯1
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1013
+      row: 7
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1010
+      row: 6
       bay: 1
       lev: 1
   # 杈撻�佺嚎1
@@ -91,10 +101,16 @@
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 102
+      staNo: 1003
       barcode: ${wcs-slave.barcode[0].id}
-      backSta: 102
+      backSta: 1001
       led: ${wcs-slave.led[0].id}
+    # 鍏ュ簱鍙�2
+    inSta[1]:
+      staNo: 1013
+      barcode: ${wcs-slave.barcode[1].id}
+      backSta: 1011
+      led: ${wcs-slave.led[3].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
       staNo: 102
@@ -108,29 +124,14 @@
       backSta: 102
       led: ${wcs-slave.led[0].id}
 
-  # 杈撻�佺嚎2
-  devp[1]:
-    id: 2
-    ip: 10.10.10.51
-    port: 102
-    rack: 0
-    slot: 0
-    # 绌烘澘鍏ュ簱鍙�1
-    emptyInSta[0]:
-      staNo: 307
-    # 绌烘澘鍏ュ簱鍙�2
-    emptyInSta[1]:
-      staNo: 408
-    # 鍑哄簱鍙�1
-    outSta[0]:
-      staNo: 305
-    # 鍑哄簱鍙�2
-    outSta[1]:
-      staNo: 400
-
   # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
+    ip: 10.10.10.3
+    port: 51236
+  # 鏉$爜鎵弿浠�2
+  barcode[1]:
+    id: 2
     ip: 10.10.10.3
     port: 51236
 
@@ -140,11 +141,25 @@
     ip: 10.10.10.205
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 100
+    staArr: 1003
   # LED2
   led[1]:
     id: 2
     ip: 10.10.10.206
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 103
\ No newline at end of file
+    staArr: 1006
+  # LED3
+  led[2]:
+    id: 3
+    ip: 10.10.10.206
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 1010
+  # LED4
+  led[3]:
+    id: 4
+    ip: 10.10.10.206
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 1013
\ No newline at end of file

--
Gitblit v1.9.1