From 9b3cd96d14f0f17bebf9d041e6cf6d05e06694a8 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期一, 07 十一月 2022 17:05:35 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/service/CommonService.java | 5 ++++- 1 files changed, 4 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 0071933..f7cc365 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -277,7 +277,10 @@ List<Integer> rows = Utils.getGroupLoc(curRow); Mat mat = matService.selectByMatnr(matNos.get(0)); - List<LocMast> locMasts = locMastService.queryFreeLocMast2(rows, rows.size(), locTypeDto.getLocType1(),mat.getInoutEveryday()); + if (Cools.isEmpty(mat.getInoutEveryday())){ + mat.setInoutEveryday(false); + } + List<LocMast> locMasts = locMastService.queryFreeLocMast(rows, rows.size(), locTypeDto.getLocType1()); if (!Cools.isEmpty(locMasts)) { Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo()); for (LocMast one : locMasts) { -- Gitblit v1.9.1