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

Junjie

2024-09-13 a1a7c03eae40f4b0344fce652e1a240cf5283624

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

@@ -4,11 +4,9 @@
import com.zy.asrs.wms.asrs.entity.dto.MergePreviewDto;
import com.zy.asrs.wms.asrs.entity.dto.MergePreviewResultDto;
import com.zy.asrs.wms.asrs.entity.dto.OrderOutBatchPreviewDto;
import com.zy.asrs.wms.asrs.entity.param.OrderOutBatchPreviewParam;
import com.zy.asrs.wms.asrs.entity.param.OrderOutMergeParam;
import com.zy.asrs.wms.asrs.entity.param.OrderOutMergePreviewParam;
import com.zy.asrs.wms.asrs.entity.param.OutParam;
import com.zy.asrs.wms.asrs.entity.param.*;
import com.zy.asrs.wms.asrs.manage.OutManage;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +29,7 @@
     * 出库
     */
    @PostMapping("/out/start")
    @OperationLog("出库")
    @Transactional
    public R start(@RequestBody OutParam param) {
        outManage.out(param);
@@ -38,6 +37,7 @@
    }

    @PostMapping("/out/orderOut/batch/preview")
    @OperationLog("批量出库预览")
    @Transactional
    public R orderOutBatchPreview(@RequestBody OrderOutBatchPreviewParam param) {
        List<OrderOutBatchPreviewDto> previewDtos = outManage.orderOutBatchPreview(param);
@@ -45,6 +45,7 @@
    }

    @PostMapping("/out/orderOut/batch")
    @OperationLog("批量出库")
    @Transactional
    public R orderOutBatch(@RequestBody List<OrderOutBatchPreviewDto> param) {
        outManage.orderOutBatch(param);
@@ -52,6 +53,7 @@
    }

    @PostMapping("/out/orderOut/merge/preview")
    @OperationLog("预览合并订单")
    @Transactional
    public R orderOutMergePreview(@RequestBody OrderOutMergePreviewParam param) {
        List<MergePreviewDto> dtos = outManage.orderOutMergePreview(param);
@@ -59,6 +61,7 @@
    }

    @PostMapping("/out/orderOut/merge/loc/preview")
    @OperationLog("预览合并订单出库")
    @Transactional
    public R orderOutMergeLocPreview(@RequestBody List<MergePreviewDto> param) {
        List<MergePreviewResultDto> dtos = outManage.orderOutMergeLocPreview(param);
@@ -66,9 +69,26 @@
    }

    @PostMapping("/out/orderOut/merge")
    @OperationLog("合并订单出库")
    @Transactional
    public R orderOutMerge(@RequestBody List<OrderOutMergeParam> param) {
    public R orderOutMerge(@RequestBody OrderOutMergeParamDto param) {
        outManage.orderOutMerge(param);
        return R.ok();
    }

    @PostMapping("/out/wave/generate")
    @OperationLog("生成波次")
    @Transactional
    public R generateWave(@RequestBody List<Long> orderIds) {
        outManage.generateWave(orderIds);
        return R.ok();
    }

    @PostMapping("/out/wave/cancel")
    @OperationLog("取消波次")
    @Transactional
    public R cancelWave(@RequestBody List<Long> waveIds) {
        outManage.cancelWave(waveIds);
        return R.ok();
    }
}