调拔功能优化

skyouc

2 天以前 d5f16640dc1bf0239beafab721480a64425d9c1e

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

@@ -4,6 +4,7 @@
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;
@@ -13,6 +14,7 @@
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 +34,8 @@

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

    @PreAuthorize("hasAuthority('manager:transfer:list')")
    @PostMapping("/transfer/page")
@@ -39,6 +43,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')")
@@ -76,6 +99,10 @@
        if (!transferService.save(transfer)) {
            return R.error("Save Fail");
        }

        /***保存成功，自动生成出库单*/
        transferService.genOutStock(transfer, getLoginUserId());

        return R.ok("Save Success").add(transfer);
    }

@@ -95,8 +122,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);
    }