From db27cce4c6ead2054c63f403dd25756ce045ac88 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 13 十月 2022 15:53:28 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |  117 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 87 insertions(+), 30 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cbb7c1c..e2c7d89 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://localhost:1433;databasename=bfasrs
     username: sa
     #    password: Zoneyung@zy56$
     password: sa@123
@@ -36,7 +36,7 @@
   enable: false
 
 wms:
-  url: localhost:8081/bfmwms
+  url: localhost:8080/bfwms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
@@ -59,16 +59,16 @@
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 100
-      row: 2
-      bay: 1
+      staNo: 107
+      row: 4
+      bay: 4
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 101
-      row: 3
-      bay: 1
+      staNo: 108
+      row: 4
+      bay: 5
       lev: 1
   # 鍫嗗灈鏈�2
   crn[1]:
@@ -83,16 +83,30 @@
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 100
-      row: 2
-      bay: 1
+      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: 101
-      row: 3
-      bay: 1
+      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]:
@@ -107,16 +121,16 @@
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 100
-      row: 2
-      bay: 1
+      staNo: 207
+      row: 18
+      bay: 4
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 101
-      row: 3
-      bay: 1
+      staNo: 208
+      row: 18
+      bay: 5
       lev: 1
   # 绌挎杞�1
   ste[0]:
@@ -148,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