From 00e1f09d1ce3ed8ab3a9976d7b7af7ef558625af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 15 十月 2023 16:41:21 +0800
Subject: [PATCH] AGV工作档取消和完成
---
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 35 +++++------------------------------
1 files changed, 5 insertions(+), 30 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 2f977a0..4633630 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -49,23 +49,12 @@
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);
+ 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;
-// 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;
}
}
}
@@ -77,26 +66,12 @@
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;
}
}
}
}
- // 绉诲簱
- } else {
-// @Deprecated
}
- return defaultIoPri == null ? 300.0D : defaultIoPri;
+ return defaultIoPri == null ? 100.0D : defaultIoPri;
}
@Override
--
Gitblit v1.9.1