From 9f3f31e66b2ffb217155b9bcd294da4ec12b6e34 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期一, 16 十月 2023 15:38:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs --- src/main/java/com/zy/common/service/CommonService.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 714c1c6..f5b703e 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -164,7 +164,13 @@ //鎵惧埌搴撲綅锛岃繑鍥瀌to return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto } - + if(locTypeDto.getLocType1()==1){ + locTypeDto.setLocType1((short)2); + return getLocNo(staDescId, 1, sourceStaNo, matNos, locTypeDto,0); + }else if(locTypeDto.getLocType1()==2){ + locTypeDto.setLocType1((short)3); + return getLocNo(staDescId, 1, sourceStaNo, matNos, locTypeDto,0); + } //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父 throw new CoolException("娌℃湁绌哄簱浣�"); } @@ -310,6 +316,7 @@ if (matNos.size() == 1) { //鍗曞搧 List<LocMast> locMasts = locMastService.selectAreaEmpty(locTypeDto.getLocType1(), 2);//鎼滅储鍗曞搧搴撲綅 + for (LocMast mast : locMasts) { List<String> groupLoc = Utils.getGroupLoc(mast.getLocNo()); if (!locMastService.checkAllLocEmpty(groupLoc)) { -- Gitblit v1.9.1