From 5067dfaba7cb0c4c3ae514dd9d9caeba670af3ad Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期四, 01 六月 2023 16:51:01 +0800 Subject: [PATCH] rm sql --- src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 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 78e5554..9c72ba2 100644 --- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java @@ -49,7 +49,7 @@ if (ioType != 11) { // 鍏ュ簱 if (ioType < 100) { - List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo); + List<String> groupOuterLoc = Utils.getGroupOuterLocIoPri(locNo); if (!Cools.isEmpty(groupOuterLoc)) { for (String outerLoc : groupOuterLoc) { WrkMast wrkMast = this.baseMapper.selectByLocNoOfPakin(outerLoc); @@ -71,17 +71,18 @@ } // 鍑哄簱 } else { - List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo); + List<String> groupOuterLoc = Utils.getGroupInsideLoc(locNo); if (!Cools.isEmpty(groupOuterLoc)) { for (String outerLoc : groupOuterLoc) { WrkMast wrkMast = this.baseMapper.selectBySourceLocNoOfPakout(outerLoc); if (wrkMast != null) { defaultIoPri = wrkMast.getIoPri() - 2; + break; // defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() - 2 : defaultIoPri - 2; } } } - List<String> groupInsideLoc = Utils.getGroupInsideLoc(locNo); + List<String> groupInsideLoc = Utils.getGroupOuterLocIoPri(locNo); if (!Cools.isEmpty(groupInsideLoc)) { for (String insideLoc : groupInsideLoc) { WrkMast wrkMast = this.baseMapper.selectBySourceLocNoOfPakout(insideLoc); @@ -96,7 +97,7 @@ } else { // @Deprecated } - return defaultIoPri == null ? 100.0D : defaultIoPri; + return defaultIoPri == null ? 300.0D : defaultIoPri; } @Override @@ -115,4 +116,9 @@ return this.baseMapper.selectOfPick(wrkNo, ioType); } + @Override + public List<WrkMast> selectSameMatnrs(String matnr) { + return this.baseMapper.selectSameMatnrs(matnr); + } + } -- Gitblit v1.9.1