From 9e69c49d2f2f9c23260827e040829689fd03b669 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 02 十二月 2022 10:09:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 d485210..aef1f9f 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());
@@ -1854,6 +1854,9 @@
Date now = new Date();
wrkMast.setCrnEndTime(now);
wrkMast.setModiTime(now);
+ LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
+ Integer outCrnNo = locMastService.getOutCrnNo(locMast);
+ wrkMast.setCrnNo(outCrnNo);
// 淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
if (wrkMastMapper.updateById(wrkMast) > 0) {
// 鍫嗗灈鏈哄浣�
@@ -2535,7 +2538,7 @@
SteChargeType first = SteChargeType.FIRST;
locNo = first.locNo;
if (basSteService.hasCarOfLocNo(locNo) == null
- && wrkChargeService.selectWorkingOfCharge(first.ssbm) != null) {
+ && wrkChargeService.selectWorkingOfCharge(first.ssbm) == null) {
steCharge = first;
break;
}
@@ -2544,7 +2547,7 @@
SteChargeType second = SteChargeType.SECOND;
locNo = second.locNo;
if (basSteService.hasCarOfLocNo(locNo) == null
- && wrkChargeService.selectWorkingOfCharge(second.ssbm) != null) {
+ && wrkChargeService.selectWorkingOfCharge(second.ssbm) == null) {
steCharge = second;
break;
}
@@ -2553,7 +2556,7 @@
SteChargeType third = SteChargeType.THIRD;
locNo = third.locNo;
if (basSteService.hasCarOfLocNo(locNo) == null
- && wrkChargeService.selectWorkingOfCharge(third.ssbm) != null) {
+ && wrkChargeService.selectWorkingOfCharge(third.ssbm) == null) {
steCharge = third;
break;
}
@@ -2792,6 +2795,12 @@
if (steProtocol.getCharge() < 99) {
continue;
}
+ if (steProtocol.getMode() == 0) {
+ continue;
+ }
+ if (!steProtocol.getStatusType().equals(SteStatusType.IDLE)) {
+ continue;
+ }
// // 1鍙峰厖鐢垫々
// if (value.equals(SteChargeType.FIRST) && devpThread.charge0) {
// continue;
--
Gitblit v1.9.1