no message

skyouc

7 天以前 e046dba174365eb8934ee1e4206f09821145e876

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java

@@ -67,9 +67,21 @@
    }

    @Override
    public R getTask() {
         List<LargeScreenTaskDto> taskDtos =  taskMapper.getTaskIntegrateByTaskNo(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id).orderByAsc(Task::getUpdateTime).last("limit 1"));

    public R getTask(HttpServletRequest request) {
        log.info("ip地址====>： {}",  getClientIpAddress(request));
        String locIp =  getClientIpAddress(request);
        List<LargeScreenTaskDto> taskDtos;
        if (locIp.equals(HttpEssUtils.S2_SITE_NO)) {
            taskDtos =  taskMapper.getTaskIntegrateByTaskNo(new LambdaQueryWrapper<Task>()
                    .eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id)
                            .eq(Task::getTargetSite, "S2")
                    .orderByAsc(Task::getUpdateTime).last("limit 1"));
        } else {
            taskDtos =  taskMapper.getTaskIntegrateByTaskNo(new LambdaQueryWrapper<Task>()
                    .eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id)
                    .eq(Task::getTargetSite, "S1")
                    .orderByAsc(Task::getUpdateTime).last("limit 1"));
        }
         return R.ok(taskDtos);
    }

@@ -81,12 +93,14 @@

    /**
     * 获取非汇总明细数据
     *
     * @param taskNo
     * @param waveNo
     * @return
     */
    @Override
    public R getTaskDetlQutify(String taskNo) {
        List<WaveTaskDetl> taskDetls = taskMapper.getTaskDetlQutify(taskNo);
    public R getTaskDetlQutify(String taskNo, String waveNo) {
        List<WaveTaskDetl> taskDetls = taskMapper.getTaskDetlQutify(taskNo, waveNo);
        return R.ok(taskDetls);
    }