From e4abcf00a4be207814968b8be9b92be33ce1b0c9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 10 三月 2022 17:14:39 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |  184 +++++++++++++---------------------------------
 1 files changed, 52 insertions(+), 132 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7de841f..e9d33bf 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=bfasrs
     username: sa
     password: sa@123
   mvc:
@@ -33,176 +33,96 @@
 swagger:
   enable: false
 
+wms:
+  url: 10.10.10.238:8080/xgmwms
+#  url: localhost:8082/xgmwms
+
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
   doubleDeep: true
   # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 1,4,5,8
+  doubleLocs: 1,4,5,8,9,12,13,16,17,20
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   groupCount: 4
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 192.168.10.10
-    port: 102
-    rack: 0
-    slot: 1
+    ip: 10.10.10.10
+    port: 8888
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     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.10.20
-    port: 102
-    rack: 0
-    slot: 1
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    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
+      row: 2
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 101
+      row: 3
+      bay: 1
+      lev: 1
+  # 绌挎杞�1
+  ste[0]:
+    id: 1
+    ip: 10.10.10.10
+    port: 8888
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    demo: false
+    # 绌挎杞﹀叆搴撶珯鐐�
+    steInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 100
+      row: 2
+      bay: 1
+      lev: 1
+    # 绌挎杞﹀嚭搴撶珯鐐�
+    steOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 101
+      row: 3
+      bay: 1
       lev: 1
   # 杈撻�佺嚎
   devp[0]:
     id: 1
-    ip: 192.168.10.100
+    ip: 10.10.10.50
     port: 102
     rack: 0
-    slot: 1
+    slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 205
-      barcode: ${wcs-slave.barcode[0].id}
-    # 鍏ュ簱鍙�2
-    inSta[1]:
-      staNo: 202
+      staNo: 176
       barcode: ${wcs-slave.barcode[0].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 205
-    # 绌烘澘鍏ュ簱鍙�1
-    emptyInSta[1]:
-      staNo: 205
+      staNo: 176
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 200
+      staNo: 173
     # 鍑哄簱鍙�2
     outSta[1]:
-      staNo: 203
-    # 鍑哄簱鍙�3
-    outSta[2]:
-      staNo: 103
+      staNo: 182
     # 鎷f枡鍏ュ簱鍙�
     pickSta[0]:
-      staNo: 127
-    # 鎷f枡鍏ュ簱鍙�
-    pickSta[1]:
-      staNo: 128
+      staNo: 176
+      barcode: ${wcs-slave.barcode[0].id}
   # 鏉$爜鎵弿浠�
   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
-    port: 51236
-  # LED1
+   # LED1
   led[0]:
     id: 1
-    ip: 192.168.10.61
+    ip: 10.10.10.60
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 109,113,103,200,203 # todo:luxiaotao
-  # LED2
-  led[1]:
-    id: 2
-    ip: 192.168.10.61
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 109,113,103,200,203 # todo:luxiaotao
-  # LED3
-  led[2]:
-    id: 2
-    ip: 192.168.10.61
-    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: 173

--
Gitblit v1.9.1