From 8084dd691e1e1914cde3df118360561c7016ade1 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期三, 08 三月 2023 10:07:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 99 +++++++++++++++++++++++++++----------------------
1 files changed, 55 insertions(+), 44 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 eae14bd..9a1ea8f 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -1,5 +1,6 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.LocDetl;
@@ -9,15 +10,16 @@
import com.zy.asrs.service.RowLastnoService;
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;
-import java.util.ArrayList;
-import java.util.Comparator;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import java.util.stream.Collectors;
+@Slf4j
@Service("locMastService")
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
@@ -29,6 +31,16 @@
@Override
public List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1) {
return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
+ }
+
+ @Override
+ public List<LocMast> queryFreeLocMast2(List<Integer> rows, Integer rowsLen, Short locType1) {
+ return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
+ }
+
+ @Override
+ public LocMast queryFreeLocMast0(Integer row, Short locType1) {
+ return this.baseMapper.queryFreeLocMast0(row, locType1);
}
@Override
@@ -44,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.getLocType1(), locMast.getCrnNo()) > 1;
+ return this.baseMapper.selectEmptyLocCount(locMast.getCrnNo()) > quaOfBlank;
}
@Override
@@ -58,54 +70,48 @@
@Override
public Boolean isOutMost(String locNo, Boolean pakin) {
- return Integer.parseInt(locNo.substring(0, 2)) == Utils.getOutermostRow(locNo, true);
+ return Integer.parseInt(locNo.substring(0, 2)) == Utils.getOutLayerRow(locNo, pakin);
+ }
+
+ public static void main(String[] args) {
+ List<String> groupLoc = Utils.getGroupLoc("2300101");
+ Collections.reverse(groupLoc);
+ System.out.println(JSON.toJSONString(groupLoc));
}
@Override
- public LocMast findOutMost(List<String> locNos) {
- List<Integer> 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);}})) {
- locNos.sort(Comparator.comparingInt(o -> Integer.parseInt(o.substring(0, 2))));
+ public LocMast findOutMost(String locNo) {
+ 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)) {
+ Collections.reverse(locNos);
} else {
- rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
- if (!rows.retainAll(new ArrayList<Integer>() {{ add(8);add(9);add(10);add(11);}})) {
- locNos.sort(Comparator.comparingInt(o -> Integer.parseInt(o.substring(0, 2))));
- } else {
- rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
- }
-
- if (!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 {
- rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
- }
-
- if (!rows.retainAll(new ArrayList<Integer>() {{ add(4);add(5);add(6);add(7);}})) {
- locNos.sort((o1, o2) -> Integer.parseInt(o2.substring(0, 2)) - Integer.parseInt(o1.substring(0, 2)));
- } else {
- rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
- }
-
- if (!rows.retainAll(new ArrayList<Integer>() {{ add(12);add(13);add(14);}})) {
- locNos.sort((o1, o2) -> Integer.parseInt(o2.substring(0, 2)) - Integer.parseInt(o1.substring(0, 2)));
- } else {
- rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
- }
-
- if (!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)));
- } else {
- rows = locNos.stream().map(item -> Integer.parseInt(item.substring(0, 2))).distinct().collect(Collectors.toList());
- }
- for (String locNo : locNos) {
- LocMast locMast = this.selectById(locNo);
+ // plan second
+ LocMast finalRes = null;
+ for (String locNo0 : locNos) {
+ LocMast locMast = this.selectById(locNo0);
if (locMast.getLocSts().equals("O")) {
- return locMast;
+ 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
@@ -125,4 +131,9 @@
workService.shuttleTransfer(groupLoc);
}
+ @Override
+ public Integer getOutCrnNo(LocMast locMast) {
+ return 1;
+ }
+
}
--
Gitblit v1.9.1