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 | 35 ++++++++++-------------------------
1 files changed, 10 insertions(+), 25 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 6ab6642..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);
@@ -69,25 +69,20 @@
}
}
}
- int row = getRow(locNo);
- if (row<=4){
- return defaultIoPri == null ? 300.0D-row*2 : defaultIoPri-row*2;
- }else {
- return defaultIoPri == null ? 300.0D+row*2 : defaultIoPri+row*2;
- }
// 鍑哄簱
} 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);
@@ -97,27 +92,12 @@
}
}
}
- int row = getRow(locNo);
- if (row<=4){
- return defaultIoPri == null ? 300.0D+row*2 : defaultIoPri+row*2;
- }else {
- return defaultIoPri == null ? 300.0D-row*2 : defaultIoPri-row*2;
- }
}
// 绉诲簱
} else {
// @Deprecated
}
- return 300.0D;
- }
- /**
- * 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
- */
- public static int getRow(String locNo) {
- if (!Cools.isEmpty(locNo)) {
- return Integer.parseInt(locNo.substring(0, 2));
- }
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ return defaultIoPri == null ? 300.0D : defaultIoPri;
}
@Override
@@ -136,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