From 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 11 十月 2023 10:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/controller/OutController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 34bff88..6970de8 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -201,7 +201,8 @@
for (TaskDto taskDto : taskDtos) {
String locNo = taskDto.getLocNo();
List<String> groupOuterSingleLoc = Utils.getGroupOuterSingleLoc(locNo);
- if (Utils.getBay(locNo)>=21){
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo));
+ if (locMast1.getLocType2().equals((short)3)){
groupOuterSingleLoc = Utils.getGroupOuterSingleLocLowFrequency(locNo);
}
for (String locNo1 : groupOuterSingleLoc){
--
Gitblit v1.9.1