gaoluyang
4 小时以前 7a923e32e55e9c34830690341469cc170f65092e
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java
@@ -109,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);
    }
@@ -158,4 +151,4 @@
                        vo.setClientName(customer.getName())));
    }
}
}