From 19d106566a98d12a3de3ef7f6816d88c99355ed4 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期三, 04 一月 2023 10:39:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 +++++++-
1 files changed, 7 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 bb23fdb..678debb 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1045,7 +1045,13 @@
} else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
if (null == waitWrkMast) {
// 鐢熸垚涓�绗旂Щ搴撲换鍔″伐浣滄。銆佹敼鍙樻祬搴撲綅鐨勬簮搴�/鐩爣搴� 搴撲綅鐘舵��
- moveLocForDeepLoc(slave, shallowLoc);
+ // 娌℃湁浣滀笟涓殑鍑哄簱浠诲姟鏃讹紝鎵嶈兘鐢熸垚绉诲簱浠诲姟
+ WrkMast one2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("crn_no",slave.getId())
+ .last(" and wrk_sts in (12,13,14,15,16)"));
+ if(one2==null) {
+ moveLocForDeepLoc(slave, shallowLoc);
+ }
flag = true;
break;
} else {
--
Gitblit v1.9.1