From e1ab30550f05d173d71c24998bc538d064fa9725 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 31 五月 2023 13:21:42 +0800
Subject: [PATCH] 搜索库位，优先找偏外侧
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 14 ++++++-
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 53 ++++++++++++++++++++++++--
2 files changed, 60 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 1bb37bc..ab9e47a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -4,19 +4,23 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.QueryStockPreDo;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
@Service("locDetlService")
public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
+
+ @Autowired
+ private LocMastService locMastService;
@Override
public Page<LocDetl> getStockOut(Page<LocDetl> page) {
@@ -186,7 +190,46 @@
@Override
public List<LocDetl> findSingleAreaByMatnr(String matnr) {
- return this.baseMapper.findAreaByMatnr(matnr, 1);
+ ArrayList<LocDetl> list = new ArrayList<>();
+ List<LocDetl> locDetls = this.baseMapper.findAreaByMatnr(matnr, 1);
+
+ //灏嗘煡鍑烘潵鐨勬暟鎹繘琛屾帓搴忋��1-3锛�8-11锛�15-18row闇�瑕侀鍊掗『搴�
+ for (LocDetl locDetl : locDetls) {
+ if (list.contains(locDetl)) {
+ continue;
+ }
+
+ String locNo = locDetl.getLocNo();
+ List<String> outerSingleLoc = Utils.getGroupLoc(locNo);
+ List<LocMast> locMasts = locMastService.selectByLocNos(outerSingleLoc);
+ int locRow = Utils.getRow(locNo);
+ if (locRow >= 1 && locRow <= 3
+ || locRow >= 8 && locRow <= 11
+ || locRow >= 15 && locRow <= 18) {
+ Collections.reverse(locMasts);
+ }
+
+ for (LocMast locMast : locMasts) {
+ if (!locMast.getLocSts().equals("F")) {
+ continue;
+ }
+
+ if (locMast.getLocType2() != 1) {
+ continue;
+ }
+
+ for (LocDetl detl : this.baseMapper.selectByLocNo(locMast.getLocNo())) {
+ if (detl.getMatnr().equals(locDetl.getMatnr())) {
+ if (!list.contains(detl)) {
+ list.add(detl);
+ }
+ }
+ }
+
+ }
+
+ }
+ return list;
}
@Override
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 89db0a0..f1e9e6e 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -245,7 +245,14 @@
if (locDetls1.size() == 0) {//鍐呬晶搴撲綅娌℃湁鐩稿悓鐨勭墿鏂欙紝璺宠繃
continue;
}
-
+ int locRow = Utils.getRow(locDetl0.getLocNo());
+ switch (locRow) {
+ case 3:
+ case 11:
+ case 18:
+ Collections.reverse(locDetls1);
+ break;
+ }
for (LocDetl detl : locDetls1) {
double lastCount = locDetl.getCount() - useCount;//鍓╀綑鎵�闇�鏁伴噺
double realCount = 0;//瀹為檯鎻愪緵鏁伴噺
@@ -302,7 +309,7 @@
double realCount = 0;//瀹為檯鎻愪緵鏁伴噺
if (locDetl0.getAnfme() >= lastCount) {//瀹為檯鏁伴噺澶т簬鎵�闇�鏁伴噺锛屾寜鎵�闇�鏁伴噺鎻愪緵
realCount = lastCount;
- }else {
+ } else {
//瀹為檯灏忎簬鎵�闇�鏁伴噺锛屾寜瀹為檯鏁伴噺鎻愪緵
realCount = locDetl0.getAnfme();
}
@@ -314,6 +321,9 @@
return locDetlList;
}
}
+
+ //搴撳瓨鏁伴噺涓嶆弧瓒�
+ throw new CoolException("鍗曞搧鍖哄煙鍙湁" + useCount + "涓揣鐗�");
}
return null;
--
Gitblit v1.9.1