From eb92a52a7cf9ab2bbc8e33ae86b2b44b4b14c78a Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 22 十一月 2022 18:47:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 22 +++++++++++++++++-----
1 files changed, 17 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 5470770..c72a8a9 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1367,7 +1367,13 @@
if (wrkMast.getWrkSts() == 17) {
//鏌ユ壘搴撲綅
boolean flag = false;
- String[] deeplocs = Utils.getDeepLocs(wrkMast.getSourceLocNo());
+// append
+ Integer row = Utils.getGroupRow(wrkMast.getSourceLocNo());
+ Integer bay = Utils.getBay(wrkMast.getSourceLocNo());
+ Integer lev = Utils.getLev(wrkMast.getSourceLocNo());
+
+ String locNo = Utils.append(row, bay, lev);
+ String[] deeplocs = Utils.getDeepLocs(locNo);
if(!Cools.isEmpty(deeplocs)){
for(String deepLocNo : deeplocs) {
LocMast deepLoc = locMastService.selectById(deepLocNo);
@@ -1383,7 +1389,7 @@
wrkMast.setIoPri((double)9999);
wrkMast.setWrkSts(2L);
wrkMast.setLocNo(deepLocNo);
- wrkMast.setSteNo(null);
+ wrkMast.setSteNo(0);
wrkMast.setModiTime(new Date());
if (wrkMastMapper.updateById(wrkMast) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 17.绉诲簱瀹屾垚 => 2.绉诲簱鍐嶅叆搴撲腑 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
@@ -1461,7 +1467,7 @@
// 鏈夊皬杞�
if (steNo != null) {
// 灏忚溅琛岃蛋鍒板爢鍨涙満寰呮惉绉荤偣
- if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
+ if (wrkMast.getWrkSts() == 2L && (wrkMast.getSteNo() == null || wrkMast.getSteNo() == 0)) {
// 娌℃湁鍏朵粬浠诲姟
if (null == wrkMastMapper.selectPakin(slave.getId(), steNo)) {
this.letCarBeWaiting(wrkMast, steNo, wrkMast.getLocNo());
@@ -1509,7 +1515,7 @@
}
// 娌℃湁灏忚溅
} else {
- if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
+ if (wrkMast.getWrkSts() == 2L && (wrkMast.getSteNo() == null || wrkMast.getSteNo() == 0)) {
// 瀵绘壘褰撳墠鍫嗗灈鏈哄搴旂殑灏忚溅
SteThread steThread = queryIdleCar(wrkMast);
if (steThread != null) {
@@ -2472,8 +2478,9 @@
// }
if (locMastService.isOutMost(wrkMast.getLocNo())) {
wrkMast.setWrkSts(17L);
+ wrkMast.setSteNo(0);
// 榛樿鐩爣搴撲綅鏄┖鏉�
- String locSts = "D";
+ String locSts = "";
// 搴撲綅绉昏浆鍒ゆ柇鏄惁涓虹┖鏉跨Щ杞�
if (wrkMast.getEmptyMk().equals("N")) {
locSts = "F";
@@ -2483,6 +2490,11 @@
continue;
}
}
+ if(Cools.isEmpty(locSts)){
+ log.error("搴撲綅绉昏浆 ===>> 搴撳瓨鐘舵�佷负绌猴紱[婧愬簱浣�={}],[鐩爣搴撲綅={}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
+ continue;
+ }
+
// 淇敼婧愬簱浣嶇姸鎬� ==> O
LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
if (null != sourceLoc) {
--
Gitblit v1.9.1