From c5698e42c67e32892424a1a94ed9e7b532f0f7b8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 08 十二月 2025 09:43:49 +0800
Subject: [PATCH] 济南二机床wcs功能调试完善

---
 src/main/resources/application.yml |  194 ++++++++++++++++++++++++++----------------------
 1 files changed, 105 insertions(+), 89 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f8ab093..5dcb7a0 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://192.168.4.15:1433;databasename=stasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jgwms
     username: sa
     password: sa@123
   mvc:
@@ -34,20 +34,21 @@
   enable: false
 
 wms:
-  url: localhost:8080/stwms
+  url: 127.0.0.1:8089/jgwms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
-  doubleDeep: true
+  doubleDeep: false
   # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 1,4,5,8,9,12,13
+  doubleLocs: 1,4,5,8
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
-  groupCount: 4
+  groupCount: 2
+
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 10.10.10.101
+    ip: 172.26.11.31
     port: 102
     rack: 0
     slot: 0
@@ -57,127 +58,142 @@
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 001
+      staNo: 201
       row: 2
       bay: 1
       lev: 1
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�2
     crnInStn[1]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 002
-      row: 3
+      staNo: 203
+      row: 1
       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: 003
-      row: 6
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 004
-      row: 7
+      staNo: 203
+      row: 1
       bay: 1
       lev: 1
-  # 鍫嗗灈鏈�3
-  crn[2]:
-    id: 3
-    ip: 10.10.10.121
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+    crnOutStn[1]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 005
-      row: 10
-      bay: 1
+      staNo: 205
+      row: 1
+      bay: 9
       lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
+    crnOutStn[2]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 006
-      row: 11
+      staNo: 201
+      row: 2
       bay: 1
       lev: 1
-  # 鍫嗗灈鏈�4
-  crn[3]:
-    id: 4
-    ip: 10.10.10.121
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 007
-      row: 14
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 008
-      row: 15
-      bay: 1
-      lev: 1
-  # 杈撻�佺嚎
+
+  # 杈撻�佺嚎1
   devp[0]:
     id: 1
-    ip: 192.168.4.250
+    ip: 172.26.11.41
     port: 102
     rack: 0
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 015
+      staNo: 201
       barcode: ${wcs-slave.barcode[0].id}
+      backSta: 202
+      led: ${wcs-slave.led[0].id}
+    # 鍏ュ簱鍙�2
+    inSta[1]:
+      staNo: 205
+      barcode: ${wcs-slave.barcode[2].id}
+      led: ${wcs-slave.led[2].id}
+    # 鍏ュ簱鍙�3
+    inSta[2]:
+      staNo: 203
+      barcode: ${wcs-slave.barcode[1].id}
+      led: ${wcs-slave.led[1].id}
+      backSta: 204
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 012
+      staNo: 201
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 202
+      led: ${wcs-slave.led[0].id}
+    # 绌烘澘鍏ュ簱鍙�2
+    emptyInSta[1]:
+      staNo: 205
+      barcode: ${wcs-slave.barcode[2].id}
+      led: ${wcs-slave.led[2].id}
+    # 绌烘澘鍏ュ簱鍙�3
+    emptyInSta[2]:
+      staNo: 203
+      barcode: ${wcs-slave.barcode[1].id}
+      backSta: 204
+      led: ${wcs-slave.led[1].id}
+#    # 鎷f枡鍏ュ簱鍙�1
+#    pickSta[0]:
+#      staNo: 104
+#      barcode: ${wcs-slave.barcode[0].id}
+#      backSta: 103
+#      led: ${wcs-slave.led[1].id}
+#    # 鎷f枡鍏ュ簱鍙�2
+#    pickSta[1]:
+#      staNo: 106
+#      barcode: ${wcs-slave.barcode[1].id}
+#      backSta: 105
+#      led: ${wcs-slave.led[2].id}
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 011
-    # 鎷f枡鍏ュ簱鍙�1
-    pickSta[0]:
-      staNo: 011
-      barcode: ${wcs-slave.barcode[0].id}
+      staNo: 204
+      led: ${wcs-slave.led[1].id}
+    # 鍑哄簱鍙�2
+    outSta[1]:
+      staNo: 205
+      led: ${wcs-slave.led[2].id}
+    # 鍑哄簱鍙�3
+    outSta[2]:
+      staNo: 202
+      led: ${wcs-slave.led[1].id}
 
-  # 鏉$爜鎵弿浠�
+  # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
-    ip: 10.10.10.52
+    ip: 172.26.11.43
     port: 51236
-   # LED1
+  # 鏉$爜鎵弿浠�2
+  barcode[1]:
+    id: 2
+    ip: 172.26.11.44
+    port: 51236
+  # 鏉$爜鎵弿浠�3
+  barcode[2]:
+    id: 3
+    ip: 172.26.11.45
+    port: 51236
+
+  # LED1
   led[0]:
     id: 1
-    ip: 10.10.10.201
+    ip: 192.168.5.104
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 015
+    staArr: 202
+    crnId: 1
   # LED2
   led[1]:
     id: 2
-    ip: 10.10.10.202
+    ip: 192.168.5.105
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 011
\ No newline at end of file
+    staArr: 204
+    crnId: 1
+  # LED3
+  led[2]:
+    id: 3
+    ip: 192.168.5.106
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 205
+    crnId: 1
\ No newline at end of file

--
Gitblit v1.9.1