blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
skyouc
2025-05-28 e98be9d02d12b0453c6267190b86fdbc11fee9fc 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java


@@ -6,6 +6,7 @@


import com.vincent.rsf.server.api.controller.params.TaskInParam;


import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;


import com.vincent.rsf.server.api.service.WcsService;


import com.vincent.rsf.server.common.constant.Constants;


import com.vincent.rsf.server.manager.enums.*;


import com.vincent.rsf.framework.common.R;


import com.vincent.rsf.framework.exception.CoolException;


@@ -81,7 +82,6 @@


            throw new CoolException("参数不能为空！！");


        }


        /**获取组拖*/


//        List<Long> ids = pakins.stream().map(WaitPakin::getId).collect(Collectors.toList());


        List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>()


                .in(WaitPakin::getId, pakins.getId())


                .eq(WaitPakin::getIoStatus, Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)));


@@ -104,7 +104,7 @@


            task.setTaskCode(ruleCode)


                    .setTaskStatus(TaskStsType.GENERATE_IN.id)


                    .setTaskType(TaskType.TASK_TYPE_IN.type)


                    .setWarehType(WarehType.WAREHOUSE_TYPE_AGV.id)


                    .setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)


                    .setTargLoc(targetLoc)


                    .setOrgSite(orgSta)


                    .setBarcode(pakin.getBarcode())


@@ -167,7 +167,6 @@


            throw new CoolException("参数不能为空！！");


        }


        /**获取组拖*/


//        List<Long> ids = pakins.stream().map(WaitPakin::getId).collect(Collectors.toList());


        List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>()


                .in(WaitPakin::getId, pakins.getId())


                .eq(WaitPakin::getIoStatus, Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)));


@@ -190,7 +189,7 @@


            task.setTaskCode(ruleCode)


                    .setTaskStatus(TaskStsType.COMPLETE_IN.id)


                    .setTaskType(TaskType.TASK_TYPE_IN.type)


                    .setWarehType(WarehType.WAREHOUSE_TYPE_PLAT.id)


                    .setWarehType(WarehType.WAREHOUSE_TYPE_PLAT.val)


                    .setTargLoc(targetLoc)


                    .setBarcode(pakin.getBarcode())


                    .setCreateBy(loginUserId)


@@ -426,23 +425,22 @@


        }




        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));


        if (taskItems.isEmpty()) {


            throw new CoolException("任务明细不存在！！");




        if (!taskItems.isEmpty()) {


            //移库有可能是空板


            try {


                //更新库位明细


                saveLocItem(taskItems, task.getId());


            } catch (Exception e) {


                throw new CoolException("库位明细更新失败！！");


            }




            if (!locItemService.remove(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocCode, task.getOrgLoc()))) {


                throw new CoolException("源库位明细删除失败！");


            }




        }


        try {


            //更新库位明细


            saveLocItem(taskItems, task.getId());


        } catch (Exception e) {


            throw new CoolException("库位明细更新失败！！");


        }


//        /**对任务明细按组拖明细进行分组*/


//        try {


//            //保存库存明细


//            saveStockItems(taskItems, null, null, pakinItem.getWkType(), pakinItem.getType());


//        } catch (Exception e) {


//            log.error("<UNK>", e);


//            throw new CoolException(e.getMessage());


//        }




        /**修改库位状态为F.在库*/


        if (!locService.update(new LambdaUpdateWrapper<Loc>()


                        .set(Loc::getBarcode, task.getBarcode())


@@ -457,9 +455,6 @@


            throw new CoolException("库位状态修改失败！！");


        }




        if (!locItemService.remove(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocCode, task.getOrgLoc()))) {


            throw new CoolException("源库位明细删除失败！");


        }




        if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getId, task.getId()).set(Task::getTaskStatus, TaskStsType.UPDATED_IN.id))) {


            throw new CoolException("任务状态修改失败！！");


@@ -566,6 +561,7 @@


     * @return


     */


    @Override


    @Transactional(rollbackFor = Exception.class)


    public R removeTask(Long[] ids) {


        List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);


        List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_EMPITY_IN.type, TaskType.TASK_TYPE_EMPITY_OUT.type, TaskType.TASK_TYPE_MERGE_OUT.type);


@@ -586,17 +582,15 @@


                    throw new CoolException("更新组托状态失败！！");


                }


            }


            Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTaskType() < TaskStsType.UPDATED_IN.id ? task.getTargLoc() : task.getOrgLoc()));


            if (null != loc


                    && (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type)


                    || loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type))) {




            Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTaskType() < TaskStsType.UPDATED_IN.id ? task.getTargLoc() : task.getOrgLoc()));


            if (null != loc && (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type) || loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type))) {


                loc.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);


                if (!locService.updateById(loc)) {


                    throw new CoolException("更新库位状态失败！！");


                }


            }


            if (!Objects.isNull(task.getWarehType()) && task.getWarehType().equals(WarehType.WAREHOUSE_TYPE_AGV.id)) {


            if (!Objects.isNull(task.getWarehType()) && task.getWarehType().equals(WarehType.WAREHOUSE_TYPE_AGV.val)) {


                BasStation basStation = null;


                if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) {


                    basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()


@@ -611,8 +605,7 @@


                ) {


                    basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()


                            .eq(BasStation::getStationName, task.getTargLoc())


                            .eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_R.type)


                    );


                            .eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_R.type));


                }


                if (null == basStation) {


                    throw new CoolException("站点状态错误！！");


@@ -621,6 +614,10 @@


                if (!basStationService.updateById(basStation)) {


                    throw new CoolException("更新站点状态失败！！");


                }


            }




            if (!taskItemService.remove(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()))) {


                throw new CoolException("任务明细删除失败！！");


            }


        }


        if (!this.removeByIds(Arrays.asList(ids))) {


@@ -644,17 +641,15 @@


            throw new CoolException("当前任务不存在！！");


        }


        Integer type;


        if (oType.equals("check")) {


        if (oType.equals(Constants.TASK_TYPE_OUT_CHECK)) {


            //盘点入库


            type = TaskType.TASK_TYPE_CHECK_IN.type;




            if (!task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {


                throw new CoolException("非盘点出库 ，不可执行此操作！！");


            }


        } else {


            //拣料入库


            type = TaskType.TASK_TYPE_PICK_IN.type;




            if (!task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) {


                throw new CoolException("非拣料出库 ，不可执行此操作！！");


            }


@@ -673,11 +668,11 @@


                .setBarcode(task.getBarcode())


                .setTaskStatus(TaskStsType.GENERATE_IN.id);




        //TODO 根据物料的库位类型生成新的库位


        TaskInParam param = new TaskInParam();


        param.setSourceStaNo(Integer.parseInt(task.getTargSite()))


                .setIoType(type)


                .setLocType1(Integer.parseInt(loc.getType()));


        //获取新库位


        InTaskMsgDto locInfo = wcsService.getLocNo(param);




        if (Objects.isNull(locInfo)) {


@@ -745,6 +740,7 @@


        if (Objects.isNull(task)) {


            throw new CoolException("参数不能为空！！");


        }




        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc()));


        if (Objects.isNull(loc)) {


            throw new CoolException("库位不存在！！");