From 398a0ea330d94bc4df491dd43d7a98662c6a5157 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 06 三月 2023 14:26:23 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 25fd543..de0495a 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://localhost:1433;databasename=htasrs
+    url: jdbc:sqlserver://localhost:1433;databasename=htasrs3
     username: sa
     password: sa@123
   mvc:
@@ -33,115 +33,139 @@
 swagger:
   enable: false
 
+wms:
+  url: localhost:8081/htwms3
+
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
+  # 鍙屾繁
+  doubleDeep: false
+  # 鍙屾繁搴撲綅鎺掑彿
+#  1,4,5,8,9,12,13,16
+  doubleLocs:
+  # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+  groupCount: 2
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 192.168.6.9
+    ip: 10.10.10.3
     port: 102
     rack: 0
     slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�1
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 5
+      staNo: 106
       row: 2
-      bay: 0
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 209
+      row: 2
+      bay: 41
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 6
+      staNo: 105
       row: 1
-      bay: 0
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 210
+      row: 1
+      bay: 41
       lev: 1
   # 鍫嗗灈鏈�2
   crn[1]:
     id: 2
-    ip: 192.168.6.20
-    port: 6000
+    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: 107
+      staNo: 110
       row: 4
-      bay: 0
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 205
+      row: 4
+      bay: 41
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 101
+      staNo: 109
       row: 3
-      bay: 0
+      bay: 1
       lev: 1
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 206
+      row: 3
+      bay: 41
+      lev: 1
+
   # 杈撻�佺嚎
   devp[0]:
     id: 1
-    ip: 192.168.6.120
+    ip: 10.10.10.30
     port: 102
     rack: 0
-    slot: 1
+    slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 1
+      staNo: 101
       barcode: ${wcs-slave.barcode[0].id}
+      scale: ${wcs-slave.scale[0].id}
+    # 鍏ュ簱鍙�2
+    inSta[1]:
+      staNo: 201
+      barcode: ${wcs-slave.barcode[1].id}
+      scale: ${wcs-slave.scale[1].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 1
+      staNo: 101
+    # 绌烘澘鍏ュ簱鍙�2
+    emptyInSta[1]:
+      staNo: 201
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 2
-    # 鎷f枡鍏ュ簱鍙�
-    pickSta[0]:
-      staNo: 3
+      staNo: 103
+    # 鍑哄簱鍙�2
+    outSta[1]:
+      staNo: 203
   # 鏉$爜鎵弿浠�
   barcode[0]:
     id: 1
-    ip: 192.168.6.150
+    ip: 10.10.10.52
     port: 51236
-  # 鏉$爜鎵弿浠�
   barcode[1]:
     id: 2
-    ip: 192.168.6.151
+    ip: 10.10.10.52
     port: 51236
-  # 鍙拌溅
-  car[0]:
+   # 纾呯Г
+  scale[0]:
     id: 1
-    ip: 192.168.10.150
-    port: 51236
-  # LED1
-  led[0]:
-    id: 1
-    ip: 192.168.10.61
+    ip: 10.10.10.201
     port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 2,3
-  # 纾呯О
-#  scale[0]:
-#    id: 1
-#    ip: 192.168.10.152
-#    port: 8888
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  # 纾呯Г
+  scale[1]:
+    id: 2
+    ip: 10.10.10.202
+    port: 5005
\ No newline at end of file

--
Gitblit v1.9.1