gaoluyang
4 小时以前 7a923e32e55e9c34830690341469cc170f65092e
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java
@@ -72,7 +72,6 @@
    @GetMapping("/get")
    @Operation(summary = "获得销售退货单")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('mes:wm-return-sales:query')")
    public CommonResult<MesWmReturnSalesRespVO> getReturnSales(@RequestParam("id") Long id) {
        MesWmReturnSalesDO returnSales = returnSalesService.getReturnSales(id);
        if (returnSales == null) {
@@ -83,7 +82,6 @@
    @GetMapping("/page")
    @Operation(summary = "获得销售退货单分页")
    @PreAuthorize("@ss.hasPermission('mes:wm-return-sales:query')")
    public CommonResult<PageResult<MesWmReturnSalesRespVO>> getReturnSalesPage(
            @Valid MesWmReturnSalesPageReqVO pageReqVO) {
        PageResult<MesWmReturnSalesDO> pageResult = returnSalesService.getReturnSalesPage(pageReqVO);
@@ -111,21 +109,14 @@
        return success(true);
    }
    @PutMapping("/finish")
    @Operation(summary = "执行退货")
    @Parameter(name = "id", description = "编号", required = true)
    @PutMapping("/confirm-inbound")
    @Operation(summary = "质检后确认退货入库")
    @PreAuthorize("@ss.hasPermission('mes:wm-return-sales:finish')")
    public CommonResult<Boolean> finishReturnSales(@RequestParam("id") Long id) {
        returnSalesService.finishReturnSales(id);
        return success(true);
    }
    @PutMapping("/stock")
    @Operation(summary = "执行上架")
    @Parameter(name = "id", description = "编号", required = true)
    @PreAuthorize("@ss.hasPermission('mes:wm-return-sales:stock')")
    public CommonResult<Boolean> stockReturnSales(@RequestParam("id") Long id) {
        returnSalesService.stockReturnSales(id);
    public CommonResult<Boolean> confirmReturnSales(@RequestParam("id") Long id,
            @RequestParam("warehouseId") Long warehouseId,
            @RequestParam("locationId") Long locationId,
            @RequestParam("areaId") Long areaId) {
        returnSalesService.confirmReturnSales(id, warehouseId, locationId, areaId);
        return success(true);
    }
@@ -141,7 +132,6 @@
    @GetMapping("/check-quantity")
    @Operation(summary = "校验销售退货单数量", description = "校验每行明细数量之和是否等于行退货数量")
    @Parameter(name = "id", description = "编号", required = true)
    @PreAuthorize("@ss.hasPermission('mes:wm-return-sales:query')")
    public CommonResult<Boolean> checkReturnSalesQuantity(@RequestParam("id") Long id) {
        return success(returnSalesService.checkReturnSalesQuantity(id));
    }
@@ -161,4 +151,4 @@
                        vo.setClientName(customer.getName())));
    }
}
}