Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

16 小时以前 5c90daa2c919f3f07df0a154ff91f0e015bf8d66

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java

@@ -1,5 +1,6 @@
package com.vincent.rsf.server.manager.controller;

import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,9 +11,9 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.controller.params.*;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
import com.vincent.rsf.server.manager.enums.CheckExceStatus;
import com.vincent.rsf.server.manager.enums.OrderType;
@@ -161,7 +162,6 @@
        return checkOrderService.saveCheckOrder(params, getLoginUserId());
    }


    @ApiOperation("盘点单信息修改")
    @PostMapping("/check/items/update")
    @PreAuthorize("hasAuthority('manager:check:update')")
@@ -172,18 +172,32 @@
        return checkOrderService.updateOrderItem(params, getLoginUserId());
    }

    @PostMapping("/outStock/order/getOutTaskItems")
    @PostMapping("/check/order/items")
    @ApiOperation("盘点出库预览")
    @PreAuthorize("hasAuthority('manager:outStock:list')")
    @PreAuthorize("hasAuthority('manager:check:list')")
    public R getOrderOutTaskItem(@RequestBody OrderOutTaskParam param) {
        if (Cools.isEmpty(param)) {
            return R.error("参数不能为空");
        }

        return checkOrderService.genCheckPreview(param);
    }


    /**
     * 盘点单生成出库任务
     * @param params
     * @return
     */
    @PostMapping("/check/generate/tasks")
    @ApiOperation("生成盘点出库任务")
    @PreAuthorize("hasAuthority('manager:outStock:list')")
    public R genCheckOutTask( @RequestBody List<CheckOrderParams> params) {
        if (Cools.isEmpty()) {
            return R.error("参数不能为空！！");
        }

        return  checkOrderService.genCheckOutTask(params, getLoginUserId());
    }

    /**
     * 获取出库站点
@@ -197,6 +211,17 @@
    }


    @ApiOperation("获取在库物料列表")
    @PostMapping("/check/locs")
    @PreAuthorize("hasAuthority('manager:check:list')")
    public R getAllLocByMatnr(@RequestBody CheckLocQueryParams params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
        return checkOrderService.getAllLocByMatnr(params);
    }


    /**
     * @author Ryan
     * @description 下载模板