#

luxiaotao1123

2022-09-06 580949f09025aa71de5ecf1e56ebe4f731cf6b19

#

 src/main/java/com/zy/asrs/service/LocMastService.java

@@ -11,7 +11,7 @@
    /**
     * 检索可用库位
     */
    LocMast queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1);
    List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1);

    /**
     * 获取同组货架的空库位

 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java

@@ -27,18 +27,8 @@
    private WorkService workService;

    @Override
    public LocMast queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1) {
        List<LocMast> locMasts = this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
        if (Cools.isEmpty(locMasts)) {
            return null;
        }
        Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
        for (LocMast locMast : locMasts) {
            if (locMast.getRow1().equals(innermostRow)) {
                return locMast;
            }
        }
        return null;
    public List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1) {
        return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
    }

    @Override

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -919,6 +919,13 @@

    @Override
    public void shuttleTransfer(List<String> locNos) {
        if (Cools.isEmpty(locNos)) {
            return;
        }
        LocMast one = locMastService.selectById(locNos.get(0));
        List<Integer> rows = Utils.getGroupLoc(Integer.parseInt(locNos.get(0).substring(0, 2)));
        List<LocMast> locMasts = locMastService.queryFreeLocMast(rows, rows.size(), one.getLocType1());


    }


 src/main/java/com/zy/common/service/CommonService.java

@@ -269,7 +269,16 @@
        if (locMast == null) {
            List<Integer> rows = Utils.getGroupLoc(curRow);

            locMast = locMastService.queryFreeLocMast(rows, rows.size(), locTypeDto.getLocType1());
            List<LocMast> locMasts = locMastService.queryFreeLocMast(rows, rows.size(), locTypeDto.getLocType1());
            if (!Cools.isEmpty(locMasts)) {
                Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
                for (LocMast one : locMasts) {
                    if (one.getRow1().equals(innermostRow)) {
                        locMast = one;
                        break;
                    }
                }
            }
            // 因库位移转、需预留空库位
//            if (!locMastService.checkEmptyCount(locMast)) {
//                locMast = null;