From 8ef2c9bf15e8d3b70fcf1cffe98d4f6ff0fc9ed6 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 21 十一月 2025 09:40:09 +0800
Subject: [PATCH] Merge branch 'devlop_whxrwms' of http://47.97.1.152:5880/r/wms-master into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 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 9996357..d4ca9e3 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
@@ -3,7 +3,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.entity.params.WavePickItemsParams;
import com.vincent.rsf.server.api.service.PdaOutStockService;
+import com.vincent.rsf.server.manager.entity.TaskItem;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -13,6 +15,7 @@
import java.util.List;
import java.util.Map;
+import java.util.Objects;
@Api(tags = "PDA鍑哄簱鎿嶄綔鎺ュ彛")
@RequestMapping("/pda")
@@ -32,7 +35,7 @@
@PreAuthorize("hasAuthority('manager:task:list')")
@GetMapping("/saveOutTaskSts/{barcode}")
- @ApiOperation("蹇�熸嫞璐ф煡璇�")
+ @ApiOperation("蹇�熸嫞璐�")
public R saveOutTaskSts(@PathVariable String barcode) {
return pdaOutStockService.saveOutTaskSts(barcode);
@@ -50,9 +53,23 @@
@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")
@@ -61,4 +78,27 @@
return pdaOutStockService.saveWavePick(containerWaveParam,getLoginUserId());
}
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @PostMapping("/task/items")
+ @ApiOperation("鏌ヨ鍑哄簱浠诲姟鎷ｈ揣鏄庣粏")
+ public R getTaskItem(@RequestBody Map<String, String> params) {
+ if (Objects.isNull(params.get("barcode"))) {
+ return R.error("鎵樼洏鐮佷笉鑳戒负绌�");
+ }
+ return pdaOutStockService.getTaskItems(params);
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @ApiOperation("娉㈡鍑哄簱鍗曟槑缁嗘崲缁�")
+ @PostMapping("/task/item/update")
+ public R modifyTaskItem(@RequestBody List<TaskItem> items) {
+ if (Objects.isNull(items) || items.isEmpty()) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return pdaOutStockService.modifyTaskItem(items);
+ }
+
+
+
}
--
Gitblit v1.9.1