From 2ea423b0f01d4db3d879066cd6c9634cc6800c7c Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 27 十一月 2025 16:37:43 +0800
Subject: [PATCH] #1

---
 src/main/resources/application.yml |  433 +++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 312 insertions(+), 121 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 61d598f..5175834 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 9090
+  port: 9093
   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://localhost:1433;databasename=htasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=shhtgcasrs
     username: sa
     password: sa@123
   mvc:
@@ -33,149 +33,340 @@
 swagger:
   enable: false
 
+wms:
+  url: 127.0.0.1:8080/wms
+
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
-  doubleDeep: true
+  doubleDeep: false
   # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 1,4,5,8
+  doubleLocs: 3
+  # 宸︽繁搴撲綅鎺掑彿
+#  doubleLocsLeft: 4,7,11,15,19,23
+  # 鍙虫繁搴撲綅鎺掑彿
+  doubleLocsRight: 3
+  # 宸︽祬搴撲綅鎺掑彿
+  shallowLocsLeft: 1
+  # 鍙虫祬搴撲綅鎺掑彿
+  shallowLocsRight: 2
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
-  groupCount: 4
+  groupCount: 2
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 192.168.0.20
-    port: 2000
-    rack: 0
-    slot: 1
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 205
-      row: 2
-      bay: 65
-      lev: 1
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 118
-      row: 2
-      bay: 0
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 203
-      row: 3
-      bay: 65
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 120
-      row: 3
-      bay: 0
-      lev: 1
-  # 鍫嗗灈鏈�2
-  crn[1]:
-    id: 2
-    ip: 192.168.0.10
-    port: 2000
-    rack: 0
-    slot: 1
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 202
-      row: 6
-      bay: 65
-      lev: 1
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 124
-      row: 6
-      bay: 0
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 200
-      row: 7
-      bay: 65
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 100
-      row: 7
-      bay: 0
-      lev: 1
-  # 杈撻�佺嚎
-  devp[0]:
-    id: 1
-    ip: 192.168.6.120
+    ip: 172.17.60.10
     port: 102
     rack: 0
-    slot: 1
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 401
+      row: 2
+      bay: 2
+      lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 402
+      row: 2
+      bay: 30
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 401
+      row: 2
+      bay: 2
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 402
+      row: 2
+      bay: 30
+      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
+    port: 102
+    rack: 0
+    slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 1
+      staNo: 401
       barcode: ${wcs-slave.barcode[0].id}
+      backSta: 401
+      led: ${wcs-slave.led[0].id}
+    # 鍏ュ簱鍙�2
+    inSta[1]:
+      staNo: 402
+      barcode: ${wcs-slave.barcode[1].id}
+      backSta: 402
+      led: ${wcs-slave.led[1].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 1
+      staNo: 401
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 401
+      led: ${wcs-slave.led[0].id}
+    # 绌烘澘鍏ュ簱鍙�1
+    emptyInSta[1]:
+      staNo: 402
+      barcode: ${wcs-slave.barcode[1].id}
+      backSta: 402
+      led: ${wcs-slave.led[1].id}
+    # 鎷f枡鍏ュ簱鍙�1
+    pickSta[0]:
+      staNo: 401
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 401
+      led: ${wcs-slave.led[0].id}
+    # 鎷f枡鍏ュ簱鍙�1
+    pickSta[1]:
+      staNo: 402
+      barcode: ${wcs-slave.barcode[1].id}
+      backSta: 402
+      led: ${wcs-slave.led[1].id}
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 2
-    # 鎷f枡鍏ュ簱鍙�
-    pickSta[0]:
-      staNo: 3
-  # 鏉$爜鎵弿浠�
+      staNo: 401
+      led: ${wcs-slave.led[0].id}
+    # 鍑哄簱鍙�1
+    outSta[1]:
+      staNo: 402
+      led: ${wcs-slave.led[0].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}
+  # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
-    ip: 192.168.6.150
+    ip: 10.10.10.121
     port: 51236
-  # 鏉$爜鎵弿浠�
+  # 鏉$爜鎵弿浠�2
   barcode[1]:
     id: 2
-    ip: 192.168.6.151
+    ip: 10.10.10.121
     port: 51236
-  # 鍙拌溅
-  car[0]:
-    id: 1
-    ip: 192.168.10.150
-    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: 192.168.10.61
+    ip: 127.0.0.1
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 109,113,103,200,203 # todo:luxiaotao
-  # 纾呯О
-#  scale[0]:
-#    id: 1
-#    ip: 192.168.10.152
-#    port: 8888
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    staArr: 401
+  # LED2
+  led[1]:
+    id: 2
+    ip: 172.17.60.183
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 402
+#  # LED3
+#  led[2]:
+#    id: 3
+#    ip: 172.17.60.181
+#    port: 5005
+#    devpPlcId: ${wcs-slave.devp[0].id}
+#    staArr: 1058
+#  # LED4
+#  led[3]:
+#    id: 4
+#    ip: 172.17.60.184
+#    port: 5005
+#    devpPlcId: ${wcs-slave.devp[0].id}
+#    staArr: 1064
+#  # LED5
+#  led[4]:
+#    id: 5
+#    ip: 172.17.60.185
+#    port: 5005
+#    devpPlcId: ${wcs-slave.devp[0].id}
+#    staArr: 1068
+#  # LED6
+#  led[5]:
+#    id: 6
+#    ip: 172.17.60.186
+#    port: 5005
+#    devpPlcId: ${wcs-slave.devp[0].id}
+#    staArr: 1071
+#  # LED7
+#  led[6]:
+#    id: 7
+#    ip: 172.17.60.182
+#    port: 5005
+#    devpPlcId: ${wcs-slave.devp[0].id}
+#    staArr: 1074
+#  # LED8
+#  led[7]:
+#    id: 8
+#    ip: 172.17.60.187
+#    port: 5005
+#    devpPlcId: ${wcs-slave.devp[1].id}
+#    staArr: 1001
+#  # LED9
+#  led[8]:
+#    id: 9
+#    ip: 172.17.60.188
+#    port: 5005
+#    devpPlcId: ${wcs-slave.devp[1].id}
+#    staArr: 1007
\ No newline at end of file

--
Gitblit v1.9.1