From e666ab89158593e0ab2e44d6e61a2a3a4f8210b2 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 02 六月 2023 14:47:22 +0800
Subject: [PATCH] 随机可用堆垛机号
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 80 +++++++++++++++++++++++-----------------
1 files changed, 46 insertions(+), 34 deletions(-)
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 3c0d63a..45a92f5 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -160,41 +160,48 @@
@Transactional
public void startupFullTakeStore(StockOutParam param, Long userId) {
ArrayList<String> locNos = new ArrayList<>();
- List<StockOutParam.LocDetl> locDetls = new ArrayList<>();
- ArrayList<String> matnrs = new ArrayList<>();//鐩殑鍋氭暟鎹幓閲�
- for (StockOutParam.LocDetl locDetl : param.getLocDetls()) {
- if (!matnrs.contains(locDetl.getMatnr())) {
- matnrs.add(locDetl.getMatnr());
-
- //1.鏍规嵁鐗╂枡鍙峰厛鎼滅储楂橀鍖哄煙鏄惁鏈夊簱瀛�
- List<StockOutParam.LocDetl> locNoStep1 = this.findLocNoStep1(locDetl);
- if (locNoStep1 != null) {
- locDetls.addAll(locNoStep1);
- continue;
- }
-
- //楂橀娣锋斁鍖哄煙娌℃湁婊¤冻鐨勫簱浣嶏紝鍦ㄥ崟鍝佸尯鍩熻繘琛屾悳绱�
- List<StockOutParam.LocDetl> locNoStep2 = this.findLocNoStep2(locDetl);
- if (locNoStep2 != null) {
- locDetls.addAll(locNoStep2);
- continue;
- }
-
- //浣庨娣锋斁鍖哄煙杩涜鎼滅储
- List<StockOutParam.LocDetl> locNoStep3 = this.findLocNoStep3(locDetl);
- if (locNoStep3 != null) {
- locDetls.addAll(locNoStep3);
- continue;
- }
-
- }
- }
-
- for (StockOutParam.LocDetl locDetl : locDetls) {
- if (!locNos.contains(locDetl.getLocNo())) {
+ for (StockOutParam.LocDetl locDetl:param.getLocDetls()){
+ if (!locNos.contains(locDetl.getLocNo())){
locNos.add(locDetl.getLocNo());
}
}
+ List<StockOutParam.LocDetl> locDetls = param.getLocDetls();
+// ArrayList<String> locNos = new ArrayList<>();
+// List<StockOutParam.LocDetl> locDetls = new ArrayList<>();
+// ArrayList<String> matnrs = new ArrayList<>();//鐩殑鍋氭暟鎹幓閲�
+// for (StockOutParam.LocDetl locDetl : param.getLocDetls()) {
+// if (!matnrs.contains(locDetl.getMatnr())) {
+// matnrs.add(locDetl.getMatnr());
+//
+// //1.鏍规嵁鐗╂枡鍙峰厛鎼滅储楂橀鍖哄煙鏄惁鏈夊簱瀛�
+// List<StockOutParam.LocDetl> locNoStep1 = this.findLocNoStep1(locDetl);
+// if (locNoStep1 != null) {
+// locDetls.addAll(locNoStep1);
+// continue;
+// }
+//
+// //楂橀娣锋斁鍖哄煙娌℃湁婊¤冻鐨勫簱浣嶏紝鍦ㄥ崟鍝佸尯鍩熻繘琛屾悳绱�
+// List<StockOutParam.LocDetl> locNoStep2 = this.findLocNoStep2(locDetl);
+// if (locNoStep2 != null) {
+// locDetls.addAll(locNoStep2);
+// continue;
+// }
+//
+// //浣庨娣锋斁鍖哄煙杩涜鎼滅储
+// List<StockOutParam.LocDetl> locNoStep3 = this.findLocNoStep3(locDetl);
+// if (locNoStep3 != null) {
+// locDetls.addAll(locNoStep3);
+// continue;
+// }
+//
+// }
+// }
+//
+// for (StockOutParam.LocDetl locDetl : locDetls) {
+// if (!locNos.contains(locDetl.getLocNo())) {
+// locNos.add(locDetl.getLocNo());
+// }
+// }
// //妫�娴嬫彁浜ょ殑鍑哄簱搴撲綅鏄惁鍚堟硶(娴呭簱浣嶆湁闈炵┖搴撲綅)
// Utils.checkStockOutLocNo(locNos);
@@ -403,9 +410,14 @@
}
}
- List<String> outerLoc = Utils.getGroupOuterSingleLoc(locNo);
+ List<String> outerLocs = Utils.getGroupOuterSingleLoc(locNo);
Double wrkPri = 15D;
- for (LocMast locMast : locMastService.selectByLocNos(outerLoc)) {
+ for (String outerLoc : outerLocs) {
+ LocMast locMast = locMastService.selectById(outerLoc);
+ if (locMast == null) {
+ continue;
+ }
+
if (!locMast.getLocSts().equals("F")) {
continue;
}
--
Gitblit v1.9.1