From b2c6ed51138b61ec721ce966b7a0f62f8b16698a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 03 十二月 2022 10:50:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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 aef1f9f..d00577d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1106,6 +1106,9 @@
wrkMast.setSteNo(steNo);
wrkMast.setCrnStrTime(now);
wrkMast.setModiTime(now);
+ LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
+ Integer outCrnNo = locMastService.getOutCrnNo(locMast);
+ wrkMast.setCrnNo(outCrnNo);
if (wrkMastMapper.updateById(wrkMast) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 14.灏忚溅鎼嚭搴� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
}
@@ -1329,6 +1332,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