提交

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/controller/DeliveryTransferController.java

@@ -32,11 +32,19 @@ public class DeliveryTransferController {
         return ApiResponse.success(service.transfer(scope(user, customerId), dispatchNo, operator(user), request));
     }
 
+    @PostMapping("/outbound-orders/one-click-dropship")
+    @Operation(summary = "Create one-click dropship outbound and push a PDA picking task")
+    public ApiResponse<DeliveryResponses.PdaTask> createOneClick(
+        @AuthenticationPrincipal AuthenticatedUser user, @RequestParam(required = false) String customerId,
+        @Valid @RequestBody DeliveryRequests.OneClickOutbound request) {
+        return ApiResponse.success(service.createOneClick(scope(user, customerId), operator(user), request));
+    }
+
     @GetMapping("/outbound-orders")
     public ApiResponse<PageResult<DeliveryResponses.OutboundRow>> outboundPage(
         @AuthenticationPrincipal AuthenticatedUser user, @RequestParam(required = false) String customerId,
         @Valid DeliveryRequests.Query query) {
-        return ApiResponse.success(service.outboundPage(scope(user, customerId), query));
+        return ApiResponse.success(service.outboundPage(listScope(user, customerId), query));
     }
 
     @GetMapping("/outbound-orders/{outboundNo}")
@@ -73,4 +81,9 @@ public class DeliveryTransferController {
     private String operator(AuthenticatedUser user) {
         return user.userId() == null ? user.username() : String.valueOf(user.userId());
     }
+    private String listScope(AuthenticatedUser user, String requestedCustomer) {
+        if (user == null || user.tenantId() == null) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
+        if ("PLATFORM".equals(user.appCode()) && user.tenantId() == 0L) return requestedCustomer == null || requestedCustomer.isBlank() ? null : requestedCustomer.trim();
+        return String.valueOf(user.tenantId());
+    }
 }

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/controller/OutboundPdaController.java

@@ -0,0 +1,43 @@
+package com.baiyue.lastleg.delivery.controller;
+
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.common.security.AuthenticatedUser;
+import com.baiyue.lastleg.delivery.dto.DeliveryRequests;
+import com.baiyue.lastleg.delivery.dto.DeliveryResponses;
+import com.baiyue.lastleg.delivery.service.DeliveryTransferService;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.server.ResponseStatusException;
+
+@RestController
+@ConditionalOnProperty(name="lastleg.future-outbound-api.enabled", havingValue="true")
+@RequestMapping("/api/pda/v1/last-leg/outbound-tasks")
+public class OutboundPdaController {
+    @Resource private DeliveryTransferService service;
+    @PostMapping("/{taskNo}/pick")
+    public ApiResponse<DeliveryResponses.PdaTask> pick(@AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String taskNo, @RequestParam(required=false) String customerId,
+        @Valid @RequestBody DeliveryRequests.PdaPick request) {
+        return ApiResponse.success(service.pdaPick(scope(user, customerId), operator(user), taskNo, request));
+    }
+    @GetMapping
+    public ApiResponse<java.util.List<DeliveryResponses.PdaTask>> list(@AuthenticationPrincipal AuthenticatedUser user,
+        @RequestParam(required=false) String customerId, @RequestParam(required=false) String status) {
+        return ApiResponse.success(service.pdaTasks(scope(user, customerId), status));
+    }
+    @PostMapping("/{taskNo}/complete")
+    public ApiResponse<DeliveryResponses.PdaTask> complete(@AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String taskNo, @RequestParam(required=false) String customerId) {
+        return ApiResponse.success(service.completePda(scope(user, customerId), taskNo));
+    }
+    private String scope(AuthenticatedUser user, String requested) {
+        if (user == null || user.tenantId() == null) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
+        if (requested != null && !requested.isBlank()) return requested.trim();
+        return String.valueOf(user.tenantId());
+    }
+    private String operator(AuthenticatedUser user) { return user.userId() == null ? user.username() : String.valueOf(user.userId()); }
+}