#合并订单出库，统一转波次出库前最新代码

Junjie

2024-09-13 a1a7c03eae40f4b0344fce652e1a240cf5283624

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveController.java

@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wms.asrs.entity.TaskDetl;
import com.zy.asrs.wms.asrs.entity.WaveDetl;
import com.zy.asrs.wms.asrs.service.TaskDetlService;
import com.zy.asrs.wms.asrs.service.WaveDetlService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
@@ -32,6 +34,8 @@
    private WaveService waveService;
    @Autowired
    private WaveDetlService waveDetlService;
    @Autowired
    private TaskDetlService taskDetlService;

    @PreAuthorize("hasAuthority('asrs:wave:list')")
    @PostMapping("/wave/page")
@@ -39,6 +43,21 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Wave, BaseParam> pageParam = new PageParam<>(baseParam, Wave.class);
        PageParam<Wave, BaseParam> page = waveService.page(pageParam, pageParam.buildWrapper(true));

        List<Wave> records = page.getRecords();
        for (Wave record : records) {
            ArrayList<Long> orderDetlIds = new ArrayList<>();
            for (WaveDetl waveDetl : record.getWaveDetlList()) {
                orderDetlIds.add(waveDetl.getOrderId());
            }

            List<TaskDetl> taskDetls = taskDetlService.list(new LambdaQueryWrapper<TaskDetl>().in(TaskDetl::getOrderId, orderDetlIds));
            if (taskDetls.isEmpty()) {
                record.setGenerateTask(false);
            }else {
                record.setGenerateTask(true);
            }
        }
        return R.ok().add(page);
    }