From 925b834a3341dbe9f486964a7ad5d1affd7a404d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 十月 2023 13:33:05 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7ca377b..9da9012 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,10 +8,10 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=tzskasrs
+ url: jdbc:sqlserver://10.10.10.40:1433;databasename=tzskasrs
username: sa
# password: Zoneyung@zy56$
- password: sa
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -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
@@ -108,9 +108,16 @@
liftNo: ${wcs-slave.lift[2].id}
# 鍏ュ簱鍙�7
inSta[6]:
+ staNo: 341
+ backSta: 340
+ barcode: ${wcs-slave.barcode[7].id}
+ led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[1].id}
+ # 鍏ュ簱鍙�8
+ inSta[7]:
staNo: 346
backSta: 345
- barcode: ${wcs-slave.barcode[8].id}
+ barcode: ${wcs-slave.barcode[6].id}
led: ${wcs-slave.led[0].id}
liftNo: ${wcs-slave.lift[2].id}
# 绌烘澘鍏ュ簱鍙�1
@@ -159,7 +166,7 @@
emptyInSta[6]:
staNo: 346
backSta: 345
- barcode: ${wcs-slave.barcode[8].id}
+ barcode: ${wcs-slave.barcode[6].id}
led: ${wcs-slave.led[0].id}
liftNo: ${wcs-slave.lift[2].id}
# 鍑哄簱鍙�1
@@ -232,9 +239,15 @@
led: ${wcs-slave.led[0].id}
liftNo: ${wcs-slave.lift[2].id}
pickInSta[6]:
+ staNo: 341
+ backSta: 340
+ barcode: ${wcs-slave.barcode[7].id}
+ led: ${wcs-slave.led[0].id}
+ liftNo: ${wcs-slave.lift[1].id}
+ pickInSta[7]:
staNo: 346
backSta: 345
- barcode: ${wcs-slave.barcode[8].id}
+ barcode: ${wcs-slave.barcode[6].id}
led: ${wcs-slave.led[0].id}
liftNo: ${wcs-slave.lift[2].id}
# # 璐ф灦鍏ュ簱绔欑偣
@@ -293,6 +306,13 @@
# row: 4
# bay: 6
# lev: 6
+ # 杈撻�佺嚎2
+ devp2[0]:
+ id: 1
+ ip: 10.10.10.58
+ port: 102
+ rack: 0
+ slot: 0
# 鏉＄爜鎵弿浠�
barcode[0]:
@@ -344,6 +364,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