Merge branch 'springboot3.5_cs' into spring3.5

zhou zhou

1 天以前 1724f77c35022b643c28dd3e5547679a5edc2d49

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

@@ -26,7 +26,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api("调拔单")
@@ -156,7 +156,7 @@
    @ApiOperation("单据信息修改")
    @PostMapping("/transfer/items/update")
    @PreAuthorize("hasAuthority('manager:transfer:update')")
    public R orderAndrItemUpdate(@RequestBody TransferItemParams params) throws Exception {
    public R orderAndrItemUpdate(@RequestBody TransferItemParams params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
@@ -167,7 +167,7 @@
    @ApiOperation("获取原库区物料信息")
    @PostMapping("/transfer/locs/items")
    @PreAuthorize("hasAuthority('manager:transfer:list')")
    public R locsPage(@RequestBody OrgLocParams params) throws Exception {
    public R locsPage(@RequestBody OrgLocParams params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
@@ -184,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);