From f6ccffb2c8f4a5be8b4a887c6f0926f67053e504 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 23 十二月 2025 08:49:46 +0800
Subject: [PATCH] #移库事务回滚修改
---
src/main/resources/application.yml | 148 +++++++++++++++++++++++++++++--------------------
1 files changed, 87 insertions(+), 61 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0614e7b..ae96752 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,20 +1,20 @@
server:
port: 9090
servlet:
- context-path: /jswcs
+ context-path: /@pom.build.finalName@
spring:
application:
- name: gdwcs
+ name: @pom.build.finalName@
datasource:
- # sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- #url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs
- #username: sa
- #password: eisoft
- url: jdbc:sqlserver://localhost:1433;databasename=jsasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=rqdzasrs
username: sa
password: sa@123
+# driver-class-name: com.oscar.Driver
+# url: jdbc:oscar://127.0.0.1:2003/osrdb?CURRENTSCHEMA=DBO
+# username: SYSDBA
+# password: szoscar55
mvc:
static-path-pattern: /**
redis:
@@ -29,7 +29,7 @@
# field-strategy: 0
logging:
- path: /stock/out/wcs/logs
+ path: /stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
@@ -37,92 +37,118 @@
swagger:
enable: false
+wms:
+ url: 127.0.0.1:8080/czkhasrs
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
+ #
+ isToOrigin: false
+ # 鍙屾繁
+ doubleDeep: true
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1,4
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.10.39
- port: 5015
+ ip: 192.168.7.210
+ port: 102
rack: 0
slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝璐ф灦浠�2寮�濮嬶紝鍔�1
+ offset: 0
+ demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 4
+ staNo: 1006
row: 2
- bay: 1
+ bay: 11
lev: 1
+
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 2
- row: 1
- bay: 1
+ staNo: 1001
+ row: 2
+ bay: 14
lev: 1
- # 杈撻�佺嚎
+
+ # plc
devp[0]:
id: 1
- ip: 192.168.10.65
- port: 6000
+ ip: 192.168.7.230
+ port: 102
rack: 0
- slot: 1
+ slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 3
+ staNo: 1006
barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 7
+ backSta: 1005
+ led: ${wcs-slave.led[0].id}
+# # 鍏ュ簱鍙�2
+# inSta[1]:
+# staNo: 223
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 222
+# led: ${wcs-slave.led[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 1006
barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ backSta: 1005
+# # 鎷ｆ枡鍏ュ簱鍙�2
+# pickSta[1]:
+# staNo: 225
+# barcode: ${wcs-slave.barcode[1].id}
+# led: ${wcs-slave.led[1].id}
+# backSta: 224
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 3
+ staNo: 1006
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 1005
+ led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 7
+ #emptyInSta[1]:
+ #staNo: 223
+ #barcode: ${wcs-slave.barcode[0].id}
+ #backSta: 222
+ #led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 1
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 5
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[0]:
- staNo: 2
- # 鏉＄爜鎵弿浠�
+ staNo: 1001
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 192.168.10.150
+ ip: 10.10.10.122
port: 51236
# LED1
led[0]:
- id: 1
- ip: 192.168.10.61
+ id: 121
+ ip: 192.168.7.241
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 1,2
- # 纾呯О
- scale[0]:
- id: 1
- ip: 192.168.10.152
- port: 8888
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ staArr: 1006
+ crnId: 1
+# # LED2
+ led[1]:
+ id: 123
+ ip: 192.168.7.240
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1005
+ crnId: 1
+# # LED1
+ led[2]:
+ id: 122
+ ip: 192.168.7.247
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1006
+ crnId: 1
--
Gitblit v1.9.1