From 3f30983db5b3cd2b25cb215579501a2ef134883c Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 04 八月 2023 17:00:11 +0800
Subject: [PATCH] agv 订单出库功能完善
---
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 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 b5bd119..9c72ba2 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -44,17 +44,18 @@
public synchronized Double getIoPri(Integer ioType, String locNo) {
Double defaultIoPri = null;
if (Cools.isEmpty(ioType, locNo)) {
- return 15.0D;
+ return 100.0D;
}
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);
if (wrkMast != null) {
- defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() + 2 : defaultIoPri + 2;
+ defaultIoPri = wrkMast.getIoPri() - 2;
+// defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() - 2 : defaultIoPri - 2;
}
}
}
@@ -63,27 +64,31 @@
for (String insideLoc : groupInsideLoc) {
WrkMast wrkMast = this.baseMapper.selectByLocNoOfPakin(insideLoc);
if (wrkMast != null) {
- defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() - 2 : defaultIoPri - 2;
+ defaultIoPri = wrkMast.getIoPri() + 2;
+// defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() + 2 : defaultIoPri + 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 = defaultIoPri == null ? wrkMast.getIoPri() - 2 : defaultIoPri - 2;
+ 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);
if (wrkMast != null) {
- defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() + 2 : defaultIoPri + 2;
+ defaultIoPri = wrkMast.getIoPri() + 2;
+// defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() + 2 : defaultIoPri + 2;
}
}
}
@@ -92,7 +97,7 @@
} else {
// @Deprecated
}
- return defaultIoPri == null ? 15.0D : defaultIoPri;
+ return defaultIoPri == null ? 300.0D : defaultIoPri;
}
@Override
@@ -101,4 +106,19 @@
.last(" and (wrk_sts in (1,2) or (wrk_sts=3 and wrk_no in (select wrk_no from asr_bas_devp)))"));
}
+ @Override
+ public Boolean setSteEmpty(Integer wrkNo) {
+ return this.baseMapper.setSteEmpty(wrkNo) > 0;
+ }
+
+ @Override
+ public WrkMast selectOfPick(Integer wrkNo, Integer ioType) {
+ return this.baseMapper.selectOfPick(wrkNo, ioType);
+ }
+
+ @Override
+ public List<WrkMast> selectSameMatnrs(String matnr) {
+ return this.baseMapper.selectSameMatnrs(matnr);
+ }
+
}
--
Gitblit v1.9.1