From e98d4b1133ed058bfe1e6af75be9975aebfc32d8 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期六, 28 三月 2026 16:00:35 +0800
Subject: [PATCH] 最后可运行版本

---
 src/main/resources/application.yml |   92 +++++++++++++++++++++++++++-------------------
 1 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0ed5b9f..a57ce72 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,13 +8,13 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jnejc-hkwms
+    url: jdbc:sqlserver://172.26.11.80:1433;databasename=jnejc-hkwms
     username: sa
     password: sa@123
   mvc:
     static-path-pattern: /**
 
-zyHikUrl: 10.10.10.200:9091/hik
+zyHikUrl: 172.26.4.184:8000
 #  redis:
 #    host: localhost
 #    port: 6379
@@ -38,10 +38,26 @@
 wms:
   url: 127.0.0.1:8084/hkwms
 
+#mes瀵规帴
+mes:
+  url: http://192.9.100.173:8088/prod-api/basicmodel/WmsFit/Api/
+#  url: http://172.26.160.73:8080/basicmodel/WmsFit/Api/
+#  url: http://172.26.160.5:8080/basicmodel/WmsFit/Api/
+  #榛樿鎺ュ彛鎿嶄綔浜哄憳id
+  defaultUserId: 30
 #娴峰悍瀵规帴
 hik:
   switch: false
   url: http://172.26.11.98:80/rcs/rtas/
+  station: Z-LVL20,Z-LVL21,Z-LVL22,Z-LVL23,Z-LVL24,Z-LVL25,Z-LVL26,Z-LVL27,Z-LVL28,Z-LVL29,Z-LVL30,Z-LVL31
+            Z-LZP1,Z-LZP2,Z-LZP3,Z-LZP4,Z-LZP5,Z-LZP6,Z-LZP7,Z-LZP8,Z-LZP9,Z-LZP10,Z-LZP11,Z-LZP12,Z-LZP13,Z-LZP14,
+            Z-LZP15,Z-LZP16,Z-LZP17,Z-LZP18,Z-LZP19,Z-LZP20,Z-LZP21,Z-LZP22,Z-LZP23,Z-LZP24,Z-LZP25,Z-LZP26,Z-LZP27
+            Z-LZP28,Z-LZP29,Z-LZP30,Z-LZP31,Z-LZP32,Z-LZP33
+  renyuan: Z-LZH25,Z-LZH26,Z-LZH27,Z-LZH28,Z-LZH29,Z-LZH30,Z-LZH31,Z-LZH32,Z-LZH33,Z-LZH34,Z-LZH35,Z-LZH36,Z-LZH37,
+            Z-LZH38,Z-LZH39,L-LZH40,L-LZH41,L-LZH42,Z-LZP7,Z-LZP8,Z-LZP9,Z-LZP10,Z-LZP11,Z-LZP12,Z-LZP13,Z-LZP14,
+            Z-LZP15,Z-LZP16,Z-LZP17,Z-LZP18,Z-LZP19,Z-LZP20,Z-LZP21,Z-LZP22,Z-LZP23,Z-LZP24,Z-LZP25,Z-LZP26,Z-LZP27
+            Z-LZP28,Z-LZP29,Z-LZP30,Z-LZP31
+
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
@@ -50,7 +66,7 @@
   # 鍙屾繁搴撲綅鎺掑彿
   doubleLocs: 3
   # 宸︽繁搴撲綅鎺掑彿
-#  doubleLocsLeft: 4,7,11,15,19,23
+  #  doubleLocsLeft: 4,7,11,15,19,23
   # 鍙虫繁搴撲綅鎺掑彿
   doubleLocsRight: 3
   # 宸︽祬搴撲綅鎺掑彿
@@ -73,28 +89,28 @@
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 401
-      row: 1
+      row: 6
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[1]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 402
-      row: 1
+      row: 6
       bay: 15
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 401
-      row: 1
+      row: 6
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[1]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 402
-      row: 1
+      row: 6
       bay: 15
       lev: 1
   # 杈撻�佺嚎1
@@ -149,24 +165,24 @@
       staNo: 402
       led: ${wcs-slave.led[1].id}
   # 杈撻�佺嚎2
-#  devp[1]:
-#    id: 2
-#    ip: 172.17.60.118
-#    port: 102
-#    rack: 0
-#    slot: 0
-#    # 鍏ュ簱鍙�1
-#    inSta[0]:
-#      staNo: 1002
-#      barcode: ${wcs-slave.barcode[2].id}
-#      backSta: 1001
-#      led: ${wcs-slave.led[7].id}
-#    # 鍏ュ簱鍙�2
-#    inSta[1]:
-#      staNo: 1007
-#      barcode: ${wcs-slave.barcode[3].id}
-#      backSta: 1003
-#      led: ${wcs-slave.led[8].id}
+  #  devp[1]:
+  #    id: 2
+  #    ip: 172.17.60.118
+  #    port: 102
+  #    rack: 0
+  #    slot: 0
+  #    # 鍏ュ簱鍙�1
+  #    inSta[0]:
+  #      staNo: 1002
+  #      barcode: ${wcs-slave.barcode[2].id}
+  #      backSta: 1001
+  #      led: ${wcs-slave.led[7].id}
+  #    # 鍏ュ簱鍙�2
+  #    inSta[1]:
+  #      staNo: 1007
+  #      barcode: ${wcs-slave.barcode[3].id}
+  #      backSta: 1003
+  #      led: ${wcs-slave.led[8].id}
   # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
@@ -177,27 +193,27 @@
     id: 2
     ip: 10.10.10.121
     port: 51236
-#  # 鏉$爜鎵弿浠�3
-#  barcode[2]:
-#    id: 3
-#    ip: 10.10.10.121
-#    port: 51236
-#  # 鏉$爜鎵弿浠�4
-#  barcode[3]:
-#    id: 4
-#    ip: 10.10.10.121
-#    port: 51236
-   # LED1
+    #  # 鏉$爜鎵弿浠�3
+    #  barcode[2]:
+    #    id: 3
+    #    ip: 10.10.10.121
+    #    port: 51236
+    #  # 鏉$爜鎵弿浠�4
+    #  barcode[3]:
+    #    id: 4
+    #    ip: 10.10.10.121
+    #    port: 51236
+    # LED1
   led[0]:
     id: 1
-    ip: 172.26.4.211
+    ip: 172.26.4.163
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
     staArr: 401
   # LED2
   led[1]:
     id: 2
-    ip: 172.26.4.212
+    ip: 172.26.4.161
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
     staArr: 402

--
Gitblit v1.9.1