From a4171a52aeb242836959fecd5f4227bfba73b241 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 23 十二月 2025 10:35:28 +0800
Subject: [PATCH] #移库事务回滚修改
---
src/main/resources/application.yml | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 962c783..8dc005b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9090
+ port: 8080
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://127.0.0.1:1433;databasename=sxjzasrs
+ url: jdbc:sqlserver://172.17.20.240:1433;databasename=sxjzasrs
username: sa
password: sa@123
mvc:
@@ -129,7 +129,7 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 314
+ staNo: 311
row: 9
bay: 0
lev: 1
@@ -224,22 +224,22 @@
staNo: 311
barcode: ${wcs-slave.barcode[3].id}
backSta: 312
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[4].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[1]:
staNo: 311
barcode: ${wcs-slave.barcode[3].id}
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[4].id}
backSta: 312
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[1]:
staNo: 311
barcode: ${wcs-slave.barcode[3].id}
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[4].id}
# 鍑哄簱鍙�1
outSta[1]:
staNo: 314
- led: ${wcs-slave.led[4].id}
+ led: ${wcs-slave.led[5].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
@@ -284,6 +284,7 @@
led[4]:
id: 5
ip: 10.10.10.110
+# ip: 172.17.20.183
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 311
@@ -291,6 +292,7 @@
led[5]:
id: 6
ip: 10.10.10.111
+# ip: 172.17.20.182
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 314
\ No newline at end of file
--
Gitblit v1.9.1