From c54f75eb2805cca47f8719bef2fce50983b5bc60 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期五, 27 五月 2022 14:56:41 +0800
Subject: [PATCH] Merge branch 'klswcs2' of http://47.97.1.152:5880/r/zy-wcs into klswcs2
---
src/main/webapp/views/render.html | 4 +-
src/main/resources/application.yml | 83 ++++++++++++++++++++++++++---------------
2 files changed, 54 insertions(+), 33 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index eed7e75..239c8dc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,7 @@
# url: jdbc:sqlserver://47.97.1.152:51433;databasename=xgmasrs
# username: sa
# password: Zoneyung@zy56$
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=xgmasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=klsasrs2
# url: jdbc:sqlserver://localhost:1433;databasename=xgmasrs
username: sa
password: sa@123
@@ -38,8 +38,7 @@
enable: false
wms:
- url: localhost:8080/xgmwms
-# url: localhost:8082/xgmwms
+ url: localhost:8080/klswms
#鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃緭閫佹湁鍏ュ簱浠诲姟锛屽彨鍥炲師鐐�
crnBackHp:
@@ -64,15 +63,15 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- row: 2
+ staNo: 106
+ row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 101
- row: 3
+ row: 2
bay: 1
lev: 1
# 鍫嗗灈鏈�2
@@ -86,15 +85,15 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- row: 6
+ staNo: 120
+ row: 7
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 7
+ staNo: 113
+ row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈�3
@@ -108,14 +107,14 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 104
- row: 10
+ staNo: 133
+ row: 11
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
+ staNo: 10
row: 11
bay: 1
lev: 1
@@ -129,33 +128,34 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 176
+ staNo: 103
barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 180
- barcode: ${wcs-slave.barcode[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 176
+ staNo: 103
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 173
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 182
- # 鎷ｆ枡鍏ュ簱鍙�
+ staNo: 110
+ # 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 176
+ staNo: 117
+ barcode: ${wcs-slave.barcode[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 124
+ barcode: ${wcs-slave.barcode[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�3
+ pickSta[2]:
+ staNo: 131
+ barcode: ${wcs-slave.barcode[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�4
+ pickSta[3]:
+ staNo: 136
barcode: ${wcs-slave.barcode[0].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
ip: 10.10.10.52
- port: 51236
- barcode[1]:
- id: 2
- ip: 10.10.10.53
port: 51236
# LED1
led[0]:
@@ -163,11 +163,32 @@
ip: 10.10.10.60
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 172
+ staArr: 110
# LED2
led[1]:
id: 2
ip: 10.10.10.61
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 182
+ staArr: 117
+ # LED3
+ led[2]:
+ id: 3
+ ip: 10.10.10.61
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 124
+ # LED4
+ led[3]:
+ id: 4
+ ip: 10.10.10.61
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 131
+ # LED5
+ led[4]:
+ id: 5
+ ip: 10.10.10.61
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 136
\ No newline at end of file
diff --git a/src/main/webapp/views/render.html b/src/main/webapp/views/render.html
index 36f5c3f..2bc1ff0 100644
--- a/src/main/webapp/views/render.html
+++ b/src/main/webapp/views/render.html
@@ -584,7 +584,7 @@
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
- console.log(res)
+ // console.log(res)
if (res.code === 200) {
var crns = res.data;
for (var i = 0; i < crns.length; i++) {
@@ -651,7 +651,7 @@
// 鍫嗗灈鏈哄亸绉诲姩鐢�
function crnAnimate(id, leftVal) {
- console.log(crn1Position)
+ // console.log(crn1Position)
switch (id) {
case 1:
$("#crn-1").animate({left: leftVal + 'px'}, 1000);
--
Gitblit v1.9.1