From acaf6624ef2f706b8ccf442b453d802320829bd3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 四月 2025 16:51:16 +0800
Subject: [PATCH] # 修改 1. 任务列表修改 2. ASN执行状态修改 3. ASN扩展字段优化 4. 确认收货扩展字段优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
index 2c57317..037dee9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -157,24 +157,26 @@
@PostMapping("/asnOrder/items/save")
@ApiOperation("淇濆瓨涓诲崟鍙婃槑缁�")
@PreAuthorize("hasAuthority('manager:asnOrder:save')")
- public R orderAndItem(@RequestBody AsnOrderAndItemsParams params) {
+ public R orderAndItem(@RequestBody AsnOrderAndItemsParams params) throws Exception {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
-
return asnOrderService.saveOrderAndItems(params, getLoginUserId());
}
@ApiOperation("鍗曟嵁淇℃伅淇敼")
@PostMapping("/asnOrder/items/update")
@PreAuthorize("hasAuthority('manager:asnOrder:update')")
- public R orderAndrItemUpdate(@RequestBody AsnOrderAndItemsParams params) {
+ public R orderAndrItemUpdate(@RequestBody AsnOrderAndItemsParams params) throws Exception {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return asnOrderService.updateOrderItem(params, getLoginUserId());
}
+ @ApiOperation("鍗曟嵁鎵归噺淇敼")
+ @PostMapping("/asnOrder/batch/update")
+ @PreAuthorize("hasAuthority('manager:asnOrder:update')")
public R batchUpdate(@RequestBody BatchUpdateParam params) {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -187,4 +189,19 @@
}
return R.ok(asnOrderService.batchUpdate(params, getLoginUserId()));
}
+
+ @ApiOperation("涓�閿敹璐�")
+ @PostMapping("/asnOrder/complete/{id}")
+ @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+ public R completeOrder(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return asnOrderService.completeOrder(id, getLoginUserId());
+ }
+
+
+
+
+
}
--
Gitblit v1.9.1