From 619b45d00468b35509f5138b2dfa5131e2963e34 Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期一, 25 三月 2024 13:16:39 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 42 ++++++++++++++++++------------------------ 1 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java index 4633630..e9cf7f1 100644 --- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java @@ -46,31 +46,21 @@ if (Cools.isEmpty(ioType, locNo)) { return 100.0D; } - if (ioType != 11) { - // 鍏ュ簱 - if (ioType < 100) { - List<String> groupInnerLoc = Utils.getGroupInnerLoc(locNo); - if (!Cools.isEmpty(groupInnerLoc)) { - for (String innerLoc : groupInnerLoc) { - WrkMast wrkMast = this.baseMapper.selectByLocNoOfPakin(innerLoc); - if (wrkMast != null) { - defaultIoPri = wrkMast.getIoPri() - 2; - } - } - } - // 鍑哄簱 - } else { - List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo); - if (!Cools.isEmpty(groupOuterLoc)) { - for (String outerLoc : groupOuterLoc) { - WrkMast wrkMast = this.baseMapper.selectBySourceLocNoOfPakout(outerLoc); - if (wrkMast != null) { - defaultIoPri = wrkMast.getIoPri() - 2; - } - } - } - } + int row = Utils.getRow(locNo); + if (row == 6) { + return 101D; } + + if (row == 13) { + return 103D; + } + if (row == 14) { + return 102D; + } + if (row == 15) { + return 101D; + } + return defaultIoPri == null ? 100.0D : defaultIoPri; } @@ -95,4 +85,8 @@ return this.baseMapper.selectSameMatnrs(matnr); } + @Override + public List<WrkMast> selectSameLevMatnrs(String matnr, Integer lev) { + return this.baseMapper.selectSameLevMatnrs(matnr, lev); + } } -- Gitblit v1.9.1