From da8e0338292e8c104f65415e24345e3d583e051e Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 27 六月 2023 16:46:29 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |  217 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 140 insertions(+), 77 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2d2c6e2..aa11a99 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,8 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    #    url: jdbc:sqlserver://47.97.1.152:51433;databasename=bfasrs
-    url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
+    url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
+#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
     username: sa
     #    password: Zoneyung@zy56$
     password: sa@123
@@ -36,7 +36,7 @@
   enable: false
 
 wms:
-  url: localhost:8081/bfmwms
+  url: 10.10.10.100:8080/bfwms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
@@ -47,71 +47,91 @@
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   groupCount: 4
   # 鍫嗗灈鏈�1
-#  crn[0]:
-#    id: 1
-#    ip: 10.10.10.10
-#    port: 102
-#    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-#    offset: 2
-#    demo: false
-#    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-#    crnInStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 100
-#      row: 2
-#      bay: 1
-#      lev: 1
-#    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-#    crnOutStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 101
-#      row: 3
-#      bay: 1
-#      lev: 1
-#  # 鍫嗗灈鏈�2
-#  crn[1]:
-#    id: 1
-#    ip: 10.10.10.20
-#    port: 102
-#    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-#    offset: 2
-#    demo: false
-#    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-#    crnInStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 100
-#      row: 2
-#      bay: 1
-#      lev: 1
-#    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-#    crnOutStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 101
-#      row: 3
-#      bay: 1
-#      lev: 1
-#  # 鍫嗗灈鏈�3
-#  crn[2]:
-#    id: 1
-#    ip: 10.10.10.30
-#    port: 102
-#    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-#    offset: 2
-#    demo: false
-#    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-#    crnInStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 100
-#      row: 2
-#      bay: 1
-#      lev: 1
-#    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-#    crnOutStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 101
-#      row: 3
-#      bay: 1
-#      lev: 1
+  crn[0]:
+    id: 1
+    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
+      row: 4
+      bay: 4
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 108
+      row: 4
+      bay: 5
+      lev: 1
+  # 鍫嗗灈鏈�2
+  crn[1]:
+    id: 2
+    ip: 10.10.10.20
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 111
+      row: 11
+      bay: 5
+      lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 211
+      row: 12
+      bay: 5
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 104
+      row: 11
+      bay: 4
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 204
+      row: 12
+      bay: 4
+      lev: 1
+  # 鍫嗗灈鏈�3
+  crn[2]:
+    id: 3
+    ip: 10.10.10.30
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 207
+      row: 18
+      bay: 4
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 208
+      row: 18
+      bay: 5
+      lev: 1
   # 绌挎杞�1
   ste[0]:
     id: 1
@@ -142,30 +162,73 @@
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 176
+      staNo: 103
       barcode: ${wcs-slave.barcode[0].id}
+      backSta: 100
+      led: ${wcs-slave.led[0].id}
+    # 鍏ュ簱鍙�1
+    inSta[1]:
+      staNo: 203
+      barcode: ${wcs-slave.barcode[1].id}
+      backSta: 200
+      led: ${wcs-slave.led[2].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 176
+      staNo: 103
+      barcode: ${wcs-slave.barcode[0].id}
+    # 绌烘澘鍏ュ簱鍙�1
+    emptyInSta[1]:
+      staNo: 203
+      barcode: ${wcs-slave.barcode[1].id}
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 173
+      staNo: 100
     # 鍑哄簱鍙�2
     outSta[1]:
-      staNo: 182
-    # 鎷f枡鍏ュ簱鍙�
-    pickSta[0]:
-      staNo: 176
+      staNo: 200
+    # 鎷f枡鍑哄簱鍙�
+    pickOutSta[0]:
+      staNo: 300
+    # 鎷f枡鍑哄簱鍙�
+    pickInSta[0]:
+      staNo: 103
       barcode: ${wcs-slave.barcode[0].id}
+      backSta: 100
+      led: ${wcs-slave.led[0].id}
+    # 鎷f枡鍑哄簱鍙�
+    pickInSta[1]:
+      staNo: 203
+      barcode: ${wcs-slave.barcode[1].id}
+      backSta: 200
+      led: ${wcs-slave.led[2].id}
   # 鏉$爜鎵弿浠�
   barcode[0]:
     id: 1
     ip: 10.10.10.52
     port: 51236
+  # 鏉$爜鎵弿浠�
+  barcode[1]:
+    id: 2
+    ip: 10.10.10.53
+    port: 51236
    # LED1
   led[0]:
     id: 1
-    ip: 10.10.10.60
+    ip: 10.10.10.205
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 173
+    staArr: 100
+  # LED1
+  led[1]:
+    id: 2
+    ip: 10.10.10.206
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 300
+  # LED1
+  led[2]:
+    id: 3
+    ip: 10.10.10.207
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 200

--
Gitblit v1.9.1