Merge origin/dev into test preserving warehouse and PDA workflows

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

@@ -38,6 +38,17 @@ public class DispatchController {
         return ApiResponse.success(service.update(dispatchNo, request));
     }
 
+    @DeleteMapping("/{dispatchNo}/items/{itemId}")
+    @PreAuthorize("hasAuthority('" + OverseasPermissions.DISPATCH_EDIT + "')")
+    @Operation(summary = "Remove one unpicked pallet before an outbound order is generated")
+    public ApiResponse<DispatchResponse> removeItem(
+        @AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String dispatchNo,
+        @PathVariable Long itemId) {
+        requirePlatform(user);
+        return ApiResponse.success(service.removeItem(dispatchNo, itemId));
+    }
+
     @DeleteMapping("/{dispatchNo}")
     @PreAuthorize("hasAuthority('" + OverseasPermissions.DISPATCH_CANCEL + "')")
     @Operation(summary = "Cancel a pending dispatch and release its pallet locks")

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

@@ -74,7 +74,9 @@ public class SmartDispatchController {
         @AuthenticationPrincipal AuthenticatedUser user,
         @Valid @RequestBody DispatchRequests.PreArrange request) {
         requirePlatform(user);
-        String scopedCustomer = service.resolveCustomerScopeForPallets(request.planPalletIds());
+        String scopedCustomer = request.relabelNo() == null || request.relabelNo().isBlank()
+            ? service.resolveCustomerScopeForPallets(request.planPalletIds())
+            : service.resolveCustomerScopeForRelabel(request.relabelNo());
         String operatorId = user.userId() == null ? user.username() : String.valueOf(user.userId());
         return ApiResponse.success(service.preArrange(scopedCustomer, operatorId, request));
     }