From f9a4e6ce9b400a30aeac6d91831e8785368ea839 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 06 九月 2024 16:48:57 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |  166 ++++++++++++++-----------------------------------------
 1 files changed, 43 insertions(+), 123 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 61d598f..1240f17 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://127.0.0.1:1433;databasename=mdzbasrs
     username: sa
     password: sa@123
   mvc:
@@ -28,10 +28,13 @@
   path: /stock/out/@pom.build.finalName@/logs
 
 super:
-  pwd: xltys1995
+  pwd: asrs2023
 
 swagger:
   enable: false
+
+wms:
+  url: localhost:8080/wms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
@@ -44,138 +47,55 @@
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 192.168.0.20
-    port: 2000
-    rack: 0
-    slot: 1
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 205
-      row: 2
-      bay: 65
-      lev: 1
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 118
-      row: 2
-      bay: 0
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 203
-      row: 3
-      bay: 65
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 120
-      row: 3
-      bay: 0
-      lev: 1
-  # 鍫嗗灈鏈�2
-  crn[1]:
-    id: 2
-    ip: 192.168.0.10
-    port: 2000
-    rack: 0
-    slot: 1
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 202
-      row: 6
-      bay: 65
-      lev: 1
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 124
-      row: 6
-      bay: 0
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 200
-      row: 7
-      bay: 65
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 100
-      row: 7
-      bay: 0
-      lev: 1
-  # 杈撻�佺嚎
-  devp[0]:
-    id: 1
-    ip: 192.168.6.120
+    ip: 10.10.10.100
     port: 102
     rack: 0
-    slot: 1
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 1
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯1
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1001
+      row: 2
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1002
+      row: 3
+      bay: 1
+      lev: 1
+
+  # 杈撻�佺嚎1
+  devp[0]:
+    id: 1
+    ip: 10.10.10.20
+    port: 102
+    rack: 0
+    slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 1
+      staNo: 1001
       barcode: ${wcs-slave.barcode[0].id}
-    # 绌烘澘鍏ュ簱鍙�1
-    emptyInSta[0]:
-      staNo: 1
-    # 鍑哄簱鍙�1
+      backSta: 1001
+      led: ${wcs-slave.led[0].id}
     outSta[0]:
-      staNo: 2
-    # 鎷f枡鍏ュ簱鍙�
-    pickSta[0]:
-      staNo: 3
-  # 鏉$爜鎵弿浠�
+      staNo: 1002
+
+
+  # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
-    ip: 192.168.6.150
+    ip: 10.10.10.5
     port: 51236
-  # 鏉$爜鎵弿浠�
-  barcode[1]:
-    id: 2
-    ip: 192.168.6.151
-    port: 51236
-  # 鍙拌溅
-  car[0]:
-    id: 1
-    ip: 192.168.10.150
-    port: 51236
+
   # LED1
   led[0]:
     id: 1
-    ip: 192.168.10.61
+    ip: 10.10.10.151
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 109,113,103,200,203 # todo:luxiaotao
-  # 纾呯О
-#  scale[0]:
-#    id: 1
-#    ip: 192.168.10.152
-#    port: 8888
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    staArr: 1002

--
Gitblit v1.9.1