lsh#

1

9 小时以前 7a92ebbfb8227ff30ebe3300cc9db263a75b7e22

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java

@@ -22,6 +22,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Service
public class AgvServiceImpl implements AgvService {
@@ -83,7 +84,9 @@
        if (Cools.isEmpty(basStation)) {
            throw new CoolException("未找到接驳站点信息，请检查站点状态");
        }
        List<Long> ids =  basStation.getCrossZoneArea();
        List<Long> ids = basStation.getCrossZoneArea().stream()
                .map(Integer::longValue)
                .collect(Collectors.toList());
//        ids.add(basStation.getArea());
//        if (basStation.getIsCrossZone() == 1) {
//            String content = basStation.getCrossZoneArea().substring(1,.length() - 1);
@@ -213,7 +216,9 @@
        if (Cools.isEmpty(waitPakinItems)) {
            throw new CoolException("数据错误，未找到组托明细");
        }
        List<Long> ids =  basStation.getCrossZoneArea();
        List<Long> ids = basStation.getCrossZoneArea().stream()
                .map(Integer::longValue)
                .collect(Collectors.toList());
//        ids.add(basStation.getArea());
//        if (basStation.getIsCrossZone() == 1) {
//            String content = basStation.getCrossZoneArea().substring(1, basStation.getCrossZoneArea().length() - 1);
@@ -274,7 +279,9 @@
            throw new CoolException("未找到站点信息");
        }
        if (!Cools.isEmpty(basStation.getContainerType())) {
            List<Long> longs1 = basStation.getCrossZoneArea();
            List<Long> longs1 = basStation.getCrossZoneArea().stream()
                    .map(Integer::longValue)
                    .collect(Collectors.toList());
            List<BasContainer> containers = basContainerService.list(
                    new LambdaQueryWrapper<BasContainer>()
                            .in(BasContainer::getContainerType, longs1)
@@ -330,12 +337,13 @@
            throw new CoolException("站点为光电站点，禁止呼叫AGV");
        }

        List<Long> areaList = basStation.getCrossZoneArea();
        if (!areaList.contains(Long.parseLong(area))) {
        if (!basStation.getCrossZoneArea().contains(Integer.parseInt(area))) {
            throw new CoolException("当前站点不支持目标库区");
        }
        if (!Cools.isEmpty(basStation.getContainerType())) {
            List<Long> longs1 = basStation.getContainerType();
            List<Long> longs1 = basStation.getContainerType().stream()
                    .map(Integer::longValue)
                    .collect(Collectors.toList());
            List<BasContainer> containers = basContainerService.list(
                    new LambdaQueryWrapper<BasContainer>()
                            .in(BasContainer::getContainerType, longs1)