盘点单据取消任务功能优化

skyouc

2 天以前 42f887929f3003026f33ba6822703b1a89a13489

 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,7 +11,14 @@
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.entity.AsnOrder;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.controller.params.CheckOrderItemParams;
import com.vincent.rsf.server.manager.controller.params.CheckOrderParams;
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
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;
import com.vincent.rsf.server.manager.service.CheckOrderService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -25,6 +33,7 @@

import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;

@Api("盘点")
@RestController
@@ -37,8 +46,8 @@
    @PostMapping("/check/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<AsnOrder, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrder.class);
        QueryWrapper<AsnOrder> wrapper = pageParam.buildWrapper(true);
        PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
        QueryWrapper<WkOrder> wrapper = pageParam.buildWrapper(true);
        wrapper.eq("type", OrderType.ORDER_CHECK.type);
        return R.ok().add(checkOrderService.page(pageParam, wrapper));
    }
@@ -64,7 +73,7 @@
    @PreAuthorize("hasAuthority('manager:check:save')")
    @OperationLog("Create 字典数据集")
    @PostMapping("/check/save")
    public R save(@RequestBody AsnOrder order) {
    public R save(@RequestBody WkOrder order) {
        order.setType(OrderType.ORDER_CHECK.type);
        String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_CHECK_RULE_CODE, order);
        if (Objects.isNull(ruleCode)) {
@@ -79,7 +88,7 @@
    @PreAuthorize("hasAuthority('manager:check:update')")
    @OperationLog("Update 字典数据集")
    @PostMapping("/check/update")
    public R update(@RequestBody AsnOrder order) {
    public R update(@RequestBody WkOrder order) {
        order.setUpdateTime(null);
        order.setUpdateBy(getLoginUserId());
        if (!checkOrderService.updateById(order)) {
@@ -92,19 +101,41 @@
    @OperationLog("Delete 字典数据集")
    @PostMapping("/check/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!checkOrderService.removeByIds(Arrays.asList(ids))) {
        if (Objects.isNull(ids)) {
            throw new RuntimeException("盘点单ID不能为空！！");
        }
        List<WkOrder> wkOrders = checkOrderService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, Arrays.asList(ids)));
        if (wkOrders.isEmpty()) {
            return R.ok();
        }
        List<WkOrder> orders = wkOrders.stream().filter(order -> order.getExceStatus().equals(CheckExceStatus.CHECK_ORDER_STATUS_UN_EXCE.val)).collect(Collectors.toList());
        if (orders.isEmpty()) {
            return R.ok();
        }
        List<Long> orderIds = orders.stream().map(WkOrder::getId).collect(Collectors.toList());
        if (!checkOrderService.removeByIds(orderIds)) {
            return R.error("Delete Fail");
        }
        return R.ok("Delete Success").add(ids);
    }

    @PreAuthorize("hasAuthority('manager:outStock:update')")
    @ApiOperation("取消盘点单据")
    @GetMapping("/check/cancel/{id}")
    public R cancel(@PathVariable Long id) {
        if (Objects.isNull(id)) {
            return R.error("参数不能为空！！");
        }
        return checkOrderService.cancelCheckOrder(id);
    }

    @PreAuthorize("hasAuthority('manager:check:list')")
    @PostMapping("/check/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<AsnOrder> wrapper = new LambdaQueryWrapper<>();
        LambdaQueryWrapper<WkOrder> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(AsnOrder::getCode, condition);
            wrapper.like(WkOrder::getCode, condition);
        }
        checkOrderService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getCode()))
@@ -115,16 +146,100 @@
    @PreAuthorize("hasAuthority('manager:check:list')")
    @PostMapping("/check/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        List<AsnOrder> orders = new ArrayList<>();
        List<WkOrder> orders = new ArrayList<>();
        if (!Objects.isNull(map.get("ids"))) {
            orders = checkOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, map.get("ids")));
            orders = checkOrderService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, map.get("ids")));
        } else {
            orders = checkOrderService.list();
        }
        ExcelUtil.build(ExcelUtil.create(orders, AsnOrder.class), response);
        ExcelUtil.build(ExcelUtil.create(orders, WkOrder.class), response);
    }

    @PostMapping("/check/items/save")
    @ApiOperation("保存盘点单及明细")
    @PreAuthorize("hasAuthority('manager:check:save')")
    public R saveOutStock(@RequestBody AsnOrderAndItemsParams params) throws Exception {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
        return checkOrderService.saveCheckOrder(params, getLoginUserId());
    }

    @ApiOperation("盘点单信息修改")
    @PostMapping("/check/items/update")
    @PreAuthorize("hasAuthority('manager:check:update')")
    public R orderAndrItemUpdate(@RequestBody AsnOrderAndItemsParams params) throws Exception {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
        return checkOrderService.updateOrderItem(params, getLoginUserId());
    }

    @PostMapping("/check/order/items")
    @ApiOperation("盘点出库预览")
    @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());
    }

    /**
     * 获取出库站点
     * @return
     */
    @GetMapping("/check/tasks/sites")
    @ApiOperation("获取盘点出库口")
    @PreAuthorize("hasAuthority('manager:check:list')")
    public R getSiteNos() {
        return checkOrderService.getSiteNos();
    }


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


    /**
     * @author Ryan
     * @description 下载模板
     * @param
     * @return
     * @time 2025/4/18 08:17
     */
    @PostMapping("/check/template/download")
    @ApiOperation("下载盘点单模板")
    @PreAuthorize("hasAuthority('manager:check:update')")
    public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        CheckOrderTemplate template = ExcelUtil.mockData(CheckOrderTemplate.class);
        List<CheckOrderTemplate> list = Arrays.asList(template);
        ExcelUtil.build(ExcelUtil.create(list, CheckOrderTemplate.class, true), response);
    }

    /**
     * 盘点单导入
@@ -141,6 +256,5 @@
        HashMap<String, Object> hashMap = new HashMap<>();
        return checkOrderService.excelImport(file, hashMap, getLoginUserId());
    }


}