波次下髮優化 堆垛機移庫任務優化

zc

7 天以前 e4a2bc817e830611f7187ba8cb62875842b79d3f

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

@@ -4,15 +4,18 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.controller.params.OrgLocParams;
import com.vincent.rsf.server.manager.controller.params.TransferItemParams;
import com.vincent.rsf.server.manager.entity.Transfer;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
import com.vincent.rsf.server.manager.service.OutStockService;
import com.vincent.rsf.server.manager.service.TransferService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
@@ -32,6 +35,8 @@

    @Autowired
    private TransferService transferService;
    @Autowired
    private OutStockService outStockService;

    @PreAuthorize("hasAuthority('manager:transfer:list')")
    @PostMapping("/transfer/page")
@@ -39,6 +44,25 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Transfer, BaseParam> pageParam = new PageParam<>(baseParam, Transfer.class);
        return R.ok().add(transferService.page(pageParam, pageParam.buildWrapper(true)));
    }

    @ApiOperation("获取调拔单关联订单")
    @PreAuthorize("hasAuthority('manager:transfer:list')")
    @PostMapping("/transfer/orders/page")
    public R getTransferInfo(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Transfer, BaseParam> pageParam = new PageParam<>(baseParam, Transfer.class);
        return R.ok().add(transferService.transfersPage(pageParam, pageParam.buildWrapper(true)));
    }

    @ApiOperation("调拔单生成出库单")
    @PreAuthorize("hasAuthority('manager:transfer:list')")
    @PostMapping("/transfer/pub/outStock")
    public R genOutstock(@RequestBody Transfer transfer) {
        if (Objects.isNull(transfer)) {
            throw new CoolException("参数不能为空！！");
        }
        return R.ok(transferService.genOutStock(transfer, getLoginUserId()));
    }

    @PreAuthorize("hasAuthority('manager:transfer:list')")
@@ -95,8 +119,12 @@
    @OperationLog("Delete 调拔单")
    @PostMapping("/transfer/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!transferService.removeByIds(Arrays.asList(ids))) {
            return R.error("Delete Fail");
        List<Long> list = Arrays.asList(ids);
        if (list.isEmpty()) {
            return R.error("参数不能为空！！");
        }
        if (!transferService.removeTransfer(list)) {
            throw new CoolException("调拔单移除失败！！");
        }
        return R.ok("Delete Success").add(ids);
    }
@@ -127,8 +155,8 @@

    @ApiOperation("单据信息修改")
    @PostMapping("/transfer/items/update")
    @PreAuthorize("hasAuthority('manager:outStock:update')")
    public R orderAndrItemUpdate(@RequestBody TransferItemParams params) throws Exception {
    @PreAuthorize("hasAuthority('manager:transfer:update')")
    public R orderAndrItemUpdate(@RequestBody TransferItemParams params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
@@ -136,6 +164,15 @@
    }


    @ApiOperation("获取原库区物料信息")
    @PostMapping("/transfer/locs/items")
    @PreAuthorize("hasAuthority('manager:transfer:list')")
    public R locsPage(@RequestBody OrgLocParams params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
        return R.ok().add(transferService.getLocsItems(params, getLoginUserId()));
    }

    /**
     * @author Ryan
@@ -147,7 +184,7 @@
    @PostMapping("/transfer/template/download")
    @ApiOperation("下载盘点单模板")
    @PreAuthorize("hasAuthority('manager:transfer:update')")
    public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
    public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) {
        CheckOrderTemplate template = ExcelUtil.mockData(CheckOrderTemplate.class);
        List<CheckOrderTemplate> list = Arrays.asList(template);
        ExcelUtil.build(ExcelUtil.create(list, CheckOrderTemplate.class, true), response);