实现mes空托和agv任务接口

lbq

17 小时以前 076cd7a73eb60c86d43eda67c5625704576d44cc

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

@@ -141,7 +141,7 @@
            for (BasContainer container : containers) {
                String codeType = container.getCodeType();  // 获取正则表达式
                if (barcode.matches(codeType)) {  // 判断条码是否符合这个正则
                    List<Integer> areaList2 = container.getAreas();
                    List<Integer> areaList2 = container.getAreasIds();
                    if (!areaList2.contains(Integer.parseInt(area))) {
                        matches2 = false;
                        continue;
@@ -182,6 +182,9 @@
        }
        StringBuilder errorBuilder = new StringBuilder();
        List<Long> areaTypeList = LocUtils.getAreaTypeList(station.getStationName());
        if (areaTypeList.isEmpty()) {
            throw new CoolException("未查询到起点可入库区（库位规则未配置）！！！");
        }
        for (Long areaType : areaTypeList) {
            if (errorBuilder.length() > 0) {
                errorBuilder.append(",");
@@ -226,24 +229,31 @@
//                throw new CoolException("该站点对应库区未找到库位");
            }

            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
            String ruleCode = StringUtils.isBlank(param.getTaskNo()) ?
                    SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null) : param.getTaskNo();
            if (StringUtils.isBlank(ruleCode)) {
                throw new CoolException("编码错误：请确认编码「SYS_TASK_CODE」是否已生成!!");
            }
            BasStation stationCode = basStationService.getById(deviceSite.getDeviceCode());
            String stationName = stationCode.getStationName();
            if (Cools.isEmpty(stationCode)) {
            String stationName = null;
            if (Cools.isEmpty(deviceSite.getDeviceCode())) {
                stationName = station.getStationName();
            } else {
                BasStation stationCode = basStationService.getById(deviceSite.getDeviceCode());
                stationName = stationCode.getStationName();
                if (Cools.isEmpty(stationCode)) {
                    stationName = station.getStationName();
                }
            }
            Task task = new Task();
            task.setTaskCode(ruleCode)
                    .setTaskStatus(TaskStsType.GENERATE_IN.id)
                    .setTaskStatus(TaskStsType.MISSION_INITIAL.id)
                    .setTaskType(TaskType.TASK_TYPE_EMPTY_IN.type)
                    .setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)//lsh待修改
                    .setTargLoc(targetLoc)
                    .setOrgSite(station.getStationName())
                    .setBarcode(param.getContainerNo())
                    .setTargSite(stationName)
                    .setTaskOrigin(StringUtils.isBlank(param.getTaskOrigin()) ? null : param.getTaskOrigin())
                    .setCreateBy(loginUserId)
                    .setUpdateBy(loginUserId);
            if (!taskService.save(task)) {