From dfafabacf23bf22181d7c3f3665e684be7921f7d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 07 八月 2024 16:45:54 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 45 +++++++++++++++++++++++----------------------
src/main/java/com/zy/service/impl/MainServiceImpl.java | 8 +++++---
src/main/resources/application.yml | 2 +-
src/main/java/com/zy/controller/ConsoleController.java | 4 ++--
4 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/controller/ConsoleController.java b/src/main/java/com/zy/controller/ConsoleController.java
index 3da518a..57ec3ec 100644
--- a/src/main/java/com/zy/controller/ConsoleController.java
+++ b/src/main/java/com/zy/controller/ConsoleController.java
@@ -141,8 +141,8 @@
// Short totalBay = locMastMapper.selectTotalBay();
- vo.setOffset((double) new Random().nextInt(560)); // 鍫嗗灈鏈哄亸绉婚噺
- vo.setBay((short) (crnProtocol.getBay() - crn.getOffset())); // 褰撳墠鍒�
+ vo.setOffset((double) new Random().nextInt(500)); // 鍫嗗灈鏈哄亸绉婚噺
+ vo.setBay((short) (crnProtocol.getBay())); // 褰撳墠鍒�
/**
* 鍫嗗灈鏈虹姸鎬佸垽鏂�
*/
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index b6cc5b6..668fa5e 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -1055,8 +1055,10 @@
break;
// continue;
}
+ // 107鏃犵墿鎵嶈兘鍑猴紝鍏朵粬鏈夎浆杩愭灦鎵嶈兘鍑�
+ boolean loading = (staProtocol.getSiteId() == 107) != staProtocol.isLoading();
// 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
- if (staProtocol.isAutoing() && staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
+ if (staProtocol.isAutoing() && loading && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
&& staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
log.warn("鍫嗗灈鏈哄嚭搴撳懡浠や笅鍙戯細"+staProtocol.getWorkNo()+","+staProtocol.isOutEnable()+","+staProtocol.getSiteId());
@@ -3042,11 +3044,11 @@
if (wrkMast.getStaNo() == 104) {
// 鍒ゆ柇鍑哄簱绔欑偣鎯呭喌,鍙叆锛屽爢鍨涙満鍙互鍙栬揣锛屽彲鍑猴紝鍫嗗灈鏈哄彲浠ユ斁璐�
- if (!staProtocol106.isInEnable() || !staProtocol105.isOutEnable()) {
+ if (!staProtocol106.isInEnable() || !staProtocol105.isOutEnable() || !staProtocol105.isLoading()) {
return;
}
} else if (wrkMast.getStaNo() == 107) {
- if (!staProtocol106.isInEnable() || !staProtocol107.isOutEnable()) {
+ if (!staProtocol106.isInEnable() || !staProtocol107.isOutEnable() || staProtocol107.isLoading()) {
return;
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0028cc6..a150a81 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -84,7 +84,7 @@
crnOutStn[2]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 107
- row: 2
+ row: 1
bay: 28
lev: 1
crnOutStn[3]:
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index d0314a4..f223198 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -595,37 +595,38 @@
for (var i = 0; i < crns.length; i++) {
var crnEl = $("#crn-" + crns[i].crnId);
crnEl.attr("class", "machine " + crns[i].crnStatus);
- var unit = 0;//($('.item').eq(0).width() + 13) / 2;
+ var unit = 31;//($('.item').eq(0).width() + 13) / 2;
if (crns[i].bay < 0 || crns[i].bay === -2) {
crns[i].bay = 1
}
// crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
// crns[i].bay = 15;
- var offSet = 0;
- switch (i) {
- case 0:
- case 1:
- case 2:
- case 3:
- unit = 35;
- offSet = 500;
- break;
- case 5:
- unit = 124;
- offSet = 550;
- break;
- case 4:
- case 6:
- unit = 62;
- offSet = 550;
- break;
- }
-
+ var offSet = 1450;
+ // switch (i) 5
+ // case 0:
+ // case 1:
+ // case 2:
+ // case 3:
+ // unit = 35;
+ // offSet = 500;
+ // break;
+ // case 5:
+ // unit = 124;
+ // offSet = 550;
+ // break;
+ // case 4:
+ // case 6:
+ // unit = 62;
+ // offSet = 550;
+ // break;
+ // }
+ console.log(offSet)
if(crns[i].bay === 1){
crnEl.animate({left: offSet + 'px'}, 1000);
} else {
- crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
+ let lf = (offSet - crns[i].bay * 42);
+ crnEl.animate({left: lf + 'px'}, 1000);
}
}
--
Gitblit v1.9.1