From 43af368c15fc15258cb4b1051a39392cfa18bbf1 Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期三, 02 四月 2025 13:22:18 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/common/service/CommonService.java | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 795f72c..55c721c 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -127,10 +127,13 @@ switch (rowLastnoType.getType()) { case 1: - List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>() - .eq("loc_sts", "O").eq("loc_type1", locTypeDto.getLocType1()).eq("whs_type", rowLastnoType.getType().longValue())); - if (locMasts != null && locMasts.size() < 8) { - throw new CoolException("娌℃湁绌哄簱浣�"); + List<LocMast> locMasts; + for (int i = locTypeDto.getLocType1(); i < 4; i++) { + locMasts = locMastService.selectList(new EntityWrapper<LocMast>() + .eq("loc_sts", "O").eq("loc_type1", i).eq("whs_type", rowLastnoType.getType().longValue())); + if (i == 3 && locMasts != null && locMasts.size() < 8) { + throw new CoolException("娌℃湁绌哄簱浣�"); + } } return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade, 0, locTypeDto, 0); case 2: -- Gitblit v1.9.1