From 851cb467145b5814e62eff9537d5fc372bfa2d86 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 09 四月 2025 14:04:13 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
index 13eb3eb..72da8c5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
import java.util.Objects;
/**
@@ -78,7 +79,7 @@
@PreAuthorize("hasAuthority('manager:warehouseAreas:save')")
@PostMapping("/orders/confirm")
@ApiOperation("纭鏀惰揣")
- public R confirmReceipt(@RequestBody ReceiptParams params) {
+ public R confirmReceipt(@RequestBody Map<String, Object> params) {
if (Objects.isNull(params)) {
throw new CoolException("璇锋眰鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -219,7 +220,7 @@
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return mobileService.publicToStock(params);
+ return mobileService.publicToStock(params, getLoginUserId());
}
@ApiOperation("鑾峰彇浠诲姟淇℃伅")
@@ -234,7 +235,7 @@
@ApiOperation("浠诲姟涓婃灦")
@PreAuthorize("hasAuthority('manager:qlyInspect:update')")
- @PostMapping("/task/stock")
+ @PostMapping("/task/public/{code}")
public R taskToLocs(@PathVariable String code) throws Exception {
if (Objects.isNull(code)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -242,4 +243,14 @@
return mobileService.taskGetLocs(code);
}
+ @ApiOperation("涓�閿敹璐�")
+ @PostMapping("/complete/{id}")
+ @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+ public R completeOrder(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.completeOrder(id, getLoginUserId());
+ }
+
}
--
Gitblit v1.9.1