From b0932123072a837e376e64de2c3417f045462cc3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 08 四月 2025 17:27:32 +0800
Subject: [PATCH] 新增PDA一键收货功能
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java | 2 ++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java | 10 ++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 7 ++++++-
3 files changed, 18 insertions(+), 1 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 3b2dbe6..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
@@ -243,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());
+ }
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
index 7b624a4..a1c2e6f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
@@ -57,4 +57,6 @@
R taskToStock(String code);
R taskGetLocs(String code) throws Exception;
+
+ R completeOrder(Long id, Long loginUserId);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index ea767f7..ae44e15 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -317,7 +317,7 @@
// //鏃ュ織琛ㄦ搷浣�
// operateOrderLogs(asnOrder);
// }
- return R.ok("鎿嶄綔鎴愬姛");
+ return R.ok(asnOrder);
}
/**
@@ -723,6 +723,11 @@
return R.ok();
}
+ @Override
+ public R completeOrder(Long id, Long loginUserId) {
+ return asnOrderMapper.completeOrder(id, loginUserId);
+ }
+
/**
* 鑾峰彇ReceiptDetlsDtos
*/
--
Gitblit v1.9.1