From 30f45550c8d54eedac210349f9bec5411662739a Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 23 十二月 2025 11:05:59 +0800
Subject: [PATCH] #移库事务回滚修改
---
src/main/resources/application.yml | 105 ++++++++++++++++++++++++----------------------------
1 files changed, 48 insertions(+), 57 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 89c53d4..1a54f94 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,16 +1,16 @@
server:
port: 9090
+ servlet:
+ context-path: /@pom.build.finalName@
spring:
application:
-# name: @pom.artifactId@
- name:
+ name: @pom.build.finalName@
datasource:
- # sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdzbasrs
username: sa
- password: sa@123
+ password: LXDDzdgz@951.36
mvc:
static-path-pattern: /**
redis:
@@ -21,90 +21,81 @@
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
- global-config:
- field-strategy: 0
+# global-config:
+# field-strategy: 0
logging:
- path: /stock/out/logs
+ path: /stock/out/@pom.build.finalName@/logs
super:
- pwd: xltys1995
+ pwd: asrs2023
swagger:
enable: false
+wms:
+ url: localhost:8080/wms
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 鍫嗗灈鏈�
+ # 鍙屾繁
+ doubleDeep: true
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1,4
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 4
+ # 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.6.10
+ ip: 172.17.5.40
port: 102
rack: 0
- slot: 2
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 1
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 5
+ staNo: 1001
row: 2
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 6
- row: 1
+ staNo: 1002
+ row: 3
bay: 1
lev: 1
- # 杈撻�佺嚎
+
+ # 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 192.168.2.125
+ ip: 172.17.5.20
port: 102
rack: 0
- slot: 1
- # 鍏ュ簱鍙�
+ slot: 0
+ # 鍏ュ簱鍙�1
inSta[0]:
- staNo: 2
+ staNo: 1001
barcode: ${wcs-slave.barcode[0].id}
- # 绌烘澘鍏ュ簱鍙�
- emptyInSta[0]:
- staNo: 2
- # 鍑哄簱鍙�
+ backSta: 1001
+ led: ${wcs-slave.led[0].id}
outSta[0]:
- staNo: 6
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[0]:
- staNo: 2
- # 鏉＄爜鎵弿浠�
+ staNo: 1002
+
+
+ # 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 192.168.2.150
+ ip: 10.10.10.5
port: 51236
- # LED
+
+ # LED1
led[0]:
id: 1
- ip: 192.168.1.1
- port: 8888
- # 纾呯О
- scale[0]:
- id: 1
- ip: 192.168.1.1
- port: 8888
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ ip: 10.10.10.151
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1002
--
Gitblit v1.9.1