贴标申请，仓储转运

2026-09-17 17:37:29 +08:00
parent 3b8b6f5aa2
commit 29f05b7b09
106 changed files with 5019 additions and 471 deletions
@@ -21,7 +21,17 @@ public final class WarehouseTransferRequests {
        @Size(max = 200) List<@NotNull Long> sourceLastlegOrderIds,
        @NotBlank @Size(max = 128) String operatingWarehouseId,
        @Size(max = 128) String fbaWarehouseCode,
+        @Size(max = 16) String destinationType,
+        @Size(max = 128) String destinationWarehouseId,
+        @Size(max = 128) String destinationWarehouseCode,
+        @Size(max = 255) String destinationWarehouseName,
+        @Size(max = 1000) String privateDestinationAddress,
+        @Size(max = 32) String privateDestinationPostalCode,
+        @Size(max = 128) String privateDestinationContactName,
+        @Size(max = 64) String privateDestinationContactPhone,
        @NotBlank @Size(max = 1000) String deliveryAddress,
+        @Size(max = 128) String pickupContactName,
+        @Size(max = 64) String pickupContactPhone,
        @Positive int packageCount,
        @NotNull @DecimalMin(value = "0.0") BigDecimal volumeCbm,
        @NotBlank @Size(max = 64) String deliveryMethod,
@@ -46,12 +56,29 @@ public final class WarehouseTransferRequests {
                      String deliveryMethod, LocalDateTime estimatedArrivalAt, String fbaShipmentNo,
                      String trackingNo, String fbaBoxNos, String remark, boolean needRelabel,
                      String idempotencyKey, List<Item> items) {
-            this(inboundCode, sourceLastlegOrderIds, operatingWarehouseId, fbaWarehouseCode, deliveryAddress,
-                packageCount, volumeCbm, deliveryMethod, estimatedArrivalAt, null, fbaShipmentNo, trackingNo,
+            this(inboundCode, sourceLastlegOrderIds, operatingWarehouseId, fbaWarehouseCode,
+                null, null, null, null, null, null, null, null,
+                deliveryAddress, null, null, packageCount, volumeCbm, deliveryMethod, estimatedArrivalAt, null, fbaShipmentNo, trackingNo,
                fbaBoxNos, remark, needRelabel, null, null, null, null, null, idempotencyKey, items, null);
        }
    }

+    public record DestinationSelection(
+        @NotBlank @Size(max = 128) String customerId,
+        @NotBlank @Size(max = 64) String transferNo) {}
+
+    public record BindDestination(
+        @NotEmpty @Size(max = 100) List<@Valid DestinationSelection> transfers,
+        @NotBlank @jakarta.validation.constraints.Pattern(regexp = "FBA|PRIVATE") String destinationType,
+        @Size(max = 128) String destinationWarehouseId,
+        @Size(max = 128) String destinationWarehouseCode,
+        @Size(max = 255) String destinationWarehouseName,
+        @Size(max = 1000) String privateDestinationAddress,
+        @Size(max = 32) String privateDestinationPostalCode,
+        @Size(max = 128) String privateDestinationContactName,
+        @Size(max = 64) String privateDestinationContactPhone,
+        @NotBlank @Size(max = 255) String idempotencyKey) {}
+
    /** 审核通过备注选填；驳回必须提供非空原因，由服务在任何状态写入前校验。 */
    public record Review(@NotBlank @Size(max = 32) String decision,
                         @Size(max = 1000) String remark) {}
@@ -72,19 +99,34 @@ public final class WarehouseTransferRequests {

    public record Palletize(
        @NotBlank @Size(max = 255) String idempotencyKey,
-        @NotEmpty @Size(max = 100) List<@Valid Pallet> pallets
+        @NotEmpty @Size(max = 20) List<@NotNull Long> photoFileIds
    ) {}

+    public record PalletDraft(
+        Long palletId,
+        @NotBlank @Size(max = 255) String idempotencyKey,
+        @Positive int cartonCount,
+        @NotNull @DecimalMin("0.01") BigDecimal lengthCm,
+        @NotNull @DecimalMin("0.01") BigDecimal widthCm,
+        @NotNull @DecimalMin("0.01") BigDecimal heightCm,
+        @NotNull @DecimalMin("0.000001") BigDecimal volumeCbm,
+        @NotNull @DecimalMin("0.01") BigDecimal grossWeightKg
+    ) {}
+
+    public record PalletAction(@NotBlank @Size(max = 255) String idempotencyKey) {}
+
+    public record PalletBind(@NotBlank @Size(max = 128) String palletCode,
+                             @NotBlank @Size(max = 255) String idempotencyKey) {}
+
    public record Pallet(
-        @Size(max = 128) String palletCode,
        @Positive int cartonCount,
+        @NotNull @DecimalMin("0.01") BigDecimal lengthCm,
+        @NotNull @DecimalMin("0.01") BigDecimal widthCm,
+        @NotNull @DecimalMin("0.01") BigDecimal heightCm,
        @NotNull @DecimalMin("0.000001") BigDecimal volumeCbm,
-        @NotNull @DecimalMin("0.01") BigDecimal grossWeightKg,
-        @NotEmpty @Size(max = 500) List<@Valid PalletItem> items
+        @NotNull @DecimalMin("0.01") BigDecimal grossWeightKg
    ) {}

-    public record PalletItem(@NotNull Long transferItemId, @Positive int packageCount) {}
-
    public record CustomerConfirm(@NotBlank @Size(max = 255) String idempotencyKey,
                                  @Size(max = 1000) String remark) {}

@@ -106,8 +148,8 @@ public final class WarehouseTransferRequests {
    ) {}

    public record Item(
-        @NotBlank @Size(max = 128) String skuCode,
-        @NotBlank @Size(max = 255) String productNameZh,
+        @Size(max = 128) String skuCode,
+        @Size(max = 255) String productNameZh,
        @Positive int packageCount,
        @Size(max = 255) String shippingMark
    ) {}
@@ -115,7 +157,7 @@ public final class WarehouseTransferRequests {
    public record RelabelItem(
        @NotBlank @Size(max = 32) String operationType,
        @NotEmpty @Size(max = 500) List<@NotBlank @Size(max = 255) String> customerCartonMarks,
-        @NotBlank @Size(max = 128) String originalSku,
+        @Size(max = 128) String originalSku,
        @Size(max = 128) String newSku,
        @Positive int quantity,
        @Size(max = 255) String fbaCartonMark,
@@ -9,12 +9,16 @@ public final class WarehouseTransferResponses {
    public record Item(Long id, String skuCode, String productNameZh, int packageCount, String shippingMark) {}
    public record Carton(String cartonMark, String customerCartonMark, int cartonIndex, int totalCartons, String status) {}
    public record Label(String transferNo, List<Carton> cartons, String printableHtml) {}
+    public record DestinationResult(String customerId, String transferNo) {}
    public record PalletItem(Long transferItemId, String skuCode, int packageCount) {}
+    public record MeasurementPhoto(Long fileId, String fileName, String contentType, long sizeBytes,
+                                   LocalDateTime uploadedAt) {}
    public record Pallet(Long id, int sequenceNo, Long warehousePalletId, String palletNo,
                         Long warehouseLocationId, String warehouseLocationCode, int cartonCount,
                         BigDecimal lengthCm, BigDecimal widthCm, BigDecimal heightCm,
                         BigDecimal grossWeightKg, BigDecimal volumeCbm, String status,
-                         List<PalletItem> items, LocalDateTime completedAt) {}
+                         String fbaWarehouseCode, String labelDownloadPath,
+                         List<PalletItem> items, LocalDateTime boundAt, LocalDateTime completedAt) {}
    public record RelabelBinding(String operationType, String customerCartonMark, String originalSku,
                                 String newSku, int quantity, String fbaCartonMark,
                                 String destinationWarehouseCode, String remark) {}
@@ -24,19 +28,28 @@ public final class WarehouseTransferResponses {
                             Long destinationInventoryPositionId) {}
    public record Summary(Long id, String transferNo, String inboundCode, Long lastlegOrderId,
                          String lastlegOrderNo, String operatingWarehouseId, String fbaWarehouseCode,
+                          String destinationType, String destinationWarehouseCode, String destinationWarehouseName,
                          int packageCount, String deliveryMethod, boolean needRelabel, String relabelNo,
                          String status, LocalDateTime estimatedArrivalAt, LocalDateTime createdAt) {}
    public record Detail(Long id, String transferNo, Long inboundOrderId, String inboundCode,
                         Long lastlegOrderId, String lastlegOrderNo, String orderType, String orderStatus,
                         String status,
                         boolean needRelabel, Long relabelApplicationId, String relabelNo, String relabelStatus,
-                          String operatingWarehouseId, String fbaWarehouseCode, String deliveryAddress,
-                         int packageCount, String deliveryMethod, LocalDateTime estimatedArrivalAt,
+                         String operatingWarehouseId, String fbaWarehouseCode, String deliveryAddress,
+                         String destinationType, String destinationWarehouseId, String destinationWarehouseCode,
+                         String destinationWarehouseName, String privateDestinationAddress,
+                         String privateDestinationPostalCode,
+                         String privateDestinationContactName, String privateDestinationContactPhone,
+                         String pickupContactName, String pickupContactPhone,
+                         int packageCount, BigDecimal volumeCbm, String deliveryMethod, LocalDateTime estimatedArrivalAt,
                         LocalDateTime estimatedShipAt,
                         String fbaShipmentNo, String trackingNo, String fbaBoxNos, String remark,
+                         LocalDateTime labelDeadline, String relabelContactName, String relabelContactPhone,
+                         String relabelDeliveryMethod,
                         String reviewDecision, String reviewRemark, String reviewedBy, LocalDateTime reviewedAt,
                         List<SourceOrder> sourceOrders, List<Item> items, List<Carton> cartons,
                         List<Pallet> pallets, List<RelabelBinding> relabelBindings,
-                         List<Allocation> allocations, LocalDateTime customerConfirmedAt,
+                         List<Allocation> allocations, List<MeasurementPhoto> measurementPhotos,
+                         LocalDateTime customerConfirmedAt,
                         LocalDateTime actualShipAt, LocalDateTime createdAt) {}
 }