#

Junjie

2025-02-14 ac4341ea6b66ae02427d39d35f41d42d78b2eb2e

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

@@ -1,11 +1,18 @@
package com.zy.asrs.wms.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.Order;
import com.zy.asrs.wms.asrs.entity.WaveDetl;
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.*;
import com.zy.asrs.wms.asrs.manage.OutManage;
import com.zy.asrs.wms.asrs.service.OrderService;
import com.zy.asrs.wms.asrs.service.WaveDetlService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +22,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.List;


@@ -24,6 +32,10 @@

    @Autowired
    private OutManage outManage;
    @Autowired
    private OrderService orderService;
    @Autowired
    private WaveDetlService waveDetlService;

    /**
     * 出库
@@ -68,19 +80,57 @@
        return R.ok().add(dtos);
    }

    @PostMapping("/out/orderOut/merge")
    @OperationLog("合并订单出库")
    @PostMapping("/out/orderOut/wave/preview")
    @OperationLog("预览波次出库")
    @Transactional
    public R orderOutWavePreview(@RequestBody OrderOutWavePreviewParam param) {
        if (param == null) {
            throw new CoolException("参数不能为空");
        }

        Long waveId = param.getWaveId();
        if (waveId == null) {
            throw new CoolException("波次不能为空");
        }

        List<Long> orderIds = new ArrayList<>();
        List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getWaveId, waveId));
        for (Order order : orders) {
            orderIds.add(order.getId());
        }

        List<MergePreviewDto> dtos = new ArrayList<>();
        List<WaveDetl> waveDetls = waveDetlService.list(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getWaveId, waveId));
        for (WaveDetl waveDetl : waveDetls) {
            MergePreviewDto dto = new MergePreviewDto();
            dtos.add(dto);

            double anfme = waveDetl.getAnfme() - waveDetl.getWorkQty();
            dto.setMatnr(waveDetl.getMatnr());
            dto.setBatch(waveDetl.getBatch());
            dto.setAnfme(anfme);
            dto.setOrderIds(orderIds);
            dto.setFieldParams(JSON.parseArray(waveDetl.getFieldParams(), FieldParam.class));
            dto.setFieldParamsEncode(waveDetl.getFieldParams());
        }

        List<MergePreviewResultDto> resultDtos = outManage.orderOutMergeLocPreview(dtos);
        return R.ok().add(resultDtos);
    }

    @PostMapping("/out/orderOut/merge/wave")
    @OperationLog("波次合并订单出库")
    @Transactional
    public R orderOutMerge(@RequestBody OrderOutMergeParamDto param) {
        outManage.orderOutMerge(param);
        outManage.orderOutMergeWave(param);
        return R.ok();
    }

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