From d2bb7362d92f0809572e15f8299ac608fe263a87 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期一, 21 四月 2025 16:23:47 +0800
Subject: [PATCH] 输送线命令下发失败重新推送队列

---
 src/main/resources/application.yml |   62 ++++++++++++++++++------------
 1 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cdd665e..b6bbee5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://localhost:1433;databasename=hylyasrs
+    url: jdbc:sqlserver://10.10.10.210:1433;databasename=hylyasrs
     username: sa
     password: sa@123
   mvc:
@@ -34,7 +34,7 @@
   enable: false
 
 wms:
-  url: localhost:8081/lywms
+  url: 10.10.10.210:8080/lywms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
@@ -146,7 +146,7 @@
   # 鍫嗗灈鏈�4
   crn[3]:
     id: 4
-    ip: 10.10.10.121
+    ip: 10.10.10.130
     port: 102
     rack: 0
     slot: 0
@@ -155,22 +155,22 @@
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 401
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 402
       row: 14
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 401
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 402
       row: 14
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 401
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 402
       row: 14
       bay: 1
       lev: 1
@@ -185,18 +185,17 @@
     inSta[0]:
       staNo: 103
       barcode: ${wcs-slave.barcode[0].id}
+      led: ${wcs-slave.led[1].id}
     # 鍏ュ簱鍙�2
     inSta[1]:
       staNo: 203
       barcode: ${wcs-slave.barcode[1].id}
+      led: ${wcs-slave.led[3].id}
     # 鍏ュ簱鍙�3
     inSta[2]:
       staNo: 305
       barcode: ${wcs-slave.barcode[2].id}
-    # 鍏ュ簱鍙�4
-    inSta[3]:
-      staNo: 401
-      barcode: ${wcs-slave.barcode[3].id}
+      led: ${wcs-slave.led[5].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
       staNo: 103
@@ -206,9 +205,6 @@
     # 绌烘澘鍏ュ簱鍙�3
     emptyInSta[2]:
       staNo: 305
-    # 绌烘澘鍏ュ簱鍙�4
-    emptyInSta[3]:
-      staNo: 401
     # 鍑哄簱鍙�1
     outSta[0]:
       staNo: 102
@@ -218,9 +214,6 @@
     # 鍑哄簱鍙�3
     outSta[2]:
       staNo: 303
-    # 鍑哄簱鍙�4
-    outSta[3]:
-      staNo: 402
     # 鎷f枡鍏ュ簱鍙�1
     pickSta[0]:
       staNo: 102
@@ -233,10 +226,29 @@
     pickSta[2]:
       staNo: 303
       barcode: ${wcs-slave.barcode[2].id}
-    # 鎷f枡鍏ュ簱鍙�4
-    pickSta[3]:
+
+  devp[1]:
+    id: 2
+    ip: 10.10.10.93
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍏ュ簱鍙�1
+    inSta[0]:
       staNo: 402
       barcode: ${wcs-slave.barcode[3].id}
+      led: ${wcs-slave.led[6].id}
+    # 绌烘澘鍏ュ簱鍙�1
+    emptyInSta[0]:
+      staNo: 402
+    # 鍑哄簱鍙�1
+    outSta[0]:
+      staNo: 401
+    # 鎷f枡鍏ュ簱鍙�1
+    pickSta[0]:
+      staNo: 402
+      barcode: ${wcs-slave.barcode[3].id}
+
   # 鏉$爜鎵弿浠�
   barcode[0]:
     id: 1
@@ -244,15 +256,15 @@
     port: 51236
   barcode[1]:
     id: 2
-    ip: 10.10.10.52
+    ip: 10.10.10.53
     port: 51236
   barcode[2]:
     id: 3
-    ip: 10.10.10.52
+    ip: 10.10.10.54
     port: 51236
   barcode[3]:
     id: 4
-    ip: 10.10.10.52
+    ip: 10.10.10.95
     port: 51236
    # LED1
   led[0]:
@@ -281,7 +293,7 @@
     ip: 10.10.10.204
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 203
+    staArr: 204
   # LED5
   led[4]:
     id: 5

--
Gitblit v1.9.1