no message

skyouc

6 天以前 e046dba174365eb8934ee1e4206f09821145e876

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

@@ -2,6 +2,7 @@


import com.alibaba.fastjson.JSON;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import com.zy.asrs.wms.asrs.entity.param.StockOutParam;

import com.zy.asrs.framework.common.R;

import com.zy.asrs.framework.exception.CoolException;

import com.zy.asrs.wms.asrs.entity.Order;

@@ -24,6 +25,7 @@


import java.util.ArrayList;

import java.util.List;

import java.util.Objects;





@RestController

@@ -82,7 +84,7 @@


    @PostMapping("/out/orderOut/wave/preview")

    @OperationLog("预览波次出库")

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public R orderOutWavePreview(@RequestBody OrderOutWavePreviewParam param) {

        if (param == null) {

            throw new CoolException("参数不能为空");

@@ -107,9 +109,10 @@
            MergePreviewDto dto = new MergePreviewDto();

            dtos.add(dto);



            double anfme = waveDetl.getAnfme() - waveDetl.getWorkQty();

            double anfme = Math.round((waveDetl.getAnfme() - waveDetl.getWorkQty()) * 1000) / 1000.0;

            dto.setMatnr(waveDetl.getMatnr());

            dto.setBatch(waveDetl.getBatch());

            dto.setStatus(0);

            dto.setWorkQty(0.0);

            dto.setAnfme(anfme);

            dto.setOrderIds(orderIds);

@@ -122,13 +125,23 @@
    }



    @PostMapping("/out/orderOut/merge/wave")

    @OperationLog("波次合并订单出库")

    @Transactional

    @OperationLog("生成波次任务")

    public R orderOutMerge(@RequestBody OrderOutMergeParamDto param) {

        outManage.orderOutMergeWave(param);

        return R.ok();

    }





    @PostMapping("/out/locs/stock")

    @OperationLog("手动出库")

    public R stockOut(@RequestBody StockOutParam param) {

        if (Objects.isNull(param)) {

            throw new CoolException("参数不能为空！！");

        }

        outManage.outLocStock(param);

        return R.ok();

    }



    @PostMapping("/out/wave/generate")

    @OperationLog("生成波次")

    @Transactional