From 2599526586d46212c48eaccba1a8cea97e14176d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 14 八月 2025 16:41:04 +0800
Subject: [PATCH] 1

---
 src/main/resources/application.yml |  235 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 182 insertions(+), 53 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0645bad..dec22c3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,14 +1,14 @@
 server:
   port: 9090
+  servlet:
+    context-path: /@pom.build.finalName@
 
 spring:
   application:
-#    name: @pom.artifactId@
-    name:
+    name: @pom.build.finalName@
   datasource:
-    # sql-server
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsasrs
+    url: jdbc:sqlserver://10.10.10.247:1433;databasename=whxrasrs
     username: sa
     password: sa@123
   mvc:
@@ -19,13 +19,20 @@
     database: 0
 #    password: xltys1995
 
+ctu:
+  url: 10.10.10.200:8088
+  locSync: /api/open/loc/sync
+  sendTask: /api/open/bus/submit
+  getLoc: /api/open/loc/one
+  update: /api/open/sta/update
+
 mybatis-plus:
   mapper-locations: classpath:mapper/*.xml
-  global-config:
-    field-strategy: 0
+#  global-config:
+#    field-strategy: 0
 
 logging:
-  path: /stock/out/logs
+  path: /stock/out/@pom.build.finalName@/logs
 
 super:
   pwd: xltys1995
@@ -33,78 +40,200 @@
 swagger:
   enable: false
 
+wms:
+  url: 127.0.0.1:8080/whxrwms
+
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
-  # 鍫嗗灈鏈�
+  # 鍙屾繁
+  doubleDeep: false
+  # 鍙屾繁搴撲綅鎺掑彿
+  doubleLocs: 1,4,5,8,9,12,13,16
+  # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+  groupCount: 2
+  # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 192.168.6.9
+    ip: 10.10.10.110
     port: 102
     rack: 0
     slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝璐ф灦浠�2寮�濮嬶紝鍔�1
+    offset: 0
+    demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 5
+      staNo: 218
       row: 2
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 6
+      staNo: 222
       row: 1
       bay: 1
       lev: 1
-  # 杈撻�佺嚎
-  devp[0]:
-    id: 1
-    ip: 192.168.2.125
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 118
+      row: 2
+      bay: 42
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 122
+      row: 1
+      bay: 42
+      lev: 1
+  # 鍫嗗灈鏈�2
+  crn[1]:
+    id: 2
+    ip: 10.10.10.120
     port: 102
     rack: 0
-    slot: 1
-    # 鍏ュ簱鍙�
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 0
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 211
+      row: 4
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 215
+      row: 3
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 111
+      row: 4
+      bay: 42
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 115
+      row: 3
+      bay: 42
+      lev: 1
+  # 鍫嗗灈鏈�3
+  crn[2]:
+    id: 3
+    ip: 10.10.10.130
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 0
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 204
+      row: 6
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 208
+      row: 5
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 104
+      row: 6
+      bay: 42
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 108
+      row: 5
+      bay: 42
+      lev: 1
+  # 杈撻�佺嚎1
+  devp[0]:
+    id: 1
+    ip: 10.10.10.191
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 2
+      staNo: 1007
       barcode: ${wcs-slave.barcode[0].id}
-    # 绌烘澘鍏ュ簱鍙�
-    emptyInSta[0]:
-      staNo: 2
-    # 鍑哄簱鍙�
+      backSta: 1007
+      led: ${wcs-slave.led[0].id}
+#    # 鍏ュ簱鍙�1
+#    inSta[1]:
+#      staNo: 201
+#      barcode: ${wcs-slave.barcode[1].id}
+#      backSta: 200
+#      led: ${wcs-slave.led[1].id}
+#    # 鎷f枡鍏ュ簱鍙�1
+#    pickSta[0]:
+#      staNo: 101
+#      barcode: ${wcs-slave.barcode[0].id}
+#      led: ${wcs-slave.led[0].id}
+#      backSta: 100
+#    # 鎷f枡鍏ュ簱鍙�1
+#    pickSta[1]:
+#      staNo: 201
+#      barcode: ${wcs-slave.barcode[1].id}
+#      led: ${wcs-slave.led[1].id}
+#      backSta: 200
+#    # 绌烘澘鍏ュ簱鍙�1
+#    emptyInSta[0]:
+#      staNo: 101
+#      barcode: ${wcs-slave.barcode[0].id}
+#      backSta: 100
+#      led: ${wcs-slave.led[0].id}
+#    # 绌烘澘鍏ュ簱鍙�2
+#    emptyInSta[1]:
+#      staNo: 201
+#      barcode: ${wcs-slave.barcode[1].id}
+#      backSta: 200
+#      led: ${wcs-slave.led[1].id}
+    # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 6
-    # 鎷f枡鍏ュ簱鍙�
-    pickSta[0]:
-      staNo: 2
-  # 鏉$爜鎵弿浠�
+      staNo: 1001
+#    outSta[1]:
+#      staNo: 223
+  # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
-    ip: 192.168.2.150
+    ip: 10.10.10.194
     port: 51236
-  # LED
+  # 鏉$爜鎵弿浠�2
+  barcode[1]:
+    id: 2
+    ip: 10.10.10.146
+    port: 51236
+  # LED1
   led[0]:
     id: 1
-    ip: 192.168.1.1
-    port: 8888
-  # 纾呯О
-  scale[0]:
-    id: 1
-    ip: 192.168.1.1
-    port: 8888
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    ip: 10.10.10.101
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 100
+  # LED2
+  led[1]:
+    id: 2
+    ip: 10.10.10.102
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 200

--
Gitblit v1.9.1