出库优先先进先出

skyouc

2025-07-03 9219e85f544780fa955945fc6c0c63e08d862ce3

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

@@ -21,6 +21,7 @@
import org.springframework.stereotype.Service;

import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;

import static com.zy.asrs.wms.utils.HttpUtils.getClientIpAddress;
@@ -67,9 +68,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);
    }