From b6b46e1c4d390c80cf9bd7d4daa23202f2d11a22 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 13:47:57 +0800
Subject: [PATCH] 站点管理编辑高低库位
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 106 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 82 insertions(+), 24 deletions(-)
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 0ba1412..ba49674 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -9,6 +9,7 @@
import com.zy.asrs.service.RowLastnoService;
import com.zy.asrs.service.WorkService;
import com.zy.asrs.utils.Utils;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -18,6 +19,7 @@
import java.util.List;
import java.util.stream.Collectors;
+@Slf4j
@Service("locMastService")
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
@@ -50,6 +52,11 @@
}
@Override
+ public List<LocMast> queryFreeLocMastEnd1(Integer row, Short locType1,Boolean inoutEveryday){
+ return this.baseMapper.queryFreeLocMastEnd1(row, locType1,inoutEveryday);
+ }
+
+ @Override
public List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd) {
return this.baseMapper.queryFreeLocMast2(locType1, rowBeg, rowEnd, bayBeg, bayEnd, levBeg, levEnd);
}
@@ -68,11 +75,16 @@
}
@Override
- public Boolean checkEmptyCount(LocMast locMast) {
+ public Boolean checkEmptyCount(LocMast locMast, int quaOfBlank) {
if (locMast == null) {
return false;
}
- return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
+ Integer nowQua = this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getLocType2(), locMast.getCrnNo());
+ boolean res = nowQua > quaOfBlank;
+ if (!res) {
+ log.warn("{}鍙峰爢鍨涙満搴撲綅涓嶈冻锛屽洜婊炵暀绌哄簱浣峽}涓�,鐩墠绌哄簱浣峽}涓�", locMast.getCrnNo(), quaOfBlank, nowQua);
+ }
+ return res;
}
@Override
@@ -124,33 +136,50 @@
rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
}
-// if (!rows.retainAll(new ArrayList<Integer>() {{ add(1);add(2);add(3);}})
-// || !rows.retainAll(new ArrayList<Integer>() {{ add(8);add(9);add(10);add(11);}})
-// || !rows.retainAll(new ArrayList<Integer>() {{ add(15);add(16);add(17);add(18);}})
-// ) {
-// locNos.sort(Comparator.comparingInt(o -> Integer.parseInt(o.substring(0, 2))));
-// } else if (!rows.retainAll(new ArrayList<Integer>() {{ add(4);add(5);add(6);add(7);}})
-// || !rows.retainAll(new ArrayList<Integer>() {{ add(12);add(13);add(14);}})
-// || !rows.retainAll(new ArrayList<Integer>() {{ add(19);add(20);add(21);}})
-// ) {
-// locNos.sort((o1, o2) -> Integer.parseInt(o2.substring(0, 2)) - Integer.parseInt(o1.substring(0, 2)));
+ // plan first
+// for (int i = 0; i<locNos.size(); i++) {
+// LocMast locMast = this.selectById(locNos.get(i));
+// if (locMast.getLocSts().equals("O")) {
+// if (i == 0) {
+// return locMast;
+// } else {
+// LocMast lastLoc = this.selectById(locNos.get(i - 1));
+// if (lastLoc.getLocSts().equals("F") || lastLoc.getLocSts().equals("D") || lastLoc.getLocSts().equals("X")) {
+// return locMast;
+// } else {
+// break;
+// }
+// }
+// }
// }
- for (int i = 0; i<locNos.size(); i++) {
- LocMast locMast = this.selectById(locNos.get(i));
+// return null;
+
+ // plan second
+ LocMast finalRes = null;
+ for (String locNo : locNos) {
+ LocMast locMast = this.selectById(locNo);
+ if(locMast == null)
+ {
+ continue;
+ }
if (locMast.getLocSts().equals("O")) {
- if (i == 0) {
- return locMast;
- } else {
- LocMast lastLoc = this.selectById(locNos.get(i - 1));
- if (lastLoc.getLocSts().equals("F") || lastLoc.getLocSts().equals("D") || lastLoc.getLocSts().equals("X")) {
- return locMast;
- } else {
- break;
- }
+ if (finalRes == null) {
+ finalRes = locMast;
}
+ } else {
+ if (finalRes != null) {
+ log.error("{}搴撲綅寮傚父锛歿}搴撲綅鐘舵�佷负O.绌哄簱浣嶏紝浣唟}搴撲綅鐘舵�佷负{}", finalRes.getLocNo(), finalRes.getLocNo(), locMast.getLocNo(), locMast.getLocSts());
+ finalRes = null;
+ break;
+ }
+ if (locMast.getLocSts().equals("R") || locMast.getLocSts().equals("P")) {
+ finalRes = null;
+ break;
+ }
+ finalRes = null;
}
}
- return null;
+ return finalRes;
}
@Override
@@ -175,4 +204,33 @@
this.baseMapper.updateLocSts(locNo,locSts);
}
+ @Override
+ public List<LocMast> findOutMast(Short locType1, List<Integer> crnNos) {
+ return this.baseMapper.findOutMast(locType1, crnNos);
+ }
+
+ @Override
+ public LocMast findInEmptyLocMast(Short locType1, List<Integer> rows) {
+ return this.baseMapper.findInEmptyLocMast(locType1, rows);
+ }
+
+ @Override
+ public List<LocMast> findEmptyLocMastByLocNos(Short locType1, List<String> locNos) {
+ return this.baseMapper.findEmptyLocMastByLocNos(locType1, locNos);
+ }
+
+ @Override
+ public List<LocMast> findEmptyLowFrequencyLocMast(Short locType1) {
+ return this.baseMapper.findEmptyLowFrequencyLocMast(locType1);
+ }
+
+ @Override
+ public List<LocMast> selectLocByLev(Integer lev) {
+ return this.baseMapper.selectLocByLev(lev);
+ }
+
+ @Override
+ public List<LocMast> selectByLocNos(List<String> locNos) {
+ return this.baseMapper.selectByLocNos(locNos);
+ }
}
--
Gitblit v1.9.1