From f7ea0b1fe3cb3be7d037290a3fa77b30c922b3f6 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 14 十月 2023 16:22:14 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0277ec1..b9f5cba 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -38,7 +38,7 @@
   enable: false
 
 wms:
-  url: localhost:8081/tzskwms
+  url: 10.10.10.40:8080/tzskwms
 
 robot:
   url: http://10.10.10.41:7002
@@ -70,84 +70,98 @@
       backSta: 101
       barcode: ${wcs-slave.barcode[0].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[0].id}
     # 鍏ュ簱鍙�2
     inSta[1]:
       staNo: 103
       backSta: 102
       barcode: ${wcs-slave.barcode[1].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[1].id}
     # 鍏ュ簱鍙�3
     inSta[2]:
       staNo: 105
       backSta: 104
       barcode: ${wcs-slave.barcode[2].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
     # 鍏ュ簱鍙�4
     inSta[3]:
       staNo: 200
       backSta: 201
       barcode: ${wcs-slave.barcode[3].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[0].id}
     # 鍏ュ簱鍙�5
     inSta[4]:
       staNo: 203
       backSta: 202
       barcode: ${wcs-slave.barcode[4].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[1].id}
     # 鍏ュ簱鍙�6
     inSta[5]:
       staNo: 205
       backSta: 204
       barcode: ${wcs-slave.barcode[5].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
     # 鍏ュ簱鍙�7
     inSta[6]:
       staNo: 346
       backSta: 345
       barcode: ${wcs-slave.barcode[8].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
       staNo: 100
       backSta: 101
       barcode: ${wcs-slave.barcode[0].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[0].id}
     # 绌烘澘鍏ュ簱鍙�2
     emptyInSta[1]:
       staNo: 103
       backSta: 102
       barcode: ${wcs-slave.barcode[1].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[1].id}
     # 绌烘澘鍏ュ簱鍙�3
     emptyInSta[2]:
       staNo: 105
       backSta: 104
       barcode: ${wcs-slave.barcode[2].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
     # 绌烘澘鍏ュ簱鍙�4
     emptyInSta[3]:
       staNo: 200
       backSta: 201
       barcode: ${wcs-slave.barcode[3].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[0].id}
     # 绌烘澘鍏ュ簱鍙�5
     emptyInSta[4]:
       staNo: 203
       backSta: 202
       barcode: ${wcs-slave.barcode[4].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[1].id}
     # 绌烘澘鍏ュ簱鍙�6
     emptyInSta[5]:
       staNo: 205
       backSta: 204
       barcode: ${wcs-slave.barcode[5].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
     # 绌烘澘鍏ュ簱鍙�7
     emptyInSta[6]:
       staNo: 346
       backSta: 345
       barcode: ${wcs-slave.barcode[8].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
     # 鍑哄簱鍙�1
     outSta[0]:
       staNo: 101
@@ -186,36 +200,43 @@
       backSta: 101
       barcode: ${wcs-slave.barcode[0].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[0].id}
     pickInSta[1]:
       staNo: 103
       backSta: 102
       barcode: ${wcs-slave.barcode[1].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[1].id}
     pickInSta[2]:
       staNo: 105
       backSta: 104
       barcode: ${wcs-slave.barcode[2].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
     pickInSta[3]:
       staNo: 200
       backSta: 201
       barcode: ${wcs-slave.barcode[3].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[0].id}
     pickInSta[4]:
       staNo: 203
       backSta: 202
       barcode: ${wcs-slave.barcode[4].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[1].id}
     pickInSta[5]:
       staNo: 205
       backSta: 204
       barcode: ${wcs-slave.barcode[5].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
     pickInSta[6]:
       staNo: 346
       backSta: 345
       barcode: ${wcs-slave.barcode[8].id}
       led: ${wcs-slave.led[0].id}
+      liftNo: ${wcs-slave.lift[2].id}
 #    # 璐ф灦鍏ュ簱绔欑偣
 #    rackInStn[0]:
 #      devpPlcId: ${wcs-slave.devp[0].id}
@@ -323,6 +344,16 @@
     id: 10
     ip: 10.10.10.102
     port: 51236
+  # 鏉$爜鎵弿浠�
+  barcode[10]:
+    id: 11
+    ip: 10.10.10.102
+    port: 51236
+  # 鏉$爜鎵弿浠�
+  barcode[11]:
+    id: 12
+    ip: 10.10.10.102
+    port: 51236
 
    # LED1
   led[0]:

--
Gitblit v1.9.1