优化

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

@@ -37,7 +37,7 @@ public class DeliveryTransferController {
     @PreAuthorize("hasAuthority('" + OverseasPermissions.OUTBOUND_CREATE + "')")
     @Operation(summary = "Create one-click dropship outbound and push a PDA picking task")
     public ApiResponse<DeliveryResponses.PdaTask> createOneClick(
-        @AuthenticationPrincipal AuthenticatedUser user, @RequestParam String customerId,
+        @AuthenticationPrincipal AuthenticatedUser user, @RequestParam(required = false) String customerId,
         @Valid @RequestBody DeliveryRequests.OneClickOutbound request) {
         return ApiResponse.success(service.createOneClick(requiredCustomer(user, customerId), operator(user), request));
     }
@@ -48,7 +48,8 @@ public class DeliveryTransferController {
     public ApiResponse<java.util.List<DeliveryResponses.OneClickCandidate>> oneClickCandidates(
         @AuthenticationPrincipal AuthenticatedUser user, @RequestParam String customerId,
         @RequestParam(required = false) String warehouseId) {
-        return ApiResponse.success(service.oneClickCandidates(requiredCustomer(user, customerId), warehouseId));
+        requirePlatform(user);
+        return ApiResponse.success(service.oneClickCandidates(customerId, warehouseId));
     }
 
     @GetMapping("/outbound-orders/return/candidates")

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/dto/DeliveryRequests.java

@@ -53,7 +53,7 @@ public final class DeliveryRequests {
                         String documentNo, String lxCode, String warehouseId, String status,
                         String dispatchNo, String waybillNo, String vehiclePlate,
                         String driverName, String deliveryMethod,
-                        LocalDateTime plannedFrom, LocalDateTime plannedTo) {
+                        LocalDateTime plannedFrom, LocalDateTime plannedTo, String outboundType) {
         public Query { if (page == 0) page = 1; if (size == 0) size = 20; }
     }
 

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/dto/DeliveryResponses.java

@@ -46,7 +46,7 @@ public final class DeliveryResponses {
                                     String destinationWarehouseCode, String destinationWarehouseName,
                                     String skuCode, int packageCount, int pickedPackageCount, String status) {}
     public record OutboundDetail(OutboundRow outbound, DeliveryRow delivery, List<OutboundPalletRow> pallets) {}
-    public record OneClickCandidate(Long inventoryPositionId, String overseasWarehouseId,
+    public record OneClickCandidate(Long inventoryPositionId, String orderNo, String customerId, String customerName, String overseasWarehouseId,
                                     String overseasWarehouseName, String palletNo, String inboundCode,
                                     String skuCode, String productName, long availablePackages) {}
     public record ReturnOutboundCandidate(String returnNo, String overseasWarehouseId,

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/service/DeliveryTransferService.java

@@ -257,7 +257,7 @@ public class DeliveryTransferService {
     }
 
     public List<DeliveryResponses.OneClickCandidate> oneClickCandidates(String customerId, String warehouseId) {
-        return dropshipProfiles.listOutboundCandidates(required(customerId, "Customer is required"),
+        return dropshipProfiles.listOutboundCandidates(customerId,
                 StringUtils.hasText(warehouseId) ? warehouseId.trim() : null).stream()
             .map(this::oneClickCandidate).toList();
     }
@@ -604,6 +604,7 @@ public class DeliveryTransferService {
                 .like(StringUtils.hasText(query.lxCode()), OutboundOrder::getLxCodes, query.lxCode())
                 .eq(StringUtils.hasText(query.warehouseId()), OutboundOrder::getOverseasWarehouseId, query.warehouseId())
                 .eq(StringUtils.hasText(query.status()), OutboundOrder::getStatus, query.status())
+                .eq(StringUtils.hasText(query.outboundType()), OutboundOrder::getOutboundType, query.outboundType())
                 .orderByDesc(OutboundOrder::getCreatedAt));
         return page(page, page.getRecords().stream().map(this::outboundRow).toList());
     }
@@ -696,7 +697,7 @@ public class DeliveryTransferService {
             item.getSkuCode(), value(item.getPackageCount()), value(item.getPickedPackageCount()), item.getStatus());
     }
     private DeliveryResponses.OneClickCandidate oneClickCandidate(DropshipOutboundCandidate candidate) {
-        return new DeliveryResponses.OneClickCandidate(candidate.getInventoryPositionId(),
+        return new DeliveryResponses.OneClickCandidate(candidate.getInventoryPositionId(), candidate.getOrderNo(), candidate.getCustomerId(), candidate.getCustomerName(),
             candidate.getOverseasWarehouseId(), candidate.getOverseasWarehouseName(), candidate.getPalletNo(),
             candidate.getInboundCode(), candidate.getSkuCode(), candidate.getProductName(),
             value(candidate.getAvailablePackages()));