From 8c3714822ea0223ae42bd5c08dbbc872fffee9d5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 13 五月 2023 13:06:53 +0800
Subject: [PATCH] 库位规则
---
src/main/java/com/zy/asrs/service/impl/LocRuleServiceImpl.java | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocRuleServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocRuleServiceImpl.java
index 79ab983..213c542 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocRuleServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocRuleServiceImpl.java
@@ -26,7 +26,7 @@
private LocMastService locMastService;
@Override
- public LocRule find(String matnr) {
+ public List<LocRule> find(String matnr) {
if (Cools.isEmpty(matnr)) {
return null;
}
@@ -40,33 +40,23 @@
//鎵炬贩杞藉簱浣嶈鍒�
@Override
- public LocRule findMixed() {
+ public List<LocRule> findMixed() {
return this.baseMapper.selectByMixed(1);//鎼滅储娣疯浇搴撲綅瑙勫垯
}
- //灏嗗簱浣嶈鍒欒浆鎹负搴撲綅缁�
+ //灏嗗簱浣嶈鍒欒浆鎹负搴撲綅缁�(鑳芥煡鍑烘潵鐨勯兘鏄┖搴撲綅)
@Override
public List<LocMast> locRuleToLocNos(LocRule locRule) {
- ArrayList<String> locNos = new ArrayList<>();
- //灏嗘墍鏈夌鍚堟贩杞借鍒欑殑搴撲綅鍙疯繘琛屽瓨鍌�
- Integer rowBeg = locRule.getRowBeg();
- Integer rowEnd = locRule.getRowEnd();
+ return locMastService.queryFreeLocMast2(null, locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
+ }
- Integer bayBeg = locRule.getBayBeg();
- Integer bayEnd = locRule.getBayEnd();
+ @Override
+ public int updateKeepGoByMatnr(String matnr, Integer keepGo) {
+ return this.baseMapper.updateKeepGoByMatnr(matnr, keepGo);
+ }
- Integer levBeg = locRule.getLevBeg();
- Integer levEnd = locRule.getLevEnd();
-
- for (int i = rowBeg; i <= rowEnd; i++) {
- for (int j = bayBeg; j <= bayEnd; j++) {
- for (int k = levBeg; k <= levEnd; k++) {
- String locNo = Utils.getLocNo(i, j, k);
- locNos.add(locNo);
- }
- }
- }
-
- return locMastService.selectEmptyByLocNos(locNos);
+ @Override
+ public int updateKeepGoByMixed(Integer keepGo) {
+ return this.baseMapper.updateKeepGoByMixed(keepGo);
}
}
--
Gitblit v1.9.1