From f2f4f392ddc450c13639dbb0494b51729ff78dc0 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 28 二月 2023 14:06:53 +0800
Subject: [PATCH] phpswcs创建
---
src/main/webapp/static/js/console.map.js | 2
src/main/webapp/static/js/common.js | 2
pom.xml | 2
src/main/resources/application.yml | 173 +++++++++++++++++++++++++++++++++------------------------
4 files changed, 102 insertions(+), 77 deletions(-)
diff --git a/pom.xml b/pom.xml
index d3ade80..f21ffa1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
</dependencies>
<build>
- <finalName>stwcs</finalName>
+ <finalName>phpswcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d40273c..9f6325f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://10.10.10.100:1433;databasename=stasrs
-# url: jdbc:sqlserver://192.168.4.15:1433;databasename=stasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=phpsasrs
username: sa
password: sa@123
mvc:
@@ -35,111 +34,105 @@
enable: false
wms:
- url: localhost:8080/stwms
+ url: localhost:8080/bgwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
+ doubleLocs: 1,4,5,8
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.110
+ ip: 10.10.10.10
port: 102
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 007
- row: 3
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 008
+ staNo: 107
row: 2
bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 201
+ row: 2
+ bay: 24
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�3
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 202
+ row: 3
+ bay: 24
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 107
+ row: 2
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 201
+ row: 2
+ bay: 24
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 202
+ row: 3
+ bay: 24
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.120
+ ip: 10.10.10.20
port: 102
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 005
+ staNo: 101
row: 7
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 006
+ staNo: 203
row: 6
- bay: 1
+ bay: 24
lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.130
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 003
- row: 11
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 004
- row: 10
+ staNo: 101
+ row: 7
bay: 1
lev: 1
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 10.10.10.140
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+ crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 001
- row: 15
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 002
- row: 14
- bay: 1
+ staNo: 203
+ row: 6
+ bay: 24
lev: 1
# 杈撻�佺嚎
devp[0]:
@@ -150,36 +143,68 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 15
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
+ staNo: 201
+ barcode: ${wcs-slave.barcode[2].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 109
+# barcode: ${wcs-slave.barcode[0].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 103
+# barcode: ${wcs-slave.barcode[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 15
+ staNo: 201
+ # 绌烘澘鍏ュ簱鍙�2
+ emptyInSta[1]:
+ staNo: 109
+ # 绌烘澘鍏ュ簱鍙�3
+ emptyInSta[2]:
+ staNo: 103
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 11
+ staNo: 201
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 104
+ # 鍑哄簱鍙�3
+ outSta[2]:
+ staNo: 110
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 15
+ staNo: 201
barcode: ${wcs-slave.barcode[0].id}
-
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 104
+ pickSta[2]:
+ staNo: 110
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
- ip: 10.10.10.55
+ ip: 10.10.10.30
port: 51236
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.30
+ port: 51236
+ barcode[2]:
+ id: 3
+ ip: 10.10.10.30
+ port: 51236
+
# LED1
led[0]:
id: 1
- ip: 10.10.10.81
+ ip: 10.10.10.201
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 15
+ staArr: 015
# LED2
led[1]:
id: 2
ip: 10.10.10.202
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 11
\ No newline at end of file
+ staArr: 011
\ No newline at end of file
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 86a6776..92f2008 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/stwcs";
+var baseUrl = "/phpswcs";
// 璧嬪��
function setVal(el, val) {
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index da770d3..af939eb 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -1,5 +1,5 @@
mapInfo = {
- "mapName": "STWCS",
+ "mapName": "PHPSWCS",
"rackCount": 16,
"crnCount": 4,
"stbCount": 16,
--
Gitblit v1.9.1