#

Junjie

2024-06-18 aab74f9728236408a573b6502d623eca2e8fff5b

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasConveyorController.java

@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.system.controller;
package com.zy.asrs.wcs.core.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,6 +10,7 @@
import com.zy.asrs.wcs.common.domain.PageParam;
import com.zy.asrs.wcs.core.entity.BasConveyor;
import com.zy.asrs.wcs.core.service.BasConveyorService;
import com.zy.asrs.wcs.system.controller.BaseController;
import com.zy.asrs.wcs.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -87,7 +88,7 @@
            wrapper.like(BasConveyor::getConveyorNo, condition);
        }
        basConveyorService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getDeviceId(), item.getConveyorNo() + "输送线[id:" + item.getDeviceId() + "]"))
                item -> vos.add(new KeyValVo(item.getId(), item.getConveyorNo() + "输送线[id:" + item.getId() + "]"))
        );
        return R.ok().add(vos);
    }