From 0fdc564dfcc46dcf50f1c3cc916b5cf17bae92e6 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 25 十二月 2025 18:34:36 +0800
Subject: [PATCH] 1.rcs请求wcs放货申请 2.wcs反馈rcs继续执行 3.rcs放货完成,已退出输送线,反馈end到wcs 4.rcs请求wcs取货申请 5.wcs反馈rcs继续执行 6.rcs取货完成,已退出输送线,重置站点工作号和目标站

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

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a6008fb..91aa221 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 9093
+  port: 9094
   servlet:
     context-path: /@pom.build.finalName@
 
@@ -8,15 +8,17 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://127.0.0.1:1433;databasename=shhtgcasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jnejc-hkwms
     username: sa
     password: sa@123
   mvc:
     static-path-pattern: /**
-  redis:
-    host: localhost
-    port: 6379
-    database: 0
+
+zyHikUrl: 10.10.10.200:9091/hik
+#  redis:
+#    host: localhost
+#    port: 6379
+#    database: 0
 #    password: xltys1995
 
 mybatis-plus:
@@ -34,7 +36,12 @@
   enable: false
 
 wms:
-  url: 127.0.0.1:8080/wms
+  url: 127.0.0.1:8084/hkwms
+
+#娴峰悍瀵规帴
+hik:
+  switch: false
+  url: http://172.26.11.98:80/rcs/rtas/
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
@@ -55,7 +62,7 @@
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 172.17.60.10
+    ip: 172.26.4.131
     port: 102
     rack: 0
     slot: 0
@@ -66,161 +73,34 @@
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 401
-      row: 2
-      bay: 2
+      row: 1
+      bay: 1
       lev: 1
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[1]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 402
-      row: 2
-      bay: 30
+      row: 1
+      bay: 15
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 401
-      row: 2
-      bay: 2
+      row: 1
+      bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[1]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 402
-      row: 2
-      bay: 30
+      row: 1
+      bay: 15
       lev: 1
-  # 鍫嗗灈鏈�2
-#  crn[1]:
-#    id: 2
-#    ip: 172.17.60.20
-#    port: 102
-#    rack: 0
-#    slot: 0
-#    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-#    offset: 2
-#    demo: false
-#    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-#    crnInStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 1023
-#      row: 8
-#      bay: 1
-#      lev: 1
-#    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-#    crnOutStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 1026
-#      row: 9
-#      bay: 1
-#      lev: 1
-  # 鍫嗗灈鏈�3
-#  crn[2]:
-#    id: 3
-#    ip: 172.17.60.30
-#    port: 102
-#    rack: 0
-#    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-#    offset: 2
-#    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-#    crnInStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 1029
-#      row: 12
-#      bay: 1
-#      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-#    crnOutStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 1032
-#      row: 13
-#      bay: 1
-#      lev: 1
-  # 鍫嗗灈鏈�4
-#  crn[3]:
-#    id: 4
-#    ip: 172.17.60.40
-#    port: 102
-#    rack: 0
-#    slot: 0
-#    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-#    offset: 2
-#    demo: false
-#    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-#    crnInStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 1036
-#      row: 16
-#      bay: 1
-#      lev: 1
-#    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-#    crnOutStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 1039
-#      row: 17
-#      bay: 1
-#      lev: 1
-#  # 鍫嗗灈鏈�5
-#  crn[4]:
-#    id: 5
-#    ip: 172.17.60.50
-#    port: 102
-#    rack: 0
-#    slot: 0
-#    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-#    offset: 2
-#    demo: false
-#    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-#    crnInStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 1042
-#      row: 20
-#      bay: 1
-#      lev: 1
-#    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-#    crnOutStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 1045
-#      row: 21
-#      bay: 1
-#      lev: 1
-#  # 鍫嗗灈鏈�6
-#  crn[5]:
-#    id: 6
-#    ip: 172.17.60.60
-#    port: 102
-#    rack: 0
-#    slot: 0
-#    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-#    offset: 2
-#    demo: false
-#    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-#    crnInStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 1049
-#      row: 24
-#      bay: 1
-#      lev: 1
-#    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-#    crnOutStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 1052
-#      row: 25
-#      bay: 1
-#      lev: 1
-  # RGV绌挎杞�1
-#  rgv[0]:
-#    id: 1
-#    ip: 172.17.60.82
-#    port: 502
-#    rack: 0
-#    slot: 0
   # 杈撻�佺嚎1
   devp[0]:
     id: 1
-    ip: 172.17.60.100
+    ip: 172.26.4.141
     port: 102
     rack: 0
     slot: 0
@@ -245,9 +125,9 @@
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[1]:
       staNo: 402
-      barcode: ${wcs-slave.barcode[0].id}
+      barcode: ${wcs-slave.barcode[1].id}
       backSta: 402
-      led: ${wcs-slave.led[0].id}
+      led: ${wcs-slave.led[1].id}
     # 鎷f枡鍏ュ簱鍙�1
     pickSta[0]:
       staNo: 401
@@ -257,9 +137,9 @@
     # 鎷f枡鍏ュ簱鍙�1
     pickSta[1]:
       staNo: 402
-      barcode: ${wcs-slave.barcode[0].id}
+      barcode: ${wcs-slave.barcode[1].id}
       backSta: 402
-      led: ${wcs-slave.led[0].id}
+      led: ${wcs-slave.led[1].id}
     # 鍑哄簱鍙�1
     outSta[0]:
       staNo: 401
@@ -310,14 +190,14 @@
    # LED1
   led[0]:
     id: 1
-    ip: 127.0.0.1
+    ip: 172.26.4.211
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
     staArr: 401
   # LED2
   led[1]:
     id: 2
-    ip: 172.17.60.183
+    ip: 172.26.4.212
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
     staArr: 402

--
Gitblit v1.9.1