#

luxiaotao1123

2022-09-06 664124d1ecd64bea4a060ed23a8e2c468c6136f0

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

@@ -7,12 +7,14 @@
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;

@@ -21,10 +23,12 @@

    @Autowired
    private RowLastnoService rowLastnoService;
    @Autowired
    private WorkService workService;

    @Override
    public LocMast queryFreeLocMast(Integer row, List<Integer> rows, Short locType1) {
        return this.baseMapper.queryFreeLocMast(row, rows, locType1);
    public List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1) {
        return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
    }

    @Override
@@ -53,8 +57,8 @@
    }

    @Override
    public Boolean isOutMost(String locNo) {
        return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo);
    public Boolean isOutMost(String locNo, Boolean pakin) {
        return Integer.parseInt(locNo.substring(0, 2)) == Utils.getOutermostRow(locNo, true);
    }

    @Override
@@ -80,4 +84,19 @@
        return null;
    }

    @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") || !excludeLocNos.contains(locMast.getLocNo())) {
                continue;
            }
            iterator.remove();
        }
        workService.shuttleTransfer(groupLoc);
    }

}