修改提交

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/controller/DispatchQueryController.java

@@ -35,7 +35,7 @@ public class DispatchQueryController {
         @AuthenticationPrincipal AuthenticatedUser user,
         @Valid DispatchRequests.Query query) {
         requirePlatform(user);
-        return ApiResponse.success(service.page(service.resolveSingleCustomerScope(), query));
+        return ApiResponse.success(service.platformPage(query));
     }
 
     @GetMapping("/{dispatchNo}")
@@ -45,7 +45,7 @@ public class DispatchQueryController {
         @AuthenticationPrincipal AuthenticatedUser user,
         @PathVariable String dispatchNo) {
         requirePlatform(user);
-        return ApiResponse.success(service.detail(service.resolveSingleCustomerScope(), dispatchNo));
+        return ApiResponse.success(service.platformDetail(dispatchNo));
     }
 
     private void requirePlatform(AuthenticatedUser user) {

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/controller/SmartDispatchController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ResponseStatusException;
 
@@ -38,13 +39,30 @@ public class SmartDispatchController {
         description = "Required authority: " + OverseasPermissions.INBOUND_ORDER_LIST)
     public ApiResponse<List<DispatchPalletCandidate>> candidates(
         @AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam List<Long> planIds,
+        @RequestParam(required = false) List<Long> planIds,
         @RequestParam(required = false) String orderNo,
         @RequestParam(required = false) String fbaWarehouseCode,
-        @RequestParam(required = false) String sourceStage) {
+        @RequestParam(required = false) String sourceStage,
+        @RequestParam(required = false) String draftToken) {
         requirePlatform(user);
+        if (planIds == null || planIds.isEmpty()) {
+            return ApiResponse.success(service.platformCandidates(orderNo, fbaWarehouseCode, sourceStage, draftToken));
+        }
         return ApiResponse.success(service.candidates(service.resolveCustomerScopeForPlans(planIds), planIds, orderNo,
-            fbaWarehouseCode, sourceStage));
+            fbaWarehouseCode, sourceStage, draftToken));
+    }
+
+    @GetMapping("/drafts")
+    @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_SMART_DISPATCH + "')")
+    public ApiResponse<List<com.baiyue.lastleg.dispatch.dto.DispatchDraftResponse>> drafts(@AuthenticationPrincipal AuthenticatedUser user) {
+        requirePlatform(user); return ApiResponse.success(service.activeDrafts(operatorId(user)));
+    }
+
+    @PostMapping("/drafts/snapshot")
+    @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_SMART_DISPATCH + "')")
+    public ApiResponse<Void> saveDraft(@AuthenticationPrincipal AuthenticatedUser user,
+                                       @Valid @RequestBody DispatchRequests.DraftSnapshot request) {
+        requirePlatform(user); service.saveDraftSnapshot(operatorId(user), request); return ApiResponse.success(null);
     }
 
     @PostMapping("/pre-arrange")
@@ -60,6 +78,45 @@ public class SmartDispatchController {
         return ApiResponse.success(service.preArrange(scopedCustomer, operatorId, request));
     }
 
+    @PostMapping("/draft-locks/lock")
+    @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_SMART_DISPATCH + "')")
+    @Operation(summary = "Immediately lock one pallet in the current intelligent dispatch draft")
+    public ApiResponse<Void> lockDraftPallet(
+        @AuthenticationPrincipal AuthenticatedUser user,
+        @Valid @RequestBody DispatchRequests.DraftPallet request) {
+        requirePlatform(user);
+        String customerId = service.resolveCustomerScopeForPallets(List.of(request.planPalletId()));
+        service.lockDraftPallet(customerId, operatorId(user), request);
+        return ApiResponse.success(null);
+    }
+
+    @PostMapping("/draft-locks/unlock")
+    @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_SMART_DISPATCH + "')")
+    @Operation(summary = "Unlock one pallet removed from the current intelligent dispatch draft")
+    public ApiResponse<Void> unlockDraftPallet(
+        @AuthenticationPrincipal AuthenticatedUser user,
+        @Valid @RequestBody DispatchRequests.DraftPallet request) {
+        requirePlatform(user);
+        String customerId = service.resolveCustomerScopeForPallets(List.of(request.planPalletId()));
+        service.unlockDraftPallet(customerId, operatorId(user), request);
+        return ApiResponse.success(null);
+    }
+
+    @PostMapping("/draft-locks/release")
+    @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_SMART_DISPATCH + "')")
+    @Operation(summary = "Release every pallet lock held by the current intelligent dispatch draft")
+    public ApiResponse<Void> releaseDraft(
+        @AuthenticationPrincipal AuthenticatedUser user,
+        @Valid @RequestBody DispatchRequests.DraftRelease request) {
+        requirePlatform(user);
+        service.releaseDraft(operatorId(user), request.draftToken());
+        return ApiResponse.success(null);
+    }
+
+    private String operatorId(AuthenticatedUser user) {
+        return user.userId() == null ? user.username() : String.valueOf(user.userId());
+    }
+
     private void requirePlatform(AuthenticatedUser user) {
         if (user == null || user.tenantId() == null) {
             throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);