提交

2026-08-26 13:51:19 +08:00
parent 270372f56a
commit 394c690601
18 changed files with 390 additions and 16 deletions
@@ -54,15 +54,25 @@ public class DeliveryTransferController {
        return ApiResponse.success(service.outboundDetail(scope(user, customerId), outboundNo, query));
    }

+    @PostMapping("/outbound-orders/{outboundNo}/cancel")
+    @Operation(summary = "Cancel outbound and linked delivery, restoring inventory")
+    public ApiResponse<Void> cancelOutbound(@AuthenticationPrincipal AuthenticatedUser user,
+                                             @RequestParam(required = false) String customerId,
+                                             @PathVariable String outboundNo,
+                                             @Valid @RequestBody DeliveryRequests.Cancel request) {
+        service.cancelOutbound(scope(user, customerId), operator(user), outboundNo, request);
+        return ApiResponse.success(null);
+    }
+
    @GetMapping("/delivery-orders")
    public ApiResponse<PageResult<DeliveryResponses.DeliveryRow>> deliveryPage(
        @AuthenticationPrincipal AuthenticatedUser user, @RequestParam(required = false) String customerId,
        @Valid DeliveryRequests.Query query) {
-        return ApiResponse.success(service.deliveryPage(scope(user, customerId), query));
+        return ApiResponse.success(service.deliveryPage(listScope(user, customerId), query));
    }

    @GetMapping("/delivery-orders/{deliveryNo}")
-    public ApiResponse<DeliveryResponses.OutboundDetail> deliveryDetail(
+    public ApiResponse<DeliveryResponses.DeliveryDetail> deliveryDetail(
        @AuthenticationPrincipal AuthenticatedUser user, @RequestParam(required = false) String customerId,
        @PathVariable String deliveryNo, @Valid DeliveryRequests.PalletQuery query) {
        return ApiResponse.success(service.deliveryDetail(scope(user, customerId), deliveryNo, query));