no message

yangyang

2025-06-21 66f482d6b979f4988f425d029ea4be3c6ec52471

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

@@ -7,6 +7,7 @@
import com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl;
import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
import com.zy.asrs.wms.apis.wcs.utils.HttpEssUtils;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.dto.LargeScreenTaskDto;
import com.zy.asrs.wms.asrs.entity.enums.OrderPickStatus;
@@ -15,15 +16,17 @@
import com.zy.asrs.wms.asrs.mapper.*;
import com.zy.asrs.wms.asrs.service.TaskService;
import com.zy.asrs.wms.asrs.service.WaveSeedService;
import org.aspectj.weaver.ast.Or;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

import static com.zy.asrs.wms.utils.HttpUtils.getClientIpAddress;

@Slf4j
@Service
public class WaveManagentServiceImpl implements WaveManagentService {
    @Autowired
@@ -65,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);
    }

@@ -121,8 +136,15 @@
     * @return
     */
    @Override
    public R AllSeedLocs() {
        List<CacheSite> cacheSites = cacheSiteMapper.selectList(new LambdaQueryWrapper<CacheSite>());
    public R AllSeedLocs(HttpServletRequest request) {
        log.info("ip地址====>： {}",  getClientIpAddress(request));
        String locIp =  getClientIpAddress(request);
        List<CacheSite> cacheSites;
        if (locIp.equals(HttpEssUtils.S2_SITE_NO)) {
            cacheSites = cacheSiteMapper.selectList(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getChannel, "S2"));
        } else {
            cacheSites = cacheSiteMapper.selectList(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getChannel, "S1"));
        }
        if (cacheSites.isEmpty()) {
            return R.error("当前播种墙信息未设置！！");
        }