From e86c84f673a552f351c6847a5f432910cb927082 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 06 九月 2022 14:06:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/WorkService.java | 8 +++++---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 18 +++++++++++++-----
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 5 +++++
3 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index 239535b..1c30ffb 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -28,9 +28,6 @@
/**
* 鍑哄簱浣滀笟
- * @param staNo 鐩爣绔欑偣
- * @param locDetls 寰呭嚭搴撶墿鏂�
- * @param ioType 鍏ュ嚭搴撶被鍨�
*/
void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, Long userId);
@@ -87,4 +84,9 @@
*/
String dealPreHaveStart(Integer wrkNo, Long userId);
+ /**
+ * 绌挎搴撶Щ杞�
+ */
+ void shuttleTransfer(List<String> locNos);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 06a94c9..740034a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -7,12 +7,14 @@
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.RowLastnoService;
+import com.zy.asrs.service.WorkService;
import com.zy.asrs.utils.Utils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Comparator;
+import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
@@ -21,6 +23,8 @@
@Autowired
private RowLastnoService rowLastnoService;
+ @Autowired
+ private WorkService workService;
@Override
public LocMast queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1) {
@@ -93,12 +97,16 @@
@Override
public synchronized void breakUp(String locNo) {
List<String> groupLoc = Utils.getGroupOuterLoc(locNo);
- for (String outerLocNo : groupLoc) {
- LocMast locMast = this.selectById(outerLocNo);
-
+ Iterator<String> iterator = groupLoc.iterator();
+ while (iterator.hasNext()) {
+ String next = iterator.next();
+ LocMast locMast = this.selectById(next);
+ if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")) {
+ continue;
+ }
+ iterator.remove();
}
-
-
+ workService.shuttleTransfer(groupLoc);
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index e49c04f..6757c6f 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -917,4 +917,9 @@
return "";
}
+ @Override
+ public void shuttleTransfer(List<String> locNos) {
+
+ }
+
}
--
Gitblit v1.9.1