From bfc97f036688f34e7c1451d68e3f6fc242f99929 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 12 五月 2023 16:07:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/webapp/views/console.html | 15 ++++++++-------
src/main/resources/application.yml | 18 +++++++++---------
3 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index f8918e9..31b4b1e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1338,7 +1338,7 @@
// 绔欑偣鏉′欢鍒ゆ柇
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
- && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() > 9990
+ && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() >= 9990
&& staProtocol.getWorkNo() <= 9999) && staProtocol.isPakMk()) {
try {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b106d7e..78851a1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -48,7 +48,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
+ ip: 10.10.10.110
port: 102
rack: 0
slot: 0
@@ -59,29 +59,29 @@
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 102
- row: 2
- bay: 32
+ row: 1
+ bay: 25
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 105
- row: 2
- bay: 31
+ row: 1
+ bay: 26
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 102
- row: 2
- bay: 32
+ row: 1
+ bay: 25
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�2
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 105
- row: 2
- bay: 31
+ row: 1
+ bay: 26
lev: 1
# 杈撻�佺嚎1
devp[0]:
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 00696c5..8d69b6c 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -603,15 +603,16 @@
// crns[i].bay = 15;
var offSet = 0;
- unit = 11.5;
- offSet = 350;
+ unit = -28.5;
+ offSet = 1710; //145
- if(crns[i].bay === 1){
- crnEl.animate({left: offSet + 'px'}, 1000);
- } else {
- crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
- }
+ crnEl.animate({left: offSet + 'px'}, 1000);
+ // if(crns[i].bay === 1){
+ // crnEl.animate({left: offSet + 'px'}, 1000);
+ // } else {
+ // crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
+ // }
}
} else if (res.code === 403) {
--
Gitblit v1.9.1