From 511d4ceb774ce6ccc1827545a205ba55a0ff26c0 Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期一, 01 十二月 2025 09:06:14 +0800
Subject: [PATCH] #1

---
 src/main/resources/application.yml |  240 ++++++++++++++++-------------------------------------------
 1 files changed, 66 insertions(+), 174 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8f43631..ae96752 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,9 +8,13 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://192.168.4.15:1433;databasename=sxlktasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=rqdzasrs
     username: sa
     password: sa@123
+#    driver-class-name: com.oscar.Driver
+#    url: jdbc:oscar://127.0.0.1:2003/osrdb?CURRENTSCHEMA=DBO
+#    username: SYSDBA
+#    password: szoscar55
   mvc:
     static-path-pattern: /**
   redis:
@@ -34,229 +38,117 @@
   enable: false
 
 wms:
-  url: 127.0.0.1:8080/lktwms
+  url: 127.0.0.1:8080/czkhasrs
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
+  #
+  isToOrigin: false
   # 鍙屾繁
   doubleDeep: true
   # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 1,4,11,14,21,24
+  doubleLocs: 1,4
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   groupCount: 4
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 192.168.4.250
+    ip: 192.168.7.210
     port: 102
     rack: 0
     slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝璐ф灦浠�2寮�濮嬶紝鍔�1
+    offset: 0
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 103
+      staNo: 1006
       row: 2
-      bay: 1
+      bay: 11
       lev: 1
+
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 104
-      row: 3
-      bay: 1
+      staNo: 1001
+      row: 2
+      bay: 14
       lev: 1
-  # 鍫嗗灈鏈�2
-  crn[1]:
-    id: 2
-    ip: 192.168.4.250
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 203
-      row: 12
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 204
-      row: 13
-      bay: 1
-      lev: 1
-  # 鍫嗗灈鏈�3
-  crn[2]:
-    id: 3
-    ip: 192.168.4.250
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[2].id}
-      staNo: 303
-      row: 22
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[2].id}
-      staNo: 304
-      row: 23
-      bay: 1
-      lev: 1
-  # 杈撻�佺嚎1
+
+  # plc
   devp[0]:
     id: 1
-    ip: 192.168.4.250
+    ip: 192.168.7.230
     port: 102
     rack: 0
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 101
+      staNo: 1006
       barcode: ${wcs-slave.barcode[0].id}
-      backSta: 100
-      led: ${wcs-slave.led[1].id}
-    # 绌烘澘鍏ュ簱鍙�1
-    emptyInSta[0]:
-      staNo: 101
-      barcode: ${wcs-slave.barcode[0].id}
-      backSta: 100
-      led: ${wcs-slave.led[1].id}
-    # 鎷f枡鍏ュ簱鍙�1
-    pickSta[0]:
-      staNo: 101
-      barcode: ${wcs-slave.barcode[0].id}
-      led: ${wcs-slave.led[1].id}
-    # 鍑哄簱鍙�1
-    outSta[0]:
-      staNo: 106
+      backSta: 1005
       led: ${wcs-slave.led[0].id}
-
-  # 杈撻�佺嚎2
-  devp[1]:
-    id: 2
-    ip: 192.168.4.250
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍏ュ簱鍙�1
-    inSta[0]:
-      staNo: 201
-      barcode: ${wcs-slave.barcode[1].id}
-      backSta: 200
-      led: ${wcs-slave.led[3].id}
-    # 绌烘澘鍏ュ簱鍙�1
-    emptyInSta[0]:
-      staNo: 201
-      barcode: ${wcs-slave.barcode[1].id}
-      backSta: 200
-      led: ${wcs-slave.led[3].id}
+#    # 鍏ュ簱鍙�2
+#    inSta[1]:
+#      staNo: 223
+#      barcode: ${wcs-slave.barcode[1].id}
+#      backSta: 222
+#      led: ${wcs-slave.led[1].id}
     # 鎷f枡鍏ュ簱鍙�1
     pickSta[0]:
-      staNo: 201
-      barcode: ${wcs-slave.barcode[1].id}
-      led: ${wcs-slave.led[3].id}
-    # 鍑哄簱鍙�1
-    outSta[0]:
-      staNo: 206
-      led: ${wcs-slave.led[2].id}
-
-  # 杈撻�佺嚎3
-  devp[2]:
-    id: 3
-    ip: 192.168.4.250
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍏ュ簱鍙�1
-    inSta[0]:
-      staNo: 301
-      barcode: ${wcs-slave.barcode[2].id}
-      backSta: 300
-      led: ${wcs-slave.led[5].id}
+      staNo: 1006
+      barcode: ${wcs-slave.barcode[0].id}
+      led: ${wcs-slave.led[0].id}
+      backSta: 1005
+#    # 鎷f枡鍏ュ簱鍙�2
+#    pickSta[1]:
+#      staNo: 225
+#      barcode: ${wcs-slave.barcode[1].id}
+#      led: ${wcs-slave.led[1].id}
+#      backSta: 224
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 301
-      barcode: ${wcs-slave.barcode[2].id}
-      backSta: 200
-      led: ${wcs-slave.led[5].id}
-    # 鎷f枡鍏ュ簱鍙�1
-    pickSta[0]:
-      staNo: 301
-      barcode: ${wcs-slave.barcode[2].id}
-      led: ${wcs-slave.led[5].id}
+      staNo: 1006
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 1005
+      led: ${wcs-slave.led[0].id}
+    # 绌烘澘鍏ュ簱鍙�2
+    #emptyInSta[1]:
+      #staNo: 223
+      #barcode: ${wcs-slave.barcode[0].id}
+      #backSta: 222
+      #led: ${wcs-slave.led[1].id}
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 306
-      led: ${wcs-slave.led[4].id}
-
+      staNo: 1001
   # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
-    ip: 10.10.10.121
-    port: 51236
-  # 鏉$爜鎵弿浠�2
-  barcode[1]:
-    id: 2
     ip: 10.10.10.122
     port: 51236
-  # 鏉$爜鎵弿浠�3
-  barcode[2]:
-    id: 3
-    ip: 10.10.10.123
-    port: 51236
-   # LED1
+  # LED1
   led[0]:
-    id: 1
-    ip: 10.10.10.249
+    id: 121
+    ip: 192.168.7.241
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 101
-  # LED2
+    staArr: 1006
+    crnId: 1
+#  # LED2
   led[1]:
-    id: 2
-    ip: 10.10.10.248
+    id: 123
+    ip: 192.168.7.240
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 108
-  # LED3
+    staArr: 1005
+    crnId: 1
+#  # LED1
   led[2]:
-    id: 3
-    ip: 10.10.10.247
+    id: 122
+    ip: 192.168.7.247
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 117
-  # LED4
-  led[3]:
-    id: 4
-    ip: 10.10.10.246
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 126
-  # LED5
-  led[4]:
-    id: 5
-    ip: 10.10.10.245
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 134
-  # LED6
-  led[5]:
-    id: 6
-    ip: 10.10.10.244
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[1].id}
-    staArr: 201
\ No newline at end of file
+    staArr: 1006
+    crnId: 1
+

--
Gitblit v1.9.1