From 113342593a17ecb75cd2f7f5af271a2528fd4a10 Mon Sep 17 00:00:00 2001 From: lsh <1> Date: 星期日, 21 一月 2024 10:42:22 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/service/CommonService.java | 7 ++++++- 1 files changed, 6 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 0834de4..56a60b7 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -179,6 +179,11 @@ if (basCrnpService.checkSiteError(crnNo, true)) { rowCount = locNecessaryParameters[0]; nearRow = locNecessaryParameters[3]; + List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O")); + if (locMasts.size()<=10){ + times++; + continue; + } break; } else { times++; @@ -308,7 +313,7 @@ } // 鏇存柊搴撲綅鎺掑彿 - if (Utils.BooleanWhsTypeSta(whsType, staDescId)) { + if (Utils.BooleanWhsTypeSta(whsType, staDescId) && Cools.isEmpty(locMast)) { rowLastno.setCurrentRow(curRow); rowLastnoService.updateById(rowLastno); } -- Gitblit v1.9.1