From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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..b50b876 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,9 @@
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.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 +17,7 @@
@Api(tags = "PDA鍑哄簱鎿嶄綔鎺ュ彛")
@RequestMapping("/pda")
@RestController
-public class PdaOutStockController {
+public class PdaOutStockController extends BaseController {
@Autowired
private PdaOutStockService pdaOutStockService;
@@ -26,6 +28,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')")
@@ -47,8 +57,8 @@
@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