From 0b7dae5aadc7e4bcd61074fdf8cdd786a23f8f18 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 02 十二月 2022 10:42:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 5eb3186..754a3cc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -970,7 +970,7 @@
}
// 缃《浠诲姟
- wrkMast.setIoPri((double) 9999);
+ wrkMast.setIoPri((double) 9998);
wrkMastMapper.updateById(wrkMast);
// 鍒ゆ柇鏄惁涓虹┛姊簱
@@ -987,7 +987,7 @@
log.error("{}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗ｏ紒", shallowLocNo);
} else {
if(waitWrkMast.getWrkSts() == 11) {
- waitWrkMast.setIoPri(20D);
+ waitWrkMast.setIoPri(wrkMast.getIoPri() + 1);
waitWrkMast.setModiTime(new Date());
if (wrkMastMapper.updateById(waitWrkMast) == 0) {
log.error("璋冩暣宸ヤ綔妗ｄ紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
@@ -1329,6 +1329,12 @@
if (!steProtocol.isIdle()) { continue; }
if (steProtocol.getRow() == 1) { continue; }
String locNo = wrkMast.getWrkSts() < 10 ? wrkMast.getLocNo() : wrkMast.getSourceLocNo();
+ // 濡傛灉鍦ㄥ悓涓�涓簱浣嶇粍
+ if (Utils.getGroupRow(locNo, true).equals(Utils.getGroupRow(steProtocol.getRow().intValue(), true))
+ && steProtocol.getBay().intValue() == Utils.getBay(locNo)
+ && steProtocol.getLev().intValue() == Utils.getLev(locNo)) {
+ return steThread;
+ }
LocMast locMast = locMastService.selectById(locNo);
int lev = locMast.getLev1();
int bay = locMast.getBay1();
--
Gitblit v1.9.1