From 15161de49e7f35e2fc926a20577905621f30554c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 28 十二月 2025 14:57:24 +0800
Subject: [PATCH] 输送线和CTU安全交互

---
 src/main/resources/application.yml |  228 ++++++++++++++++++--------------------------------------
 1 files changed, 74 insertions(+), 154 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0028cc6..6fb60bd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 9090
+  port: 9091
   servlet:
     context-path: /@pom.build.finalName@
 
@@ -8,7 +8,7 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://10.10.10.243:1433;databasename=ghlnasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=djwms
     username: sa
     password: sa@123
   mvc:
@@ -34,190 +34,110 @@
   enable: false
 
 wms:
-  url: 10.10.10.243:8080/ghlnwms
+  url: 127.0.0.1:8088/djwms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
-  doubleDeep: true
+  doubleDeep: false
   # 鍙屾繁搴撲綅鎺掑彿
   doubleLocs: 1,4,5,8
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
-  groupCount: 4
+  groupCount: 2
 
   # 鍫嗗灈鏈�1
-  crn[0]:
-    id: 1
-    ip: 10.10.10.1
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 103
-      row: 2
-      bay: 1
-      lev: 1
-    crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 203
-      row: 2
-      bay: 1
-      lev: 6
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 103
-      row: 2
-      bay: 1
-      lev: 1
-    crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 105
-      row: 2
-      bay: 4
-      lev: 1
-    crnOutStn[2]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 107
-      row: 2
-      bay: 28
-      lev: 1
-    crnOutStn[3]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 203
-      row: 2
-      bay: 1
-      lev: 6
-  # 鍫嗗灈鏈�2
-  crn[1]:
-    id: 2
-    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: 101
-      row: 6
-      bay: 1
-      lev: 1
-    crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 201
-      row: 6
-      bay: 1
-      lev: 6
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 101
-      row: 6
-      bay: 1
-      lev: 1
-    crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 201
-      row: 6
-      bay: 1
-      lev: 6
-    crnOutStn[2]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 106
-      row: 6
-      bay: 28
-      lev: 1
+#  crn[0]:
+#    id: 1
+#    ip: 172.26.11.31
+#    port: 102
+#    rack: 0
+#    slot: 0
+#    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+#    offset: 2
+#    demo: false
+#    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+#    crnInStn[0]:
+#      devpPlcId: ${wcs-slave.devp[0].id}
+#      staNo: 201
+#      row: 2
+#      bay: 1
+#      lev: 1
+#    # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+#    crnInStn[1]:
+#      devpPlcId: ${wcs-slave.devp[0].id}
+#      staNo: 203
+#      row: 1
+#      bay: 1
+#      lev: 1
+#    # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
+#    crnOutStn[0]:
+#      devpPlcId: ${wcs-slave.devp[0].id}
+#      staNo: 203
+#      row: 1
+#      bay: 1
+#      lev: 1
+#    # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+#    crnOutStn[1]:
+#      devpPlcId: ${wcs-slave.devp[0].id}
+#      staNo: 205
+#      row: 1
+#      bay: 9
+#      lev: 1
+#    # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
+#    crnOutStn[2]:
+#      devpPlcId: ${wcs-slave.devp[0].id}
+#      staNo: 201
+#      row: 2
+#      bay: 1
+#      lev: 1
 
   # 杈撻�佺嚎1
   devp[0]:
     id: 1
-    ip: 10.10.10.18
+    ip: 172.26.11.50
     port: 102
     rack: 0
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 101
+      staNo: 104
       barcode: ${wcs-slave.barcode[0].id}
-      backSta: 100
+      backSta: 103
       led: ${wcs-slave.led[0].id}
-    # 鍏ュ簱鍙�2
-    inSta[1]:
-      staNo: 103
-      barcode: ${wcs-slave.barcode[1].id}
-      backSta: 102
-      led: ${wcs-slave.led[1].id}
-    # 鍏ュ簱鍙�3
-    inSta[2]:
-      staNo: 305
     # 绌烘澘鍏ュ簱鍙�1
-#    emptyInSta[0]:
-#      staNo: 101
-#      barcode: ${wcs-slave.barcode[0].id}
-#      backSta: 100
-#      led: ${wcs-slave.led[0].id}
-#    emptyInSta[1]:
-#      staNo: 103
-#      barcode: ${wcs-slave.barcode[1].id}
-#      backSta: 102
-#      led: ${wcs-slave.led[1].id}
+    emptyInSta[0]:
+      staNo: 104
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 103
+      led: ${wcs-slave.led[0].id}
+    # 鎷f枡鍏ュ簱鍙�1
+    pickSta[0]:
+      staNo: 104
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 103
+      led: ${wcs-slave.led[0].id}
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 100
+      staNo: 101
       led: ${wcs-slave.led[0].id}
-    # 鍑哄簱鍙�2
-    outSta[1]:
-      staNo: 102
-      led: ${wcs-slave.led[1].id}
-    # 鍑哄簱鍙�3
-    outSta[2]:
-      staNo: 104
-      led: ${wcs-slave.led[2].id}
-    # 鍑哄簱鍙�4
-    outSta[3]:
-      staNo: 107
-    # 鍑哄簱鍙�5
-    outSta[4]:
-      staNo: 305
 
   # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
-    ip: 10.10.10.121
-    port: 51236
-  # 鏉$爜鎵弿浠�2
-  barcode[1]:
-    id: 2
-    ip: 10.10.10.122
+    ip: 172.26.11.43
     port: 51236
 
   # LED1
   led[0]:
     id: 1
-    ip: 10.10.10.190
+    ip: 172.26.11.82
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 101,100
-
-  # LED2
-  led[1]:
-    id: 2
-    ip: 10.10.10.191
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 102,103
-  # LED3
-  led[2]:
-    id: 3
-    ip: 10.10.10.192
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 104
\ No newline at end of file
+    staArr: 103,104
+    crnId: 1
+# TMS
+dj:
+  url: http://172.26.11.2/
+#娴峰悍瀵规帴
+hik:
+  url: http://172.26.11.98:80/rcs/rtas/
\ No newline at end of file

--
Gitblit v1.9.1