From 3602e4088519be44965118c852593c6376217d4e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 03 六月 2023 13:46:38 +0800
Subject: [PATCH] jlwms ==> xzjlwms
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 113 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 82 insertions(+), 31 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 5ff2572..b63a392 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -11,6 +11,7 @@
import com.zy.asrs.service.WorkService;
import com.zy.asrs.utils.Utils;
import com.zy.common.service.CommonService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -18,6 +19,7 @@
import java.util.Iterator;
import java.util.List;
+@Slf4j
@Service("locMastService")
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
@@ -29,6 +31,11 @@
@Override
public List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1) {
return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
+ }
+
+ @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);
}
@Override
@@ -49,11 +56,11 @@
}
@Override
- public Boolean checkEmptyCount(LocMast locMast) {
+ public Boolean checkEmptyCount(LocMast locMast, int quaOfBlank) {
if (locMast == null) {
return false;
}
- return this.baseMapper.selectEmptyLocCount(locMast.getCrnNo()) > 1;
+ return this.baseMapper.selectEmptyLocCount(locMast.getCrnNo()) > quaOfBlank;
}
@Override
@@ -77,35 +84,38 @@
int row = Utils.getRow(locNo);
List<String> locNos = Utils.getGroupLoc(locNo);
if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
+ } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row) || CommonService.THIRD_GROUP_ROW_LIST.contains(row)) {
Collections.reverse(locNos);
} else {
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
- LocMast result = null;
- // 鍏ュ簱澶栧眰搴撲綅婊炵┖
- for (int i = 0; i<locNos.size() - 1; i++) {
- LocMast locMast = this.selectById(locNos.get(i));
+
+ // plan second
+ LocMast finalRes = null;
+ for (String locNo0 : locNos) {
+ LocMast locMast = this.selectById(locNo0);
+ if (locMast == null) {
+ continue;
+ }
+
if (locMast.getLocSts().equals("O")) {
- if (i == 0) {
- result = locMast;
- } else {
- LocMast lastLoc = this.selectById(locNos.get(i - 1));
- if (lastLoc.getLocSts().equals("F") || lastLoc.getLocSts().equals("D")
- || lastLoc.getLocSts().equals("S") || lastLoc.getLocSts().equals("X")) {
- if (result == null) {
- result = locMast;
- }
- }
+ if (finalRes == null) {
+ finalRes = locMast;
}
- } else if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")
- || locMast.getLocSts().equals("P") || locMast.getLocSts().equals("R")) {
- if (result != null) {
- result = null;
+ } 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 result;
+ return finalRes;
}
@Override
@@ -127,15 +137,56 @@
@Override
public Integer getOutCrnNo(LocMast locMast) {
- int row = Utils.getRow(locMast.getLocNo());
- if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
- return 1;
- }
- if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
- return 3;
- } else {
- return locMast.getCrnNo();
- }
+ return 1;
}
+ @Override
+ public LocMast findNearloc(String locNo) {
+ int row = getRow(locNo);
+ LocMast locMast = null;
+ if (row>19) {
+ List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
+ if (!Cools.isEmpty(groupOuterLoc)) {
+ locMast = this.baseMapper.selectAvailableNearLocDesc(groupOuterLoc);
+ }
+
+ }else {
+ List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
+ if (!Cools.isEmpty(groupOuterLoc)) {
+ locMast = this.baseMapper.selectAvailableNearLocAsc(groupOuterLoc);
+ }
+ }
+ return locMast;
+ }
+
+ /**
+ * 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
+ */
+ public static int getRow(String locNo) {
+ if (!Cools.isEmpty(locNo)) {
+ return Integer.parseInt(locNo.substring(0, 2));
+ }
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+
+ @Override
+ public List<LocMast> selectAllPeakLoc() {
+ return this.baseMapper.selectAllPeakLoc();
+ }
+
+ @Override
+ public Boolean checkAllLocEmpty(List<String> groupOuterLoc) {
+ List<LocMast> result = this.baseMapper.selectAllLocNotEmpty(groupOuterLoc);
+ return result.size() <= 0;
+ }
+
+ @Override
+ public List<LocMast> selectLocByLev(Integer lev) {
+ return this.baseMapper.selectLocByLev(lev);
+ }
+
+ @Override
+ public List<LocMast> selectEmptyByLocNos(List<String> locNos) {
+ return this.baseMapper.selectEmptyByLocNos(locNos);
+ }
}
--
Gitblit v1.9.1