Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-08-15 57660aeba6e8bf2b4c9557b6b7c11cb227dac912

Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

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

@@ -64,7 +64,7 @@
    @PostMapping("/asnOrder/dashbord/header")
    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    public R getDashbord() {
        return R.ok().add(asnOrderService.getDashbord());
        return asnOrderService.getDashbord();
    }

    @ApiOperation("获取出入库趋势图")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java

@@ -428,7 +428,7 @@
        //获取执行中任务数量
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<>());
        if (!tasks.isEmpty()) {
            outTrand.setTaskQty(tasks.size());
            dto.setTaskQty(tasks.size());
        }
        return R.ok().add(dto);
    }