From e32ff68be04c9e2e3ab689c4494aefe5d3036400 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 12 四月 2025 11:12:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wcs' into jx-fyxc-wcs
---
src/main/resources/application.yml | 50 ++++++++++++++++----------------------------------
1 files changed, 16 insertions(+), 34 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index eb000ff..7b63829 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=fyxcasrs
+ url: jdbc:sqlserver://192.168.10.201:1433;databasename=fyxcasrs
username: sa
password: sa@123
mvc:
@@ -138,7 +138,7 @@
staNo: 1112
barcode: ${wcs-slave.barcode[0].id}
backSta: 1111
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�1
inSta[1]:
staNo: 1114
@@ -150,25 +150,25 @@
staNo: 1122
barcode: ${wcs-slave.barcode[0].id}
backSta: 1121
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[2].id}
# 鍏ュ簱鍙�1
inSta[3]:
staNo: 1124
barcode: ${wcs-slave.barcode[0].id}
backSta: 1123
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[3].id}
outSta[0]:
staNo: 1111
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[0].id}
outSta[1]:
staNo: 1121
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[2].id}
outSta[2]:
staNo: 1113
led: ${wcs-slave.led[1].id}
outSta[3]:
staNo: 1123
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[3].id}
# 鏉＄爜鎵弿浠�1
@@ -191,42 +191,24 @@
ip: 10.10.10.102
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- inStaArr: 1112
- outStaArr: 1111
- modelSta: 1112
+ inStaArr: 1114
+ outStaArr: 1113
+ modelSta: 1114
# LED3
led[2]:
id: 3
ip: 10.10.10.103
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- inStaArr: 1112
- outStaArr: 1111
- modelSta: 1112
+ inStaArr: 122
+ outStaArr: 1121
+ modelSta: 1122
# LED4
led[3]:
id: 4
ip: 10.10.10.104
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- inStaArr: 1112
- outStaArr: 1111
- modelSta: 1112
- # LED5
- led[4]:
- id: 5
- ip: 10.10.10.105
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- inStaArr: 1112
- outStaArr: 1111
- modelSta: 1112
- # LED6
- led[5]:
- id: 6
- ip: 10.10.10.106
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- inStaArr: 1112
- outStaArr: 1111
- modelSta: 1112
\ No newline at end of file
+ inStaArr: 1124
+ outStaArr: 1123
+ modelSta: 1124
\ No newline at end of file
--
Gitblit v1.9.1