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 | 6 ++++++
1 files changed, 6 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..754a3cc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -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