lsh#

1

2 天以前 6e695903059e82c1c376bf2926ffb8b209c0dc3e

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

@@ -80,7 +80,9 @@
            throw new CoolException("站点状态不为空闲");
        }
        if (!Cools.isEmpty(basStation.getContainerType())) {
            List<Integer> 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)
@@ -131,12 +133,13 @@
            throw new CoolException("站点状态不为空闲");
        }

        List<Integer> areaList = basStation.getCrossZoneArea();
        if (!areaList.contains(Integer.parseInt(area))) {
        if (!basStation.getCrossZoneArea().contains(Integer.parseInt(area))) {
            throw new CoolException("当前站点不支持目标库区");
        }
        if (!Cools.isEmpty(basStation.getContainerType())) {
            List<Integer> 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)
@@ -264,8 +267,9 @@
            if (!taskService.save(task)) {
                throw new CoolException("任务保存失败！！");
            }
            station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);

            if (!station.getType().equals(0)){
                station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
            }
            if (!basStationService.updateById(station)) {
                throw new CoolException("站点状态更新失败！！");
            }
@@ -317,11 +321,11 @@
                .setTaskCode(ruleCode)
                .setOrgLoc(loc.getCode())
                .setTargSite(station.getStationName())
                .setResource(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val)
                .setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type)
                .setResource(TaskResouceType.TASK_RESOUCE_STOCK_TYPE.val)
                .setTaskType(TaskType.TASK_TYPE_OUT.type)
                .setTaskStatus(TaskStsType.MISSION_INITIAL.id)
                .setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)
                .setBarcode(param.getContainerNo())
                .setBarcode(loc.getBarcode())
                .setCreateTime(new Date())
                .setUpdateBy(loginUserId)
                .setUpdateTime(new Date())
@@ -346,7 +350,7 @@
                    .setSplrBatch(item.getBatch())
                    .setPlatWorkCode(item.getPlatWorkCode())
                    .setPlatItemId(item.getPlatItemId())
                    .setOrderType(OrderType.ORDER_IN.type)
                    .setOrderType(OrderType.ORDER_OUT.type)
                    .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type));
            taskItems.add(taskItem);
        }