From 67f4004e7645ecb4b88191981bcb106a55cd5765 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期二, 29 八月 2023 16:03:14 +0800 Subject: [PATCH] U8接口bug修复 --- src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 185 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 183 insertions(+), 2 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 45c15df..8c4fc7e 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java @@ -1,16 +1,197 @@ 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; import com.zy.asrs.entity.LocMast; import com.zy.asrs.mapper.LocMastMapper; import com.zy.asrs.service.LocMastService; +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.Collections; +import java.util.Iterator; +import java.util.List; + +@Slf4j @Service("locMastService") public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService { + @Autowired + private RowLastnoService rowLastnoService; + @Autowired + private WorkService workService; + @Override - public LocMast queryFreeLocMast(Integer row) { - return this.baseMapper.queryFreeLocMast(row); + 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 + public LocMast queryFreeLocMast0(Integer row, Short locType1) { + return this.baseMapper.queryFreeLocMast0(row, locType1); + } + + @Override + public List<String> queryGroupEmptyStock(String sourceLocNo) { + if (Cools.isEmpty(sourceLocNo)) { + return null; + } + LocMast sourceStock = this.selectById(sourceLocNo); + if (Cools.isEmpty(sourceStock)) { + return null; + } + return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo()); + } + + @Override + public Boolean checkEmptyCount(LocMast locMast, int quaOfBlank) { + if (locMast == null) { + return false; + } + return this.baseMapper.selectEmptyLocCount(locMast.getCrnNo()) > quaOfBlank; + } + + @Override + public Boolean checkWhole(List<LocDetl> locDetls) { + return null; + } + + @Override + public Boolean isOutMost(String locNo, Boolean pakin) { + 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(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) || CommonService.THIRD_GROUP_ROW_LIST.contains(row)) { + Collections.reverse(locNos); + } else { + throw new RuntimeException("搴撲綅瑙f瀽寮傚父"); + } + + // plan second + LocMast finalRes = null; + for (String locNo0 : locNos) { + LocMast locMast = this.selectById(locNo0); + if (locMast == null) { + continue; + } + + if (locMast.getLocSts().equals("O")) { + 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 finalRes; + } + + @Override + public synchronized void breakUp(String locNo, List<String> excludeLocNos) { + List<String> groupLoc = Utils.getGroupOuterLoc(locNo); + Iterator<String> iterator = groupLoc.iterator(); + while (iterator.hasNext()) { + String next = iterator.next(); + LocMast locMast = this.selectById(next); + if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")) { + if (!excludeLocNos.contains(locMast.getLocNo())) { + continue; + } + } + iterator.remove(); + } + workService.shuttleTransfer(groupLoc); + } + + @Override + public Integer getOutCrnNo(LocMast locMast) { + 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("搴撲綅瑙f瀽寮傚父"); + } + + @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); + } + + @Override + public Integer updateLocType2ByRBL(Integer locType2, Integer startRow, Integer endRow, Integer startBay, Integer endBay, Integer startLev, Integer endLev) { + return this.baseMapper.updateLocType2ByRBL(locType2, startRow, endRow, startBay, endBay, startLev, endLev); } } -- Gitblit v1.9.1