调拔单功能优化

skyouc

3 天以前 474103da0c9793ec9cd7559f109491ece282e269

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

@@ -4,15 +4,20 @@
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.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.TransferService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +40,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')")
@@ -63,6 +87,12 @@
        transfer.setCreateTime(new Date());
        transfer.setUpdateBy(getLoginUserId());
        transfer.setUpdateTime(new Date());

        if (Objects.isNull(transfer.getCode())) {
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, transfer);
            transfer.setCode(ruleCode);
        }

        if (!transferService.save(transfer)) {
            return R.error("Save Fail");
        }
@@ -105,6 +135,28 @@
        return R.ok().add(vos);
    }

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

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



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