Merge branch 'dev' of http://8.163.30.128:10082/java-project/baiyue-firstleg into dev

2026-08-20 18:22:20 +08:00
parent 382ffc7f55 a38396ce3f
commit b0dcbf77e5
23 changed files with 401 additions and 48 deletions
@@ -7,9 +7,10 @@ import com.baiyue.lastleg.inboundplan.dto.ConvertInboundPlanRequest;
 import com.baiyue.lastleg.inboundplan.dto.BatchFbaAppointmentRequest;
 import com.baiyue.lastleg.inboundplan.dto.FbaAppointmentResponse;
 import com.baiyue.lastleg.inboundplan.dto.InboundPlanResponse;
+import com.baiyue.lastleg.inboundplan.dto.InboundPlanListResponse;
 import com.baiyue.lastleg.inboundplan.dto.InboundPlanRequests;
-import com.baiyue.lastleg.inboundplan.dto.InboundPlanSummary;
 import com.baiyue.lastleg.inboundplan.dto.SupplementPalletRequest;
+import com.baiyue.lastleg.inboundplan.dto.UpdateFbaAppointmentRequest;
 import com.baiyue.lastleg.inboundplan.service.InboundFbaAppointmentService;
 import com.baiyue.lastleg.inboundplan.service.InboundPlanService;
 import com.baiyue.lastleg.security.OverseasPermissions;
@@ -25,24 +26,26 @@ import org.springframework.web.server.ResponseStatusException;

@RestController
@RequestMapping("/api/platform/v1/last-leg/inbound-plans")
-@Tag(name = "Tail-leg inbound plans")
+@Tag(name = "尾程入仓计划")
 public class InboundPlanController {
    @Resource private InboundPlanService service;
    @Resource private InboundFbaAppointmentService appointmentService;

+    /** 按入仓计划明细分页查询可预约的入库订单行。 */
    @GetMapping
    @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_LIST + "')")
-    @Operation(summary = "Page inbound plans without PDA, internal-event or outbound workflow fields", description = "Required authority: " + OverseasPermissions.INBOUND_ORDER_LIST)
-    public ApiResponse<PageResult<InboundPlanSummary>> page(
+    @Operation(summary = "分页查询入库订单", description = "Required authority: " + OverseasPermissions.INBOUND_ORDER_LIST)
+    public ApiResponse<PageResult<InboundPlanListResponse>> page(
        @AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam(required = false) String customerId,
+        @RequestParam String customerId,
        @Valid InboundPlanRequests.Query query) {
        return ApiResponse.success(service.page(scope(user, customerId), query));
    }

    @PostMapping("/convert")
    @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_CREATE + "')")
-    @Operation(summary = "Convert one inbound order to one inbound plan", description = "Required authority: " + OverseasPermissions.INBOUND_ORDER_CREATE)
+    /** 将入仓单转换为入仓计划。 */
+    @Operation(summary = "入仓单转入仓计划", description = "Required authority: " + OverseasPermissions.INBOUND_ORDER_CREATE)
    public ApiResponse<InboundPlanResponse> convert(@AuthenticationPrincipal AuthenticatedUser user,
                                                    @Valid @RequestBody ConvertInboundPlanRequest request) {
        return ApiResponse.success(service.convert(scope(user, request.customerId()), request.orderId()));
@@ -50,7 +53,8 @@ public class InboundPlanController {

    @GetMapping("/{planNo}")
    @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_LIST + "')")
-    @Operation(summary = "Get an inbound plan with lines, pallets and allocations", description = "Required authority: " + OverseasPermissions.INBOUND_ORDER_LIST)
+    /** 查询入仓计划及其明细、托盘和分配信息。 */
+    @Operation(summary = "查询入仓计划详情", description = "Required authority: " + OverseasPermissions.INBOUND_ORDER_LIST)
    public ApiResponse<InboundPlanResponse> detail(@AuthenticationPrincipal AuthenticatedUser user,
                                                   @PathVariable String planNo,
                                                   @RequestParam(required = false) String customerId) {
@@ -59,7 +63,8 @@ public class InboundPlanController {

    @PostMapping("/{planNo}/pallets/supplement")
    @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_EDIT + "')")
-    @Operation(summary = "Add one printable supplemental pallet for a plan destination warehouse", description = "Required authority: " + OverseasPermissions.INBOUND_ORDER_EDIT)
+    /** 为计划目标仓新增一个可打印的补充托盘。 */
+    @Operation(summary = "新增补充托盘", description = "Required authority: " + OverseasPermissions.INBOUND_ORDER_EDIT)
    public ApiResponse<InboundPlanResponse.Pallet> supplementPallet(@AuthenticationPrincipal AuthenticatedUser user,
                                                                     @PathVariable String planNo,
                                                                     @Valid @RequestBody SupplementPalletRequest request) {
@@ -68,7 +73,8 @@ public class InboundPlanController {

    @PostMapping("/fba-appointments/batch")
    @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_EDIT + "')")
-    @Operation(summary = "Create one FBA appointment for selected inbound lines", description = "Required authority: " + OverseasPermissions.INBOUND_ORDER_EDIT)
+    /** 为选中的入仓明细创建 FBA 预约。 */
+    @Operation(summary = "创建 FBA 预约", description = "Required authority: " + OverseasPermissions.INBOUND_ORDER_EDIT)
    public ApiResponse<FbaAppointmentResponse> batchFbaAppointment(
        @AuthenticationPrincipal AuthenticatedUser user,
        @Valid @RequestBody BatchFbaAppointmentRequest request) {
@@ -79,7 +85,8 @@ public class InboundPlanController {

    @GetMapping("/fba-appointments/{appointmentNo}")
    @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_LIST + "')")
-    @Operation(summary = "Get an FBA appointment and its selected inbound lines", description = "Required authority: " + OverseasPermissions.INBOUND_ORDER_LIST)
+    /** 查询 FBA 预约及其选中的入仓明细。 */
+    @Operation(summary = "查询 FBA 预约详情", description = "Required authority: " + OverseasPermissions.INBOUND_ORDER_LIST)
    public ApiResponse<FbaAppointmentResponse> fbaAppointmentDetail(
        @AuthenticationPrincipal AuthenticatedUser user,
        @PathVariable String appointmentNo,
@@ -87,6 +94,17 @@ public class InboundPlanController {
        return ApiResponse.success(appointmentService.detail(scope(user, customerId), appointmentNo));
    }

+    @PutMapping("/fba-appointments/{appointmentNo}")
+    @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_EDIT + "')")
+    @Operation(summary = "编辑 FBA 预约", description = "Required authority: " + OverseasPermissions.INBOUND_ORDER_EDIT)
+    public ApiResponse<FbaAppointmentResponse> updateFbaAppointment(
+        @AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String appointmentNo,
+        @Valid @RequestBody UpdateFbaAppointmentRequest request) {
+        return ApiResponse.success(appointmentService.update(scope(user, request.customerId()),
+            appointmentNo, request));
+    }
+
    private String scope(AuthenticatedUser user, String requestedCustomer) {
        if (user == null || user.tenantId() == null) {
            throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
@@ -13,6 +13,7 @@ public record BatchFbaAppointmentRequest(
    @NotEmpty @Size(max = 500) List<@NotNull Long> lineIds,
    @NotBlank @Size(max = 64) String appointmentNo,
    @NotNull LocalDateTime appointmentAt,
+    @NotNull LocalDateTime expectedLoadingAt,
    @NotBlank @Size(max = 32) String appointmentStatus,
    @Size(max = 1000) String appointmentRemark
 ) {
@@ -8,6 +8,7 @@ public record FbaAppointmentResponse(
    String customerId,
    String appointmentNo,
    LocalDateTime appointmentAt,
+    LocalDateTime expectedLoadingAt,
    String appointmentStatus,
    String appointmentRemark,
    String fbaWarehouseCode,
@@ -0,0 +1,30 @@
+package com.baiyue.lastleg.inboundplan.dto;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+public record InboundPlanListResponse(
+    Long lineId,
+    Long planId,
+    String planNo,
+    String customerId,
+    Long orderId,
+    String inboundCode,
+    String orderType,
+    String warehouseId,
+    String warehouseCode,
+    String warehouseName,
+    String fbaWarehouseCode,
+    String customerName,
+    Integer packageCount,
+    BigDecimal volumeCbm,
+    Integer palletCount,
+    String status,
+    String appointmentNo,
+    String appointmentStatus,
+    LocalDateTime appointmentAt,
+    LocalDateTime expectedLoadingAt,
+    String dispatchStatus,
+    LocalDateTime createdAt
+) {
+}
@@ -2,6 +2,7 @@ package com.baiyue.lastleg.inboundplan.dto;

 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Pattern;

 import java.time.LocalDateTime;

@@ -17,8 +18,12 @@ public final class InboundPlanRequests {
        String status,
        String overseasWarehouseId,
        String destinationWarehouseCode,
+        String warehouse,
        String fbaWarehouseCode,
+        @Pattern(regexp = "UNAPPOINTED|PENDING|SUCCESS|FAILED|CANCELLED")
        String appointmentStatus,
+        @Pattern(regexp = "UNSCHEDULED|SCHEDULED")
+        String dispatchStatus,
        LocalDateTime createdFrom,
        LocalDateTime createdTo
    ) {
@@ -0,0 +1,16 @@
+package com.baiyue.lastleg.inboundplan.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+
+import java.time.LocalDateTime;
+
+public record UpdateFbaAppointmentRequest(
+    String customerId,
+    @NotNull LocalDateTime appointmentAt,
+    @NotNull LocalDateTime expectedLoadingAt,
+    @NotBlank @Size(max = 32) String appointmentStatus,
+    @Size(max = 1000) String appointmentRemark
+) {
+}
@@ -15,6 +15,7 @@ public class InboundFbaAppointment {
    private String customerId;
    private String appointmentNo;
    private LocalDateTime appointmentAt;
+    private LocalDateTime expectedLoadingAt;
    private String appointmentStatus;
    private String appointmentRemark;
    private String fbaWarehouseCode;
@@ -0,0 +1,55 @@
+package com.baiyue.lastleg.inboundplan.mapper;
+
+import com.baiyue.lastleg.inboundplan.dto.InboundPlanListResponse;
+import com.baiyue.lastleg.inboundplan.dto.InboundPlanRequests;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface InboundPlanQueryMapper {
+    String FROM_AND_FILTER = " FROM ll_inbound_plan_line l" +
+        " JOIN ll_inbound_plan p ON p.id=l.plan_id AND p.customer_id=#{customerId}" +
+        " JOIN ll_order o ON o.id=l.order_id AND o.customer_id=#{customerId}" +
+        " LEFT JOIN ll_inbound_fba_appointment_item ai ON ai.line_id=l.id" +
+        " AND ai.id=(SELECT ai2.id FROM ll_inbound_fba_appointment_item ai2" +
+        " JOIN ll_inbound_fba_appointment a2 ON a2.id=ai2.appointment_id" +
+        " WHERE ai2.line_id=l.id AND a2.customer_id=#{customerId}" +
+        " ORDER BY a2.created_at DESC,ai2.id DESC LIMIT 1)" +
+        " LEFT JOIN ll_inbound_fba_appointment a ON a.id=ai.appointment_id AND a.customer_id=#{customerId}" +
+        " WHERE 1=1" +
+        "<if test='q.planNo != null and q.planNo != \"\"'> AND p.plan_no LIKE CONCAT('%',#{q.planNo},'%')</if>" +
+        "<if test='q.inboundCode != null and q.inboundCode != \"\"'> AND l.inbound_code LIKE CONCAT('%',#{q.inboundCode},'%')</if>" +
+        "<if test='q.status != null and q.status != \"\"'> AND p.status=#{q.status}</if>" +
+        "<if test='q.overseasWarehouseId != null and q.overseasWarehouseId != \"\"'> AND l.destination_warehouse_id=#{q.overseasWarehouseId}</if>" +
+        "<if test='q.destinationWarehouseCode != null and q.destinationWarehouseCode != \"\"'> AND l.destination_warehouse_code=#{q.destinationWarehouseCode}</if>" +
+        "<if test='q.warehouse != null and q.warehouse != \"\"'> AND (l.destination_warehouse_id LIKE CONCAT('%',#{q.warehouse},'%') OR l.destination_warehouse_code LIKE CONCAT('%',#{q.warehouse},'%') OR l.destination_warehouse_name LIKE CONCAT('%',#{q.warehouse},'%'))</if>" +
+        "<if test='q.fbaWarehouseCode != null and q.fbaWarehouseCode != \"\"'> AND l.fba_warehouse_code LIKE CONCAT('%',#{q.fbaWarehouseCode},'%')</if>" +
+        "<choose><when test='q.appointmentStatus == \"UNAPPOINTED\"'> AND ai.id IS NULL</when>" +
+        "<when test='q.appointmentStatus != null and q.appointmentStatus != \"\"'> AND a.appointment_status=#{q.appointmentStatus}</when></choose>" +
+        "<choose><when test='q.dispatchStatus == \"SCHEDULED\"'> AND EXISTS (SELECT 1 FROM ll_dispatch_item di WHERE di.customer_id=#{customerId} AND di.order_id=l.order_id)</when>" +
+        "<when test='q.dispatchStatus == \"UNSCHEDULED\"'> AND NOT EXISTS (SELECT 1 FROM ll_dispatch_item di WHERE di.customer_id=#{customerId} AND di.order_id=l.order_id)</when></choose>" +
+        "<if test='q.createdFrom != null'> AND p.created_at &gt;=#{q.createdFrom}</if>" +
+        "<if test='q.createdTo != null'> AND p.created_at &lt;=#{q.createdTo}</if>";
+
+    @Select("<script>SELECT l.id lineId,p.id planId,p.plan_no planNo,p.customer_id customerId," +
+        "l.order_id orderId,l.inbound_code inboundCode,o.order_type orderType," +
+        "l.destination_warehouse_id warehouseId,l.destination_warehouse_code warehouseCode," +
+        "l.destination_warehouse_name warehouseName,l.fba_warehouse_code fbaWarehouseCode," +
+        "o.customer_name customerName,l.required_package_count packageCount,l.volume_cbm volumeCbm," +
+        "l.planned_pallet_count palletCount,p.status status,a.appointment_no appointmentNo," +
+        "a.appointment_status appointmentStatus,a.appointment_at appointmentAt," +
+        "a.expected_loading_at expectedLoadingAt," +
+        "CASE WHEN EXISTS (SELECT 1 FROM ll_dispatch_item di WHERE di.customer_id=#{customerId} AND di.order_id=l.order_id)" +
+        " THEN 'SCHEDULED' ELSE 'UNSCHEDULED' END dispatchStatus,p.created_at createdAt" +
+        FROM_AND_FILTER + " ORDER BY p.created_at DESC,l.id DESC LIMIT #{limit} OFFSET #{offset}</script>")
+    List<InboundPlanListResponse> rows(@Param("customerId") String customerId,
+                                       @Param("q") InboundPlanRequests.Query query,
+                                       @Param("offset") long offset,
+                                       @Param("limit") long limit);
+
+    @Select("<script>SELECT COUNT(*)" + FROM_AND_FILTER + "</script>")
+    long count(@Param("customerId") String customerId, @Param("q") InboundPlanRequests.Query query);
+}
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baiyue.lastleg.inboundplan.dto.BatchFbaAppointmentRequest;
 import com.baiyue.lastleg.inboundplan.dto.FbaAppointmentResponse;
+import com.baiyue.lastleg.inboundplan.dto.UpdateFbaAppointmentRequest;
 import com.baiyue.lastleg.inboundplan.entity.InboundFbaAppointment;
 import com.baiyue.lastleg.inboundplan.entity.InboundFbaAppointmentItem;
 import com.baiyue.lastleg.inboundplan.mapper.InboundFbaAppointmentItemMapper;
@@ -44,7 +45,7 @@ public class InboundFbaAppointmentService {

        InboundFbaAppointment existing = find(customerId, appointmentNo);
        if (existing != null) {
-            return verifyReplay(existing, lineIds, request.appointmentAt(), status, remark);
+            return verifyReplay(existing, lineIds, request.appointmentAt(), request.expectedLoadingAt(), status, remark);
        }

        List<FbaAppointmentLineSnapshot> lines = queryMapper.lockLines(customerId, lineIds);
@@ -57,7 +58,7 @@ public class InboundFbaAppointmentService {
        // The row locks serialize concurrent submissions selecting the same inbound lines.
        existing = find(customerId, appointmentNo);
        if (existing != null) {
-            return verifyReplay(existing, lineIds, request.appointmentAt(), status, remark);
+            return verifyReplay(existing, lineIds, request.appointmentAt(), request.expectedLoadingAt(), status, remark);
        }

        LocalDateTime now = LocalDateTime.now();
@@ -66,6 +67,7 @@ public class InboundFbaAppointmentService {
        appointment.setCustomerId(customerId);
        appointment.setAppointmentNo(appointmentNo);
        appointment.setAppointmentAt(request.appointmentAt());
+        appointment.setExpectedLoadingAt(request.expectedLoadingAt());
        appointment.setAppointmentStatus(status);
        appointment.setAppointmentRemark(remark);
        appointment.setFbaWarehouseCode(fbaWarehouseCode);
@@ -78,7 +80,7 @@ public class InboundFbaAppointmentService {
        } catch (DuplicateKeyException exception) {
            InboundFbaAppointment concurrent = find(customerId, appointmentNo);
            if (concurrent != null) {
-                return verifyReplay(concurrent, lineIds, request.appointmentAt(), status, remark);
+                return verifyReplay(concurrent, lineIds, request.appointmentAt(), request.expectedLoadingAt(), status, remark);
            }
            throw exception;
        }
@@ -108,12 +110,31 @@ public class InboundFbaAppointmentService {
        return response(appointment, items(appointment.getId()));
    }

+    @Transactional
+    public FbaAppointmentResponse update(String customerId, String appointmentNo,
+                                         UpdateFbaAppointmentRequest request) {
+        InboundFbaAppointment appointment = find(customerId,
+            requiredTrimmed(appointmentNo, "Appointment number is required"));
+        if (appointment == null) {
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "FBA appointment not found");
+        }
+        appointment.setAppointmentAt(request.appointmentAt());
+        appointment.setExpectedLoadingAt(request.expectedLoadingAt());
+        appointment.setAppointmentStatus(normalizeStatus(request.appointmentStatus()));
+        appointment.setAppointmentRemark(trimToNull(request.appointmentRemark()));
+        appointment.setUpdatedAt(LocalDateTime.now());
+        appointmentMapper.updateById(appointment);
+        return response(appointment, items(appointment.getId()));
+    }
+
    private FbaAppointmentResponse verifyReplay(InboundFbaAppointment existing, List<Long> requestedLineIds,
-                                                LocalDateTime appointmentAt, String status, String remark) {
+                                                LocalDateTime appointmentAt, LocalDateTime expectedLoadingAt,
+                                                String status, String remark) {
        List<InboundFbaAppointmentItem> existingItems = items(existing.getId());
        Set<Long> existingLineIds = existingItems.stream()
            .map(InboundFbaAppointmentItem::getLineId).collect(java.util.stream.Collectors.toSet());
        if (!Objects.equals(existing.getAppointmentAt(), appointmentAt)
+            || !Objects.equals(existing.getExpectedLoadingAt(), expectedLoadingAt)
            || !Objects.equals(existing.getAppointmentStatus(), status)
            || !Objects.equals(existing.getAppointmentRemark(), remark)
            || existingLineIds.size() != requestedLineIds.size()
@@ -149,7 +170,8 @@ public class InboundFbaAppointmentService {
    private FbaAppointmentResponse response(InboundFbaAppointment appointment,
                                            List<InboundFbaAppointmentItem> items) {
        return new FbaAppointmentResponse(appointment.getId(), appointment.getCustomerId(),
-            appointment.getAppointmentNo(), appointment.getAppointmentAt(), appointment.getAppointmentStatus(),
+            appointment.getAppointmentNo(), appointment.getAppointmentAt(), appointment.getExpectedLoadingAt(),
+            appointment.getAppointmentStatus(),
            appointment.getAppointmentRemark(), appointment.getFbaWarehouseCode(), appointment.getSelectedCount(),
            appointment.getCreatedBy(), appointment.getCreatedAt(), appointment.getUpdatedAt(),
            items.stream().map(item -> new FbaAppointmentResponse.Item(item.getId(), item.getPlanId(),
@@ -3,9 +3,9 @@ package com.baiyue.lastleg.inboundplan.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baiyue.common.core.api.PageResult;
+import com.baiyue.lastleg.inboundplan.dto.InboundPlanListResponse;
 import com.baiyue.lastleg.inboundplan.dto.InboundPlanRequests;
 import com.baiyue.lastleg.inboundplan.dto.InboundPlanResponse;
-import com.baiyue.lastleg.inboundplan.dto.InboundPlanSummary;
 import com.baiyue.lastleg.inboundplan.dto.SupplementPalletRequest;
 import com.baiyue.lastleg.inboundplan.entity.InboundPlan;
 import com.baiyue.lastleg.inboundplan.entity.InboundPlanLine;
@@ -16,6 +16,7 @@ import com.baiyue.lastleg.inboundplan.mapper.InboundPlanMapper;
 import com.baiyue.lastleg.inboundplan.mapper.InboundPlanOrderMapper;
 import com.baiyue.lastleg.inboundplan.mapper.InboundPlanPalletAllocationMapper;
 import com.baiyue.lastleg.inboundplan.mapper.InboundPlanPalletMapper;
+import com.baiyue.lastleg.inboundplan.mapper.InboundPlanQueryMapper;
 import com.baiyue.lastleg.inboundplan.model.SourceOrderSnapshot;
 import jakarta.annotation.Resource;
 import org.springframework.http.HttpStatus;
@@ -38,16 +39,18 @@ public class InboundPlanService {
    @Resource private InboundPlanPalletMapper palletMapper;
    @Resource private InboundPlanPalletAllocationMapper allocationMapper;
    @Resource private InboundPlanOrderMapper orderMapper;
+    @Resource private InboundPlanQueryMapper queryMapper;

    @Transactional(readOnly = true)
-    public PageResult<InboundPlanSummary> page(String customerId, InboundPlanRequests.Query query) {
+    public PageResult<InboundPlanListResponse> page(String customerId, InboundPlanRequests.Query query) {
        if (query.createdFrom() != null && query.createdTo() != null
            && query.createdFrom().isAfter(query.createdTo())) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "createdFrom must not be after createdTo");
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
+                "createdFrom must not be after createdTo");
        }
-        long total = planMapper.countRows(customerId, query);
-        List<InboundPlanSummary> records = total == 0 ? List.of()
-            : planMapper.pageRows(customerId, query, Math.multiplyExact(query.page() - 1, query.size()), query.size());
+        long total = queryMapper.count(customerId, query);
+        List<InboundPlanListResponse> records = total == 0 ? List.of() : queryMapper.rows(
+            customerId, query, (query.page() - 1) * query.size(), query.size());
        long pages = total == 0 ? 0 : (total + query.size() - 1) / query.size();
        return new PageResult<>(records, query.page(), query.size(), total, pages);
    }
@@ -13,6 +13,7 @@ public record InventoryLedgerView(
    String palletNo,
    String batchNo,
    String warehouseLocationCode,
+    String skuCode,
    String businessType,
    String businessOrderNo,
    String outboundOrderNo,
@@ -21,6 +21,8 @@ public final class InventoryQueryRequests {
        String businessOrderNo,
        String skuCode,
        String productName,
+        String batchNo,
+        String warehouseLocationCode,
        String inventoryStatus
    ) {
        public BalanceQuery {
@@ -44,6 +46,8 @@ public final class InventoryQueryRequests {
        String outboundOrderNo,
        String palletNo,
        String batchNo,
+        String skuCode,
+        String warehouseLocationCode,
        LocalDateTime occurredFrom,
        LocalDateTime occurredTo
    ) {
@@ -21,6 +21,8 @@ public interface InventoryQueryMapper {
        "<if test='q.businessOrderNo != null and q.businessOrderNo != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_ledger l WHERE l.balance_id=ll_inventory_balance.id AND l.customer_id=#{customerId} AND l.business_order_no LIKE CONCAT('%',#{q.businessOrderNo},'%'))</if>" +
        "<if test='q.skuCode != null and q.skuCode != \"\"'> AND sku_code LIKE CONCAT('%',#{q.skuCode},'%')</if>" +
        "<if test='q.productName != null and q.productName != \"\"'> AND (product_name_zh LIKE CONCAT('%',#{q.productName},'%') OR product_name_en LIKE CONCAT('%',#{q.productName},'%'))</if>" +
+        "<if test='q.batchNo != null and q.batchNo != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_position p WHERE p.balance_id=ll_inventory_balance.id AND p.customer_id=#{customerId} AND p.batch_no LIKE CONCAT('%',#{q.batchNo},'%'))</if>" +
+        "<if test='q.warehouseLocationCode != null and q.warehouseLocationCode != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_position p WHERE p.balance_id=ll_inventory_balance.id AND p.customer_id=#{customerId} AND p.warehouse_location_code LIKE CONCAT('%',#{q.warehouseLocationCode},'%'))</if>" +
        "<choose>" +
        "<when test='q.inventoryStatus == \"AVAILABLE\"'> AND available_packages &gt; 0</when>" +
        "<when test='q.inventoryStatus == \"HOLD\"'> AND hold_packages &gt; 0</when>" +
@@ -41,6 +43,8 @@ public interface InventoryQueryMapper {
        "<if test='q.businessOrderNo != null and q.businessOrderNo != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_ledger l WHERE l.balance_id=b.id AND l.customer_id=#{customerId} AND l.business_order_no LIKE CONCAT('%',#{q.businessOrderNo},'%'))</if>" +
        "<if test='q.skuCode != null and q.skuCode != \"\"'> AND b.sku_code LIKE CONCAT('%',#{q.skuCode},'%')</if>" +
        "<if test='q.productName != null and q.productName != \"\"'> AND (b.product_name_zh LIKE CONCAT('%',#{q.productName},'%') OR b.product_name_en LIKE CONCAT('%',#{q.productName},'%'))</if>" +
+        "<if test='q.batchNo != null and q.batchNo != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_position p2 WHERE p2.balance_id=b.id AND p2.customer_id=#{customerId} AND p2.batch_no LIKE CONCAT('%',#{q.batchNo},'%'))</if>" +
+        "<if test='q.warehouseLocationCode != null and q.warehouseLocationCode != \"\"'> AND EXISTS (SELECT 1 FROM ll_inventory_position p2 WHERE p2.balance_id=b.id AND p2.customer_id=#{customerId} AND p2.warehouse_location_code LIKE CONCAT('%',#{q.warehouseLocationCode},'%'))</if>" +
        "<choose>" +
        "<when test='q.inventoryStatus == \"AVAILABLE\"'> AND b.available_packages &gt; 0</when>" +
        "<when test='q.inventoryStatus == \"HOLD\"'> AND b.hold_packages &gt; 0</when>" +
@@ -83,6 +87,8 @@ public interface InventoryQueryMapper {
    @Select("<script>SELECT * FROM ll_inventory_position WHERE customer_id=#{customerId} AND balance_id=#{balanceId}" +
        "<if test='q.palletNo != null and q.palletNo != \"\"'> AND pallet_no LIKE CONCAT('%',#{q.palletNo},'%')</if>" +
        "<if test='q.batchNo != null and q.batchNo != \"\"'> AND batch_no LIKE CONCAT('%',#{q.batchNo},'%')</if>" +
+        "<if test='q.skuCode != null and q.skuCode != \"\"'> AND sku_code LIKE CONCAT('%',#{q.skuCode},'%')</if>" +
+        "<if test='q.warehouseLocationCode != null and q.warehouseLocationCode != \"\"'> AND warehouse_location_code LIKE CONCAT('%',#{q.warehouseLocationCode},'%')</if>" +
        "<choose>" +
        "<when test='q.inventoryStatus == \"AVAILABLE\"'> AND available_packages &gt; 0</when>" +
        "<when test='q.inventoryStatus == \"HOLD\"'> AND hold_packages &gt; 0</when>" +
@@ -142,7 +142,7 @@ public class InventoryQueryService {
        return new InventoryLedgerView(value.getId(), value.getCustomerId(), value.getOverseasWarehouseId(),
            value.getDestinationWarehouseCode(), value.getInboundOrderId(), value.getInboundOrderNo(), value.getInboundCode(),
            value.getPalletNo(), value.getBatchNo(),
-            value.getWarehouseLocationCode(), value.getBusinessType(), value.getBusinessOrderNo(),
+            value.getWarehouseLocationCode(), value.getSkuCode(), value.getBusinessType(), value.getBusinessOrderNo(),
            value.getOutboundOrderNo(), value.getStatusFrom(), value.getStatusTo(),
            number(value.getBeforePackages()), number(value.getDeltaPackages()), number(value.getAfterPackages()),
            value.getOperatorId(), value.getRemark(), value.getOccurredAt());
@@ -627,6 +627,7 @@ CREATE TABLE IF NOT EXISTS ll_inbound_fba_appointment (
  customer_id VARCHAR(128) NOT NULL COMMENT '客户租户ID',
  appointment_no VARCHAR(64) NOT NULL COMMENT '预约单号',
  appointment_at DATETIME(3) NOT NULL COMMENT '预约时间',
+  expected_loading_at DATETIME(3) NOT NULL COMMENT '预计装车时间',
  appointment_status VARCHAR(32) NOT NULL DEFAULT 'PENDING' COMMENT '预约状态',
  appointment_remark VARCHAR(1000) NULL COMMENT '预约备注',
  fba_warehouse_code VARCHAR(128) NOT NULL COMMENT 'FBA仓库编码',
@@ -26,6 +26,7 @@ class InboundPlanSchemaContractTest {
            assertTrue(schema.contains("create table if not exists ll_inbound_pallet_merge"));
            assertTrue(schema.contains("create table if not exists ll_inbound_fba_appointment"));
            assertTrue(schema.contains("unique key uk_ll_fba_appointment_no (customer_id, appointment_no)"));
+            assertTrue(schema.contains("expected_loading_at"));
            assertTrue(schema.contains("create table if not exists ll_inbound_fba_appointment_item"));
            assertTrue(schema.contains("fba_warehouse_code"));
            assertFalse(schema.contains("cabinet_no"));
@@ -0,0 +1,68 @@
+package com.baiyue.lastleg.inboundplan.controller;
+
+import com.baiyue.common.core.api.PageResult;
+import com.baiyue.common.security.AuthenticatedUser;
+import com.baiyue.lastleg.inboundplan.dto.InboundPlanRequests;
+import com.baiyue.lastleg.inboundplan.dto.UpdateFbaAppointmentRequest;
+import com.baiyue.lastleg.inboundplan.service.InboundFbaAppointmentService;
+import com.baiyue.lastleg.inboundplan.service.InboundPlanService;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.util.List;
+import java.util.Set;
+import java.time.LocalDateTime;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class InboundPlanControllerTest {
+    @Mock InboundPlanService service;
+    @Mock InboundFbaAppointmentService appointmentService;
+    private InboundPlanController controller;
+
+    @BeforeEach
+    void setUp() {
+        controller = new InboundPlanController();
+        ReflectionTestUtils.setField(controller, "service", service);
+        ReflectionTestUtils.setField(controller, "appointmentService", appointmentService);
+    }
+
+    @Test
+    void platformPageRequiresAndPassesExplicitCustomerId() {
+        InboundPlanRequests.Query query = new InboundPlanRequests.Query(1, 20, null, null, null,
+            null, null, null, null, null, null, null, null);
+        when(service.page("100", query)).thenReturn(new PageResult<>(List.of(), 1, 20, 0, 0));
+
+        controller.page(platform(), "100", query);
+
+        verify(service).page("100", query);
+        assertThatThrownBy(() -> controller.page(platform(), "", query))
+            .isInstanceOf(ResponseStatusException.class)
+            .satisfies(error -> org.assertj.core.api.Assertions.assertThat(
+                ((ResponseStatusException) error).getStatusCode().value()).isEqualTo(400));
+    }
+
+    @Test
+    void platformAppointmentUpdateUsesExplicitCustomerScope() {
+        UpdateFbaAppointmentRequest request = new UpdateFbaAppointmentRequest("100",
+            LocalDateTime.of(2026, 8, 20, 10, 30), LocalDateTime.of(2026, 8, 21, 8, 0),
+            "PENDING", "dock");
+
+        controller.updateFbaAppointment(platform(), "APT-1", request);
+
+        verify(appointmentService).update("100", "APT-1", request);
+    }
+
+    private static AuthenticatedUser platform() {
+        return new AuthenticatedUser(7L, 0L, 0L, 8L, "operator", "PLATFORM", "WEB",
+            Set.of("platform:overseas-warehouse:inbound-order:list"));
+    }
+}
@@ -1,12 +1,14 @@
 package com.baiyue.lastleg.inboundplan.service;

 import com.baiyue.lastleg.inboundplan.dto.BatchFbaAppointmentRequest;
+import com.baiyue.lastleg.inboundplan.dto.UpdateFbaAppointmentRequest;
 import com.baiyue.lastleg.inboundplan.entity.InboundFbaAppointment;
 import com.baiyue.lastleg.inboundplan.entity.InboundFbaAppointmentItem;
 import com.baiyue.lastleg.inboundplan.mapper.InboundFbaAppointmentItemMapper;
 import com.baiyue.lastleg.inboundplan.mapper.InboundFbaAppointmentMapper;
 import com.baiyue.lastleg.inboundplan.mapper.InboundFbaAppointmentQueryMapper;
 import com.baiyue.lastleg.inboundplan.model.FbaAppointmentLineSnapshot;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -35,6 +37,7 @@ class InboundFbaAppointmentServiceTest {

    private InboundFbaAppointmentService service;
    private final LocalDateTime appointmentAt = LocalDateTime.of(2026, 8, 20, 10, 30);
+    private final LocalDateTime expectedLoadingAt = LocalDateTime.of(2026, 8, 21, 8, 0);

    @BeforeEach
    void setUp() {
@@ -57,6 +60,7 @@ class InboundFbaAppointmentServiceTest {

        assertEquals("APT-1", result.appointmentNo());
        assertEquals("ONT8", result.fbaWarehouseCode());
+        assertEquals(expectedLoadingAt, result.expectedLoadingAt());
        assertEquals(2, result.selectedCount());
        verify(appointmentMapper).insert(any(InboundFbaAppointment.class));
        verify(itemMapper, org.mockito.Mockito.times(2)).insert(any(InboundFbaAppointmentItem.class));
@@ -114,8 +118,51 @@ class InboundFbaAppointmentServiceTest {
            () -> service.batchCreate("100", "7", request(List.of(12L), "APT-1")));
    }

+    @Test
+    void sameAppointmentNumberWithDifferentExpectedLoadingTimeConflicts() {
+        when(appointmentMapper.selectOne(any())).thenReturn(appointment(99L, "APT-1", "ONT8"));
+        InboundFbaAppointmentItem item = new InboundFbaAppointmentItem();
+        item.setLineId(11L);
+        when(itemMapper.selectList(any())).thenReturn(List.of(item));
+        BatchFbaAppointmentRequest changed = new BatchFbaAppointmentRequest("100", List.of(11L), "APT-1",
+            appointmentAt, expectedLoadingAt.plusHours(1), "SUCCESS", "dock");
+
+        ResponseStatusException exception = assertThrows(ResponseStatusException.class,
+            () -> service.batchCreate("100", "7", changed));
+        assertEquals(409, exception.getStatusCode().value());
+    }
+
+    @Test
+    void stringSnowflakeLineIdsDeserializeWithoutPrecisionLoss() throws Exception {
+        String json = "{\"customerId\":\"100\",\"lineIds\":[\"9007199254740993\"],"
+            + "\"appointmentNo\":\"APT-1\",\"appointmentAt\":\"2026-08-20T10:30:00\","
+            + "\"expectedLoadingAt\":\"2026-08-21T08:00:00\",\"appointmentStatus\":\"PENDING\"}";
+
+        BatchFbaAppointmentRequest request = new ObjectMapper().findAndRegisterModules()
+            .readValue(json, BatchFbaAppointmentRequest.class);
+
+        assertEquals(List.of(9007199254740993L), request.lineIds());
+        assertEquals(expectedLoadingAt, request.expectedLoadingAt());
+    }
+
+    @Test
+    void updatesAppointmentDetailsWithoutReplacingSelectedLines() {
+        InboundFbaAppointment existing = appointment(99L, "APT-1", "ONT8");
+        when(appointmentMapper.selectOne(any())).thenReturn(existing);
+        LocalDateTime loadingAt = expectedLoadingAt.plusHours(2);
+
+        var result = service.update("100", "APT-1", new UpdateFbaAppointmentRequest(
+            "100", appointmentAt.plusDays(1), loadingAt, "PENDING", "updated"));
+
+        assertEquals(loadingAt, result.expectedLoadingAt());
+        assertEquals("PENDING", result.appointmentStatus());
+        verify(appointmentMapper).updateById(existing);
+        verify(itemMapper, never()).insert(any(InboundFbaAppointmentItem.class));
+    }
+
    private BatchFbaAppointmentRequest request(List<Long> lineIds, String number) {
-        return new BatchFbaAppointmentRequest("100", lineIds, number, appointmentAt, "SUCCESS", "dock");
+        return new BatchFbaAppointmentRequest("100", lineIds, number, appointmentAt, expectedLoadingAt,
+            "SUCCESS", "dock");
    }

    private FbaAppointmentLineSnapshot line(Long id, String inboundCode, String fba) {
@@ -128,6 +175,7 @@ class InboundFbaAppointmentServiceTest {
        value.setCustomerId("100");
        value.setAppointmentNo(number);
        value.setAppointmentAt(appointmentAt);
+        value.setExpectedLoadingAt(expectedLoadingAt);
        value.setAppointmentStatus("SUCCESS");
        value.setAppointmentRemark("dock");
        value.setFbaWarehouseCode(fba);
@@ -0,0 +1,84 @@
+package com.baiyue.lastleg.inboundplan.service;
+
+import com.baiyue.lastleg.inboundplan.dto.InboundPlanListResponse;
+import com.baiyue.lastleg.inboundplan.dto.InboundPlanRequests;
+import com.baiyue.lastleg.inboundplan.mapper.InboundPlanQueryMapper;
+import jakarta.validation.Validation;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class InboundPlanPaginationTest {
+    @Mock InboundPlanQueryMapper queryMapper;
+    private InboundPlanService service;
+
+    @BeforeEach
+    void setUp() {
+        service = new InboundPlanService();
+        ReflectionTestUtils.setField(service, "queryMapper", queryMapper);
+    }
+
+    @Test
+    void queryDefaultsPageAndSizeAndRejectsOversizedPages() {
+        InboundPlanRequests.Query defaults = query(0, 0);
+        assertThat(defaults.page()).isEqualTo(1);
+        assertThat(defaults.size()).isEqualTo(20);
+
+        try (var validatorFactory = Validation.buildDefaultValidatorFactory()) {
+            var violations = validatorFactory.getValidator().validate(query(1, 201));
+            assertThat(violations).extracting(value -> value.getPropertyPath().toString()).contains("size");
+        }
+    }
+
+    @Test
+    void pagesAtLineGranularityAndPassesTenantAndAllFiltersToDatabase() {
+        InboundPlanRequests.Query query = new InboundPlanRequests.Query(2, 10, "LIP", "IN-1",
+            "PENDING_ASSIGNMENT", null, null, "ONT", "ONT8", "UNAPPOINTED", "UNSCHEDULED",
+            LocalDateTime.of(2026, 8, 1, 0, 0), LocalDateTime.of(2026, 8, 31, 23, 59));
+        InboundPlanListResponse row = new InboundPlanListResponse(9007199254740993L, 2L, "LIP2", "100",
+            3L, "IN-1", "FIRST_LEG", "W1", "ONT", "安大略仓", "ONT8", "客户A", 10,
+            BigDecimal.ONE, 1, "PENDING_ASSIGNMENT", null, null, null, null, "UNSCHEDULED",
+            LocalDateTime.of(2026, 8, 20, 10, 0));
+        when(queryMapper.count("100", query)).thenReturn(11L);
+        when(queryMapper.rows("100", query, 10, 10)).thenReturn(List.of(row));
+
+        var result = service.page("100", query);
+
+        assertThat(result.records()).containsExactly(row);
+        assertThat(result.records().get(0).lineId()).isEqualTo(9007199254740993L);
+        assertThat(result.records().get(0).appointmentStatus()).isNull();
+        assertThat(result.pages()).isEqualTo(2);
+        verify(queryMapper).count("100", query);
+        verify(queryMapper).rows("100", query, 10, 10);
+    }
+
+    @Test
+    void mapperSqlProjectsLatestAppointmentAndTenantScopedDispatchState() throws Exception {
+        String sql = String.join("", InboundPlanQueryMapper.class
+            .getMethod("rows", String.class, InboundPlanRequests.Query.class, long.class, long.class)
+            .getAnnotation(org.apache.ibatis.annotations.Select.class).value()) + InboundPlanQueryMapper.FROM_AND_FILTER;
+        assertThat(sql).contains("a2.customer_id=#{customerId}", "ORDER BY a2.created_at DESC,ai2.id DESC LIMIT 1");
+        assertThat(sql).contains("di.customer_id=#{customerId} AND di.order_id=l.order_id");
+        assertThat(sql).contains("q.planNo", "q.inboundCode", "q.status", "q.overseasWarehouseId",
+            "q.destinationWarehouseCode", "q.warehouse",
+            "q.fbaWarehouseCode", "q.appointmentStatus", "q.dispatchStatus", "q.createdFrom", "q.createdTo");
+        assertThat(sql).contains("LIMIT #{limit} OFFSET #{offset}");
+    }
+
+    private static InboundPlanRequests.Query query(long page, long size) {
+        return new InboundPlanRequests.Query(page, size, null, null, null, null, null,
+            null, null, null, null, null, null);
+    }
+}
@@ -2,7 +2,6 @@ package com.baiyue.lastleg.inboundplan.service;

 import com.baiyue.lastleg.inboundplan.entity.InboundPlan;
 import com.baiyue.lastleg.inboundplan.dto.InboundPlanRequests;
-import com.baiyue.lastleg.inboundplan.dto.InboundPlanSummary;
 import com.baiyue.lastleg.inboundplan.entity.InboundPlanLine;
 import com.baiyue.lastleg.inboundplan.entity.InboundPlanPallet;
 import com.baiyue.lastleg.inboundplan.entity.InboundPlanPalletAllocation;
@@ -118,33 +117,13 @@ class InboundPlanServiceTest {
        verify(orderMapper, never()).markPlanned(any(), any(), any(), org.mockito.ArgumentMatchers.anyInt(), any());
    }

-    @Test
-    void pagesInboundPlansWithinCustomerScope() {
-        InboundPlanRequests.Query query = new InboundPlanRequests.Query(
-            2, 20, "LIP", "RK", "PENDING_ASSIGNMENT", "WH-1", "ONT8", "ONT8",
-            "NOT_APPOINTED", null, null);
-        InboundPlanSummary row = new InboundPlanSummary(1L, "LIP1", 2L, "100", "Customer A",
-            "FBA", "RK-1", "CONT-1", "WH-1", "LA Warehouse", "ONT8", "ONT8", "ONT8",
-            "ONT8", 10, BigDecimal.ONE, 1, "PENDING_ASSIGNMENT", "NOT_APPOINTED", null, null);
-        when(planMapper.countRows("100", query)).thenReturn(21L);
-        when(planMapper.pageRows("100", query, 20L, 20L)).thenReturn(List.of(row));
-
-        var result = service.page("100", query);
-
-        assertEquals(21L, result.total());
-        assertEquals(2L, result.pages());
-        assertEquals("RK-1", result.records().get(0).inboundCode());
-        verify(planMapper).pageRows("100", query, 20L, 20L);
-    }
-
    @Test
    void rejectsReversedInboundPlanDateRange() {
        InboundPlanRequests.Query query = new InboundPlanRequests.Query(1, 20, null, null, null, null,
-            null, null, null, LocalDateTime.of(2026, 8, 20, 0, 0),
+            null, null, null, null, null, LocalDateTime.of(2026, 8, 20, 0, 0),
            LocalDateTime.of(2026, 8, 19, 0, 0));

        assertThrows(ResponseStatusException.class, () -> service.page("100", query));
-        verify(planMapper, never()).countRows(any(), any());
    }

    @Test
@@ -18,7 +18,7 @@ class InventoryQueryControllerTest {
    private final InventoryQueryService service = mock(InventoryQueryService.class);
    private final InventoryQueryController controller = controller();
    private final InventoryQueryRequests.BalanceQuery query = new InventoryQueryRequests.BalanceQuery(
-        1, 20, null, null, null, null, null, null, null, null, null, null);
+        1, 20, null, null, null, null, null, null, null, null, null, null, null, null);

    @Test
    void merchantCannotOverrideCustomerScope() {
@@ -105,7 +105,7 @@ class InventoryQueryServiceTest {
    @Test
    void reversedLedgerDateRangeIsRejected() {
        InventoryQueryRequests.LedgerQuery query = new InventoryQueryRequests.LedgerQuery(
-            1, 20, null, null, null, null, null, null, null, null, null,
+            1, 20, null, null, null, null, null, null, null, null, null, null, null,
            java.time.LocalDateTime.of(2026, 8, 18, 0, 0),
            java.time.LocalDateTime.of(2026, 8, 17, 0, 0));

@@ -125,6 +125,6 @@ class InventoryQueryServiceTest {
    }

    private static InventoryQueryRequests.BalanceQuery balanceQuery(String status) {
-        return new InventoryQueryRequests.BalanceQuery(1, 20, null, null, null, null, null, null, null, null, null, status);
+        return new InventoryQueryRequests.BalanceQuery(1, 20, null, null, null, null, null, null, null, null, null, null, null, status);
    }
 }
@@ -3647,6 +3647,15 @@ SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE tab
  'ALTER TABLE ll_order ADD COLUMN source_container_booking_id VARCHAR(128) NULL COMMENT ''来源头程货柜预订ID'' AFTER source_loading_plan_id'));
 PREPARE phase4_schema_028 FROM @ddl; EXECUTE phase4_schema_028; DEALLOCATE PREPARE phase4_schema_028;

+-- ============================================================================
+-- 2026-08-20 / 029
+-- FBA appointment expected loading time used by the platform appointment editor.
+-- ============================================================================
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_inbound_fba_appointment' AND column_name='expected_loading_at'),
+  'ALTER TABLE ll_inbound_fba_appointment MODIFY COLUMN expected_loading_at DATETIME(3) NOT NULL COMMENT ''预计装车时间''',
+  'ALTER TABLE ll_inbound_fba_appointment ADD COLUMN expected_loading_at DATETIME(3) NULL COMMENT ''预计装车时间'' AFTER appointment_at'));
+PREPARE phase4_fba_appointment_029 FROM @ddl; EXECUTE phase4_fba_appointment_029; DEALLOCATE PREPARE phase4_fba_appointment_029;
+
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_inbound_pda_task' AND column_name='unload_photo_file_ids'),
  'ALTER TABLE ll_inbound_pda_task MODIFY COLUMN unload_photo_file_ids JSON NULL COMMENT ''卸柜照片文件ID列表''',
  'ALTER TABLE ll_inbound_pda_task ADD COLUMN unload_photo_file_ids JSON NULL COMMENT ''卸柜照片文件ID列表'' AFTER completed_at'));