From 7a923e32e55e9c34830690341469cc170f65092e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 16 十一月 2026 09:32:35 +0800
Subject: [PATCH] feat: 完善销售和投标业务流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java
index 3738d85..cdd8d84 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java
+++ b/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())));
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3