From 0d8fcb1505ba869290cce9099b42370e4333b708 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 05 六月 2025 09:44:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 e1cdcef..4d6cb49 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1561,7 +1561,15 @@
*/
public synchronized void locToCrnStn1(CrnSlave slave, CrnProtocol crnProtocol) {
List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep12(slave.getId());
+ Double pri = 0.0;
for (WrkMast wrkMast : wrkMasts) {
+ if (wrkMast.getIoType() != 110){
+ if (wrkMast.getIoPri()>=pri){
+ pri = wrkMast.getIoPri();
+ } else {
+ continue;
+ }
+ }
if (wrkMast == null) {
continue;
}
@@ -1640,7 +1648,11 @@
log.error("{}搴撲綅寮傚父锛屾湭妫�绱㈠埌鐩稿簲宸ヤ綔妗ｏ紒", shallowLocNo);
} else {
if (waitWrkMast.getWrkSts() == 11) {
- waitWrkMast.setIoPri(15D);
+ if (waitWrkMast.getIoPri() + 100000D < 99999999) {
+ waitWrkMast.setIoPri(waitWrkMast.getIoPri()+100000D);
+ } else {
+ waitWrkMast.setIoPri(99999999D);
+ }
waitWrkMast.setModiTime(new Date());
if (wrkMastMapper.updateById(waitWrkMast) == 0) {
log.error("璋冩暣宸ヤ綔妗ｄ紭鍏堢骇澶辫触锛佸伐浣滃彿={}", waitWrkMast.getWrkNo());
--
Gitblit v1.9.1