blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhou zhou
16 小时以前 cfe049492f81d2c650a2b17348593edbc5054498 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java


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


import org.slf4j.LoggerFactory;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.context.annotation.Lazy;


import org.springframework.http.HttpEntity;


import org.springframework.http.HttpHeaders;


import org.springframework.http.HttpMethod;


@@ -97,10 +98,9 @@


    @Autowired


    private BasStationService basStationService;


    @Autowired


    private TaskService taskService;


    @Autowired


    private LocItemWorkingService locItemWorkingService;


    @Autowired


    @Lazy


    private WcsService wcsService;


    @Autowired


    private OutStockService outStockService;


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


    @Autowired


    private CheckOrderItemService checkOrderItemService;


    @Autowired


    @Lazy


    private CheckOrderService checkOrderService;


    @Autowired


    private CheckDiffService checkDiffService;


@@ -123,6 +124,7 @@


    @Autowired


    private RemotesInfoProperties.RcsApi rcsApi;


    @Autowired


    @Lazy


    private FlowStepInstanceService flowStepInstanceService;


    @Autowired


    private RemotesInfoProperties.WmsOpenApi wmsOpenApi;


@@ -791,14 +793,14 @@


    @Transactional(rollbackFor = Exception.class)


    public Task taskToTop(Long id, Long loginUserId) throws Exception {


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


        Task tasks = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));


        Task tasks = this.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));


        if (Objects.isNull(tasks)) {


            throw new CoolException("任务已处执行状态不可一键置顶！！");


        }


        //判断浅库位任务，修改任务优先级


        modiftyTaskSort(tasks, loginUserId);




        if (!taskService.updateById(tasks)) {


        if (!this.updateById(tasks)) {


            throw new CoolException("置顶失败！！");


        }


        return null;


@@ -963,7 +965,7 @@


                throw new CoolException("数据错误，库位不存在！！");


            }


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


                Task serviceOne = taskService.getOne(new LambdaQueryWrapper<Task>()


                Task serviceOne = this.getOne(new LambdaQueryWrapper<Task>()


                        .eq(Task::getOrgLoc, loc.getCode())


                        .or()


                        .eq(Task::getTargLoc, loc.getCode()));


@@ -1184,7 +1186,7 @@


        locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()));




        task.setTaskStatus(TaskStsType.UPDATED_IN.id).setUpdateTime(new Date()).setUpdateBy(loginUserId);


        if (!taskService.updateById(task)) {


        if (!this.updateById(task)) {


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


        }




@@ -1241,7 +1243,7 @@


        locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()));




        task.setTaskStatus(TaskStsType.UPDATED_IN.id).setUpdateTime(new Date()).setUpdateBy(loginUserId);


        if (!taskService.updateById(task)) {


        if (!this.updateById(task)) {


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


        }


        // 盘点再入库任务结束：将关联的盘点差异单置为已审核


@@ -1255,7 +1257,7 @@


     */


    @Override


    public void markCheckDiffApprovedWhenCheckInDone(Task checkInTask) {


        Task outTask = taskService.getOne(new LambdaQueryWrapper<Task>()


        Task outTask = this.getOne(new LambdaQueryWrapper<Task>()


                .eq(Task::getBarcode, checkInTask.getBarcode())


                .eq(Task::getTaskType, TaskType.TASK_TYPE_CHECK_OUT.type)


                .last("limit 1"));


@@ -1333,7 +1335,7 @@


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


                }




                Task outTask = taskService.getById(task.getParentId());


                Task outTask = this.getById(task.getParentId());


                if (!Objects.isNull(outTask)) {


                    LocToTaskParams params = new LocToTaskParams();


                    params.setOrgLoc(task.getOrgLoc()).setSiteNo(task.getOrgSite());


@@ -2215,7 +2217,7 @@


            return R.error("任务编码不能为空！！");


        }


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


        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()


        List<Task> tasks = this.list(new LambdaQueryWrapper<Task>()


                .in(Task::getId, ids)


                .in(Task::getTaskStatus, integers)


                .orderByDesc(Task::getSort));


@@ -2229,7 +2231,7 @@


            }


        }




        taskService.pubTaskToWcs(tasks);


        this.pubTaskToWcs(tasks);




        return R.ok();


    }


@@ -2355,7 +2357,7 @@


                                throw new CoolException("站点不存在！！");


                            }




                            if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())


                            if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())


                                    .set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_IN.id))) {


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


                            }


@@ -2379,7 +2381,7 @@


                                throw new CoolException("站点不存在！！");


                            }




                            if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())


                            if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())


                                    .set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_OUT.id))) {


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


                            }