lsh#

1

3 天以前 3eba7ada3a89607324895f6d9091550c6e290ab0

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

@@ -10,6 +10,7 @@
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.enums.PakinIOStatus;
import com.vincent.rsf.server.manager.enums.StationTypeEnum;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.utils.LocManageUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +44,17 @@
        getAGVStaBind(waitPakinPda);
        //生成任务
        AGVInTaskStart(waitPakinPda, loginUserId);
        return R.ok();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R AGVBindAndInTaskStart(String barcode) {
        //验证条码
        boolean b = checkStaStatus(barcode);
        if (!b) {
            return R.error("条码未找到对应规则");
        }
        return R.ok();
    }

@@ -305,6 +317,9 @@
        if (!basStation.getUseStatus().equals("O")) {
            throw new CoolException("站点状态不为空闲");
        }
        if (basStation.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
            throw new CoolException("站点为光电站点，禁止呼叫AGV");
        }

        List<String> areaList = JSONObject.parseArray(basStation.getCrossZoneArea(), String.class);
        if (!areaList.contains(area)) {
@@ -345,4 +360,42 @@

        return basStation;
    }
    private boolean checkStaStatus(String barcode) {
        if (Cools.isEmpty(barcode)) {
            throw new CoolException("容器码不能为空");
        }
        WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
                .eq(WaitPakin::getBarcode, barcode)
                .eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val)
        );
        if (Cools.isEmpty(waitPakin)) {
            throw new CoolException("容器码未找到组托信息,请检查组托状态");
        }
        BasStation isBarcodeSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
                        .eq(BasStation::getBarcode, barcode)
                , false
        );
        if (!Cools.isEmpty(isBarcodeSta)) {
            throw new CoolException("该条码已被" + isBarcodeSta.getStationName() + "站绑定");
        }

        List<BasContainer> containers = basContainerService.list(
                new LambdaQueryWrapper<BasContainer>());
        boolean matches = false;
        for (BasContainer container : containers) {
            String codeType = container.getCodeType();  // 获取正则表达式
            if (barcode.matches(codeType)) {  // 判断条码是否符合这个正则
                matches = true;
                return true;
            }
        }
//            boolean matches = containers.stream()
//                    .map(BasContainer::getCodeType)
//                    .anyMatch(codeType -> barcode.matches(codeType));
        if (!matches) {
            return false;
        }

        return true;
    }
}