From 9f095733d13185290cfedd242b5f299585fbcad0 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 07 四月 2025 10:05:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 93 +++++++++++-----------------------------------
1 files changed, 23 insertions(+), 70 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..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,78 +46,22 @@
if (Cools.isEmpty(ioType, locNo)) {
return 100.0D;
}
- if (ioType != 11) {
- // 鍏ュ簱
- if (ioType < 100) {
- List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
- if (!Cools.isEmpty(groupOuterLoc)) {
- for (String outerLoc : groupOuterLoc) {
- WrkMast wrkMast = this.baseMapper.selectByLocNoOfPakin(outerLoc);
- if (wrkMast != null) {
- defaultIoPri = wrkMast.getIoPri() - 2;
-// defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() - 2 : defaultIoPri - 2;
- }
- }
- }
- List<String> groupInsideLoc = Utils.getGroupInsideLoc(locNo);
- if (!Cools.isEmpty(groupInsideLoc)) {
- for (String insideLoc : groupInsideLoc) {
- WrkMast wrkMast = this.baseMapper.selectByLocNoOfPakin(insideLoc);
- if (wrkMast != null) {
- defaultIoPri = wrkMast.getIoPri() + 2;
-// defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() + 2 : defaultIoPri + 2;
- }
- }
- }
- 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);
- if (!Cools.isEmpty(groupOuterLoc)) {
- for (String outerLoc : groupOuterLoc) {
- WrkMast wrkMast = this.baseMapper.selectBySourceLocNoOfPakout(outerLoc);
- if (wrkMast != null) {
- defaultIoPri = wrkMast.getIoPri() - 2;
-// defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() - 2 : defaultIoPri - 2;
- }
- }
- }
- List<String> groupInsideLoc = Utils.getGroupInsideLoc(locNo);
- if (!Cools.isEmpty(groupInsideLoc)) {
- for (String insideLoc : groupInsideLoc) {
- WrkMast wrkMast = this.baseMapper.selectBySourceLocNoOfPakout(insideLoc);
- if (wrkMast != null) {
- defaultIoPri = wrkMast.getIoPri() + 2;
-// defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() + 2 : defaultIoPri + 2;
- }
- }
- }
- 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
+ int row = Utils.getRow(locNo);
+ if (row == 6) {
+ return 101D;
}
- return 300.0D;
- }
- /**
- * 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
- */
- public static int getRow(String locNo) {
- if (!Cools.isEmpty(locNo)) {
- return Integer.parseInt(locNo.substring(0, 2));
+
+ if (row == 13) {
+ return 103D;
}
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ if (row == 14) {
+ return 102D;
+ }
+ if (row == 15) {
+ return 101D;
+ }
+
+ return defaultIoPri == null ? 100.0D : defaultIoPri;
}
@Override
@@ -136,4 +80,13 @@
return this.baseMapper.selectOfPick(wrkNo, ioType);
}
+ @Override
+ public List<WrkMast> selectSameMatnrs(String matnr) {
+ return this.baseMapper.selectSameMatnrs(matnr);
+ }
+
+ @Override
+ public List<WrkMast> selectSameLevMatnrs(String matnr, Integer lev) {
+ return this.baseMapper.selectSameLevMatnrs(matnr, lev);
+ }
}
--
Gitblit v1.9.1