优化

2026-08-14 14:26:56 +08:00
parent 06c264db0a
commit 261a8bf2df
65 changed files with 1040 additions and 670 deletions
@@ -5,6 +5,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.http.ResponseEntity;

 /** 仅用于确认证据文件属于当前客户和入库单，不在 firstleg 复制文件元数据。 */
@FeignClient(name = "file-service", contextId = "firstlegLoadingEvidenceFileClient",
@@ -15,5 +16,10 @@ public interface LoadingEvidenceFileClient {
                                       @PathVariable long tenantId, @PathVariable long inboundId,
                                       @PathVariable long fileId);

+    @GetMapping("/{tenantId}/{inboundId}/{fileId}/content")
+    ResponseEntity<byte[]> download(@RequestHeader("X-Internal-Service-Token") String token,
+                                    @PathVariable long tenantId, @PathVariable long inboundId,
+                                    @PathVariable long fileId);
+
    record FileMetadata(Long fileId, String fileName, String businessType, String contentType) {}
 }
@@ -31,12 +31,12 @@ public class InternalPriceBookController {
    }

    @PostMapping("/channels/validate")
-    public ApiResponse<Void> validateChannel(
+    public ApiResponse<PriceBookChannelValidation.Response> validateChannel(
        @RequestHeader(value = "X-Internal-Service-Token", required = false) String token,
        @Valid @RequestBody PriceBookChannelValidation.Request request) {
        requireToken(token);
-        service.requireAvailableChannel(request.tenantId(), request.originWarehouseId(), request.channelCode());
-        return ApiResponse.success(null);
+        return ApiResponse.success(service.requireAvailableChannel(request.tenantId(), request.originWarehouseId(),
+            request.channelCode(), request.destinationType()));
    }

    private void requireToken(String token) {
@@ -55,6 +55,18 @@ public class PlatformContainerController {
    public ApiResponse<Overview> overview(@AuthenticationPrincipal AuthenticatedUser user,@PathVariable @Positive long id) {
        FirstlegScopeGuard.platform(user); return ApiResponse.success(overview.overview(id));
    }
+    @GetMapping("/{id}/pda/photos/{fileId}/download")
+    @PreAuthorize("hasAuthority('platform:firstleg:container:list')")
+    public ResponseEntity<byte[]> downloadPdaPhoto(@AuthenticationPrincipal AuthenticatedUser user,
+                                                    @PathVariable @Positive long id,
+                                                    @PathVariable @Positive long fileId) {
+        FirstlegScopeGuard.platform(user);
+        var value = overview.downloadPhoto(id, fileId);
+        return ResponseEntity.ok().cacheControl(CacheControl.noStore())
+            .header(HttpHeaders.CONTENT_DISPOSITION, org.springframework.http.ContentDisposition.inline()
+                .filename(value.fileName(), StandardCharsets.UTF_8).build().toString())
+            .contentType(value.contentType()).contentLength(value.content().length).body(value.content());
+    }
    @PostMapping("/{id}/exception") @PreAuthorize("hasAuthority('platform:firstleg:container:edit')")
    public ApiResponse<Void> markException(@AuthenticationPrincipal AuthenticatedUser user,@PathVariable @Positive long id,
                                           @RequestHeader("Idempotency-Key") String key,
@@ -79,7 +79,7 @@ public class PlatformFbaPricingController {
    @PutMapping("/published")
    @PreAuthorize("hasAuthority('firstleg:fba-pricing:adjust')")
    @BusinessAudit(event = "FBA_FEE_ADJUST", resourceType = "INBOUND", resourceId = "#inboundId",
-        description = "调整已发布入库费用，不回退入库状态")
+        description = "调整初算或已发布入库费用，不回退待分柜状态")
    public ApiResponse<FeeSnapshotResponse> adjustPublished(
        @AuthenticationPrincipal AuthenticatedUser user, @RequestParam long tenantId,
        @PathVariable long inboundId, @RequestHeader("Idempotency-Key") String idempotencyKey,
@@ -8,11 +8,11 @@ import com.baiyue.common.core.api.PageResult;
 import com.baiyue.common.security.AuthenticatedUser;
 import com.baiyue.firstleg.dto.ExceptionReleaseRequest;
 import com.baiyue.firstleg.dto.MeasurementReviewRequest;
+import com.baiyue.firstleg.dto.MeasurementApprovalResponse;
 import com.baiyue.firstleg.entity.MeasureReviewRecordEntity;
 import com.baiyue.firstleg.service.MeasurementReviewService;
-import com.baiyue.firstleg.service.AutomaticInboundCompletionService;
+import com.baiyue.firstleg.service.InitialInboundPricingService;
 import com.baiyue.firstleg.service.FirstlegScopeGuard;
-import com.baiyue.firstleg.dto.FbaPricingDtos.FeeSnapshotResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -36,15 +36,15 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/api/platform/v1/inbounds")
 public class PlatformInboundMeasurementReviewController {
    @Resource private MeasurementReviewService service;
-    @Resource private AutomaticInboundCompletionService automaticCompletion;
+    @Resource private InitialInboundPricingService initialPricing;

    @BusinessAudit(event = "INBOUND_MEASURE_APPROVE", resourceType = "INBOUND",
        resourceId = "#inboundId", description = "测量审核通过")
    @Operation(summary = "测量审核通过",
-        description = "客服确认测量数据后直接进入待分柜；费用和其他资料可在后续继续维护。")
+        description = "客服确认测量数据后直接进入待分柜，并按已审核测量数据尝试生成初算费用；初算失败不阻塞状态流转。")
    @PostMapping("/{inboundId}/measurements/approve")
    @PreAuthorize("hasAuthority('firstleg:inbound:measurement-review')")
-    public ApiResponse<FeeSnapshotResponse> approve(
+    public ApiResponse<MeasurementApprovalResponse> approve(
        @AuthenticationPrincipal AuthenticatedUser user,
        @RequestParam long tenantId,
        @PathVariable long inboundId,
@@ -52,12 +52,9 @@ public class PlatformInboundMeasurementReviewController {
        @RequestHeader("Idempotency-Key") String idempotencyKey,
        @Valid @RequestBody MeasurementReviewRequest request) {
        validateScope(user, tenantId);
-        // 审核服务事务在此调用返回时已提交；随后自动编排从新事务/新查询读取 WAIT_PRICING，
-        // 避免在未提交的审核事务中读取旧状态。自动流程失败时保留已审核状态，原样返回业务错误，
-        // 使用同一幂等键重试会从持久化阶段继续推进。
        service.approve(tenantId, user.userId(), user.username(), inboundId, idempotencyKey, request);
-        return ApiResponse.success(automaticCompletion.completeApproved(
-            tenantId, inboundId, user.userId(), user.username(), request.measurementId(), request.expectedVersion() + 1));
+        return ApiResponse.success(initialPricing.tryCalculate(tenantId, user.userId(), inboundId,
+            request.measurementId(), request.expectedVersion() + 1));
    }

    @BusinessAudit(event = "INBOUND_MEASURE_REJECT", resourceType = "INBOUND",
@@ -80,7 +77,7 @@ public class PlatformInboundMeasurementReviewController {
    @BusinessAudit(event = "INBOUND_MEASURE_EXCEPTION_RELEASE", resourceType = "INBOUND",
        resourceId = "#inboundId", description = "测量驳回异常放行")
    @Operation(summary = "测量驳回异常放行",
-        description = "Nacos 开关开启、有异常放行权限且原因非空时，才可从 MEASURE_REJECTED 推进至 WAIT_PRICING。")
+        description = "Nacos 开关开启、有异常放行权限且原因非空时，才可从 MEASURE_REJECTED 推进至 WAIT_SPLIT。")
    @PostMapping("/{inboundId}/measurements/exception-release")
    @PreAuthorize("hasAuthority('firstleg:inbound:exception-release')")
    public ApiResponse<Void> exceptionRelease(
@@ -8,29 +8,33 @@ public final class PriceBookChannelCatalog {
    private PriceBookChannelCatalog() {}

    public static final List<ChannelDefinition> CHANNELS = List.of(
-        fba("MATSON_CLX_TRUCK", "美森正班海卡", "美森正班海卡"),
-        fba("MATSON_MAX_TRUCK", "美森加班海卡", "美森加班海卡"),
-        fba("EXX_TRUCK", "EXX海卡", "EXX海卡"),
-        fba("HEDE_TRUCK", "合德海卡", "合德海卡"),
-        fba("EXX_RAIL_NY", "纽约EXX海铁", "纽约EXX海铁"),
-        fba("OA_LA_TRUCK", "洛杉矶普船海卡", "洛杉矶普船海卡"),
-        fba("OA_LA_FULL_TRUCK", "洛杉矶普船全卡", "洛杉矶普船全卡"),
-        fba("OA_CHICAGO_RAIL", "芝加哥普船海铁", "芝加哥普船海铁"),
-        fba("OA_HOUSTON_TRUCK", "休斯顿普船海卡", "休斯顿普船海卡"),
-        fba("OA_NEW_YORK_TRUCK", "纽约普船海卡", "纽约普船海卡"),
-        fba("OA_SAVANNAH_TRUCK", "萨凡纳普船海卡", "萨凡纳普船海卡"),
-        parcel("MATSON_CLX_PARCEL", "美森正班海派", "海派"),
-        parcel("MATSON_MAX_PARCEL", "美森加班海派", "海派"),
-        parcel("HEDE_PARCEL", "合德海派", "海派"),
-        parcel("OA_PARCEL", "普船海派", "海派")
+        fba("MATSON_CLX_TRUCK", "美森正班海卡", "美森正班海卡", "ZBYHK", "ZBYHWK"),
+        fba("MATSON_MAX_TRUCK", "美森加班海卡", "美森加班海卡", "BYHK", "BYHWK"),
+        fba("EXX_TRUCK", "EXX海卡", "EXX海卡", "EXXHK", "EXXHWK"),
+        fba("HEDE_TRUCK", "合德海卡", "合德海卡", "HDHK", "HDHWK"),
+        fba("EXX_RAIL_NY", "纽约EXX海铁", "纽约EXX海铁", "NYEXX", null),
+        fba("OA_LA_TRUCK", "洛杉矶普船海卡", "洛杉矶普船海卡", "PCHK", "PCHWK"),
+        fba("OA_LA_FULL_TRUCK", "洛杉矶普船全卡", "洛杉矶普船全卡", "PCKK", null),
+        fba("OA_CHICAGO_RAIL", "芝加哥普船海铁", "芝加哥普船海铁", "CPHT", null),
+        fba("OA_HOUSTON_TRUCK", "休斯顿普船海卡", "休斯顿普船海卡", "HPHK", null),
+        fba("OA_NEW_YORK_TRUCK", "纽约普船海卡", "纽约普船海卡", "NPHK", "NPHWK"),
+        fba("OA_SAVANNAH_TRUCK", "萨凡纳普船海卡", "萨凡纳普船海卡", "SPHK", null),
+        parcel("MATSON_CLX_PARCEL", "美森正班海派", "海派", "ZBYHP", null),
+        parcel("MATSON_MAX_PARCEL", "美森加班海派", "海派", "BYHP", null),
+        parcel("HEDE_PARCEL", "合德海派", "海派", "HDHP", null),
+        parcel("OA_PARCEL", "普船海派", "海派", "PCHP", null)
    );

-    private static ChannelDefinition fba(String code, String name, String sheet) {
-        return new ChannelDefinition(code, name, PriceModel.FBA_WAREHOUSE_RATE, sheet, Set.of(name));
+    private static ChannelDefinition fba(String code, String name, String sheet,
+                                         String inboundCodePrefix, String overseasInboundCodePrefix) {
+        return new ChannelDefinition(code, name, PriceModel.FBA_WAREHOUSE_RATE, sheet, Set.of(name),
+            inboundCodePrefix, overseasInboundCodePrefix);
    }

-    private static ChannelDefinition parcel(String code, String name, String sheet) {
-        return new ChannelDefinition(code, name, PriceModel.REGION_WEIGHT_TIER, sheet, Set.of(name));
+    private static ChannelDefinition parcel(String code, String name, String sheet,
+                                            String inboundCodePrefix, String overseasInboundCodePrefix) {
+        return new ChannelDefinition(code, name, PriceModel.REGION_WEIGHT_TIER, sheet, Set.of(name),
+            inboundCodePrefix, overseasInboundCodePrefix);
    }

    public record ChannelDefinition(
@@ -38,6 +42,8 @@ public final class PriceBookChannelCatalog {
        String displayName,
        PriceModel priceModel,
        String sourceSheetName,
-        Set<String> aliases
+        Set<String> aliases,
+        String inboundCodePrefix,
+        String overseasInboundCodePrefix
    ) {}
 }
@@ -16,7 +16,7 @@ public final class ContainerOverviewDtos {
        String status, Long warehouseId, String warehouseName, String voyageNo, String vesselName,
        Integer version) {}
    public record PdaSummary(Long taskId, Long loadingPlanId, Long containerBookingId, String taskStatus,
-        Integer taskVersion, Integer itemCount, Integer completedItemCount, Integer unresolvedItemCount,
+        String workflowStatus, Integer taskVersion, Integer itemCount, Integer completedItemCount, Integer unresolvedItemCount,
        List<PhotoCount> photoCounts, List<Photo> photos, List<String> exceptionReasons) {}
    public record PhotoCount(String evidenceType, Integer count) {}
    public record Photo(Long evidenceId, Long tenantId, Long inboundId, String evidenceType,
@@ -6,6 +6,7 @@ import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Positive;
 import jakarta.validation.constraints.Size;

 import java.math.BigDecimal;
@@ -52,7 +53,9 @@ public final class FbaPricingDtos {
    public record CalculateRequest(LocalDateTime pricingAt) {}

    public record AdjustFeeRequest(
-        @NotNull @DecimalMin("0.00") BigDecimal subtotalAmount,
+        @NotNull @Positive Integer expectedFeeVersion,
+        @NotNull @DecimalMin(value = "0", inclusive = false) BigDecimal chargeableQuantity,
+        @NotNull @DecimalMin("0.00") BigDecimal unitPrice,
        @NotNull @DecimalMin("0.00") BigDecimal additionalAmount,
        @NotBlank @Size(max = 500) String reason
    ) {}
@@ -0,0 +1,13 @@
+package com.baiyue.firstleg.dto;
+
+import com.baiyue.firstleg.dto.FbaPricingDtos.FeeSnapshotResponse;
+
+public record MeasurementApprovalResponse(
+    Long inboundId,
+    Long measurementId,
+    String processStatus,
+    String feeStatus,
+    boolean initialPricingSucceeded,
+    String initialPricingMessage,
+    FeeSnapshotResponse initialFee
+) {}
@@ -3,6 +3,7 @@ package com.baiyue.firstleg.dto;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.Pattern;

 public final class PriceBookChannelValidation {
    private PriceBookChannelValidation() {}
@@ -10,6 +11,9 @@ public final class PriceBookChannelValidation {
    public record Request(
        @Min(1) long tenantId,
        @Min(1) long originWarehouseId,
-        @NotBlank @Size(max = 64) String channelCode
+        @NotBlank @Size(max = 64) String channelCode,
+        @NotBlank @Pattern(regexp = "FBA|OVERSEAS|PRIVATE") String destinationType
    ) {}
+
+    public record Response(String channelCode, String inboundCodePrefix) {}
 }
@@ -15,5 +15,7 @@ public class PriceChannelCatalogEntity {
    private String priceModel;
    private String sourceSheetName;
    private String aliasesJson;
+    private String inboundCodePrefix;
+    private String overseasInboundCodePrefix;
    private String status;
 }
@@ -3,6 +3,7 @@ package com.baiyue.firstleg.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Getter;
 import lombok.Setter;
 import java.math.BigDecimal;
@@ -53,4 +54,12 @@ public class TruckAppointmentEntity {
    private String remark;
    private LocalDateTime createdAt;
    private LocalDateTime updatedAt;
+    @TableField(exist = false) private String oceanBookingNo;
+    @TableField(exist = false) private String warehouseName;
+    @TableField(exist = false) private Long shippingCompanyId;
+    @TableField(exist = false) private String shippingCompanyName;
+    @TableField(exist = false) private Long bookingAgentId;
+    @TableField(exist = false) private String bookingAgentName;
+    @TableField(exist = false) private String cabinetNo;
+    @TableField(exist = false) private String containerNo;
 }
@@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Update;
 public interface InboundOrderMapper extends BaseMapper<InboundOrderEntity> {
    @Update("""
        UPDATE fl_inbound_order
-           SET process_status = 'WAIT_PRICING', measure_review_status = 'APPROVED',
+           SET process_status = 'WAIT_SPLIT', measure_review_status = 'APPROVED',
               actual_gross_weight_kg = (SELECT COALESCE(SUM(item.total_weight_kg), 0)
                   FROM fl_inbound_measurement_item item
                  WHERE item.tenant_id = #{tenantId} AND item.measurement_id = #{measurementId}),
@@ -21,7 +21,7 @@ public interface InboundOrderMapper extends BaseMapper<InboundOrderEntity> {
               volume_weight_kg = (SELECT COALESCE(SUM(item.volume_weight_kg), 0)
                   FROM fl_inbound_measurement_item item
                  WHERE item.tenant_id = #{tenantId} AND item.measurement_id = #{measurementId}),
-               updated_by = #{operatorId}, version = version + 1
+               inbounded_at = CURRENT_TIMESTAMP(3), updated_by = #{operatorId}, version = version + 1
         WHERE tenant_id = #{tenantId} AND id = #{inboundId} AND deleted = 0
           AND process_status = 'MEASURE_PENDING' AND measure_review_status = 'PENDING'
           AND version = #{expectedVersion}
@@ -45,7 +45,8 @@ public interface InboundOrderMapper extends BaseMapper<InboundOrderEntity> {

    @Update("""
        UPDATE fl_inbound_order
-           SET process_status = 'WAIT_PRICING', updated_by = #{operatorId}, version = version + 1
+           SET process_status = 'WAIT_SPLIT', inbounded_at = CURRENT_TIMESTAMP(3),
+               updated_by = #{operatorId}, version = version + 1
         WHERE tenant_id = #{tenantId} AND id = #{inboundId} AND deleted = 0
           AND process_status = 'MEASURE_REJECTED' AND measure_review_status = 'REJECTED'
           AND version = #{expectedVersion}
@@ -3,6 +3,7 @@ package com.baiyue.firstleg.mapper;
 import com.baiyue.firstleg.repository.PriceBookQueryRows.ChannelRow;
 import com.baiyue.firstleg.repository.PriceBookQueryRows.ChannelTaxModeRow;
 import com.baiyue.firstleg.repository.PriceBookQueryRows.RateRow;
+import com.baiyue.firstleg.repository.PriceBookQueryRows.ChannelPrefixRow;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -12,6 +13,15 @@ import java.util.List;
 /** Dedicated read model for merchant channel selection and reference estimates. */
@Mapper
 public interface PriceBookQueryMapper {
+    @Select("""
+        SELECT channel_code AS channelCode, inbound_code_prefix AS inboundCodePrefix,
+               overseas_inbound_code_prefix AS overseasInboundCodePrefix
+          FROM fl_price_channel_catalog
+         WHERE channel_code = #{channelCode} AND status = 'ACTIVE'
+         LIMIT 1
+        """)
+    ChannelPrefixRow findChannelPrefix(@Param("channelCode") String channelCode);
+
    @Select("""
        SELECT id
          FROM fl_price_book_version
@@ -192,15 +192,30 @@ public class FbaPricingRepository {
            .orderByAsc(InboundFeeItemEntity::getItemNo));
    }

-    public int supersedeSent(long tenantId, long feeId) {
+    public int supersedeCurrent(long tenantId, long feeId, String feeStatus) {
        return fees.update(null, new LambdaUpdateWrapper<InboundFeeEntity>()
            .eq(InboundFeeEntity::getTenantId, tenantId)
            .eq(InboundFeeEntity::getId, feeId)
-            .eq(InboundFeeEntity::getFeeStatus, "SENT")
+            .eq(InboundFeeEntity::getFeeStatus, feeStatus)
            .set(InboundFeeEntity::getFeeStatus, "SUPERSEDED")
            .set(InboundFeeEntity::getUpdatedAt, LocalDateTime.now()));
    }

+    public int markInboundAdjusted(long tenantId, long inboundId, String feeStatus,
+                                   String chargeUnit, java.math.BigDecimal chargeableQuantity) {
+        LambdaUpdateWrapper<InboundPricingEntity> update = new LambdaUpdateWrapper<InboundPricingEntity>()
+            .eq(InboundPricingEntity::getTenantId, tenantId)
+            .eq(InboundPricingEntity::getId, inboundId)
+            .eq(InboundPricingEntity::getProcessStatus, "WAIT_SPLIT")
+            .set(InboundPricingEntity::getFeeStatus, feeStatus);
+        if ("KG".equals(chargeUnit)) {
+            update.set(InboundPricingEntity::getChargeableWeightKg, chargeableQuantity);
+        } else {
+            update.set(InboundPricingEntity::getChargeableVolumeCbm, chargeableQuantity);
+        }
+        return inbounds.update(null, update);
+    }
+
    public int markInboundCalculated(long tenantId, long inboundId, String processStatus, String chargeMode,
                                     java.math.BigDecimal chargeable) {
        LambdaUpdateWrapper<InboundPricingEntity> update = new LambdaUpdateWrapper<InboundPricingEntity>()
@@ -46,4 +46,8 @@ public class PriceBookQueryRepository {
        return channels(versionId, originWarehouseId).stream()
            .anyMatch(channel -> channelCode.equals(channel.getChannelCode()));
    }
+
+    public PriceBookQueryRows.ChannelPrefixRow channelPrefix(String channelCode) {
+        return mapper.findChannelPrefix(channelCode);
+    }
 }
@@ -10,6 +10,9 @@ import java.time.LocalDate;
 public final class PriceBookQueryRows {
    private PriceBookQueryRows() {}

+    public record ChannelPrefixRow(String channelCode, String inboundCodePrefix,
+                                   String overseasInboundCodePrefix) {}
+
    @Getter
    @Setter
    public static class ChannelRow {
@@ -1,70 +0,0 @@
-package com.baiyue.firstleg.service;
-
-import jakarta.annotation.Resource;
-
-import com.baiyue.common.audit.BusinessAudit;
-import com.baiyue.common.core.api.ResultCode;
-import com.baiyue.common.core.exception.BizException;
-import com.baiyue.firstleg.dto.FbaPricingDtos.FeeSnapshotResponse;
-import com.baiyue.firstleg.entity.InboundOrderEntity;
-import com.baiyue.firstleg.repository.InboundWorkflowRepository;
-import org.springframework.stereotype.Service;
-
-@Service
-public class AutomaticInboundCompletionService {
-    @Resource
-    private FbaPricingService pricing;
-    @Resource
-    private InboundWorkflowRepository workflow;
-    @Resource
-    private InboundCompletionOrchestrator completion;
-
-    @BusinessAudit(event = "INBOUND_AUTO_COMPLETE", resourceType = "INBOUND", resourceId = "#inboundId",
-        description = "测量审核通过后自动计费、发送费用并完成入库", captureBefore = false)
-    public FeeSnapshotResponse completeApproved(long tenantId, long inboundId, long operatorId,
-                                                String operatorName, long measurementId,
-                                                int reviewedOrderVersion) {
-        String key = "auto-" + inboundId + "-" + measurementId + "-" + reviewedOrderVersion;
-        InboundOrderEntity order = requireOrder(tenantId, inboundId);
-        if (completed(order)) return pricing.latest(tenantId, inboundId);
-
-        if ("WAIT_PRICING".equals(order.getProcessStatus()) && "UNPRICED".equals(order.getFeeStatus())) {
-            pricing.calculate(tenantId, operatorId, inboundId, null, key + "-calculate");
-            order = requireOrder(tenantId, inboundId);
-        }
-        if ("FEE_CONFIRMING".equals(order.getProcessStatus())
-            && "CALCULATED".equals(order.getFeeStatus())) {
-            pricing.confirm(tenantId, operatorId, inboundId, key + "-confirm");
-            order = requireOrder(tenantId, inboundId);
-        }
-
-        FeeSnapshotResponse fee = pricing.latest(tenantId, inboundId);
-        if ("FEE_CONFIRMING".equals(order.getProcessStatus())
-            && "CONFIRMED".equals(order.getFeeStatus())) {
-            completion.beginSendFeeAndInbound(tenantId, operatorId, operatorName, inboundId,
-                fee.feeId(), order.getVersion(), key + "-begin");
-            order = requireOrder(tenantId, inboundId);
-        }
-        if ("INBOUNDING".equals(order.getProcessStatus())
-            && "CONFIRMED".equals(order.getFeeStatus())) {
-            completion.completeSendFeeAndInbound(tenantId, operatorId, operatorName, inboundId,
-                fee.feeId(), order.getVersion(), key + "-complete");
-            order = requireOrder(tenantId, inboundId);
-        }
-        if (!completed(order)) {
-            throw new BizException(ResultCode.CONFLICT, "客服审核后的自动计费入库流程状态异常");
-        }
-        return pricing.latest(tenantId, inboundId);
-    }
-
-    private static boolean completed(InboundOrderEntity order) {
-        return "WAIT_SPLIT".equals(order.getProcessStatus())
-            && "SENT".equals(order.getFeeStatus());
-    }
-
-    private InboundOrderEntity requireOrder(long tenantId, long inboundId) {
-        InboundOrderEntity order = workflow.findOwned(tenantId, inboundId);
-        if (order == null) throw new BizException(ResultCode.NOT_FOUND, "入库单不存在");
-        return order;
-    }
-}
@@ -8,10 +8,14 @@ import com.baiyue.firstleg.entity.ContainerBookingEntity;
 import com.baiyue.firstleg.entity.ContainerDocumentEntity;
 import com.baiyue.firstleg.mapper.ContainerOverviewMapper;
 import com.baiyue.firstleg.repository.ContainerRepository;
+import com.baiyue.firstleg.client.LoadingEvidenceFileClient;
 import jakarta.annotation.Resource;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import feign.FeignException;

 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
@@ -25,6 +29,8 @@ import java.util.List;
 public class ContainerOverviewService {
    @Resource private ContainerRepository containers;
    @Resource private ContainerOverviewMapper mapper;
+    @Resource private LoadingEvidenceFileClient evidenceFiles;
+    @Value("${baiyue.security.internal-service-token}") private String internalToken;

    public Overview overview(long id) {
        ContainerBookingEntity booking = required(id);
@@ -94,18 +100,47 @@ public class ContainerOverviewService {
    private PdaSummary pda(ContainerOverviewMapper.PickTaskRow task) {
        List<Photo> photos = mapper.photos(task.loadingPlanId()).stream().map(value -> new Photo(value.evidenceId(),
            value.tenantId(), value.inboundId(), value.evidenceType(), value.fileId(), value.fileName(),
-            value.status(), "/api/platform/v1/files/loading-evidence/" + value.tenantId() + '/'
-                + value.inboundId() + '/' + value.fileId(), value.uploadedAt())).toList();
+            value.status(), "/api/platform/v1/containers/" + task.containerBookingId() + "/pda/photos/"
+                + value.fileId() + "/download", value.uploadedAt())).toList();
        var counts = new LinkedHashMap<String, Integer>();
        photos.stream().filter(photo -> "ACTIVE".equals(photo.status()))
            .forEach(photo -> counts.merge(photo.evidenceType(), 1, Integer::sum));
        List<PhotoCount> photoCounts = counts.entrySet().stream()
            .map(entry -> new PhotoCount(entry.getKey(), entry.getValue())).toList();
+        int itemCount = mapper.itemCount(task.id());
+        int unresolvedItemCount = mapper.unresolvedItemCount(task.id());
+        String workflowStatus = "COMPLETED".equals(task.taskStatus()) ? "COMPLETED"
+            : unresolvedItemCount == 0 ? "AWAITING_REVIEW" : "IN_PROGRESS";
        return new PdaSummary(task.id(), task.loadingPlanId(), task.containerBookingId(), task.taskStatus(),
-            task.version(), mapper.itemCount(task.id()), mapper.completedItemCount(task.id()),
-            mapper.unresolvedItemCount(task.id()), photoCounts, photos, mapper.pickExceptionReasons(task.id()));
+            workflowStatus, task.version(), itemCount, mapper.completedItemCount(task.id()),
+            unresolvedItemCount, photoCounts, photos, mapper.pickExceptionReasons(task.id()));
    }

+    public PhotoDownload downloadPhoto(long containerBookingId, long fileId) {
+        ContainerBookingEntity booking = required(containerBookingId);
+        var task = mapper.pickTask(booking.getId());
+        if (task == null) throw new BizException(ResultCode.NOT_FOUND, "货柜尚无PDA作业任务");
+        var photo = mapper.photos(task.loadingPlanId()).stream()
+            .filter(value -> Long.valueOf(fileId).equals(value.fileId()) && "ACTIVE".equals(value.status()))
+            .findFirst().orElseThrow(() -> new BizException(ResultCode.NOT_FOUND, "PDA照片不存在或不属于该货柜"));
+        final org.springframework.http.ResponseEntity<byte[]> response;
+        try {
+            response = evidenceFiles.download(internalToken, photo.tenantId(), photo.inboundId(), fileId);
+        } catch (FeignException.NotFound exception) {
+            throw new BizException(ResultCode.NOT_FOUND, "PDA照片文件不存在或归属不匹配");
+        } catch (FeignException exception) {
+            throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "文件服务暂不可用");
+        }
+        byte[] content = response.getBody();
+        if (!response.getStatusCode().is2xxSuccessful() || content == null) {
+            throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "PDA照片下载失败");
+        }
+        MediaType contentType = response.getHeaders().getContentType();
+        return new PhotoDownload(photo.fileName(), contentType == null ? MediaType.APPLICATION_OCTET_STREAM : contentType, content);
+    }
+
+    public record PhotoDownload(String fileName, MediaType contentType, byte[] content) {}
+
    private List<TimelineEntry> timeline(long id, Long taskId, List<ExceptionHistory> exceptionHistory) {
        var result = new ArrayList<TimelineEntry>();
        mapper.transport(id).forEach(value -> result.add(new TimelineEntry("TRANSPORT_UPDATE", value.getReason(),
@@ -144,14 +144,18 @@ public class FbaPricingService {
                                               AdjustFeeRequest request, String idempotencyKey) {
        InboundPricingEntity inbound = repository.findInbound(tenantId, inboundId);
        if (inbound == null) throw new BizException(ResultCode.NOT_FOUND, "入库单不存在");
-        if (!isCompletedInbound(inbound.getProcessStatus()) || !"SENT".equals(inbound.getFeeStatus())) {
-            throw conflict("只能修改已完成入库且已发布的费用");
+        if (!isCompletedInbound(inbound.getProcessStatus())) {
+            throw conflict("只能在待分柜阶段修改初算或已发布费用");
        }
        InboundFeeEntity current = repository.findLatestFee(tenantId, inboundId);
-        if (current == null || !"SENT".equals(current.getFeeStatus())) {
-            throw conflict("入库单没有可修改的已发布费用");
+        if (current == null || !List.of("CALCULATED", "CONFIRMED", "SENT").contains(current.getFeeStatus())) {
+            throw conflict("入库单没有可修改的初算或已发布费用");
        }
-        String discriminator = current.getId() + ":" + request.subtotalAmount() + ":"
+        if (!request.expectedFeeVersion().equals(current.getFeeVersion())) {
+            throw conflict("费用版本已变化，请刷新后重试");
+        }
+        String discriminator = current.getId() + ":" + request.expectedFeeVersion() + ":"
+            + request.chargeableQuantity() + ":" + request.unitPrice() + ":"
            + request.additionalAmount() + ":" + request.reason().trim();
        InboundPricingIdempotencyEntity token = beginIdempotency(tenantId, operatorId, inboundId,
            "FEE_ADJUST", idempotencyKey, hash("ADJUST", inboundId, discriminator));
@@ -166,30 +170,33 @@ public class FbaPricingService {
        adjusted.setId(null);
        adjusted.setFeeNo("FBAF-" + inboundId + "-" + nextVersion);
        adjusted.setFeeVersion(nextVersion);
-        adjusted.setSubtotalAmount(request.subtotalAmount().setScale(MONEY_SCALE, RoundingMode.HALF_UP));
+        adjusted.setChargeableQuantity(request.chargeableQuantity().setScale(4, RoundingMode.HALF_UP));
+        adjusted.setConvertedQuantity(adjusted.getChargeableQuantity());
+        adjusted.setSubtotalAmount(adjusted.getChargeableQuantity().multiply(request.unitPrice())
+            .setScale(MONEY_SCALE, RoundingMode.HALF_UP));
        adjusted.setAdditionalAmount(request.additionalAmount().setScale(MONEY_SCALE, RoundingMode.HALF_UP));
        adjusted.setTotalAmount(adjusted.getSubtotalAmount().add(adjusted.getAdditionalAmount()));
-        adjusted.setFeeStatus("SENT");
-        adjusted.setReviewStatus("NOT_REQUIRED");
+        boolean published = "SENT".equals(current.getFeeStatus());
+        adjusted.setFeeStatus(published ? "SENT" : "CALCULATED");
+        adjusted.setReviewStatus(published ? "NOT_REQUIRED" : "NOT_SUBMITTED");
        adjusted.setCalculatedBy(operatorId);
        adjusted.setCalculatedAt(now);
-        adjusted.setConfirmedBy(operatorId);
-        adjusted.setConfirmedAt(now);
-        adjusted.setSentBy(operatorId);
-        adjusted.setSentAt(now);
+        adjusted.setConfirmedBy(published ? operatorId : null);
+        adjusted.setConfirmedAt(published ? now : null);
+        adjusted.setSentBy(published ? operatorId : null);
+        adjusted.setSentAt(published ? now : null);
        adjusted.setCreatedAt(now);
        adjusted.setUpdatedAt(now);
-        if (repository.supersedeSent(tenantId, current.getId()) != 1) {
+        if (repository.supersedeCurrent(tenantId, current.getId(), current.getFeeStatus()) != 1) {
            throw conflict("费用已被其他操作员修改，请刷新后重试");
        }
        repository.insertFee(adjusted);
-        BigDecimal quantity = current.getChargeableQuantity();
+        BigDecimal quantity = adjusted.getChargeableQuantity();
        InboundFeeItemEntity base = item(tenantId, adjusted, 1, "FBA_BASE", "FBA基础运费",
            adjusted.getSubtotalAmount(), now);
        base.setQuantity(quantity);
        base.setUnit(current.getChargeUnit());
-        base.setUnitPrice(quantity.signum() == 0 ? BigDecimal.ZERO
-            : adjusted.getSubtotalAmount().divide(quantity, 6, RoundingMode.HALF_UP));
+        base.setUnitPrice(request.unitPrice().setScale(6, RoundingMode.HALF_UP));
        base.setAutomaticFlag(false);
        base.setRemark(request.reason().trim());
        repository.insertItem(base);
@@ -200,9 +207,15 @@ public class FbaPricingService {
            extra.setRemark(request.reason().trim());
            repository.insertItem(extra);
        }
-        feeDetails.publishFreight(tenantId, inboundId, adjusted.getId(), operatorId, null, now);
-        financeOutbox.publishInbound(FinanceFeeSourceOutboxService.ADJUSTED,
-            tenantId, inboundId, adjusted.getId(), nextVersion, now);
+        if (repository.markInboundAdjusted(tenantId, inboundId, adjusted.getFeeStatus(),
+                adjusted.getChargeUnit(), quantity) != 1) {
+            throw conflict("入库单状态已变化，费用调整未保存");
+        }
+        if (published) {
+            feeDetails.publishFreight(tenantId, inboundId, adjusted.getId(), operatorId, null, now);
+            financeOutbox.publishInbound(FinanceFeeSourceOutboxService.ADJUSTED,
+                tenantId, inboundId, adjusted.getId(), nextVersion, now);
+        }
        complete(token, adjusted.getId(), now);
        return response(tenantId, adjusted.getId(), inbound.getProcessStatus());
    }
@@ -1,147 +0,0 @@
-package com.baiyue.firstleg.service;
-
-import jakarta.annotation.Resource;
-
-import com.baiyue.common.core.api.ResultCode;
-import com.baiyue.common.core.exception.BizException;
-import com.baiyue.firstleg.entity.InboundFeeEntity;
-import com.baiyue.firstleg.entity.InboundOrderEntity;
-import com.baiyue.firstleg.repository.InboundWorkflowRepository;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
-
-import java.time.LocalDateTime;
-
-/**
- * 发送费用并完成入库的状态编排骨架。
- *
- * <p>本服务不计算费用、不创建托盘/库位，也不调用仓库 CRUD。测量完成阶段已确认托盘和库位占用；
- * 客服审核通过后的自动编排调用 {@link #beginSendFeeAndInbound} 进入 INBOUNDING，再调用
- * {@link #completeSendFeeAndInbound} 发布费用并完成入库。</p>
- */
-@Service
-public class InboundCompletionOrchestrator {
-    @Resource
-    private InboundWorkflowRepository repository;
-    @Resource
-    private InboundIdempotencyService idempotency;
-    @Resource
-    private InboundFeeDetailService feeDetails;
-    @Resource
-    private FinanceFeeSourceOutboxService financeOutbox;
-
-    /**
-     * 任务5对接方法一：锁定发送动作。允许前置状态仅为 FEE_CONFIRMING + CONFIRMED。
-     */
-    @Transactional
-    public void beginSendFeeAndInbound(long tenantId, long operatorId, String operatorName,
-                                       long inboundId, long feeId, int expectedVersion,
-                                       String idempotencyKey) {
-        String canonical = inboundId + "|" + feeId + "|" + expectedVersion;
-        InboundIdempotencyService.Context context = idempotency.begin(
-            tenantId, operatorId, inboundId, "SEND_FEE_BEGIN", idempotencyKey, canonical);
-        if (context.replayed()) {
-            return;
-        }
-        InboundOrderEntity order = requireOrder(tenantId, inboundId);
-        if (!"FEE_CONFIRMING".equals(order.getProcessStatus()) || !"CONFIRMED".equals(order.getFeeStatus())) {
-            throw new BizException(ResultCode.CONFLICT, "费用未确认或入库单不在待发送阶段");
-        }
-        boolean released = measurementGatePassed(order, tenantId, inboundId);
-        InboundFeeEntity fee = repository.findConfirmedFee(tenantId, inboundId, feeId);
-        if (fee == null) {
-            throw new BizException(ResultCode.CONFLICT, "缺少已确认且不可变的费用快照");
-        }
-        if (Boolean.TRUE.equals(fee.getExceptionRelease()) != released) {
-            throw new BizException(ResultCode.CONFLICT, "费用快照的异常放行标记与审核历史不一致");
-        }
-        if (repository.countPreparedAllocations(tenantId, inboundId) <= 0) {
-            throw new BizException(ResultCode.CONFLICT, "尚未准备托盘和库位预占引用");
-        }
-        if (repository.beginInbound(tenantId, inboundId, operatorId, expectedVersion) != 1) {
-            throw concurrentConflict();
-        }
-        repository.insertHistory(MeasurementReviewService.history(tenantId, inboundId,
-            "FEE_CONFIRMING", "INBOUNDING", "SEND_FEE_BEGIN", null, operatorId, operatorName));
-        idempotency.complete(context, inboundId);
-    }
-
-    /**
-     * 任务5对接方法二：仓库确认占用成功后，原子锁定费用、完成入库并写 Outbox。
-     */
-    @Transactional
-    public void completeSendFeeAndInbound(long tenantId, long operatorId, String operatorName,
-                                          long inboundId, long feeId, int expectedVersion,
-                                          String idempotencyKey) {
-        String canonical = inboundId + "|" + feeId + "|" + expectedVersion;
-        InboundIdempotencyService.Context context = idempotency.begin(
-            tenantId, operatorId, inboundId, "SEND_FEE_COMPLETE", idempotencyKey, canonical);
-        if (context.replayed()) {
-            return;
-        }
-        InboundOrderEntity order = requireOrder(tenantId, inboundId);
-        if (!"INBOUNDING".equals(order.getProcessStatus())) {
-            throw new BizException(ResultCode.CONFLICT, "入库单不在入库处理中");
-        }
-        if (repository.completeInbound(tenantId, inboundId, operatorId, expectedVersion) != 1) {
-            throw concurrentConflict();
-        }
-        if (repository.markFeeSent(tenantId, inboundId, feeId, operatorId) != 1) {
-            throw new BizException(ResultCode.CONFLICT, "费用快照已被并发发送或状态不正确");
-        }
-        var published = feeDetails.publishFreight(tenantId, inboundId, feeId, operatorId,
-            operatorName, LocalDateTime.now());
-        repository.insertHistory(MeasurementReviewService.history(tenantId, inboundId,
-            "INBOUNDING", "WAIT_SPLIT", "SEND_FEE_COMPLETE", null, operatorId, operatorName));
-        financeOutbox.publishInbound(FinanceFeeSourceOutboxService.PUBLISHED, tenantId,
-            inboundId, feeId, published.getSourceFeeVersion(), LocalDateTime.now());
-        idempotency.complete(context, inboundId);
-    }
-
-    /** 任务5对接方法三：仅在仓库预占已释放后回退，不能回退已完成实物入库。 */
-    @Transactional
-    public void rollbackSendFeeAndInbound(long tenantId, long operatorId, String operatorName,
-                                          long inboundId, int expectedVersion, String reason,
-                                          String idempotencyKey) {
-        if (!StringUtils.hasText(reason)) {
-            throw new BizException(ResultCode.VALIDATION_FAILED, "入库回退必须记录失败原因");
-        }
-        String canonical = inboundId + "|" + expectedVersion + "|" + (reason == null ? "" : reason.trim());
-        InboundIdempotencyService.Context context = idempotency.begin(
-            tenantId, operatorId, inboundId, "SEND_FEE_ROLLBACK", idempotencyKey, canonical);
-        if (context.replayed()) {
-            return;
-        }
-        requireOrder(tenantId, inboundId);
-        if (repository.rollbackInbound(tenantId, inboundId, operatorId, expectedVersion) != 1) {
-            throw concurrentConflict();
-        }
-        repository.insertHistory(MeasurementReviewService.history(tenantId, inboundId,
-            "INBOUNDING", "FEE_CONFIRMING", "SEND_FEE_ROLLBACK", reason, operatorId, operatorName));
-        idempotency.complete(context, inboundId);
-    }
-
-    private boolean measurementGatePassed(InboundOrderEntity order, long tenantId, long inboundId) {
-        if ("APPROVED".equals(order.getMeasureReviewStatus())) {
-            return false;
-        }
-        if ("REJECTED".equals(order.getMeasureReviewStatus())
-            && repository.hasExceptionRelease(tenantId, inboundId)) {
-            return true;
-        }
-        throw new BizException(ResultCode.CONFLICT, "测量未审核通过且无有效异常放行记录");
-    }
-
-    private InboundOrderEntity requireOrder(long tenantId, long inboundId) {
-        InboundOrderEntity order = repository.findOwned(tenantId, inboundId);
-        if (order == null) {
-            throw new BizException(ResultCode.NOT_FOUND, "入库单不存在");
-        }
-        return order;
-    }
-
-    private static BizException concurrentConflict() {
-        return new BizException(ResultCode.CONFLICT, "入库单已被并发更新，请刷新后重试");
-    }
-}
@@ -0,0 +1,40 @@
+package com.baiyue.firstleg.service;
+
+import jakarta.annotation.Resource;
+
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.firstleg.dto.FbaPricingDtos.FeeSnapshotResponse;
+import com.baiyue.firstleg.dto.MeasurementApprovalResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+/** Best-effort initial pricing; pricing availability never gates inbound workflow. */
+@Service
+public class InitialInboundPricingService {
+    private static final Logger log = LoggerFactory.getLogger(InitialInboundPricingService.class);
+    @Resource
+    private FbaPricingService pricing;
+
+    public MeasurementApprovalResponse tryCalculate(long tenantId, long operatorId, long inboundId,
+                                                     long measurementId, int reviewedOrderVersion) {
+        String key = "initial-" + inboundId + "-" + measurementId + "-" + reviewedOrderVersion;
+        try {
+            FeeSnapshotResponse fee = pricing.calculate(tenantId, operatorId, inboundId, null, key);
+            return new MeasurementApprovalResponse(inboundId, measurementId, "WAIT_SPLIT",
+                fee.feeStatus(), true, null, fee);
+        } catch (BizException exception) {
+            log.info("入库初算未生成，主流程继续 tenantId={}, inboundId={}, reason={}",
+                tenantId, inboundId, exception.getMessage());
+            return pending(inboundId, measurementId, exception.getMessage());
+        } catch (RuntimeException exception) {
+            log.warn("入库初算异常，主流程继续 tenantId={}, inboundId={}", tenantId, inboundId, exception);
+            return pending(inboundId, measurementId, "初算暂未生成，请人工维护费用");
+        }
+    }
+
+    private static MeasurementApprovalResponse pending(long inboundId, long measurementId, String message) {
+        return new MeasurementApprovalResponse(inboundId, measurementId, "WAIT_SPLIT", "UNPRICED",
+            false, message, null);
+    }
+}
@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
 import java.math.BigDecimal;

 /**
- * 测量审核应用服务。审核通过后进入内部计费编排，完成费用发布和入库后再进入 WAIT_SPLIT。
+ * 测量审核应用服务。审核通过后直接进入 WAIT_SPLIT，费用初算和人工维护不阻塞主流程。
 */
@Service
 public class MeasurementReviewService {
@@ -99,7 +99,7 @@ public class MeasurementReviewService {
        repository.insertReview(reviewRecord(tenantId, inboundId, request.measurementId(), result,
            request.reason(), false, null, false, operatorId, operatorName));
        repository.insertHistory(history(tenantId, inboundId, "MEASURE_PENDING",
-            approved ? "WAIT_PRICING" : "MEASURE_REJECTED",
+            approved ? "WAIT_SPLIT" : "MEASURE_REJECTED",
            approved ? "MEASURE_APPROVE" : "MEASURE_REJECT", request.reason(), operatorId, operatorName));
        idempotency.complete(context, inboundId);
    }
@@ -135,7 +135,7 @@ public class MeasurementReviewService {
        }
        repository.insertReview(reviewRecord(tenantId, inboundId, request.measurementId(), "REJECTED",
            null, true, request.reason(), true, operatorId, operatorName));
-        repository.insertHistory(history(tenantId, inboundId, "MEASURE_REJECTED", "WAIT_PRICING",
+        repository.insertHistory(history(tenantId, inboundId, "MEASURE_REJECTED", "WAIT_SPLIT",
            "MEASURE_EXCEPTION_RELEASE", request.reason(), operatorId, operatorName));
        idempotency.complete(context, inboundId);
    }
@@ -7,6 +7,7 @@ import com.baiyue.firstleg.domain.PricingTaxMode;
 import com.baiyue.firstleg.dto.PriceBookDtos.CurrentChannel;
 import com.baiyue.firstleg.dto.PriceBookDtos.EstimateRequest;
 import com.baiyue.firstleg.dto.PriceBookDtos.EstimateResponse;
+import com.baiyue.firstleg.dto.PriceBookChannelValidation.Response;
 import com.baiyue.firstleg.pricing.ActivePriceBookEstimator;
 import com.baiyue.firstleg.repository.PriceBookQueryRepository;
 import com.baiyue.firstleg.repository.PriceBookQueryRows.ChannelRow;
@@ -47,14 +48,22 @@ public class MerchantPriceBookService {
            estimate.amount(), estimate.currency(), DISCLAIMER);
    }

-    public void requireAvailableChannel(long merchantTenantId, long originWarehouseId, String channelCode) {
+    public Response requireAvailableChannel(long merchantTenantId, long originWarehouseId, String channelCode,
+                                            String destinationType) {
        requireMerchant(merchantTenantId);
        if (originWarehouseId <= 0) throw validation("请选择有效起运仓");
        Long versionId = repository.activeVersionId();
-        if (versionId == null || !repository.channelAvailable(versionId, originWarehouseId,
-            normalizeChannel(channelCode))) {
+        String normalized = normalizeChannel(channelCode);
+        if (versionId == null || !repository.channelAvailable(versionId, originWarehouseId, normalized)) {
            throw new BizException(ResultCode.CONFLICT, "所选渠道已下线，请重新选择");
        }
+        var prefix = repository.channelPrefix(normalized);
+        if (prefix == null || !StringUtils.hasText(prefix.inboundCodePrefix())) {
+            throw new BizException(ResultCode.CONFLICT, "所选渠道未配置入仓码前缀");
+        }
+        String selected = "OVERSEAS".equals(destinationType) && StringUtils.hasText(prefix.overseasInboundCodePrefix())
+            ? prefix.overseasInboundCodePrefix() : prefix.inboundCodePrefix();
+        return new Response(normalized, selected);
    }

    private CurrentChannel toChannel(ChannelRow row, Map<String, List<PricingTaxMode>> taxModes) {
@@ -35,20 +35,21 @@ public class TruckAppointmentService {
 @Resource TruckAppointmentFileClient files;
 @Resource ObjectMapper objectMapper;
 @Value("${baiyue.security.internal-service-token}") String internalToken;
- public PageResult<TruckAppointmentEntity> page(Query q){return repo.page(q);} public TruckAppointmentEntity detail(long id){return required(id);}
+ public PageResult<TruckAppointmentEntity> page(Query q){return repo.page(q);} public TruckAppointmentEntity detail(long id){return enrich(required(id));}
 public java.util.List<TruckAppointmentHistoryEntity> history(long id){required(id);return repo.histories(id);} public java.util.List<TruckAppointmentAttachmentEntity> attachments(long id){required(id);return repo.attachments(id);}
 @Transactional public TruckAppointmentAttachmentEntity upload(long id,String type,MultipartFile file,long uid){TruckAppointmentEntity appointment=required(id);if(appointment.getCustomerId()==null||appointment.getCustomerId()<=0)throw bad("预约缺少客户归属，无法上传附件");try{var response=files.upload(internalToken,uid,appointment.getCustomerId(),"TRUCK_APPOINTMENT_ATTACHMENT",Long.toString(id),file);if(response==null||!response.successful()||response.data()==null)throw bad("附件上传失败");var m=response.data();TruckAppointmentAttachmentEntity a=new TruckAppointmentAttachmentEntity();a.setId(IdWorker.getId());a.setAppointmentId(id);a.setFileId(m.fileId());a.setAttachmentType(type);a.setFileName(m.fileName());a.setFileHash(m.sha256());a.setVisibility("PLATFORM");a.setUploadedBy(uid);a.setUploadedAt(LocalDateTime.now());repo.attachment(a);return a;}catch(FeignException ex){throw new BizException(ResultCode.SERVICE_UNAVAILABLE,"文件服务暂不可用");}}
 @Transactional public TruckAppointmentAttachmentEntity attach(long id,AttachmentRequest r,long uid){TruckAppointmentEntity appointment=required(id); if(appointment.getCustomerId()==null||appointment.getCustomerId()<=0)throw bad("预约缺少客户归属，无法引用附件"); TruckAppointmentFileClient.Metadata metadata;try{var response=files.metadata(internalToken,appointment.getCustomerId(),"TRUCK_APPOINTMENT_ATTACHMENT",Long.toString(id),r.fileId());if(response==null||!response.successful()||response.data()==null)throw bad("附件不存在或归属不匹配");metadata=response.data();}catch(FeignException ex){throw new BizException(ResultCode.SERVICE_UNAVAILABLE,"文件服务暂不可用");} TruckAppointmentAttachmentEntity a=new TruckAppointmentAttachmentEntity();a.setId(IdWorker.getId());a.setAppointmentId(id);a.setFileId(metadata.fileId());a.setAttachmentType(r.attachmentType());a.setFileName(metadata.fileName());a.setFileHash(metadata.sha256());a.setVisibility("PLATFORM");a.setUploadedBy(uid);a.setUploadedAt(LocalDateTime.now());repo.attachment(a);return a;}
 @Transactional public void deleteAttachment(long id,long attachmentId){required(id);if(repo.deleteAttachment(id,attachmentId)!=1)throw new BizException(ResultCode.NOT_FOUND,"附件引用不存在");}
- @Transactional public TruckAppointmentEntity create(long uid,String name,SaveRequest r){if(r.expectedVersion()!=0)throw bad("新增 expectedVersion 必须为0"); validateBookingLink(r); TruckAppointmentEntity e=new TruckAppointmentEntity(); e.setId(IdWorker.getId()); e.setAppointmentNo("TA"+e.getId()); e.setStatus(TruckAppointmentStatus.DRAFT); e.setRevision(0); e.setVersion(0); e.setCreatedAt(LocalDateTime.now()); e.setUpdatedAt(e.getCreatedAt()); copy(e,r); repo.insert(e); record(e,null,e.getStatus().name(),"CREATE",null,uid,name); return e;}
- @Transactional public TruckAppointmentEntity edit(long id,long uid,String name,SaveRequest r){TruckAppointmentEntity e=required(id); checkVersion(e,r.expectedVersion()); if(!(e.getStatus()==TruckAppointmentStatus.DRAFT||e.getStatus()==TruckAppointmentStatus.PENDING_DISPATCH||e.getStatus()==TruckAppointmentStatus.RESCHEDULED))throw conflict("当前状态不可编辑"); validateBookingLink(r); copy(e,r); if(repo.updateEdit(e,r.expectedVersion())!=1)throw conflict("版本已变化，请刷新后重试"); record(e,e.getStatus().name(),e.getStatus().name(),"EDIT",null,uid,name); return required(id);}
+ @Transactional public TruckAppointmentEntity create(long uid,String name,SaveRequest r){if(r.expectedVersion()!=0)throw bad("新增 expectedVersion 必须为0"); OceanBookingEntity booking=validateBookingLink(r); TruckAppointmentEntity e=new TruckAppointmentEntity(); e.setId(IdWorker.getId()); e.setAppointmentNo("TA"+e.getId()); e.setStatus(TruckAppointmentStatus.DRAFT); e.setRevision(0); e.setVersion(0); e.setCreatedAt(LocalDateTime.now()); e.setUpdatedAt(e.getCreatedAt()); copy(e,r,booking); repo.insert(e); record(e,null,e.getStatus().name(),"CREATE",null,uid,name); return e;}
+ @Transactional public TruckAppointmentEntity edit(long id,long uid,String name,SaveRequest r){TruckAppointmentEntity e=required(id); checkVersion(e,r.expectedVersion()); if(!(e.getStatus()==TruckAppointmentStatus.DRAFT||e.getStatus()==TruckAppointmentStatus.PENDING_DISPATCH||e.getStatus()==TruckAppointmentStatus.RESCHEDULED))throw conflict("当前状态不可编辑"); OceanBookingEntity booking=validateBookingLink(r); copy(e,r,booking); if(repo.updateEdit(e,r.expectedVersion())!=1)throw conflict("版本已变化，请刷新后重试"); record(e,e.getStatus().name(),e.getStatus().name(),"EDIT",null,uid,name); return required(id);}
 @Transactional public TruckAppointmentEntity action(long id,String action,ActionRequest r,String idem,String clientHash,long uid,String name){String requestHash=hash(action,id,r);verifyClientHash(clientHash,requestHash);TruckAppointmentEntity replay=claimOrReplay(id,action,idem,requestHash);if(replay!=null)return replay;TruckAppointmentEntity e=required(id); checkVersion(e,r.expectedVersion()); if("RESCHEDULE".equals(action))throw conflict("改约请使用专用接口"); TruckAppointmentStatus from=e.getStatus(),to=next(from,action); if(repo.transition(id,from.name(),to.name(),e.getVersion())!=1)throw conflict("状态或版本已变化，请刷新后重试"); TruckAppointmentEntity after=required(id);record(after,from.name(),to.name(),action,r.reason(),uid,name);return completeOperation(id,action,idem,after);}
 @Transactional public TruckAppointmentEntity reschedule(long id,LocalDateTime at,ActionRequest r,String idem,String clientHash,long uid,String name){String action="RESCHEDULE";String requestHash=hash(action,id,new ReschedulePayload(at,r));verifyClientHash(clientHash,requestHash);TruckAppointmentEntity replay=claimOrReplay(id,action,idem,requestHash);if(replay!=null)return replay;TruckAppointmentEntity e=required(id);checkVersion(e,r.expectedVersion()); if(e.getStatus()==TruckAppointmentStatus.COMPLETED||e.getStatus()==TruckAppointmentStatus.CANCELLED)throw conflict("当前状态不可改约"); String from=e.getStatus().name(); if(repo.reschedule(id,at,r.reason(),e.getVersion())!=1)throw conflict("状态或版本已变化，请刷新后重试");TruckAppointmentEntity after=required(id);record(after,from,"RESCHEDULED",action,r.reason(),uid,name);return completeOperation(id,action,idem,after);}
- private void validateBookingLink(SaveRequest r){if(r.oceanBookingId()==null||r.oceanBookingId()<=0)throw bad("oceanBookingId不能为空"); OceanBookingEntity b=oceanBookings.find(r.oceanBookingId()); if(b==null)throw new BizException(ResultCode.NOT_FOUND,"关联订舱不存在"); if(!"RELEASED".equals(b.getStatus()))throw conflict("仅已放舱订舱可创建拖车预约"); if(r.customerId()!=null&&r.customerId()>0&&!Objects.equals(r.customerId(),b.getCustomerId()))throw bad("customerId与订舱客户不一致"); if(r.containerBookingId()!=null&&r.containerBookingId()>0){ContainerBookingEntity c=oceanBookings.containerBooking(r.containerBookingId()); if(c==null)throw new BizException(ResultCode.NOT_FOUND,"关联柜体不存在"); boolean allocated=oceanBookings.allocations(r.oceanBookingId()).stream().anyMatch(a->Objects.equals(a.getContainerBookingId(),r.containerBookingId())); if(!allocated)throw bad("containerBookingId未分配至该订舱"); if(r.warehouseId()!=null&&r.warehouseId()>0&&c.getWarehouseId()!=null&&!Objects.equals(r.warehouseId(),c.getWarehouseId()))throw bad("warehouseId与柜体不一致");} validateLoadingPlanLink(r);}
+ private OceanBookingEntity validateBookingLink(SaveRequest r){if(r.oceanBookingId()==null||r.oceanBookingId()<=0)throw bad("oceanBookingId不能为空"); OceanBookingEntity b=oceanBookings.find(r.oceanBookingId()); if(b==null)throw new BizException(ResultCode.NOT_FOUND,"关联订舱不存在"); if(!"RELEASED".equals(b.getStatus()))throw conflict("仅已放舱订舱可创建拖车预约"); if(b.getCustomerId()==null||!StringUtils.hasText(b.getCustomerName()))throw conflict("关联订舱缺少客户快照"); if(r.customerId()!=null&&r.customerId()>0&&!Objects.equals(r.customerId(),b.getCustomerId()))throw bad("customerId与订舱客户不一致"); if(StringUtils.hasText(r.customerName())&&!r.customerName().trim().equals(b.getCustomerName()))throw bad("customerName与订舱客户快照不一致"); if(r.containerBookingId()!=null&&r.containerBookingId()>0){ContainerBookingEntity c=oceanBookings.containerBooking(r.containerBookingId()); if(c==null)throw new BizException(ResultCode.NOT_FOUND,"关联柜体不存在"); boolean allocated=oceanBookings.allocations(r.oceanBookingId()).stream().anyMatch(a->Objects.equals(a.getContainerBookingId(),r.containerBookingId())); if(!allocated)throw bad("containerBookingId未分配至该订舱"); if(r.warehouseId()!=null&&r.warehouseId()>0&&c.getWarehouseId()!=null&&!Objects.equals(r.warehouseId(),c.getWarehouseId()))throw bad("warehouseId与柜体不一致");} validateLoadingPlanLink(r);return b;}
 private void validateLoadingPlanLink(SaveRequest r){if(r.loadingPlanId()==null)return;if(r.loadingPlanId()<=0)throw bad("loadingPlanId必须大于0");if(r.containerBookingId()==null||r.containerBookingId()<=0)throw bad("关联装柜计划时containerBookingId不能为空");LoadingPlanEntity plan=loadingPlans.plan(r.loadingPlanId());if(plan==null)throw new BizException(ResultCode.NOT_FOUND,"关联装柜计划不存在");if(!Objects.equals(plan.getContainerBookingId(),r.containerBookingId()))throw bad("loadingPlanId与柜体不一致");}
 private TruckAppointmentStatus next(TruckAppointmentStatus s,String a){return switch(a){case"SUBMIT"->s==TruckAppointmentStatus.DRAFT?TruckAppointmentStatus.PENDING_DISPATCH:badStatus();case"DISPATCH"->s==TruckAppointmentStatus.PENDING_DISPATCH||s==TruckAppointmentStatus.RESCHEDULED?TruckAppointmentStatus.DISPATCHED:badStatus();case"PICKUP"->s==TruckAppointmentStatus.DISPATCHED?TruckAppointmentStatus.PICKUP_IN_PROGRESS:badStatus();case"ARRIVE"->s==TruckAppointmentStatus.PICKUP_IN_PROGRESS?TruckAppointmentStatus.ARRIVED_WAREHOUSE:badStatus();case"LOAD"->s==TruckAppointmentStatus.ARRIVED_WAREHOUSE?TruckAppointmentStatus.LOADING:badStatus();case"DEPART"->s==TruckAppointmentStatus.LOADING?TruckAppointmentStatus.DEPARTED:badStatus();case"COMPLETE"->s==TruckAppointmentStatus.DEPARTED?TruckAppointmentStatus.COMPLETED:badStatus();case"EXCEPTION"->s!=TruckAppointmentStatus.COMPLETED&&s!=TruckAppointmentStatus.CANCELLED?TruckAppointmentStatus.EXCEPTION:badStatus();case"CANCEL"->s!=TruckAppointmentStatus.COMPLETED?TruckAppointmentStatus.CANCELLED:badStatus();default->badStatus();};}
 private TruckAppointmentStatus badStatus(){throw conflict("不允许的状态动作");} private TruckAppointmentEntity required(long id){TruckAppointmentEntity e=repo.find(id);if(e==null)throw new BizException(ResultCode.NOT_FOUND,"拖车预约不存在");return e;} private void checkVersion(TruckAppointmentEntity e,int v){if(e.getVersion()!=v)throw conflict("版本已变化，请刷新后重试");} private static BizException conflict(String m){return new BizException(ResultCode.CONFLICT,m);} private static BizException bad(String m){return new BizException(ResultCode.BAD_REQUEST,m);}
- private void copy(TruckAppointmentEntity e,SaveRequest r){e.setOutboundOrderId(r.outboundOrderId());e.setOceanBookingId(r.oceanBookingId());e.setContainerBookingId(r.containerBookingId());e.setLoadingPlanId(r.loadingPlanId());e.setWarehouseId(r.warehouseId());e.setCustomerId(r.customerId());e.setCustomerName(r.customerName());e.setCarrierId(r.carrierId());e.setCarrierName(r.carrierName());e.setFleetContact(r.fleetContact());e.setFleetPhone(r.fleetPhone());e.setDriverName(r.driverName());e.setDriverPhone(r.driverPhone());e.setDriverIdCard(r.driverIdCard());e.setVehicleNo(r.vehicleNo());e.setStoreName(r.storeName());e.setStoreContact(r.storeContact());e.setStorePhone(r.storePhone());e.setStoreAddress(r.storeAddress());e.setStoreCity(r.storeCity());e.setStoreZipcode(r.storeZipcode());e.setPackageCount(r.packageCount());e.setGrossWeightKg(r.grossWeightKg());e.setVolumeCbm(r.volumeCbm());e.setPalletCount(r.palletCount());e.setPoNo(r.poNo());e.setPlannedLoadingAt(r.plannedLoadingAt());e.setTransitMinutes(r.transitMinutes());e.setPayableAmount(r.payableAmount());e.setReceivableAmount(r.receivableAmount());e.setCurrency(r.currency()==null?"RMB":r.currency());e.setRemark(r.remark());}
+ private TruckAppointmentEntity enrich(TruckAppointmentEntity value){OceanBookingEntity booking=oceanBookings.find(value.getOceanBookingId());if(booking!=null){value.setOceanBookingNo(booking.getBookingNo());value.setWarehouseName(booking.getWarehouseName());value.setShippingCompanyId(booking.getShippingCompanyId());value.setShippingCompanyName(booking.getShippingCompanyName());value.setBookingAgentId(booking.getBookingAgentId());value.setBookingAgentName(booking.getBookingAgentName());}if(value.getContainerBookingId()!=null){ContainerBookingEntity container=oceanBookings.containerBooking(value.getContainerBookingId());if(container!=null){value.setCabinetNo(container.getCabinetNo());value.setContainerNo(container.getContainerNo());if(!StringUtils.hasText(value.getWarehouseName()))value.setWarehouseName(container.getWarehouseName());}}return value;}
+ private void copy(TruckAppointmentEntity e,SaveRequest r,OceanBookingEntity booking){e.setOutboundOrderId(r.outboundOrderId());e.setOceanBookingId(r.oceanBookingId());e.setContainerBookingId(r.containerBookingId());e.setLoadingPlanId(r.loadingPlanId());e.setWarehouseId(r.warehouseId());e.setCustomerId(booking.getCustomerId());e.setCustomerName(booking.getCustomerName());e.setCarrierId(r.carrierId());e.setCarrierName(r.carrierName());e.setFleetContact(r.fleetContact());e.setFleetPhone(r.fleetPhone());e.setDriverName(r.driverName());e.setDriverPhone(r.driverPhone());e.setDriverIdCard(r.driverIdCard());e.setVehicleNo(r.vehicleNo());e.setStoreName(r.storeName());e.setStoreContact(r.storeContact());e.setStorePhone(r.storePhone());e.setStoreAddress(r.storeAddress());e.setStoreCity(r.storeCity());e.setStoreZipcode(r.storeZipcode());e.setPackageCount(r.packageCount());e.setGrossWeightKg(r.grossWeightKg());e.setVolumeCbm(r.volumeCbm());e.setPalletCount(r.palletCount());e.setPoNo(r.poNo());e.setPlannedLoadingAt(r.plannedLoadingAt());e.setTransitMinutes(r.transitMinutes());e.setPayableAmount(r.payableAmount());e.setReceivableAmount(r.receivableAmount());e.setCurrency(r.currency()==null?"RMB":r.currency());e.setRemark(r.remark());}
 private TruckAppointmentEntity claimOrReplay(long id,String action,String key,String hash){validateKey(key);String normalized=key.trim();if(repo.claimOperation(IdWorker.getId(),id,action,normalized,hash))return null;TruckAppointmentOperationEntity existing=repo.operation(normalized);if(existing==null||!Objects.equals(existing.getAppointmentId(),id)||!action.equals(existing.getAction())||!hash.equals(existing.getRequestHash()))throw conflict("Idempotency-Key已用于不同请求");if(!StringUtils.hasText(existing.getResponseSnapshot()))throw conflict("相同请求正在处理中，请稍后重试");try{return objectMapper.readValue(existing.getResponseSnapshot(),TruckAppointmentEntity.class);}catch(JsonProcessingException ex){throw new IllegalStateException("无法读取拖车预约幂等结果",ex);}}
 private TruckAppointmentEntity completeOperation(long id,String action,String key,TruckAppointmentEntity result){try{String normalized=key.trim();if(repo.completeOperation(id,action,normalized,objectMapper.writeValueAsString(result))!=1)throw conflict("拖车预约幂等请求完成状态冲突");return result;}catch(JsonProcessingException ex){throw new IllegalStateException("无法保存拖车预约幂等结果",ex);}}
 private String hash(String action,long id,Object request){try{return HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256").digest((action+'|'+id+'|'+objectMapper.writeValueAsString(request)).getBytes(StandardCharsets.UTF_8)));}catch(Exception ex){throw new IllegalStateException("无法计算拖车预约请求摘要",ex);}}
@@ -421,6 +421,8 @@ CREATE TABLE IF NOT EXISTS fl_price_channel_catalog (
  price_model VARCHAR(32) NOT NULL COMMENT '默认价格模型',
  source_sheet_name VARCHAR(128) NOT NULL COMMENT '来源Sheet名称；海派为同一Sheet',
  aliases_json JSON NOT NULL COMMENT '上传名称别名数组',
+  inbound_code_prefix VARCHAR(6) NOT NULL COMMENT '普通目的仓入仓码物流前缀',
+  overseas_inbound_code_prefix VARCHAR(6) NULL COMMENT '海外仓中转入仓码物流前缀；为空时使用普通前缀',
  status VARCHAR(16) NOT NULL DEFAULT 'ACTIVE' COMMENT '目录状态：ACTIVE启用、DISABLED停用',
  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
  updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '最后更新时间',
@@ -511,26 +513,29 @@ CREATE TABLE IF NOT EXISTS fl_price_book_channel (
 ) ENGINE=InnoDB COMMENT='价格版本渠道及船期快照';

 INSERT INTO fl_price_channel_catalog
-  (id, channel_code, display_name, price_model, source_sheet_name, aliases_json, status)
+  (id, channel_code, display_name, price_model, source_sheet_name, aliases_json,
+   inbound_code_prefix, overseas_inbound_code_prefix, status)
 VALUES
-  (1, 'MATSON_CLX_TRUCK', '美森正班海卡', 'FBA_WAREHOUSE_RATE', '美森正班海卡', JSON_ARRAY('美森正班海卡'), 'ACTIVE'),
-  (2, 'MATSON_MAX_TRUCK', '美森加班海卡', 'FBA_WAREHOUSE_RATE', '美森加班海卡', JSON_ARRAY('美森加班海卡'), 'ACTIVE'),
-  (3, 'EXX_TRUCK', 'EXX海卡', 'FBA_WAREHOUSE_RATE', 'EXX海卡', JSON_ARRAY('EXX海卡'), 'ACTIVE'),
-  (4, 'HEDE_TRUCK', '合德海卡', 'FBA_WAREHOUSE_RATE', '合德海卡', JSON_ARRAY('合德海卡'), 'ACTIVE'),
-  (5, 'EXX_RAIL_NY', '纽约EXX海铁', 'FBA_WAREHOUSE_RATE', '纽约EXX海铁', JSON_ARRAY('纽约EXX海铁'), 'ACTIVE'),
-  (6, 'OA_LA_TRUCK', '洛杉矶普船海卡', 'FBA_WAREHOUSE_RATE', '洛杉矶普船海卡', JSON_ARRAY('洛杉矶普船海卡'), 'ACTIVE'),
-  (7, 'OA_LA_FULL_TRUCK', '洛杉矶普船全卡', 'FBA_WAREHOUSE_RATE', '洛杉矶普船全卡', JSON_ARRAY('洛杉矶普船全卡'), 'ACTIVE'),
-  (8, 'OA_CHICAGO_RAIL', '芝加哥普船海铁', 'FBA_WAREHOUSE_RATE', '芝加哥普船海铁', JSON_ARRAY('芝加哥普船海铁'), 'ACTIVE'),
-  (9, 'OA_HOUSTON_TRUCK', '休斯顿普船海卡', 'FBA_WAREHOUSE_RATE', '休斯顿普船海卡', JSON_ARRAY('休斯顿普船海卡'), 'ACTIVE'),
-  (10, 'OA_NEW_YORK_TRUCK', '纽约普船海卡', 'FBA_WAREHOUSE_RATE', '纽约普船海卡', JSON_ARRAY('纽约普船海卡'), 'ACTIVE'),
-  (11, 'OA_SAVANNAH_TRUCK', '萨凡纳普船海卡', 'FBA_WAREHOUSE_RATE', '萨凡纳普船海卡', JSON_ARRAY('萨凡纳普船海卡'), 'ACTIVE'),
-  (12, 'MATSON_CLX_PARCEL', '美森正班海派', 'REGION_WEIGHT_TIER', '海派', JSON_ARRAY('美森正班海派'), 'ACTIVE'),
-  (13, 'MATSON_MAX_PARCEL', '美森加班海派', 'REGION_WEIGHT_TIER', '海派', JSON_ARRAY('美森加班海派'), 'ACTIVE'),
-  (14, 'HEDE_PARCEL', '合德海派', 'REGION_WEIGHT_TIER', '海派', JSON_ARRAY('合德海派'), 'ACTIVE'),
-  (15, 'OA_PARCEL', '普船海派', 'REGION_WEIGHT_TIER', '海派', JSON_ARRAY('普船海派'), 'ACTIVE')
+  (1, 'MATSON_CLX_TRUCK', '美森正班海卡', 'FBA_WAREHOUSE_RATE', '美森正班海卡', JSON_ARRAY('美森正班海卡'), 'ZBYHK', 'ZBYHWK', 'ACTIVE'),
+  (2, 'MATSON_MAX_TRUCK', '美森加班海卡', 'FBA_WAREHOUSE_RATE', '美森加班海卡', JSON_ARRAY('美森加班海卡'), 'BYHK', 'BYHWK', 'ACTIVE'),
+  (3, 'EXX_TRUCK', 'EXX海卡', 'FBA_WAREHOUSE_RATE', 'EXX海卡', JSON_ARRAY('EXX海卡'), 'EXXHK', 'EXXHWK', 'ACTIVE'),
+  (4, 'HEDE_TRUCK', '合德海卡', 'FBA_WAREHOUSE_RATE', '合德海卡', JSON_ARRAY('合德海卡'), 'HDHK', 'HDHWK', 'ACTIVE'),
+  (5, 'EXX_RAIL_NY', '纽约EXX海铁', 'FBA_WAREHOUSE_RATE', '纽约EXX海铁', JSON_ARRAY('纽约EXX海铁'), 'NYEXX', NULL, 'ACTIVE'),
+  (6, 'OA_LA_TRUCK', '洛杉矶普船海卡', 'FBA_WAREHOUSE_RATE', '洛杉矶普船海卡', JSON_ARRAY('洛杉矶普船海卡'), 'PCHK', 'PCHWK', 'ACTIVE'),
+  (7, 'OA_LA_FULL_TRUCK', '洛杉矶普船全卡', 'FBA_WAREHOUSE_RATE', '洛杉矶普船全卡', JSON_ARRAY('洛杉矶普船全卡'), 'PCKK', NULL, 'ACTIVE'),
+  (8, 'OA_CHICAGO_RAIL', '芝加哥普船海铁', 'FBA_WAREHOUSE_RATE', '芝加哥普船海铁', JSON_ARRAY('芝加哥普船海铁'), 'CPHT', NULL, 'ACTIVE'),
+  (9, 'OA_HOUSTON_TRUCK', '休斯顿普船海卡', 'FBA_WAREHOUSE_RATE', '休斯顿普船海卡', JSON_ARRAY('休斯顿普船海卡'), 'HPHK', NULL, 'ACTIVE'),
+  (10, 'OA_NEW_YORK_TRUCK', '纽约普船海卡', 'FBA_WAREHOUSE_RATE', '纽约普船海卡', JSON_ARRAY('纽约普船海卡'), 'NPHK', 'NPHWK', 'ACTIVE'),
+  (11, 'OA_SAVANNAH_TRUCK', '萨凡纳普船海卡', 'FBA_WAREHOUSE_RATE', '萨凡纳普船海卡', JSON_ARRAY('萨凡纳普船海卡'), 'SPHK', NULL, 'ACTIVE'),
+  (12, 'MATSON_CLX_PARCEL', '美森正班海派', 'REGION_WEIGHT_TIER', '海派', JSON_ARRAY('美森正班海派'), 'ZBYHP', NULL, 'ACTIVE'),
+  (13, 'MATSON_MAX_PARCEL', '美森加班海派', 'REGION_WEIGHT_TIER', '海派', JSON_ARRAY('美森加班海派'), 'BYHP', NULL, 'ACTIVE'),
+  (14, 'HEDE_PARCEL', '合德海派', 'REGION_WEIGHT_TIER', '海派', JSON_ARRAY('合德海派'), 'HDHP', NULL, 'ACTIVE'),
+  (15, 'OA_PARCEL', '普船海派', 'REGION_WEIGHT_TIER', '海派', JSON_ARRAY('普船海派'), 'PCHP', NULL, 'ACTIVE')
 ON DUPLICATE KEY UPDATE
  display_name = VALUES(display_name), price_model = VALUES(price_model),
-  source_sheet_name = VALUES(source_sheet_name), aliases_json = VALUES(aliases_json), status = VALUES(status);
+  source_sheet_name = VALUES(source_sheet_name), aliases_json = VALUES(aliases_json),
+  inbound_code_prefix = VALUES(inbound_code_prefix),
+  overseas_inbound_code_prefix = VALUES(overseas_inbound_code_prefix), status = VALUES(status);

 INSERT INTO fl_price_origin_alias (id, warehouse_code, alias_name, status)
 VALUES
@@ -153,8 +153,8 @@ paths:
      responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
  /api/platform/v1/inbounds/{inboundId}/fees/published:
    put:
-      summary: 调整已发布费用
-      description: 需要 firstleg:fba-pricing:adjust 权限；生成新 SENT 版本并将旧版本标记 SUPERSEDED，不回退 WAIT_SPLIT 状态。
+      summary: 调整初算或已发布费用
+      description: 需要 firstleg:fba-pricing:adjust 权限；人工修改计费量、单价和附加费，小计与总额由服务端重算并生成新版本，不回退 WAIT_SPLIT 状态。调整 CALCULATED/CONFIRMED 时生成新的 CALCULATED 版本；调整 SENT 时生成新的 SENT 版本并发布调整事件。
      parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/InboundId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
      requestBody:
        required: true
@@ -175,9 +175,11 @@ components:
  schemas:
    AdjustFeeRequest:
      type: object
-      required: [subtotalAmount, additionalAmount, reason]
+      required: [expectedFeeVersion, chargeableQuantity, unitPrice, additionalAmount, reason]
      properties:
-        subtotalAmount: {type: number, minimum: 0, multipleOf: 0.01}
+        expectedFeeVersion: {type: integer, minimum: 1}
+        chargeableQuantity: {type: number, exclusiveMinimum: 0, description: 计费量，单位沿用当前费用快照的 chargeUnit}
+        unitPrice: {type: number, minimum: 0, description: 人工确认单价}
        additionalAmount: {type: number, minimum: 0, multipleOf: 0.01}
        reason: {type: string, minLength: 1, maxLength: 500}
    CalculateRequest:
@@ -356,7 +356,7 @@ paths:
              type: object
              required: [boxCode, length, width, height, machineNo, picture]
              properties:
-                boxCode: {type: string, maxLength: 128, example: 'RK-2085911321565003778#4-1'}
+                boxCode: {type: string, maxLength: 128, example: 'ZBYHK2608140897#4-1'}
                shipment_id: {type: string, maxLength: 64, example: 'FBA19L5KMY2CU000002', description: '可选；设备从Amazon FBA箱标实际扫描得到，有则原样上传；系统只保存，不生成且不覆盖客户下单值'}
                length: {type: number, format: decimal, minimum: 0.001}
                width: {type: number, format: decimal, minimum: 0.001}
@@ -558,7 +558,7 @@ paths:
  /api/platform/v1/inbounds/{inboundId}/measurements/approve:
    post:
      summary: 审核通过测量
-      description: 需要 firstleg:inbound:measurement-review 权限。审核事务提交后服务端自动执行计费、费用发布和入库编排并返回费用快照；若后续编排失败，审核结果保持已提交，使用同一 Idempotency-Key 重试将从持久化阶段继续，接口不会伪造 WAIT_SPLIT。
+      description: 需要 firstleg:inbound:measurement-review 权限。审核通过后立即进入 WAIT_SPLIT，并按该次测量数据尽力生成 CALCULATED 初算费用；价格未覆盖或初算异常只返回非阻断提示，不影响审核结果和待分柜状态。
      parameters:
        - {name: inboundId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
        - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
@@ -575,7 +575,7 @@ paths:
                expectedVersion: {type: integer, minimum: 0}
                reason: {type: string, maxLength: 1000}
      responses:
-        '200': {description: 成功或业务失败，按响应体 code 判断；成功 data 为 FeeSnapshotResponse 且 nextStatus=WAIT_SPLIT；失败可能表示审核已提交但自动编排尚未完成、版本冲突或费用/仓库门禁失败，不得据此推断 WAIT_SPLIT}
+        '200': {description: 成功或业务失败，按响应体 code 判断；审核成功 data.processStatus 固定为 WAIT_SPLIT，initialPricingSucceeded 表示是否同时生成初算费用，初算失败时 feeStatus=UNPRICED 且主流程仍成功}
  /api/platform/v1/inbounds/{inboundId}/measurements/reject:
    post:
      summary: 驳回测量
@@ -982,7 +982,7 @@ components:
        tenantId: {type: string, pattern: '^[1-9][0-9]*$', description: 当前客户隔离 ID}
        orderId: {type: string, pattern: '^[1-9][0-9]*$'}
        orderNo: {type: string, nullable: true}
-        inboundCode: {type: string, minLength: 1, maxLength: 40, example: RK-2085308606829346818}
+        inboundCode: {type: string, minLength: 1, maxLength: 40, example: ZBYHK2608140897}
        customerId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
        customerName: {type: string, minLength: 1}
        warehouseId: {type: string, pattern: '^[1-9][0-9]*$'}
@@ -1217,7 +1217,7 @@ components:
        eventNo: {type: string, maxLength: 128, pattern: '^[A-Za-z0-9._:-]+$', example: M202608010001}
        externalDetailNo: {type: string, maxLength: 128, pattern: '^[A-Za-z0-9._:-]+$', example: BOX-20260801-0001}
        warehouseCode: {type: string, maxLength: 50, example: CN-YW-01}
-        inboundCode: {type: string, maxLength: 40, example: RK202608010001}
+        inboundCode: {type: string, maxLength: 40, example: ZBYHK2608140897}
        inboundDetailId: {type: string, example: '190000000000000001', description: 柏悦订单货物明细ID}
        deviceCode: {type: string, maxLength: 64, example: DEVICE-01}
        measuredAt: {type: string, format: date-time, example: '2026-08-01T10:30:00+08:00'}
@@ -11,6 +11,12 @@ paths:
    parameters: [{$ref: '#/components/parameters/ContainerId'}]
    post: {operationId: markContainerException, description: '权限：platform:firstleg:container:edit', parameters: [{name: Idempotency-Key, in: header, required: true, schema: {type: string, minLength: 1, maxLength: 128}}], requestBody: {$ref: '#/components/requestBodies/ExceptionRequest'}, responses: {'200': {description: OK}}}
    delete: {operationId: cancelContainerException, description: '权限：platform:firstleg:container:edit', parameters: [{name: Idempotency-Key, in: header, required: true, schema: {type: string, minLength: 1, maxLength: 128}}], requestBody: {$ref: '#/components/requestBodies/ExceptionRequest'}, responses: {'200': {description: OK}}}
+  /api/platform/v1/containers/{id}/pda/photos/{fileId}/download:
+    get:
+      operationId: downloadContainerPdaPhoto
+      description: '权限：platform:firstleg:container:list；Firstleg按柜次、装柜计划、入库单和文件归属代理下载，不暴露内部服务令牌'
+      parameters: [{$ref: '#/components/parameters/ContainerId'}, {name: fileId, in: path, required: true, schema: {type: integer, format: int64}}]
+      responses: {'200': {description: photo bytes, content: {application/octet-stream: {schema: {type: string, format: binary}}}}, '404': {description: photo missing or not owned by the container}}
  /api/platform/v1/containers/{id}/documents/{documentType}:
    get:
      operationId: getContainerDocument
@@ -50,7 +56,7 @@ components:
        exceptionHistory: {type: array, items: {$ref: '#/components/schemas/ExceptionHistory'}}
        timeline: {type: array, items: {$ref: '#/components/schemas/TimelineEntry'}}
    Container: {type: object, properties: {id: {type: integer, format: int64}, bookingNo: {type: string}, cabinetNo: {type: string}, containerNo: {type: string}, status: {type: string}, warehouseId: {type: integer, format: int64}, warehouseName: {type: string}, voyageNo: {type: string}, vesselName: {type: string}, version: {type: integer, minimum: 0}}}
-    PdaSummary: {type: object, properties: {taskId: {type: integer, format: int64}, loadingPlanId: {type: integer, format: int64}, containerBookingId: {type: integer, format: int64}, taskStatus: {type: string}, taskVersion: {type: integer}, itemCount: {type: integer}, completedItemCount: {type: integer}, unresolvedItemCount: {type: integer}, photoCounts: {type: array, items: {$ref: '#/components/schemas/PhotoCount'}}, photos: {type: array, items: {$ref: '#/components/schemas/Photo'}}, exceptionReasons: {type: array, items: {type: string}}}}
+    PdaSummary: {type: object, properties: {taskId: {type: integer, format: int64}, loadingPlanId: {type: integer, format: int64}, containerBookingId: {type: integer, format: int64}, taskStatus: {type: string, description: '持久化任务态：LOADING/COMPLETED'}, workflowStatus: {type: string, enum: [IN_PROGRESS, AWAITING_REVIEW, COMPLETED], description: 'PDA作业展示态'}, taskVersion: {type: integer}, itemCount: {type: integer}, completedItemCount: {type: integer}, unresolvedItemCount: {type: integer}, photoCounts: {type: array, items: {$ref: '#/components/schemas/PhotoCount'}}, photos: {type: array, items: {$ref: '#/components/schemas/Photo'}}, exceptionReasons: {type: array, items: {type: string}}}}
    PhotoCount: {type: object, properties: {evidenceType: {type: string}, count: {type: integer}}}
    Photo: {type: object, properties: {evidenceId: {type: integer, format: int64}, tenantId: {type: integer, format: int64}, inboundId: {type: integer, format: int64}, evidenceType: {type: string}, fileId: {type: integer, format: int64}, fileName: {type: string}, status: {type: string}, downloadPath: {type: string}, uploadedAt: {type: string, format: date-time}}}
    Document: {type: object, properties: {id: {type: integer, format: int64}, documentType: {type: string}, fileId: {type: integer, format: int64}, fileName: {type: string}, fileHash: {type: string}, uploadedBy: {type: integer, format: int64}, uploadedByName: {type: string}, uploadedAt: {type: string, format: date-time}, version: {type: integer}, completed: {type: boolean}}}
@@ -24,7 +24,7 @@ paths:
    get:
      summary: Query a truck appointment
      responses:
-        '200': {description: Appointment detail}
+        '200': {description: Appointment detail, content: {application/json: {schema: {$ref: '#/components/schemas/DetailStableReferences'}}}}
    put:
      summary: Update an editable truck appointment with optimistic locking
      requestBody:
@@ -78,16 +78,20 @@ paths:
    parameters: [{$ref: '#/components/parameters/AppointmentId'}]
    get:
      summary: Query attachment references owned by the appointment
+      description: 'Requires platform:firstleg:truck-appointment:list.'
      responses:
-        '200': {description: Attachment references}
+        '200': {description: Attachment references, content: {application/json: {schema: {type: array, items: {$ref: '#/components/schemas/Attachment'}}}}}
    post:
      summary: Reference a file already owned by the appointment customer and business scope
+      description: 'Requires platform:firstleg:truck-appointment:edit. The file must belong to customerId + TRUCK_APPOINTMENT_ATTACHMENT + appointmentId.'
+      requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/AttachmentRequest'}}}}
      responses:
-        '200': {description: Created attachment reference}
+        '200': {description: Created attachment reference, content: {application/json: {schema: {$ref: '#/components/schemas/Attachment'}}}}
  /api/platform/v1/truck-appointments/{id}/attachments/upload:
    parameters: [{$ref: '#/components/parameters/AppointmentId'}]
    post:
      summary: Upload and reference a truck appointment attachment
+      description: 'Requires platform:firstleg:truck-appointment:edit.'
      requestBody:
        required: true
        content:
@@ -96,7 +100,7 @@ paths:
              type: object
              required: [file]
              properties:
-                attachmentType: {type: string, maxLength: 32}
+                attachmentType: {type: string, maxLength: 64}
                file: {type: string, format: binary}
      responses:
        '200': {description: Uploaded attachment reference}
@@ -106,6 +110,7 @@ paths:
      - {$ref: '#/components/parameters/AttachmentId'}
    delete:
      summary: Delete an attachment reference owned by the appointment
+      description: 'Requires platform:firstleg:truck-appointment:edit. Deletes the appointment reference only; the File object is retained.'
      responses:
        '200': {description: Reference deleted}
 components:
@@ -122,6 +127,26 @@ components:
    IdempotencyKey: {name: Idempotency-Key, in: header, required: true, schema: {type: string, maxLength: 128}}
    RequestHash: {name: X-Request-Hash, in: header, required: false, schema: {type: string, pattern: '^[0-9a-fA-F]{64}$'}}
  schemas:
+    AttachmentRequest:
+      type: object
+      required: [fileId]
+      properties:
+        fileId: {type: integer, format: int64, minimum: 1}
+        attachmentType: {type: string, maxLength: 64}
+        fileName: {type: string, maxLength: 255, description: Ignored; authoritative metadata comes from File service}
+        fileHash: {type: string, maxLength: 128, description: Ignored; authoritative metadata comes from File service}
+    Attachment:
+      type: object
+      properties:
+        id: {type: integer, format: int64}
+        appointmentId: {type: integer, format: int64}
+        fileId: {type: integer, format: int64}
+        attachmentType: {type: string}
+        fileName: {type: string}
+        fileHash: {type: string}
+        visibility: {type: string, enum: [PLATFORM]}
+        uploadedBy: {type: integer, format: int64}
+        uploadedAt: {type: string, format: date-time}
    ActionRequest:
      type: object
      required: [expectedVersion]
@@ -137,3 +162,23 @@ components:
        loadingPlanId: {type: integer, format: int64, minimum: 1}
        plannedLoadingAt: {type: string, format: date-time}
        expectedVersion: {type: integer, minimum: 0}
+    DetailStableReferences:
+      type: object
+      description: Stable IDs plus server-resolved saved resource names returned by appointment detail.
+      properties:
+        oceanBookingId: {type: integer, format: int64}
+        oceanBookingNo: {type: string}
+        containerBookingId: {type: integer, format: int64}
+        cabinetNo: {type: string}
+        containerNo: {type: string, nullable: true}
+        loadingPlanId: {type: integer, format: int64}
+        warehouseId: {type: integer, format: int64}
+        warehouseName: {type: string}
+        customerId: {type: integer, format: int64}
+        customerName: {type: string, description: Frozen from the associated ocean booking; request input cannot override it}
+        shippingCompanyId: {type: integer, format: int64}
+        shippingCompanyName: {type: string}
+        bookingAgentId: {type: integer, format: int64}
+        bookingAgentName: {type: string}
+        carrierId: {type: integer, format: int64}
+        carrierName: {type: string}
@@ -25,6 +25,7 @@ class ContainerControllerContractTest {
        assertPermission("updateTransport", "platform:firstleg:container:edit");
        assertPermission("uploadClearance", "platform:firstleg:customs:manage");
        assertPermission("overview", "platform:firstleg:container:list");
+        assertPermission("downloadPdaPhoto", "platform:firstleg:container:list");
        assertPermission("markException", "platform:firstleg:container:edit");
        assertPermission("cancelException", "platform:firstleg:container:edit");
        assertPermission("logisticsDocument", "platform:firstleg:container:list");
@@ -38,7 +39,8 @@ class ContainerControllerContractTest {
        assertThat(openapi).contains("/api/platform/v1/containers/{id}/overview:",
            "/documents/{documentType}/{fileId}/download:", "ExceptionRequest",
            "enum: [DELIVERY_ORDER, PICKUP_ORDER]", "Idempotency-Key", "photoCounts:",
-            "downloadPath:", "version: {type: integer, minimum: 0}")
+            "/pda/photos/{fileId}/download:", "downloadPath:", "workflowStatus:",
+            "AWAITING_REVIEW", "version: {type: integer, minimum: 0}")
            .doesNotContain("?containerNo", "containerNo in: query");
    }

@@ -36,7 +36,7 @@ class FbaPricingContractTest {
    }

    @Test
-    @DisplayName("契约声明二期边界计费、已发布费用调整和幂等头")
+    @DisplayName("契约声明二期边界计费、人工费用调整和幂等头")
    void documentsPricingLifecycle() throws Exception {
        String openapi = new ClassPathResource("openapi/fba-pricing-v1.yaml")
            .getContentAsString(StandardCharsets.UTF_8);
@@ -53,6 +53,10 @@ class FbaPricingContractTest {
            .contains("不再以 carrierId、业务 customerId 或客户计费规则作为前置")
            .contains("该动作涉及后续仓储流程，本轮二期验收不调用")
            .contains("不回退 WAIT_SPLIT 状态")
+            .contains("expectedFeeVersion")
+            .contains("chargeableQuantity")
+            .contains("unitPrice")
+            .doesNotContain("required: [subtotalAmount, additionalAmount, reason]")
            .doesNotContain("应收")
            .doesNotContain("应付")
            .doesNotContain("待客户确认");
@@ -1,10 +1,10 @@
 package com.baiyue.firstleg.controller;

-import com.baiyue.common.audit.BusinessAudit;
 import com.baiyue.common.security.AuthenticatedUser;
 import com.baiyue.firstleg.dto.ExceptionReleaseRequest;
+import com.baiyue.firstleg.dto.MeasurementApprovalResponse;
 import com.baiyue.firstleg.dto.MeasurementReviewRequest;
-import com.baiyue.firstleg.service.AutomaticInboundCompletionService;
+import com.baiyue.firstleg.service.InitialInboundPricingService;
 import com.baiyue.firstleg.service.MeasurementReviewService;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -46,50 +46,39 @@ class InboundMeasurementReviewContractTest {
            .contains("/api/platform/v1/inbounds/{inboundId}/measurements/reject:")
            .contains("firstleg:inbound:exception-release")
            .contains("Idempotency-Key")
-            .contains("审核事务提交后服务端自动执行计费")
-            .contains("接口不会伪造 WAIT_SPLIT")
-            .contains("成功 data 为 FeeSnapshotResponse")
-            .contains("nextStatus=WAIT_SPLIT")
+            .contains("初算异常只返回非阻断提示")
+            .contains("data.processStatus 固定为 WAIT_SPLIT")
+            .contains("feeStatus=UNPRICED 且主流程仍成功")
            .contains("name: inboundId")
            .contains("schema: {type: string, pattern:")
            .doesNotContain("待客户确认");
    }

    @Test
-    @DisplayName("审核事务完成后才启动自动编排并返回真实费用快照")
-    void shouldCompleteApprovedReviewAfterReviewTransactionReturns() {
+    @DisplayName("审核先提交待分柜，再执行不阻塞的初算")
+    void shouldApproveBeforeBestEffortInitialPricing() {
        MeasurementReviewService review = mock(MeasurementReviewService.class);
-        AutomaticInboundCompletionService completion = mock(AutomaticInboundCompletionService.class);
+        InitialInboundPricingService initialPricing = mock(InitialInboundPricingService.class);
        PlatformInboundMeasurementReviewController controller = new PlatformInboundMeasurementReviewController();
        ReflectionTestUtils.setField(controller, "service", review);
-        ReflectionTestUtils.setField(controller, "automaticCompletion", completion);
+        ReflectionTestUtils.setField(controller, "initialPricing", initialPricing);
        AuthenticatedUser user = new AuthenticatedUser(9L, 0L, 0L, null,
            "客服", "PLATFORM", "WEB", Set.of("firstleg:inbound:measurement-review"));
        MeasurementReviewRequest request = new MeasurementReviewRequest(30L, 4, "通过");
-        var fee = mock(com.baiyue.firstleg.dto.FbaPricingDtos.FeeSnapshotResponse.class);
-        when(completion.completeApproved(10001L, 88L, 9L, "客服", 30L, 5)).thenReturn(fee);
+        var result = new MeasurementApprovalResponse(88L, 30L, "WAIT_SPLIT", "UNPRICED",
+            false, "待人工维护费用", null);
+        when(initialPricing.tryCalculate(10001L, 9L, 88L, 30L, 5)).thenReturn(result);

        var first = controller.approve(user, 10001L, 88L, "approve-1", request);
        var replay = controller.approve(user, 10001L, 88L, "approve-1", request);

-        assertThat(first.data()).isSameAs(fee);
-        assertThat(replay.data()).isSameAs(fee);
-        var ordered = inOrder(review, completion);
+        assertThat(first.data()).isSameAs(result);
+        assertThat(replay.data()).isSameAs(result);
+        var ordered = inOrder(review, initialPricing);
        ordered.verify(review).approve(10001L, 9L, "客服", 88L, "approve-1", request);
-        ordered.verify(completion).completeApproved(10001L, 88L, 9L, "客服", 30L, 5);
+        ordered.verify(initialPricing).tryCalculate(10001L, 9L, 88L, 30L, 5);
        ordered.verify(review).approve(10001L, 9L, "客服", 88L, "approve-1", request);
-        ordered.verify(completion).completeApproved(10001L, 88L, 9L, "客服", 30L, 5);
-    }
-
-    @Test
-    void shouldAuditAutomaticInboundCompletion() throws Exception {
-        Method method = AutomaticInboundCompletionService.class.getDeclaredMethod("completeApproved",
-            long.class, long.class, long.class, String.class, long.class, int.class);
-        BusinessAudit audit = method.getAnnotation(BusinessAudit.class);
-        assertThat(audit.event()).isEqualTo("INBOUND_AUTO_COMPLETE");
-        assertThat(audit.resourceType()).isEqualTo("INBOUND");
-        assertThat(audit.resourceId()).isEqualTo("#inboundId");
-        assertThat(audit.captureBefore()).isFalse();
+        ordered.verify(initialPricing).tryCalculate(10001L, 9L, 88L, 30L, 5);
    }

    private void assertAuthority(String name, String expression, Class<?>... types) throws Exception {
@@ -23,6 +23,12 @@ class PriceBookContractTest {
    @DisplayName("固定十五个渠道且海派使用区域重量模型")
    void keepsStableChannelCatalog() {
        assertThat(PriceBookChannelCatalog.CHANNELS).hasSize(15);
+        assertThat(PriceBookChannelCatalog.CHANNELS)
+            .extracting(value -> value.channelCode() + ":" + value.inboundCodePrefix())
+            .contains("MATSON_CLX_TRUCK:ZBYHK", "OA_LA_FULL_TRUCK:PCKK", "OA_CHICAGO_RAIL:CPHT");
+        assertThat(PriceBookChannelCatalog.CHANNELS)
+            .filteredOn(value -> "OA_NEW_YORK_TRUCK".equals(value.channelCode()))
+            .singleElement().extracting(value -> value.overseasInboundCodePrefix()).isEqualTo("NPHWK");
        assertThat(PriceBookChannelCatalog.CHANNELS.stream()
            .map(PriceBookChannelCatalog.ChannelDefinition::channelCode))
            .containsExactly(
@@ -19,6 +19,7 @@ class TruckAppointmentControllerContractTest {
 @Test void exposesDedicatedEndpointAndPermissions() {String p=PlatformTruckAppointmentController.class.getAnnotation(org.springframework.web.bind.annotation.RequestMapping.class).value()[0];assertThat(p).isEqualTo("/api/platform/v1/truck-appointments"); for(String n:new String[]{"page","detail","history","attachments","attach","upload","deleteAttachment","create","edit","action","reschedule"}) assertThat(java.util.Arrays.stream(PlatformTruckAppointmentController.class.getDeclaredMethods()).anyMatch(m->m.getName().equals(n))).isTrue();}
 @Test void schemaHasAggregateTablesStatesAndActualEventTimes() throws Exception {String s=new ClassPathResource("db/phase3-truck-appointment-schema.sql").getContentAsString(StandardCharsets.UTF_8);assertThat(s).contains("fl_truck_appointment","fl_truck_appointment_history","fl_truck_appointment_attachment","fl_truck_appointment_operation","PENDING_DISPATCH","PICKUP_IN_PROGRESS","ARRIVED_WAREHOUSE","RESCHEDULED","actual_arrived_warehouse_at","actual_loading_at","actual_departed_at","CALL phase3_truck_add_column");}
 @Test void openApiDocumentsLifecycleIdempotencyAndActualTimes() throws Exception {String s=new ClassPathResource("openapi/truck-appointments-v1.yaml").getContentAsString(StandardCharsets.UTF_8);assertThat(s).contains("/api/platform/v1/truck-appointments/{id}/{action}:","/api/platform/v1/truck-appointments/{id}/reschedule:","name: Idempotency-Key","required: true","actual event timestamps");}
+ @Test void openApiFreezesAttachmentRequestAndOwnershipContract() throws Exception {String s=new ClassPathResource("openapi/truck-appointments-v1.yaml").getContentAsString(StandardCharsets.UTF_8);assertThat(s).contains("AttachmentRequest:","required: [fileId]","maxLength: 64","TRUCK_APPOINTMENT_ATTACHMENT","Deletes the appointment reference only","DetailStableReferences:","oceanBookingNo:","shippingCompanyName:","bookingAgentName:","cabinetNo:");}
 @Test void methodsHavePlatformPermissionsAndAuthenticatedScope() {
   Map<String,String> expected=Map.ofEntries(
       Map.entry("page","platform:firstleg:truck-appointment:list"), Map.entry("detail","platform:firstleg:truck-appointment:list"),
@@ -11,10 +11,11 @@ import static org.assertj.core.api.Assertions.assertThat;

 class InboundOrderStatusSqlContractTest {
    @Test
-    void advancesThroughPricingBeforeOpeningWaitSplit() {
+    void opensWaitSplitImmediatelyAfterMeasurementApproval() {
        assertThat(sql("approveMeasurement"))
-            .contains("process_status = 'WAIT_PRICING'")
-            .doesNotContain("inbounded_at =");
+            .contains("process_status = 'WAIT_SPLIT'")
+            .contains("inbounded_at = CURRENT_TIMESTAMP(3)")
+            .doesNotContain("process_status = 'WAIT_PRICING'");
        assertThat(sql("completeInbound"))
            .contains("process_status = 'WAIT_SPLIT'")
            .contains("inbounded_at = CURRENT_TIMESTAMP(3)")
@@ -1,92 +0,0 @@
-package com.baiyue.firstleg.service;
-
-import com.baiyue.firstleg.dto.FbaPricingDtos.FeeSnapshotResponse;
-import com.baiyue.firstleg.entity.InboundOrderEntity;
-import com.baiyue.firstleg.repository.InboundWorkflowRepository;
-import jakarta.annotation.Resource;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@SpringJUnitConfig(AutomaticInboundCompletionService.class)
-class AutomaticInboundCompletionServiceTest {
-    @MockBean private FbaPricingService pricing;
-    @MockBean private InboundWorkflowRepository workflow;
-    @MockBean private InboundCompletionOrchestrator completion;
-    @Resource private AutomaticInboundCompletionService service;
-
-    @Test
-    void shouldHandleCase01() {
-        FeeSnapshotResponse fee = fee(501L);
-        when(pricing.latest(10001L, 88L)).thenReturn(fee);
-        when(workflow.findOwned(10001L, 88L)).thenReturn(
-            order("WAIT_PRICING", "UNPRICED", 4),
-            order("FEE_CONFIRMING", "CALCULATED", 5),
-            order("FEE_CONFIRMING", "CONFIRMED", 6),
-            order("INBOUNDING", "CONFIRMED", 7),
-            order("WAIT_SPLIT", "SENT", 8));
-
-        FeeSnapshotResponse result = service.completeApproved(10001L, 88L, 9L, "客服", 30L, 4);
-
-        assertThat(result).isSameAs(fee);
-        verify(pricing).calculate(10001L, 9L, 88L, null, "auto-88-30-4-calculate");
-        verify(pricing).confirm(10001L, 9L, 88L, "auto-88-30-4-confirm");
-        verify(completion).beginSendFeeAndInbound(10001L, 9L, "客服", 88L, 501L, 6,
-            "auto-88-30-4-begin");
-        verify(completion).completeSendFeeAndInbound(10001L, 9L, "客服", 88L, 501L, 7,
-            "auto-88-30-4-complete");
-    }
-
-    @Test
-    void shouldHandleCase02() {
-        FeeSnapshotResponse fee = fee(501L);
-        when(workflow.findOwned(10001L, 88L)).thenReturn(order("WAIT_SPLIT", "SENT", 8));
-        when(pricing.latest(10001L, 88L)).thenReturn(fee);
-
-        assertThat(service.completeApproved(10001L, 88L, 9L, "客服", 30L, 4)).isSameAs(fee);
-
-        verify(pricing, never()).calculate(anyLong(), anyLong(), anyLong(),
-            org.mockito.ArgumentMatchers.any(), anyString());
-        verify(pricing, never()).confirm(anyLong(), anyLong(), anyLong(), anyString());
-        verify(completion, never()).beginSendFeeAndInbound(anyLong(), anyLong(), anyString(),
-            anyLong(), anyLong(), org.mockito.ArgumentMatchers.anyInt(), anyString());
-    }
-
-    @Test
-    void shouldHandleCase03() {
-        FeeSnapshotResponse fee = fee(501L);
-        when(pricing.latest(10001L, 88L)).thenReturn(fee);
-        when(workflow.findOwned(10001L, 88L)).thenReturn(
-            order("INBOUNDING", "CONFIRMED", 7), order("WAIT_SPLIT", "SENT", 8));
-
-        service.completeApproved(10001L, 88L, 9L, "客服", 30L, 4);
-
-        verify(completion).completeSendFeeAndInbound(10001L, 9L, "客服", 88L, 501L, 7,
-            "auto-88-30-4-complete");
-        verify(pricing, never()).calculate(anyLong(), anyLong(), anyLong(),
-            org.mockito.ArgumentMatchers.any(), anyString());
-        verify(pricing, never()).confirm(anyLong(), anyLong(), anyLong(), anyString());
-    }
-
-    private static InboundOrderEntity order(String process, String feeStatus, int version) {
-        InboundOrderEntity order = new InboundOrderEntity();
-        order.setProcessStatus(process);
-        order.setFeeStatus(feeStatus);
-        order.setVersion(version);
-        return order;
-    }
-
-    private static FeeSnapshotResponse fee(long feeId) {
-        FeeSnapshotResponse fee = mock(FeeSnapshotResponse.class);
-        when(fee.feeId()).thenReturn(feeId);
-        return fee;
-    }
-}
@@ -5,6 +5,10 @@ import com.baiyue.firstleg.dto.ContainerOverviewDtos.ExceptionRequest;
 import com.baiyue.firstleg.entity.ContainerBookingEntity;
 import com.baiyue.firstleg.mapper.ContainerOverviewMapper;
 import com.baiyue.firstleg.repository.ContainerRepository;
+import com.baiyue.firstleg.client.LoadingEvidenceFileClient;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.util.ReflectionTestUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
@@ -13,6 +17,7 @@ import org.mockito.MockitoAnnotations;

 import java.time.LocalDateTime;

+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
@@ -20,9 +25,67 @@ import static org.mockito.Mockito.*;
 class ContainerOverviewServiceTest {
    @Mock ContainerRepository containers;
    @Mock ContainerOverviewMapper mapper;
+    @Mock LoadingEvidenceFileClient evidenceFiles;
    @InjectMocks ContainerOverviewService service;

-    @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); }
+    @BeforeEach void setUp() {
+        MockitoAnnotations.openMocks(this);
+        ReflectionTestUtils.setField(service, "internalToken", "internal-token");
+    }
+
+    @Test void overviewExposesAwaitingReviewWorkflowAndFirstlegPhotoDownloadPath() {
+        ContainerBookingEntity booking = new ContainerBookingEntity();
+        booking.setId(41L); booking.setVersion(3); booking.setPlanId(52L);
+        when(containers.find(41L)).thenReturn(booking);
+        when(mapper.pickTask(41L)).thenReturn(new ContainerOverviewMapper.PickTaskRow(
+            61L, 52L, 41L, "LOADING", 7));
+        when(mapper.itemCount(61L)).thenReturn(2);
+        when(mapper.completedItemCount(61L)).thenReturn(2);
+        when(mapper.unresolvedItemCount(61L)).thenReturn(0);
+        when(mapper.photos(52L)).thenReturn(java.util.List.of(new ContainerOverviewMapper.PhotoRow(
+            71L, 81L, 91L, "LOADING_DOOR_OPEN", 101L, "door.jpg", "ACTIVE", LocalDateTime.now())));
+        when(mapper.documents(41L)).thenReturn(java.util.List.of());
+        when(mapper.exceptions(41L)).thenReturn(java.util.List.of());
+        when(mapper.transport(41L)).thenReturn(java.util.List.of());
+        when(mapper.pickTimeline(61L)).thenReturn(java.util.List.of());
+        when(mapper.pickExceptionReasons(61L)).thenReturn(java.util.List.of());
+
+        var overview = service.overview(41L);
+
+        assertThat(overview.pda().taskStatus()).isEqualTo("LOADING");
+        assertThat(overview.pda().workflowStatus()).isEqualTo("AWAITING_REVIEW");
+        assertThat(overview.pda().photos().get(0).downloadPath())
+            .isEqualTo("/api/platform/v1/containers/41/pda/photos/101/download");
+    }
+
+    @Test void downloadsOnlyActivePhotoOwnedByContainerLoadingPlan() {
+        ContainerBookingEntity booking = new ContainerBookingEntity(); booking.setId(41L);
+        when(containers.find(41L)).thenReturn(booking);
+        when(mapper.pickTask(41L)).thenReturn(new ContainerOverviewMapper.PickTaskRow(
+            61L, 52L, 41L, "LOADING", 7));
+        when(mapper.photos(52L)).thenReturn(java.util.List.of(new ContainerOverviewMapper.PhotoRow(
+            71L, 81L, 91L, "LOADING_DOOR_OPEN", 101L, "door.jpg", "ACTIVE", LocalDateTime.now())));
+        when(evidenceFiles.download("internal-token", 81L, 91L, 101L)).thenReturn(ResponseEntity.ok()
+            .contentType(MediaType.IMAGE_JPEG).body(new byte[]{1, 2, 3}));
+
+        var download = service.downloadPhoto(41L, 101L);
+
+        assertThat(download.fileName()).isEqualTo("door.jpg");
+        assertThat(download.contentType()).isEqualTo(MediaType.IMAGE_JPEG);
+        assertThat(download.content()).containsExactly(1, 2, 3);
+    }
+
+    @Test void rejectsPhotoFromAnotherContainerBeforeCallingFileService() {
+        ContainerBookingEntity booking = new ContainerBookingEntity(); booking.setId(41L);
+        when(containers.find(41L)).thenReturn(booking);
+        when(mapper.pickTask(41L)).thenReturn(new ContainerOverviewMapper.PickTaskRow(
+            61L, 52L, 41L, "LOADING", 7));
+        when(mapper.photos(52L)).thenReturn(java.util.List.of());
+
+        assertThatThrownBy(() -> service.downloadPhoto(41L, 999L))
+            .isInstanceOf(BizException.class).hasMessageContaining("不属于该货柜");
+        verifyNoInteractions(evidenceFiles);
+    }

    @Test void markLocksContainerAndPersistsIdempotentImmutableHistory() {
        ContainerBookingEntity booking = new ContainerBookingEntity(); booking.setId(41L); booking.setVersion(3);
@@ -31,6 +31,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
@@ -302,7 +303,9 @@ class FbaPricingServiceTest {
        doAnswer(invocation -> { ((InboundPricingIdempotencyEntity) invocation.getArgument(0)).setId(901L); return null; })
            .when(repository).insertIdempotency(any());
        when(repository.nextFeeVersion(TENANT, INBOUND)).thenReturn(2);
-        when(repository.supersedeSent(TENANT, 501L)).thenReturn(1);
+        when(repository.supersedeCurrent(TENANT, 501L, "SENT")).thenReturn(1);
+        when(repository.markInboundAdjusted(eq(TENANT), eq(INBOUND), eq("SENT"), eq("KG"), any()))
+            .thenReturn(1);
        doAnswer(invocation -> {
            InboundFeeEntity fee = invocation.getArgument(0);
            fee.setId(502L);
@@ -314,18 +317,80 @@ class FbaPricingServiceTest {

        FeeSnapshotResponse response = service.adjustPublished(TENANT, OPERATOR, INBOUND,
            new com.baiyue.firstleg.dto.FbaPricingDtos.AdjustFeeRequest(
-                new BigDecimal("100.00"), new BigDecimal("20.00"), "客服修正"), "adjust-1");
+                1, new BigDecimal("12.5"), new BigDecimal("8.00"),
+                new BigDecimal("20.00"), "客服修正"), "adjust-1");

        assertThat(response.feeVersion()).isEqualTo(2);
        assertThat(response.feeStatus()).isEqualTo("SENT");
        assertThat(response.totalAmount()).isEqualByComparingTo("120.00");
        assertThat(response.nextProcessStatus()).isEqualTo("WAIT_SPLIT");
        assertThat(inbound.getProcessStatus()).isEqualTo("WAIT_SPLIT");
-        verify(repository).supersedeSent(TENANT, 501L);
+        assertThat(inserted.get().getChargeableQuantity()).isEqualByComparingTo("12.5000");
+        verify(repository).supersedeCurrent(TENANT, 501L, "SENT");
        verify(financeOutbox).publishInbound(eq(FinanceFeeSourceOutboxService.ADJUSTED),
            eq(TENANT), eq(INBOUND), eq(502L), eq(2), eq(NOW));
    }

+    @Test
+    @DisplayName("初算费用调整后保持初算状态且不发布财务来源")
+    void adjustsCalculatedFeeWithoutPublishingIt() {
+        InboundPricingEntity inbound = inbound("10", "1");
+        inbound.setProcessStatus("WAIT_SPLIT");
+        inbound.setFeeStatus("CALCULATED");
+        InboundFeeEntity current = savedFee("CALCULATED");
+        AtomicReference<InboundFeeEntity> inserted = new AtomicReference<>();
+        when(repository.findInbound(TENANT, INBOUND)).thenReturn(inbound);
+        when(repository.findLatestFee(TENANT, INBOUND)).thenReturn(current);
+        when(repository.findIdempotency(TENANT, OPERATOR, "FEE_ADJUST", "adjust-calculated")).thenReturn(null);
+        doAnswer(invocation -> { ((InboundPricingIdempotencyEntity) invocation.getArgument(0)).setId(902L); return null; })
+            .when(repository).insertIdempotency(any());
+        when(repository.nextFeeVersion(TENANT, INBOUND)).thenReturn(2);
+        when(repository.supersedeCurrent(TENANT, 501L, "CALCULATED")).thenReturn(1);
+        when(repository.markInboundAdjusted(eq(TENANT), eq(INBOUND), eq("CALCULATED"), eq("KG"), any()))
+            .thenReturn(1);
+        doAnswer(invocation -> {
+            InboundFeeEntity fee = invocation.getArgument(0);
+            fee.setId(503L);
+            inserted.set(fee);
+            return null;
+        }).when(repository).insertFee(any());
+        when(repository.completeIdempotency(any(), eq(503L), eq(NOW))).thenReturn(1);
+        when(repository.findFee(TENANT, 503L)).thenAnswer(invocation -> inserted.get());
+
+        FeeSnapshotResponse response = service.adjustPublished(TENANT, OPERATOR, INBOUND,
+            new com.baiyue.firstleg.dto.FbaPricingDtos.AdjustFeeRequest(
+                1, new BigDecimal("12.5"), new BigDecimal("8.00"),
+                new BigDecimal("20.00"), "客服修正"), "adjust-calculated");
+
+        assertThat(response.feeStatus()).isEqualTo("CALCULATED");
+        assertThat(response.totalAmount()).isEqualByComparingTo("120.00");
+        assertThat(response.nextProcessStatus()).isEqualTo("WAIT_SPLIT");
+        verify(repository).supersedeCurrent(TENANT, 501L, "CALCULATED");
+        verify(financeOutbox, never()).publishInbound(any(), anyLong(), anyLong(), anyLong(), anyInt(), any());
+    }
+
+    @Test
+    @DisplayName("费用版本已变化时拒绝覆盖当前版本")
+    void rejectsAdjustmentWithStaleFeeVersion() {
+        InboundPricingEntity inbound = inbound("10", "1");
+        inbound.setProcessStatus("WAIT_SPLIT");
+        InboundFeeEntity current = savedFee("CALCULATED");
+        current.setFeeVersion(2);
+        when(repository.findInbound(TENANT, INBOUND)).thenReturn(inbound);
+        when(repository.findLatestFee(TENANT, INBOUND)).thenReturn(current);
+
+        assertThatThrownBy(() -> service.adjustPublished(TENANT, OPERATOR, INBOUND,
+            new com.baiyue.firstleg.dto.FbaPricingDtos.AdjustFeeRequest(
+                1, new BigDecimal("12.5"), new BigDecimal("8.00"),
+                BigDecimal.ZERO, "客服修正"), "stale-adjust"))
+            .isInstanceOf(BizException.class)
+            .extracting(error -> ((BizException) error).getResultCode())
+            .isEqualTo(ResultCode.CONFLICT);
+
+        verify(repository, never()).insertIdempotency(any());
+        verify(repository, never()).supersedeCurrent(anyLong(), anyLong(), any());
+    }
+
    private void readyRepository() {
        when(repository.findIdempotency(anyLong(), anyLong(), any(), any())).thenReturn(null);
        doAnswer(invocation -> { ((InboundPricingIdempotencyEntity) invocation.getArgument(0)).setId(900L); return null; })
@@ -1,150 +0,0 @@
-package com.baiyue.firstleg.service;
-
-import com.baiyue.common.core.api.ResultCode;
-import com.baiyue.common.core.exception.BizException;
-import com.baiyue.firstleg.entity.InboundFeeEntity;
-import com.baiyue.firstleg.entity.InboundOrderEntity;
-import com.baiyue.firstleg.repository.InboundWorkflowRepository;
-import jakarta.annotation.Resource;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@DisplayName("发送费用并入库状态编排")
-@SpringJUnitConfig(InboundCompletionOrchestrator.class)
-class InboundCompletionOrchestratorTest {
-    @MockBean private FinanceFeeSourceOutboxService financeOutbox;
-    @MockBean
-    private InboundWorkflowRepository repository;
-    @MockBean
-    private InboundIdempotencyService idempotency;
-    @MockBean
-    private InboundFeeDetailService feeDetails;
-    @Resource
-    private InboundCompletionOrchestrator service;
-    @Test
-    @DisplayName("审核通过且费用和库位引用已准备时进入INBOUNDING")
-    void shouldBeginInboundAfterAllGuardsPass() {
-        Fixture fixture = fixture("APPROVED", false);
-        when(fixture.repository.beginInbound(10001L, 10L, 9L, 4)).thenReturn(1);
-
-        fixture.service.beginSendFeeAndInbound(10001L, 9L, "操作员", 10L, 30L, 4, "send-1");
-
-        verify(fixture.repository).beginInbound(10001L, 10L, 9L, 4);
-        verify(fixture.repository).insertHistory(any());
-    }
-
-    @Test
-    @DisplayName("测量驳回且无异常放行记录时禁止发送费用")
-    void shouldBlockRejectedMeasurementWithoutRelease() {
-        Fixture fixture = fixture("REJECTED", true);
-        when(fixture.repository.hasExceptionRelease(10001L, 10L)).thenReturn(false);
-
-        assertThatThrownBy(() -> fixture.service.beginSendFeeAndInbound(
-            10001L, 9L, "操作员", 10L, 30L, 4, "send-1"))
-            .isInstanceOf(BizException.class)
-            .extracting(error -> ((BizException) error).getResultCode())
-            .isEqualTo(ResultCode.CONFLICT);
-        verify(fixture.repository, never()).beginInbound(anyLong(), anyLong(), anyLong(), anyInt());
-    }
-
-    @Test
-    @DisplayName("异常放行标记必须与费用快照一致")
-    void shouldRequireFeeSnapshotReleaseFlag() {
-        Fixture fixture = fixture("REJECTED", false);
-        when(fixture.repository.hasExceptionRelease(10001L, 10L)).thenReturn(true);
-
-        assertThatThrownBy(() -> fixture.service.beginSendFeeAndInbound(
-            10001L, 9L, "操作员", 10L, 30L, 4, "send-1"))
-            .isInstanceOf(BizException.class)
-            .hasMessageContaining("异常放行标记");
-    }
-
-    @Test
-    @DisplayName("完成阶段原子发送费用、完成入库并写待投递事件")
-    void shouldCompleteInboundAndWriteOutbox() {
-        Fixture fixture = fixture("APPROVED", false);
-        fixture.order.setProcessStatus("INBOUNDING");
-        when(fixture.repository.completeInbound(10001L, 10L, 9L, 5)).thenReturn(1);
-        when(fixture.repository.markFeeSent(10001L, 10L, 30L, 9L)).thenReturn(1);
-        com.baiyue.firstleg.entity.InboundFeeDetailEntity published =
-            new com.baiyue.firstleg.entity.InboundFeeDetailEntity();
-        published.setSourceFeeVersion(1);
-        when(feeDetails.publishFreight(eq(10001L), eq(10L), eq(30L), eq(9L), eq("操作员"),
-            org.mockito.ArgumentMatchers.any(java.time.LocalDateTime.class))).thenReturn(published);
-
-        fixture.service.completeSendFeeAndInbound(
-            10001L, 9L, "操作员", 10L, 30L, 5, "complete-1");
-
-        verify(fixture.repository).completeInbound(10001L, 10L, 9L, 5);
-        verify(fixture.repository).markFeeSent(10001L, 10L, 30L, 9L);
-        verify(feeDetails).publishFreight(eq(10001L), eq(10L), eq(30L), eq(9L), eq("操作员"),
-            org.mockito.ArgumentMatchers.any(java.time.LocalDateTime.class));
-        verify(financeOutbox).publishInbound(eq(FinanceFeeSourceOutboxService.PUBLISHED),
-            eq(10001L), eq(10L), eq(30L), eq(1),
-            org.mockito.ArgumentMatchers.any(java.time.LocalDateTime.class));
-    }
-
-    @Test
-    @DisplayName("条件更新失败时报告并发冲突且不发送费用")
-    void shouldRejectConcurrentCompletion() {
-        Fixture fixture = fixture("APPROVED", false);
-        fixture.order.setProcessStatus("INBOUNDING");
-        when(fixture.repository.completeInbound(10001L, 10L, 9L, 5)).thenReturn(0);
-
-        assertThatThrownBy(() -> fixture.service.completeSendFeeAndInbound(
-            10001L, 9L, "操作员", 10L, 30L, 5, "complete-1"))
-            .isInstanceOf(BizException.class)
-            .extracting(error -> ((BizException) error).getResultCode())
-            .isEqualTo(ResultCode.CONFLICT);
-        verify(fixture.repository, never()).markFeeSent(anyLong(), anyLong(), anyLong(), anyLong());
-        verify(financeOutbox, never()).publishInbound(any(), anyLong(), anyLong(), anyLong(),
-            org.mockito.ArgumentMatchers.anyInt(),
-            org.mockito.ArgumentMatchers.any(java.time.LocalDateTime.class));
-    }
-
-    @Test
-    @DisplayName("只有仓库预占已补偿后才通过显式方法回退")
-    void shouldRollbackOnlyInboundingState() {
-        Fixture fixture = fixture("APPROVED", false);
-        when(fixture.repository.rollbackInbound(10001L, 10L, 9L, 5)).thenReturn(1);
-
-        fixture.service.rollbackSendFeeAndInbound(
-            10001L, 9L, "操作员", 10L, 5, "仓库确认失败且已释放预占", "rollback-1");
-
-        verify(fixture.repository).rollbackInbound(10001L, 10L, 9L, 5);
-        verify(fixture.repository).insertHistory(any());
-    }
-
-    private Fixture fixture(String reviewStatus, boolean feeRelease) {
-        when(idempotency.begin(anyLong(), anyLong(), anyLong(), anyString(), anyString(), anyString()))
-            .thenReturn(new InboundIdempotencyService.Context(10001L, 1L, false));
-        InboundOrderEntity order = new InboundOrderEntity();
-        order.setProcessStatus("FEE_CONFIRMING");
-        order.setFeeStatus("CONFIRMED");
-        order.setMeasureReviewStatus(reviewStatus);
-        InboundFeeEntity fee = new InboundFeeEntity();
-        fee.setExceptionRelease(feeRelease);
-        when(repository.findOwned(10001L, 10L)).thenReturn(order);
-        when(repository.findConfirmedFee(10001L, 10L, 30L)).thenReturn(fee);
-        when(repository.countPreparedAllocations(10001L, 10L)).thenReturn(1L);
-        return new Fixture(service, repository, order);
-    }
-
-    private record Fixture(InboundCompletionOrchestrator service,
-                           InboundWorkflowRepository repository,
-                           InboundOrderEntity order) {
-    }
-}
@@ -0,0 +1,46 @@
+package com.baiyue.firstleg.service;
+
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.firstleg.dto.FbaPricingDtos.FeeSnapshotResponse;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class InitialInboundPricingServiceTest {
+    private final FbaPricingService pricing = mock(FbaPricingService.class);
+    private final InitialInboundPricingService service = new InitialInboundPricingService();
+
+    InitialInboundPricingServiceTest() {
+        ReflectionTestUtils.setField(service, "pricing", pricing);
+    }
+
+    @Test
+    void returnsCalculatedDraftWithoutChangingWaitSplit() {
+        FeeSnapshotResponse fee = mock(FeeSnapshotResponse.class);
+        when(fee.feeStatus()).thenReturn("CALCULATED");
+        when(pricing.calculate(10001L, 9L, 88L, null, "initial-88-30-5")).thenReturn(fee);
+
+        var result = service.tryCalculate(10001L, 9L, 88L, 30L, 5);
+
+        assertThat(result.processStatus()).isEqualTo("WAIT_SPLIT");
+        assertThat(result.feeStatus()).isEqualTo("CALCULATED");
+        assertThat(result.initialPricingSucceeded()).isTrue();
+        assertThat(result.initialFee()).isSameAs(fee);
+    }
+
+    @Test
+    void keepsWaitSplitWhenNoPriceMatches() {
+        when(pricing.calculate(10001L, 9L, 88L, null, "initial-88-30-5"))
+            .thenThrow(new BizException("未匹配有效价格"));
+
+        var result = service.tryCalculate(10001L, 9L, 88L, 30L, 5);
+
+        assertThat(result.processStatus()).isEqualTo("WAIT_SPLIT");
+        assertThat(result.feeStatus()).isEqualTo("UNPRICED");
+        assertThat(result.initialPricingSucceeded()).isFalse();
+        assertThat(result.initialPricingMessage()).contains("未匹配有效价格");
+    }
+}
@@ -78,7 +78,7 @@ class MeasurementReviewServiceTest {
            ArgumentCaptor.forClass(InboundStatusHistoryEntity.class);
        verify(fixture.repository).insertHistory(history.capture());
        assertThat(history.getValue().getFromStatus()).isEqualTo("MEASURE_PENDING");
-        assertThat(history.getValue().getToStatus()).isEqualTo("WAIT_PRICING");
+        assertThat(history.getValue().getToStatus()).isEqualTo("WAIT_SPLIT");
    }

    @Test
@@ -16,6 +16,7 @@ import com.baiyue.firstleg.pricing.RegionWeightTierEstimator;
 import com.baiyue.firstleg.repository.PriceBookQueryRepository;
 import com.baiyue.firstleg.repository.PriceBookQueryRows.ChannelRow;
 import com.baiyue.firstleg.repository.PriceBookQueryRows.ChannelTaxModeRow;
+import com.baiyue.firstleg.repository.PriceBookQueryRows.ChannelPrefixRow;
 import com.baiyue.firstleg.repository.PriceBookQueryRows.RateRow;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
@@ -41,6 +42,32 @@ class MerchantPriceBookServiceTest {
    @MockBean private PriceBookWarehouseClient warehouses;
    @Resource private MerchantPriceBookService service;

+    @Test
+    void shouldResolveNormalAndOverseasInboundCodePrefixesFromChannelCatalog() {
+        when(repository.activeVersionId()).thenReturn(7L);
+        when(repository.channels(7L, 10L)).thenReturn(List.of(
+            channel(7L, "MATSON_CLX_TRUCK", PriceModel.FBA_WAREHOUSE_RATE)));
+        when(repository.channelPrefix("MATSON_CLX_TRUCK"))
+            .thenReturn(new ChannelPrefixRow("MATSON_CLX_TRUCK", "ZBYHK", "ZBYHWK"));
+
+        assertThat(service.requireAvailableChannel(10001L, 10L, "matson_clx_truck", "FBA")
+            .inboundCodePrefix()).isEqualTo("ZBYHK");
+        assertThat(service.requireAvailableChannel(10001L, 10L, "MATSON_CLX_TRUCK", "OVERSEAS")
+            .inboundCodePrefix()).isEqualTo("ZBYHWK");
+    }
+
+    @Test
+    void shouldFallBackToNormalPrefixWhenChannelHasNoOverseasVariant() {
+        when(repository.activeVersionId()).thenReturn(7L);
+        when(repository.channels(7L, 10L)).thenReturn(List.of(
+            channel(7L, "OA_HOUSTON_TRUCK", PriceModel.FBA_WAREHOUSE_RATE)));
+        when(repository.channelPrefix("OA_HOUSTON_TRUCK"))
+            .thenReturn(new ChannelPrefixRow("OA_HOUSTON_TRUCK", "HPHK", null));
+
+        assertThat(service.requireAvailableChannel(10001L, 10L, "OA_HOUSTON_TRUCK", "OVERSEAS")
+            .inboundCodePrefix()).isEqualTo("HPHK");
+    }
+
    @Test
    void shouldReturnEmptyChannelsWithoutActiveVersion() {
        when(repository.activeVersionId()).thenReturn(null);
@@ -41,6 +41,28 @@ class TruckAppointmentServiceTest {

    @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); }

+    @Test void detailResolvesStableNamesAndIdentifiersFromLinkedResources() {
+        TruckAppointmentEntity appointment = new TruckAppointmentEntity();
+        appointment.setId(51L); appointment.setOceanBookingId(61L); appointment.setContainerBookingId(71L);
+        when(repository.find(51L)).thenReturn(appointment);
+        OceanBookingEntity booking = new OceanBookingEntity(); booking.setId(61L); booking.setBookingNo("OB61");
+        booking.setWarehouseName("Shenzhen Transit"); booking.setShippingCompanyId(81L);
+        booking.setShippingCompanyName("Carrier Line"); booking.setBookingAgentId(91L); booking.setBookingAgentName("Agent Co");
+        when(oceanBookings.find(61L)).thenReturn(booking);
+        ContainerBookingEntity container = new ContainerBookingEntity(); container.setId(71L);
+        container.setCabinetNo("CAB-71"); container.setContainerNo("MSCU1234567");
+        when(oceanBookings.containerBooking(71L)).thenReturn(container);
+
+        TruckAppointmentEntity detail = service.detail(51L);
+
+        assertThat(detail.getOceanBookingNo()).isEqualTo("OB61");
+        assertThat(detail.getWarehouseName()).isEqualTo("Shenzhen Transit");
+        assertThat(detail.getShippingCompanyName()).isEqualTo("Carrier Line");
+        assertThat(detail.getBookingAgentName()).isEqualTo("Agent Co");
+        assertThat(detail.getCabinetNo()).isEqualTo("CAB-71");
+        assertThat(detail.getContainerNo()).isEqualTo("MSCU1234567");
+    }
+
    @Test void createRequiresZeroVersionAndInitialisesDraft() {
        SaveRequest invalid = request(1);
        assertThatThrownBy(() -> service.create(7L, "admin", invalid)).isInstanceOf(BizException.class);
@@ -63,10 +85,13 @@ class TruckAppointmentServiceTest {
        when(request.oceanBookingId()).thenReturn(99L);
        when(request.customerId()).thenReturn(7L);
        when(request.loadingPlanId()).thenReturn(null);
-        OceanBookingEntity booking = new OceanBookingEntity(); booking.setId(99L); booking.setStatus("RELEASED"); booking.setCustomerId(7L);
+        OceanBookingEntity booking = new OceanBookingEntity(); booking.setId(99L); booking.setStatus("RELEASED"); booking.setCustomerId(7L); booking.setCustomerName("Canonical Customer");
        when(oceanBookings.find(99L)).thenReturn(booking);
        service.create(7L, "admin", request);
-        verify(repository).insert(any(TruckAppointmentEntity.class));
+        ArgumentCaptor<TruckAppointmentEntity> entity = ArgumentCaptor.forClass(TruckAppointmentEntity.class);
+        verify(repository).insert(entity.capture());
+        assertThat(entity.getValue().getCustomerId()).isEqualTo(7L);
+        assertThat(entity.getValue().getCustomerName()).isEqualTo("Canonical Customer");
        verify(repository).history(any(TruckAppointmentHistoryEntity.class));
    }

@@ -76,7 +101,7 @@ class TruckAppointmentServiceTest {
        when(request.oceanBookingId()).thenReturn(99L);
        when(request.containerBookingId()).thenReturn(88L);
        when(request.loadingPlanId()).thenReturn(77L);
-        OceanBookingEntity booking = new OceanBookingEntity(); booking.setId(99L); booking.setStatus("RELEASED");
+        OceanBookingEntity booking = new OceanBookingEntity(); booking.setId(99L); booking.setStatus("RELEASED"); booking.setCustomerId(7L); booking.setCustomerName("Canonical Customer");
        when(oceanBookings.find(99L)).thenReturn(booking);
        ContainerBookingEntity container = new ContainerBookingEntity(); container.setId(88L);
        when(oceanBookings.containerBooking(88L)).thenReturn(container);
@@ -97,7 +122,7 @@ class TruckAppointmentServiceTest {
        when(request.oceanBookingId()).thenReturn(99L);
        when(request.containerBookingId()).thenReturn(88L);
        when(request.loadingPlanId()).thenReturn(77L);
-        OceanBookingEntity booking = new OceanBookingEntity(); booking.setId(99L); booking.setStatus("RELEASED");
+        OceanBookingEntity booking = new OceanBookingEntity(); booking.setId(99L); booking.setStatus("RELEASED"); booking.setCustomerId(7L); booking.setCustomerName("Canonical Customer");
        when(oceanBookings.find(99L)).thenReturn(booking);
        ContainerBookingEntity container = new ContainerBookingEntity(); container.setId(88L);
        when(oceanBookings.containerBooking(88L)).thenReturn(container);