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 |  171 +++++++--------------------------------------------------
 1 files changed, 21 insertions(+), 150 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 36d4881..1240f17 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,7 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#    url: jdbc:sqlserver://localhost:1433;databasename=nbjfasrs
-    url: jdbc:sqlserver://192.168.4.15:1433;databasename=nbjfasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdzbasrs
     username: sa
     password: sa@123
   mvc:
@@ -29,13 +28,13 @@
   path: /stock/out/@pom.build.finalName@/logs
 
 super:
-  pwd: xltys1995
+  pwd: asrs2023
 
 swagger:
   enable: false
 
 wms:
-  url: localhost:8080/nbjfwms
+  url: localhost:8080/wms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
@@ -48,183 +47,55 @@
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 10.10.10.101
+    ip: 10.10.10.100
     port: 102
     rack: 0
     slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
+    offset: 1
     demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    # 鍫嗗灈鏈哄叆搴撶珯1
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 102
+      staNo: 1001
       row: 2
       bay: 1
       lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 106
-      row: 2
-      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
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 113
+      staNo: 1002
       row: 3
       bay: 1
       lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 114
-      row: 4
-      bay: 1
-      lev: 1
+
   # 杈撻�佺嚎1
   devp[0]:
     id: 1
-    ip: 192.168.4.250
+    ip: 10.10.10.20
     port: 102
     rack: 0
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 109
+      staNo: 1001
       barcode: ${wcs-slave.barcode[0].id}
-    # 鍏ュ簱鍙�2
-    inSta[1]:
-      staNo: 117
-      barcode: ${wcs-slave.barcode[0].id}
-    # 鍏ュ簱鍙�3
-    inSta[2]:
-      staNo: 101
-      barcode: ${wcs-slave.barcode[0].id}
-    # 绌烘澘鍏ュ簱鍙�1
-    emptyInSta[0]:
-      staNo: 109
-    # 绌烘澘鍏ュ簱鍙�2
-    emptyInSta[1]:
-      staNo: 117
-    # 绌烘澘鍏ュ簱鍙�2
-    emptyInSta[2]:
-      staNo: 101
-    # 鍑哄簱鍙�1
+      backSta: 1001
+      led: ${wcs-slave.led[0].id}
     outSta[0]:
-      staNo: 126
-    # 鍑哄簱鍙�2
-    outSta[1]:
-      staNo: 134
-    # 鍑哄簱鍙�2
-    outSta[2]:
-      staNo: 100
-#    # 鎷f枡鍏ュ簱鍙�1
-#    pickSta[0]:
-#      staNo: 126
-#      barcode: ${wcs-slave.barcode[0].id}
-#    # 鎷f枡鍏ュ簱鍙�2
-#    pickSta[1]:
-#      staNo: 134
-#      barcode: ${wcs-slave.barcode[0].id}
-  # 杈撻�佺嚎2
-  devp[1]:
-    id: 2
-    ip: 192.168.4.250
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍏ュ簱鍙�1
-    inSta[0]:
-      staNo: 201
-      barcode: ${wcs-slave.barcode[0].id}
-    # 鍏ュ簱鍙�2
-    inSta[1]:
-      staNo: 207
-      barcode: ${wcs-slave.barcode[0].id}
-    # 鍏ュ簱鍙�3
-    inSta[2]:
-      staNo: 213
-      barcode: ${wcs-slave.barcode[0].id}
-    # 绌烘澘鍏ュ簱鍙�1
-    emptyInSta[0]:
-      staNo: 201
-    # 绌烘澘鍏ュ簱鍙�2
-    emptyInSta[1]:
-      staNo: 207
-    # 绌烘澘鍏ュ簱鍙�3
-    emptyInSta[2]:
-      staNo: 213
-    # 鍑哄簱鍙�1
-    outSta[0]:
-      staNo: 205
-    # 鍑哄簱鍙�2
-    outSta[1]:
-      staNo: 211
-    # 鍑哄簱鍙�3
-    outSta[2]:
-      staNo: 217
-#    # 鎷f枡鍏ュ簱鍙�1
-#    pickSta[0]:
-#      staNo: 011
-#      barcode: ${wcs-slave.barcode[0].id}
-#    # 鎷f枡鍏ュ簱鍙�2
-#    pickSta[1]:
-#      staNo: 011
-#      barcode: ${wcs-slave.barcode[0].id}
+      staNo: 1002
+
 
   # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
-    ip: 10.10.10.52
+    ip: 10.10.10.5
     port: 51236
-  # 鏉$爜鎵弿浠�2
-  barcode[1]:
-    id: 2
-    ip: 10.10.10.52
-    port: 51236
-  # 鏉$爜鎵弿浠�3
-  barcode[2]:
-    id: 3
-    ip: 10.10.10.52
-    port: 51236
-  # 鏉$爜鎵弿浠�4
-  barcode[3]:
-    id: 4
-    ip: 10.10.10.52
-    port: 51236
-  # 鏉$爜鎵弿浠�5
-  barcode[4]:
-    id: 5
-    ip: 10.10.10.52
-    port: 51236
-  # 鏉$爜鎵弿浠�6
-  barcode[5]:
-    id: 6
-    ip: 10.10.10.52
-    port: 51236
-   # LED1
+
+  # LED1
   led[0]:
     id: 1
-    ip: 10.10.10.201
+    ip: 10.10.10.151
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 015
-  # LED2
-  led[1]:
-    id: 2
-    ip: 10.10.10.202
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 011
\ No newline at end of file
+    staArr: 1002

--
Gitblit v1.9.1