From 5090e469d6428e4508db52b49b4e34d9ba6198ea Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 28 九月 2020 08:53:07 +0800
Subject: [PATCH] Merge branch 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs
---
src/main/resources/application.yml | 101 ++++++++++++++++++++++++++++----------------------
1 files changed, 57 insertions(+), 44 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 63be732..63b7175 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,14 +1,18 @@
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://192.168.3.99:1433;databasename=gdasrs
+ #username: sa
+ #password: eisoft
+ url: jdbc:sqlserver://localhost:1433;databasename=jsasrs
username: sa
password: sa@123
mvc:
@@ -21,11 +25,11 @@
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
@@ -35,62 +39,71 @@
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 鍫嗗灈鏈�
-# crn[0]:
-# id: 1
-# ip: 192.168.6.9
-# port: 102
-# rack: 0
-# slot: 0
-# # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 5
-# row: 2
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 6
-# row: 1
-# bay: 1
-# lev: 1
+ # 鍫嗗灈鏈�1
+ crn[0]:
+ id: 1
+ ip: 192.168.6.9
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 5
+ row: 2
+ bay: 0
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 6
+ row: 1
+ bay: 0
+ lev: 1
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.2.125
+ ip: 192.168.6.120
port: 102
rack: 0
slot: 1
- # 鍏ュ簱鍙�
+ # 鍏ュ簱鍙�1
inSta[0]:
- staNo: 2
+ staNo: 1
barcode: ${wcs-slave.barcode[0].id}
- # 绌烘澘鍏ュ簱鍙�
+ # 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 2
- # 鍑哄簱鍙�
+ staNo: 1
+ # 鍑哄簱鍙�1
outSta[0]:
- staNo: 6
+ staNo: 2
# 鎷ｆ枡鍏ュ簱鍙�
pickSta[0]:
- staNo: 2
+ staNo: 3
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 192.168.2.150
+ ip: 192.168.6.150
port: 51236
- # LED
- led[0]:
+ # 鍙拌溅
+ car[0]:
id: 1
- ip: 192.168.1.1
- port: 8888
+ ip: 192.168.10.150
+ port: 51236
+ # LED1
+# led[0]:
+# id: 1
+# ip: 192.168.10.61
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 1,2
# 纾呯О
- scale[0]:
- id: 1
- ip: 192.168.1.1
- port: 8888
+# scale[0]:
+# id: 1
+# ip: 192.168.10.152
+# port: 8888
--
Gitblit v1.9.1