From 450320f28d8db37264d7fc448c01fb32f64610b2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 13 十一月 2025 16:53:06 +0800
Subject: [PATCH] 波次出库修改
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
index f4045d5..1e287d7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
@@ -2,7 +2,10 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.entity.dto.ContainerWaveDto;
+import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
+import com.vincent.rsf.server.api.entity.params.WavePickItemsParams;
import com.vincent.rsf.server.api.service.PdaOutStockService;
+import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +18,7 @@
@Api(tags = "PDA鍑哄簱鎿嶄綔鎺ュ彛")
@RequestMapping("/pda")
@RestController
-public class PdaOutStockController {
+public class PdaOutStockController extends BaseController {
@Autowired
private PdaOutStockService pdaOutStockService;
@@ -26,6 +29,14 @@
public R getOutStockTaskItem(@PathVariable String barcode) {
return pdaOutStockService.getOutStockTaskItem(barcode);
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @GetMapping("/saveOutTaskSts/{barcode}")
+ @ApiOperation("蹇�熸嫞璐�")
+ public R saveOutTaskSts(@PathVariable String barcode) {
+
+ return pdaOutStockService.saveOutTaskSts(barcode);
}
@PreAuthorize("hasAuthority('manager:task:list')")
@@ -40,15 +51,32 @@
@PostMapping("/getContainerWaveList")
@ApiOperation("鏍规嵁瀹瑰櫒鐮佹煡璇㈡尝娆″強鍑哄簱鍗�")
public R getContainerWaveList(@RequestBody Map<String, String> map) {
-
return pdaOutStockService.getContainerWaveList(map);
}
@PreAuthorize("hasAuthority('manager:task:list')")
+ @PostMapping("/wave/order/items")
+ @ApiOperation("鑾峰彇娉㈡鎷ｈ揣鏄庣粏")
+ public R getWaveOrderItem(@RequestBody Map<String, Object> params) {
+ return pdaOutStockService.getWaveOrderItems(params);
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @ApiOperation("娉㈡鏄庣粏鎷ｈ揣")
+ @PostMapping("/wave/pick/item")
+ public R wavePickItems(@RequestBody WavePickItemsParams items) {
+ return pdaOutStockService.wavePickItems(items);
+ }
+
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/saveWavePick")
@ApiOperation("鏍规嵁瀹瑰櫒鐮佹煡璇㈡尝娆″強鍑哄簱鍗�")
- public R saveWavePick(@RequestBody List<ContainerWaveDto> containerWaveDtos) {
+ public R saveWavePick(@RequestBody ContainerWaveParam containerWaveParam) {
- return pdaOutStockService.saveWavePick(containerWaveDtos);
+ return pdaOutStockService.saveWavePick(containerWaveParam,getLoginUserId());
}
+
+
+
}
--
Gitblit v1.9.1