From 3e266a267dcbbbf86e8b47eaf6abea449dc1cd04 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <xltys1995> Date: 星期四, 10 三月 2022 12:47:57 +0800 Subject: [PATCH] # ycq 条码显示 --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index a92d976..5f48cdb 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -1340,6 +1340,15 @@ for (Integer row : rows) { if (Utils.isDeepLoc(slaveProperties, row)) { loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1()); + + if (Utils.isDeepLoc(slaveProperties, loc.getLocNo())){ + String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo()); + LocMast shallowLoc1 = locMastService.selectById(shallowLocNo); + if(!shallowLoc1.getLocSts().equals("O")){ + loc = null; + } + } + if (null != loc) { break; } } } -- Gitblit v1.9.1