feat(appointments): unify pre-inbound planning and confirmed FBA bookings

lastleg-service/src/main/java/com/baiyue/lastleg/appointmentplanning/AppointmentBatchPreviewController.java

@@ -0,0 +1,25 @@
+package com.baiyue.lastleg.appointmentplanning;
+
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.common.security.AuthenticatedUser;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import java.util.List;
+import com.baiyue.lastleg.appointmentplanning.AppointmentCoverageService.SourceRef;
+
+@RestController
+@RequestMapping("/api/platform/v1/last-leg/appointment-planning/batches")
+public class AppointmentBatchPreviewController {
+    private final AppointmentBatchPreviewService service;
+    public AppointmentBatchPreviewController(AppointmentBatchPreviewService service) { this.service=service; }
+    public record Request(@NotEmpty @Size(max=100) List<@NotNull SourceRef> sources) { }
+    @PostMapping("/preview")
+    @PreAuthorize("hasAuthority('platform:appointment:list') and hasAuthority('platform:overseas-warehouse:last-mile-order:list')")
+    public ApiResponse<AppointmentBatchPreviewService.Preview> preview(@AuthenticationPrincipal AuthenticatedUser user,@Valid @RequestBody Request request) {
+        AppointmentPlanningController.requirePlatform(user);
+        return ApiResponse.success(service.preview(request.sources()));
+    }
+}

lastleg-service/src/main/java/com/baiyue/lastleg/appointmentplanning/AppointmentBatchPreviewMapper.java

@@ -0,0 +1,21 @@
+package com.baiyue.lastleg.appointmentplanning;
+
+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 AppointmentBatchPreviewMapper {
+    record Flags(Long orderId, boolean detained, boolean mixedDestinations, boolean activeAppointment) { }
+    @Select("<script>" + """
+        SELECT o.id AS orderId,o.detained,
+          EXISTS(SELECT 1 FROM ll_order_detail d WHERE d.order_id=o.id AND d.customer_id=o.customer_id
+            AND d.destination_warehouse_code IS NOT NULL AND d.destination_warehouse_code&lt;&gt;o.fba_warehouse_code) AS mixedDestinations,
+          EXISTS(SELECT 1 FROM ll_inbound_fba_appointment_item i JOIN ll_inbound_fba_appointment a ON a.id=i.appointment_id
+            WHERE i.order_id=o.id AND i.customer_id=o.customer_id AND a.appointment_status NOT IN ('CANCELLED','FAILED')) AS activeAppointment
+        FROM ll_order o WHERE o.id IN
+        <foreach collection='ids' item='id' open='(' separator=',' close=')'>#{id}</foreach>
+        """ + "</script>")
+    List<Flags> flags(@Param("ids") List<Long> ids);
+}

lastleg-service/src/main/java/com/baiyue/lastleg/appointmentplanning/AppointmentBatchPreviewService.java

@@ -0,0 +1,47 @@
+package com.baiyue.lastleg.appointmentplanning;
+
+import org.springframework.stereotype.Service;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.server.ResponseStatusException;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Service
+public class AppointmentBatchPreviewService {
+    private final AppointmentSourceService sources;
+    private final AppointmentBatchPreviewMapper mapper;
+    public AppointmentBatchPreviewService(AppointmentSourceService sources,AppointmentBatchPreviewMapper mapper) {
+        this.sources=sources;this.mapper=mapper;
+    }
+    public record Preview(AppointmentPlanningPolicy.Group group,String originWarehouseName,
+                          String destinationWarehouseCode,List<AppointmentSourceService.Source> sources,
+                          List<String> missingFields) { }
+    public Preview preview(List<AppointmentCoverageService.SourceRef> refs) {
+        var resolved=sources.resolveBatch(refs);
+        var ids=resolved.stream().map(AppointmentSourceService.Source::orderId).filter(Objects::nonNull).distinct().toList();
+        var flags=ids.isEmpty()?java.util.Map.<Long,AppointmentBatchPreviewMapper.Flags>of():mapper.flags(ids).stream()
+            .collect(Collectors.toMap(AppointmentBatchPreviewMapper.Flags::orderId,Function.identity()));
+        var cargo=resolved.stream().map(source->{
+            String reason=source.canFollowup()?null:String.join("；",source.blockReasons());
+            var state=source.orderId()==null?null:flags.get(source.orderId());
+            if(source.orderId()!=null && state==null) reason="货源已变化，请重新查询";
+            else if(state!=null) {
+                if(state.detained()) reason="货物暂扣，请先处理后再合批";
+                else if(state.mixedDestinations()) reason="货物含多个目的地，请先核对明细";
+                else if(state.activeAppointment()) reason="货物已有有效预约，请编辑原预约";
+            }
+            // Arrival/warehouse ETA is not a cargo-ready window. Until an authoritative producer exists it stays unknown.
+            return new AppointmentPlanningPolicy.Cargo(source.sourceKey(),source.customerId(),source.originWarehouseId(),
+                source.destinationKey(),"US","US",source.packages(),null,null,reason==null,reason);
+        }).toList();
+        try {
+            var group=AppointmentPlanningPolicy.group(cargo);
+            return new Preview(group,resolved.get(0).originWarehouseName(),resolved.get(0).destinationWarehouseCode(),resolved,
+                group.unknownQuantitySources()>0?List.of("READY_WINDOW_UNVERIFIED","CARGO_QUANTITY_REVIEW"):List.of("READY_WINDOW_UNVERIFIED"));
+        } catch(IllegalArgumentException error) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST,error.getMessage(),error);
+        }
+    }
+}

lastleg-service/src/main/java/com/baiyue/lastleg/appointmentplanning/AppointmentCoverageMapper.java

@@ -8,30 +8,34 @@ import java.util.List;
 
 @Mapper
 public interface AppointmentCoverageMapper {
+    String DESTINATION_TYPE="CASE WHEN o.order_type='WAREHOUSE_TRANSFER' THEN wt.destination_type ELSE o.destination_type END";
+    String DESTINATION_CODE="CASE WHEN o.order_type='WAREHOUSE_TRANSFER' THEN wt.destination_warehouse_code ELSE o.fba_warehouse_code END";
+    String SHIPMENT_MISSING="CASE WHEN o.order_type='WAREHOUSE_TRANSFER' THEN (wt.id IS NULL OR ((wt.fba_shipment_no IS NULL OR TRIM(wt.fba_shipment_no)='') AND (wt.tracking_no IS NULL OR TRIM(wt.tracking_no)=''))) ELSE " +
+        "(NOT EXISTS(SELECT 1 FROM ll_order_detail d WHERE d.order_id=o.id AND d.customer_id=o.customer_id) OR EXISTS(SELECT 1 FROM ll_order_detail d WHERE d.order_id=o.id AND d.customer_id=o.customer_id AND (d.shipment_no IS NULL OR TRIM(d.shipment_no)='') AND (d.fba_tracking_no IS NULL OR TRIM(d.fba_tracking_no)=''))) END";
+    String TRANSFER_JOIN=" LEFT JOIN ll_warehouse_transfer_order wt ON o.order_type='WAREHOUSE_TRANSFER' AND wt.lastleg_order_id=o.id AND wt.customer_id=o.customer_id ";
     record OrderRef(String customerId, Long orderId) { }
     record Source(Long orderId, String customerId, String destinationType, String fbaWarehouseCode,
                   Integer packages, Integer version, LocalDateTime updatedAt, boolean shipmentReferencesMissing) { }
     record Fact(Long orderId, String customerId, String appointmentNo, String status,
                 LocalDateTime appointmentAt, LocalDateTime appointmentEndAt, LocalDateTime updatedAt,
-                Long lineId, Integer packages, String warehouseCode) { }
+                Long itemId, Integer packages, String warehouseCode,String sourceKey,String sourceVersion,
+                String confirmationNo,String timezone) { }
 
-    @Select({"<script>SELECT o.id AS orderId,o.customer_id AS customerId,o.destination_type AS destinationType,",
-        "o.fba_warehouse_code AS fbaWarehouseCode,o.package_count AS packages,o.version,o.updated_at AS updatedAt, ",
-        "(NOT EXISTS(SELECT 1 FROM ll_order_detail d WHERE d.order_id=o.id AND d.customer_id=o.customer_id) OR ",
-        "EXISTS(SELECT 1 FROM ll_order_detail d WHERE d.order_id=o.id AND d.customer_id=o.customer_id ",
-        "AND (d.shipment_no IS NULL OR TRIM(d.shipment_no)='') AND (d.fba_tracking_no IS NULL OR TRIM(d.fba_tracking_no)=''))) AS shipmentReferencesMissing ",
-        "FROM ll_order o WHERE <foreach collection='sources' item='s' open='(' separator=' OR ' close=')'>",
+    @Select({"<script>SELECT o.id AS orderId,o.customer_id AS customerId,"+DESTINATION_TYPE+" AS destinationType,",
+        DESTINATION_CODE+" AS fbaWarehouseCode,o.package_count AS packages,o.version,o.updated_at AS updatedAt, ",
+        SHIPMENT_MISSING+" AS shipmentReferencesMissing ",
+        "FROM ll_order o "+TRANSFER_JOIN+" WHERE <foreach collection='sources' item='s' open='(' separator=' OR ' close=')'>",
         "(o.id=#{s.orderId} AND o.customer_id=#{s.customerId})</foreach></script>"})
     List<Source> sources(@Param("sources") List<OrderRef> sources);
 
     @Select({"<script>SELECT i.order_id AS orderId,i.customer_id AS customerId,a.appointment_no AS appointmentNo,",
         "a.appointment_status AS status,a.appointment_at AS appointmentAt,a.appointment_end_at AS appointmentEndAt,",
-        "a.updated_at AS updatedAt,i.line_id AS lineId,l.required_package_count AS packages,l.fba_warehouse_code AS warehouseCode ",
+        "a.updated_at AS updatedAt,i.id AS itemId,i.package_count AS packages,i.fba_warehouse_code AS warehouseCode, ",
+        "i.source_key AS sourceKey,i.source_version AS sourceVersion,a.confirmation_no AS confirmationNo,a.timezone ",
         "FROM ll_inbound_fba_appointment_item i JOIN ll_inbound_fba_appointment a ON a.id=i.appointment_id ",
-        "JOIN ll_inbound_plan_line l ON l.id=i.line_id AND l.plan_id=i.plan_id AND l.order_id=i.order_id AND l.customer_id=i.customer_id ",
-        "WHERE a.appointment_status NOT IN ('FAILED','CANCELLED') AND ",
+        "WHERE i.active=1 AND a.appointment_status NOT IN ('FAILED','CANCELLED') AND ",
         "<foreach collection='sources' item='s' open='(' separator=' OR ' close=')'>",
-        "(i.order_id=#{s.orderId} AND i.customer_id=#{s.customerId})</foreach>",
+        "(i.source_key=#{s.sourceKey} AND i.customer_id=#{s.customerId})</foreach>",
         " ORDER BY a.appointment_at,a.id,i.id</script>"})
-    List<Fact> appointments(@Param("sources") List<OrderRef> sources);
+    List<Fact> appointments(@Param("sources") List<AppointmentCoverageService.SourceRef> sources);
 }

lastleg-service/src/main/java/com/baiyue/lastleg/appointmentplanning/AppointmentCoverageService.java

@@ -48,8 +48,8 @@ public class AppointmentCoverageService {
         if (unique.size()!=refs.size()) throw new IllegalArgumentException("同一货物存在重复来源，请保留原外接登记来源后再核对");
         var orders=unique.isEmpty() ? List.<AppointmentCoverageMapper.Source>of() : mapper.sources(unique);
         var orderMap=orders.stream().collect(Collectors.toMap(s -> new AppointmentCoverageMapper.OrderRef(s.customerId(),s.orderId()),s -> s));
-        var facts=unique.isEmpty() ? List.<AppointmentCoverageMapper.Fact>of() : mapper.appointments(unique);
-        var byOrder=facts.stream().collect(Collectors.groupingBy(f -> new AppointmentCoverageMapper.OrderRef(f.customerId(),f.orderId())));
+        var facts=mapper.appointments(requested);
+        var bySource=facts.stream().collect(Collectors.groupingBy(f -> key(f.customerId(),f.sourceKey())));
         var output=new ArrayList<Coverage>();
         for (var source:requested) {
             var booking=bookingMap.get(key(source.customerId(),source.sourceKey()));
@@ -60,22 +60,30 @@ public class AppointmentCoverageService {
                 output.add(empty(source,"SOURCE_NOT_READY","CARRIER_CONFIRMATION",version(booking.recordVersion()),false)); continue;
             }
             var order=orderMap.get(refs.get(source));
+            var relevant=bySource.getOrDefault(key(source.customerId(),source.sourceKey()),List.of());
             if (order==null) {
+                if(booking!=null && !relevant.isEmpty()) {
+                    var planned=relevant.stream().map(f->new Appointment(f.appointmentNo(),null,f.status(),null,null,f.timezone())).distinct().toList();
+                    output.add(new Coverage(source.customerId(),source.sourceKey(),source.destinationKey(),"PENDING",planned,List.of("REAL_CARGO_MATERIALS","RECEIVING_CONFIRMATION"),version(booking.recordVersion()),false));continue;
+                }
                 output.add(empty(source,booking==null ? "SOURCE_NOT_FOUND" : "SOURCE_NOT_MATERIALIZED","REAL_CARGO_MATERIALS",booking==null ? null : version(booking.recordVersion()),false)); continue;
             }
+            if(blank(order.destinationType()) || blank(order.fbaWarehouseCode())) {
+                output.add(empty(source,"SOURCE_NOT_READY","DESTINATION_UNVERIFIED",version(order.version()),false));continue;
+            }
             if (!"FBA".equals(order.destinationType()) || !source.destinationKey().equals("FBA:"+order.fbaWarehouseCode())) {
                 output.add(empty(source,"DESTINATION_MISMATCH","DESTINATION",version(order.version()),true)); continue;
             }
-            var relevant=byOrder.getOrDefault(refs.get(source),List.of());
             var distinct=new LinkedHashMap<String,Appointment>();
             var seen=new HashSet<Long>(); long confirmed=0, covered=0; boolean invalid=false, changed=false;
             for (var fact:relevant) {
-                if (!Objects.equals(order.fbaWarehouseCode(),fact.warehouseCode()) || fact.packages()==null || fact.packages()<=0 || !seen.add(fact.lineId())) { invalid=true; continue; }
+                if (fact.orderId()!=null && !Objects.equals(order.orderId(),fact.orderId()) || !Objects.equals(order.fbaWarehouseCode(),fact.warehouseCode()) || fact.packages()==null || fact.packages()<=0 || !seen.add(fact.itemId())) { invalid=true; continue; }
                 covered+=fact.packages();
-                if ("SUCCESS".equals(fact.status()) && fact.appointmentAt()!=null) confirmed+=fact.packages();
-                boolean success="SUCCESS".equals(fact.status());
-                distinct.putIfAbsent(fact.appointmentNo(),new Appointment(fact.appointmentNo(),success ? fact.appointmentNo() : null,fact.status(),success ? fact.appointmentAt() : null,success ? fact.appointmentEndAt() : null,null));
-                changed|=order.updatedAt()==null || fact.updatedAt()==null || order.updatedAt().isAfter(fact.updatedAt());
+                boolean success="SUCCESS".equals(fact.status()) && fact.appointmentAt()!=null && !blank(fact.confirmationNo()) && !blank(fact.timezone());
+                if (success) confirmed+=fact.packages();
+                distinct.putIfAbsent(fact.appointmentNo(),new Appointment(fact.appointmentNo(),success ? fact.confirmationNo() : null,fact.status(),success ? fact.appointmentAt() : null,success ? fact.appointmentEndAt() : null,fact.timezone()));
+                String currentVersion=(booking==null?"":"BOOKING:"+version(booking.recordVersion())+"/")+"ORDER:"+version(order.version());
+                changed|=!Objects.equals(currentVersion,fact.sourceVersion());
             }
             var missing=new ArrayList<String>();
             String status;
@@ -84,7 +92,7 @@ public class AppointmentCoverageService {
             else if (covered<order.packages()) { status="PARTIAL"; missing.add("UNCOVERED_CARGO"); }
             else if (confirmed<order.packages()) { status="PENDING"; missing.add("RECEIVING_CONFIRMATION"); }
             else { status="CONFIRMED"; }
-            if (confirmed>0) missing.add("APPOINTMENT_TIMEZONE_UNVERIFIED");
+            if (relevant.stream().anyMatch(f->"SUCCESS".equals(f.status()) && blank(f.timezone()))) missing.add("APPOINTMENT_TIMEZONE_UNVERIFIED");
             if (order.shipmentReferencesMissing()) missing.add("FBA_SHIPMENT_REFERENCES");
             if (changed) missing.add("SOURCE_CHANGED_REVIEW");
             output.add(new Coverage(source.customerId(),source.sourceKey(),source.destinationKey(),status,List.copyOf(distinct.values()),List.copyOf(missing),

lastleg-service/src/main/java/com/baiyue/lastleg/appointmentplanning/AppointmentExternalSourceGateway.java

@@ -5,7 +5,12 @@ import java.util.List;
 /** Implemented by the external-booking owner; planning must not query Fleet's persistence directly. */
 public interface AppointmentExternalSourceGateway {
     record SourceRef(String customerId, String bookingNo) { }
+    record OrderRef(String customerId, Long orderId) { }
     record Source(String customerId, String bookingNo, String tripNo, String bookingStatus,
                   String warehouseId, String destinationKey, Long orderId, Integer packageCount, Long recordVersion) { }
     List<Source> resolve(List<SourceRef> sources);
+    /** Returns existing original bookings only, for canonicalizing post-receipt selections. Never creates a booking. */
+    List<Source> resolveOrders(List<OrderRef> orders);
+    /** Inside the caller transaction, lock original booking rows in stable order before validating an appointment write. */
+    void lockForAppointment(List<SourceRef> sources);
 }

lastleg-service/src/main/java/com/baiyue/lastleg/appointmentplanning/AppointmentPlanningPolicy.java

@@ -14,9 +14,9 @@ public final class AppointmentPlanningPolicy {
                         String destinationKey, String originCountry, String destinationCountry,
                         Integer packages, Instant readyFrom, Instant readyTo,
                         boolean eligibleForPlanning, String blockReason) { }
-    public record Group(String originWarehouseId, String destinationKey, long packages,
+    public record Group(String originWarehouseId, String destinationKey, Long packages,
                         int sourceCount, int customerCount, Instant readyFrom, Instant readyTo,
-                        boolean readinessIncomplete) { }
+                        boolean readinessIncomplete, int unknownQuantitySources) { }
     public record Forecast(String sourceKey, String sourceVersion, Instant eta, Instant readyAt) { }
     public record Impact(String sourceKey, String reason, Instant previousEta, Instant latestEta,
                          Instant confirmedAt, boolean reviewRequired) { }
@@ -28,6 +28,7 @@ public final class AppointmentPlanningPolicy {
         Set<String> customers = new HashSet<>();
         String origin = null, destination = null;
         long packages = 0;
+        int unknownQuantitySources = 0;
         Instant from = null, to = null;
         boolean incomplete = false;
         for (Cargo row : cargo) {
@@ -47,8 +48,8 @@ public final class AppointmentPlanningPolicy {
             if (!origin.equals(row.originWarehouseId()) || !destination.equals(row.destinationKey())) {
                 throw new IllegalArgumentException("同批货物必须具有相同实际起运仓和目的地");
             }
-            if (row.packages() == null || row.packages() <= 0) throw new IllegalArgumentException("货物箱数待核实，不能填默认数量");
-            packages = Math.addExact(packages, row.packages().longValue());
+            if (row.packages() == null || row.packages() <= 0) unknownQuantitySources++;
+            else packages = Math.addExact(packages, row.packages().longValue());
             customers.add(row.customerId());
             if (row.readyFrom() == null || row.readyTo() == null) incomplete = true;
             if (row.readyFrom() != null && row.readyTo() != null && row.readyTo().isBefore(row.readyFrom())) {
@@ -58,7 +59,7 @@ public final class AppointmentPlanningPolicy {
             if (row.readyTo() != null && (to == null || row.readyTo().isBefore(to))) to = row.readyTo();
         }
         if (from != null && to != null && to.isBefore(from)) throw new IllegalArgumentException("所选货物预计备妥窗口不相容，请分别安排");
-        return new Group(origin, destination, packages, sources.size(), customers.size(), from, to, incomplete);
+        return new Group(origin, destination, unknownQuantitySources==0?packages:null, sources.size(), customers.size(), from, to, incomplete, unknownQuantitySources);
     }
 
     /** A new forecast only requests review; it never changes an externally confirmed appointment. */

lastleg-service/src/main/java/com/baiyue/lastleg/appointmentplanning/AppointmentSourceCreateController.java

@@ -0,0 +1,31 @@
+package com.baiyue.lastleg.appointmentplanning;
+
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.common.core.api.PageResult;
+import com.baiyue.common.security.AuthenticatedUser;
+import com.baiyue.lastleg.inboundplan.dto.*;
+import com.baiyue.lastleg.inboundplan.service.InboundFbaAppointmentService;
+import com.baiyue.lastleg.security.OverseasPermissions;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/platform/v1/last-leg/appointment-planning/appointments")
+public class AppointmentSourceCreateController {
+    private final InboundFbaAppointmentService service;
+    public AppointmentSourceCreateController(InboundFbaAppointmentService service){this.service=service;}
+    @PostMapping
+    @PreAuthorize("hasAuthority('platform:appointment:list') and hasAuthority('platform:overseas-warehouse:last-mile-order:list') and hasAuthority('"+OverseasPermissions.INBOUND_ORDER_FBA_APPOINTMENT+"')")
+    public ApiResponse<FbaAppointmentResponse> create(@AuthenticationPrincipal AuthenticatedUser user,@Valid @RequestBody SourceFbaAppointmentRequest request) {
+        AppointmentPlanningController.requirePlatform(user);
+        return ApiResponse.success(service.createFromSources(String.valueOf(user.userId()),request));
+    }
+    @GetMapping("/unscheduled")
+    @PreAuthorize("hasAuthority('platform:appointment:list')")
+    public ApiResponse<PageResult<FbaAppointmentResponse>> unscheduled(@AuthenticationPrincipal AuthenticatedUser user,@RequestParam(defaultValue="1") int page,@RequestParam(defaultValue="20") int size) {
+        AppointmentPlanningController.requirePlatform(user);
+        return ApiResponse.success(service.unscheduled(page,size));
+    }
+}

lastleg-service/src/main/java/com/baiyue/lastleg/appointmentplanning/AppointmentSourceLinker.java

@@ -0,0 +1,42 @@
+package com.baiyue.lastleg.appointmentplanning;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baiyue.lastleg.inboundplan.entity.InboundFbaAppointmentItem;
+import com.baiyue.lastleg.inboundplan.mapper.InboundFbaAppointmentItemMapper;
+import com.baiyue.lastleg.mapper.LastlegOrderMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.server.ResponseStatusException;
+import org.springframework.http.HttpStatus;
+import java.util.List;
+import java.util.Objects;
+
+/** Called by actual incoming materialization, never as a migration or historical data repair. */
+@Service
+public class AppointmentSourceLinker {
+    private final LastlegOrderMapper orders;
+    private final InboundFbaAppointmentItemMapper items;
+    private final AppointmentExternalSourceGateway bookings;
+    public AppointmentSourceLinker(LastlegOrderMapper orders,InboundFbaAppointmentItemMapper items,AppointmentExternalSourceGateway bookings) {this.orders=orders;this.items=items;this.bookings=bookings;}
+    @Transactional(propagation=Propagation.MANDATORY)
+    public void materialized(String customerId,String bookingNo,Long orderId) {
+        var ref=new AppointmentExternalSourceGateway.SourceRef(customerId,bookingNo);
+        bookings.lockForAppointment(List.of(ref));
+        var matched=bookings.resolve(List.of(ref));
+        if(matched.size()!=1 || !Objects.equals(matched.get(0).customerId(),customerId) || !Objects.equals(matched.get(0).bookingNo(),bookingNo) || !Objects.equals(matched.get(0).orderId(),orderId)) throw conflict("来货与原登记的归属不一致，请核对");
+        var order=orderId==null?null:orders.selectById(orderId);
+        if(order==null || !Objects.equals(order.getCustomerId(),customerId)) throw conflict("来货尚未形成对应客户的真实货物");
+        var rows=items.selectList(new LambdaQueryWrapper<InboundFbaAppointmentItem>().eq(InboundFbaAppointmentItem::getSourceKey,"BOOKING:"+bookingNo)
+            .eq(InboundFbaAppointmentItem::getCustomerId,customerId).eq(InboundFbaAppointmentItem::getActive,true).last("FOR UPDATE"));
+        for(var row:rows) {
+            if(row.getOrderId()!=null && !row.getOrderId().equals(orderId)) throw conflict("原预约已关联其他来货，不能自动改绑");
+            if(Objects.equals(row.getOrderId(),orderId) && Objects.equals(row.getInboundCode(),order.getInboundCode())) continue;
+            try {items.update(null,new LambdaUpdateWrapper<InboundFbaAppointmentItem>().eq(InboundFbaAppointmentItem::getId,row.getId()).eq(InboundFbaAppointmentItem::getActive,true)
+                .set(InboundFbaAppointmentItem::getOrderId,orderId).set(InboundFbaAppointmentItem::getInboundCode,order.getInboundCode()));}
+            catch(org.springframework.dao.DuplicateKeyException duplicate){throw conflict("该来货已有其他有效预约，请先核对原安排");}
+        }
+    }
+    private static ResponseStatusException conflict(String message){return new ResponseStatusException(HttpStatus.CONFLICT,message);}
+}

lastleg-service/src/main/java/com/baiyue/lastleg/appointmentplanning/AppointmentSourceService.java

@@ -9,6 +9,10 @@ import org.springframework.web.server.ResponseStatusException;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.Map;
+import java.util.LinkedHashSet;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @Service
 public class AppointmentSourceService {
@@ -21,47 +25,105 @@ public class AppointmentSourceService {
     private final AppointmentExternalSourceGateway external;
     private final AppointmentWarehouseClient warehouses;
     private final String token;
+    @jakarta.annotation.Resource private AppointmentCoverageMapper destinationFacts;
     public AppointmentSourceService(LastlegOrderMapper orders, ContainerShippingGateMapper shipping,
                                     AppointmentExternalSourceGateway external, AppointmentWarehouseClient warehouses,
                                     @Value("${baiyue.security.internal-service-token:}") String token) {
         this.orders=orders; this.shipping=shipping; this.external=external; this.warehouses=warehouses; this.token=token;
     }
     public Source resolve(String sourceKey,String customerId,String destinationKey) {
-        if (blank(sourceKey) || sourceKey.length()>160 || blank(customerId) || customerId.length()>128) throw bad("请选择完整的真实货源");
+        return resolveBatch(List.of(new AppointmentCoverageService.SourceRef(customerId,sourceKey,destinationKey))).get(0);
+    }
+    public void lockForWrite(List<AppointmentCoverageService.SourceRef> refs) {
+        if(refs==null || refs.isEmpty() || refs.size()>100 || refs.stream().anyMatch(Objects::isNull)) throw bad("每批请选择1至100票真实货源");
+        var bookings=refs.stream().filter(ref->ref.sourceKey()!=null && ref.sourceKey().startsWith("BOOKING:"))
+            .map(ref->new AppointmentExternalSourceGateway.SourceRef(ref.customerId(),ref.sourceKey().substring(8))).toList();
+        if(!bookings.isEmpty()) external.lockForAppointment(bookings);
+    }
+    public List<AppointmentCoverageService.SourceRef> canonicalOrders(List<AppointmentExternalSourceGateway.OrderRef> refs) {
+        if(refs==null || refs.isEmpty() || refs.size()>100) throw bad("每批请选择1至100票真实货源");
+        var bookings=external.resolveOrders(refs);
+        var byOrder=bookings.stream().collect(Collectors.toMap(s->new AppointmentExternalSourceGateway.OrderRef(s.customerId(),s.orderId()),Function.identity()));
+        return refs.stream().distinct().map(ref->{
+            var booking=byOrder.get(ref);
+            return new AppointmentCoverageService.SourceRef(ref.customerId(),booking==null?"ORDER:"+ref.orderId():"BOOKING:"+booking.bookingNo(),null);
+        }).toList();
+    }
+    public String destinationTimezone(String code) {
+        var destination=catalog().stream().filter(w->"US".equals(w.countryCode()) && "FBA".equals(w.warehouseType()) && code.equals(w.warehouseCode())).findFirst().orElseThrow(()->bad("目的仓不在美国FBA目录中"));
+        try {
+            var response=warehouses.activeDetail(token,destination.id());
+            if(response==null || !response.successful() || response.data()==null || response.data().warehouse()==null
+                || !Objects.equals(response.data().warehouse().id(),destination.id()) || !Long.valueOf(0).equals(response.data().warehouse().tenantId())) throw new IllegalStateException();
+            return response.data().warehouse().timezone();
+        } catch(RuntimeException error) { throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE,"目的仓时区读取失败，请稍后核对",error); }
+    }
+    /** One catalog request and batched source reads, including mixed first-leg and external bookings. */
+    public List<Source> resolveBatch(List<AppointmentCoverageService.SourceRef> requested) {
+        if(requested==null || requested.isEmpty() || requested.size()>100) throw bad("每批请选择1至100票真实货源");
+        var keys=new LinkedHashSet<String>(); var orderIds=new LinkedHashSet<Long>();
+        var bookingRefs=new java.util.ArrayList<AppointmentExternalSourceGateway.SourceRef>();
+        for(var ref:requested) {
+            if(ref==null || blank(ref.sourceKey()) || ref.sourceKey().length()>160 || blank(ref.customerId()) || ref.customerId().length()>128) throw bad("请选择完整的真实货源");
+            if(!keys.add(ref.sourceKey())) throw bad("同一来源货物不能重复选择");
+            if(ref.sourceKey().startsWith("ORDER:")) orderIds.add(orderId(ref.sourceKey()));
+            else if(ref.sourceKey().startsWith("BOOKING:") && !blank(ref.sourceKey().substring(8))) bookingRefs.add(new AppointmentExternalSourceGateway.SourceRef(ref.customerId(),ref.sourceKey().substring(8)));
+            else throw bad("不支持的货源类型");
+        }
+        var bookings=bookingRefs.isEmpty()?List.<AppointmentExternalSourceGateway.Source>of():external.resolve(bookingRefs);
+        var bookingMap=new java.util.HashMap<String,AppointmentExternalSourceGateway.Source>();
+        for(var booking:bookings) {
+            if(bookingMap.put(booking.customerId()+"\n"+booking.bookingNo(),booking)!=null) throw bad("外接来源重复，请先核对");
+            if(booking.orderId()!=null) orderIds.add(booking.orderId());
+        }
+        var orderRows=orderIds.isEmpty()?List.<com.baiyue.lastleg.entity.LastlegOrder>of():orders.selectBatchIds(orderIds);
+        var directOrders=requested.stream().filter(ref->ref.sourceKey().startsWith("ORDER:")).map(ref->new AppointmentExternalSourceGateway.OrderRef(ref.customerId(),orderId(ref.sourceKey()))).toList();
+        if(!directOrders.isEmpty() && !external.resolveOrders(directOrders).isEmpty()) throw bad("该货物来自外接登记，请使用原登记来源继续预约");
+        var orderMap=orderRows.stream().collect(Collectors.toMap(com.baiyue.lastleg.entity.LastlegOrder::getId,Function.identity()));
+        var transferRefs=orderRows.stream().filter(o->"WAREHOUSE_TRANSFER".equals(o.getOrderType())).map(o->new AppointmentCoverageMapper.OrderRef(o.getCustomerId(),o.getId())).toList();
+        var destinations=transferRefs.isEmpty()?Map.<Long,AppointmentCoverageMapper.Source>of():destinationFacts.sources(transferRefs).stream().collect(Collectors.toMap(AppointmentCoverageMapper.Source::orderId,Function.identity()));
+        var containerIds=orderRows.stream().filter(o->"FIRST_LEG".equals(o.getOrderType())).map(com.baiyue.lastleg.entity.LastlegOrder::getSourceContainerBookingId).filter(Objects::nonNull).distinct().toList();
+        var gates=containerIds.isEmpty()?Map.<String,Boolean>of():shipping.selectBatchIds(containerIds).stream().collect(Collectors.toMap(g->g.getContainerBookingId(),g->g.getNodeSequence()!=null && g.getNodeSequence()>=40));
+        var catalog=catalog();
+        var result=requested.stream().map(ref->resolve(ref.sourceKey(),ref.customerId(),ref.destinationKey(),orderMap,bookingMap,gates,catalog,destinations)).toList();
+        var materialized=new java.util.HashSet<Long>();
+        for(var source:result) if(source.orderId()!=null && !materialized.add(source.orderId())) throw bad("同一货物存在重复来源，请保留原登记来源");
+        return result;
+    }
+    private Source resolve(String sourceKey,String customerId,String destinationKey,
+        Map<Long,com.baiyue.lastleg.entity.LastlegOrder> orderMap,
+        Map<String,AppointmentExternalSourceGateway.Source> bookingMap,Map<String,Boolean> gates,
+        List<AppointmentWarehouseClient.Warehouse> catalog,Map<Long,AppointmentCoverageMapper.Source> destinations) {
         com.baiyue.lastleg.entity.LastlegOrder order=null;
         String bookingNo=null,origin,destination,version;
         Integer packages;
         boolean followup=true;
         List<String> reasons=List.of();
         if (sourceKey.startsWith("ORDER:")) {
-            long id;
-            try { id=Long.parseLong(sourceKey.substring(6)); if (id<=0 || !sourceKey.equals("ORDER:"+id)) throw new NumberFormatException(); }
-            catch (NumberFormatException error) { throw bad("货源标识无效"); }
-            order=orders.selectById(id);
+            order=orderMap.get(orderId(sourceKey));
             if (order==null || !customerId.equals(order.getCustomerId())) throw missing();
-            if (!"FIRST_LEG".equals(order.getOrderType())) throw bad("请从原外接登记继续跟进，避免重复建立货源");
-            var gate=order.getSourceContainerBookingId()==null ? null : shipping.selectById(order.getSourceContainerBookingId());
-            if (gate==null || gate.getNodeSequence()==null || gate.getNodeSequence()<40) throw bad("货物尚无已开船或后续实际船节点");
-            origin=order.getOverseasWarehouseId(); destination="FBA:"+order.getFbaWarehouseCode();
-            if (!"FBA".equals(order.getDestinationType())) throw bad("当前货源不是FBA送仓货物");
+            if (!Set.of("FIRST_LEG","WAREHOUSE_TRANSFER").contains(Objects.toString(order.getOrderType(),""))) throw bad("当前货源类型不支持FBA预约");
+            if ("FIRST_LEG".equals(order.getOrderType()) && (order.getSourceContainerBookingId()==null || !Boolean.TRUE.equals(gates.get(order.getSourceContainerBookingId())))) throw bad("货物尚无已开船或后续实际船节点");
+            origin=order.getOverseasWarehouseId(); destination="FBA:"+destinationCode(order,destinations);
+            if (!"FBA".equals(destinationType(order,destinations))) throw bad("当前货源不是FBA送仓货物");
             packages=order.getPackageCount(); version=order.getVersion()==null ? null : "ORDER:"+order.getVersion();
         } else if (sourceKey.startsWith("BOOKING:")) {
             bookingNo=sourceKey.substring(8);
             if (blank(bookingNo)) throw bad("外接登记号不能为空");
-            var matches=external.resolve(List.of(new AppointmentExternalSourceGateway.SourceRef(customerId,bookingNo)));
-            if (matches.size()!=1) throw missing();
-            var source=matches.get(0);
+            var source=bookingMap.get(customerId+"\n"+bookingNo);
+            if (source==null) throw missing();
             if (!Objects.equals(source.customerId(),customerId) || !Objects.equals(source.bookingNo(),bookingNo)) throw missing();
             origin=source.warehouseId(); destination=source.destinationKey(); packages=source.packageCount();
             version=source.recordVersion()==null ? null : "BOOKING:"+source.recordVersion();
             followup=Set.of("CONFIRMED","RECEIVED","BOUND").contains(source.bookingStatus()==null ? "" : source.bookingStatus());
             if (!followup) reasons=List.of("当前登记尚未确认承运或已取消，仅可查看跟进记录");
             if (source.orderId()!=null) {
-                order=orders.selectById(source.orderId());
+                order=orderMap.get(source.orderId());
                 if (order==null || !customerId.equals(order.getCustomerId())) throw missing();
                 if (!Objects.equals(order.getOverseasWarehouseId(),origin)) throw bad("来货的接仓点与原登记不一致，请先核对");
-                if (!"FBA".equals(order.getDestinationType()) || !Objects.equals(destination,"FBA:"+order.getFbaWarehouseCode())) throw bad("来货目的仓与原登记不一致，请先核对");
+                if (!"FBA".equals(destinationType(order,destinations)) || !Objects.equals(destination,"FBA:"+destinationCode(order,destinations))) throw bad("来货目的仓与原登记不一致，请先核对");
                 packages=order.getPackageCount();
+                version=version+"/ORDER:"+order.getVersion();
             }
         } else throw bad("不支持的货源类型");
         if (order!=null && Set.of("CANCELLED","COMPLETED").contains(order.getCurrentStatus()==null ? "" : order.getCurrentStatus())) {
@@ -69,7 +131,7 @@ public class AppointmentSourceService {
         }
         if (!blank(destinationKey) && !Objects.equals(destination,destinationKey)) throw bad("目的地已变化，请返回原业务重新核对");
         if (destination==null || !destination.startsWith("FBA:")) throw bad("当前仅支持FBA收货跟进来源");
-        var catalog=catalog(); final String originId=origin; final String code=destination.substring(4);
+        final String originId=origin; final String code=destination.substring(4);
         var warehouse=catalog.stream().filter(w -> w.id()!=null && w.id().toString().equals(originId) && "US".equals(w.countryCode())
             && Set.of("OVERSEAS","OVERSEAS_PARTNER").contains(w.warehouseType()==null ? "" : w.warehouseType())).findFirst().orElseThrow(() -> bad("接仓点不在启用的美国仓目录中"));
         if (catalog.stream().noneMatch(w -> "FBA".equals(w.warehouseType()) && "US".equals(w.countryCode()) && code.equals(w.warehouseCode()))) throw bad("目的仓不在启用的美国FBA目录中");
@@ -81,6 +143,18 @@ public class AppointmentSourceService {
         catch (RuntimeException error) { throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE,"仓库目录暂不可用，请稍后重新核对",error); }
     }
     private static boolean blank(String value) { return value==null || value.isBlank(); }
+    private static String destinationType(com.baiyue.lastleg.entity.LastlegOrder order,Map<Long,AppointmentCoverageMapper.Source> facts) {
+        if(!"WAREHOUSE_TRANSFER".equals(order.getOrderType())) return order.getDestinationType();
+        var fact=facts.get(order.getId());return fact==null?null:fact.destinationType();
+    }
+    private static String destinationCode(com.baiyue.lastleg.entity.LastlegOrder order,Map<Long,AppointmentCoverageMapper.Source> facts) {
+        if(!"WAREHOUSE_TRANSFER".equals(order.getOrderType())) return order.getFbaWarehouseCode();
+        var fact=facts.get(order.getId());return fact==null?null:fact.fbaWarehouseCode();
+    }
+    private static long orderId(String key) {
+        try { long id=Long.parseLong(key.substring(6)); if(id<=0 || !key.equals("ORDER:"+id)) throw new NumberFormatException(); return id; }
+        catch(NumberFormatException error) { throw bad("货源标识无效"); }
+    }
     private static ResponseStatusException bad(String message) { return new ResponseStatusException(HttpStatus.BAD_REQUEST,message); }
     private static ResponseStatusException missing() { return new ResponseStatusException(HttpStatus.NOT_FOUND,"未找到当前客户的货物来源"); }
 }

lastleg-service/src/main/java/com/baiyue/lastleg/appointmentplanning/AppointmentTimePolicy.java

@@ -20,7 +20,7 @@ public final class AppointmentTimePolicy {
         final ZoneId zone;
         try { zone = ZoneId.of(timezone); }
         catch (DateTimeException error) { throw new IllegalArgumentException("预约地点时区无效", error); }
-        if (zone instanceof ZoneOffset) throw new IllegalArgumentException("预约地点需要地区时区，不能仅填写固定时差");
+        if (zone instanceof ZoneOffset || zone.getRules().isFixedOffset()) throw new IllegalArgumentException("预约地点需要地区时区，不能仅填写固定时差");
         Instant first = instant(start, zone, startOffset);
         Instant last = end == null ? null : instant(end, zone, endOffset);
         if (end == null && endOffset != null) throw new IllegalArgumentException("未填写结束时间，不能指定结束时差");

lastleg-service/src/main/java/com/baiyue/lastleg/appointmentplanning/AppointmentWarehouseClient.java

@@ -4,6 +4,7 @@ import com.baiyue.common.core.api.ApiResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.PathVariable;
 import java.util.List;
 
 @FeignClient(name = "warehouse-service", contextId = "appointmentWarehouseClient", url = "${baiyue.clients.domestic-warehouse.url:}")
@@ -11,4 +12,8 @@ public interface AppointmentWarehouseClient {
     @GetMapping("/internal/warehouses/order-catalog")
     ApiResponse<List<Warehouse>> catalog(@RequestHeader("X-Internal-Service-Token") String token);
     record Warehouse(Long id, String warehouseCode, String warehouseName, String warehouseType, String countryCode) { }
+    @GetMapping("/internal/warehouses/0/{warehouseId}/active")
+    ApiResponse<Detail> activeDetail(@RequestHeader("X-Internal-Service-Token") String token,@PathVariable("warehouseId") long warehouseId);
+    record Identity(Long id,Long tenantId,String warehouseType,String status,String timezone) { }
+    record Detail(Identity warehouse) { }
 }

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/mapper/DispatchCandidateMapper.java

@@ -9,6 +9,15 @@ import java.util.List;
 
 @Mapper
 public interface DispatchCandidateMapper {
+    // Only the receiving party's confirmed appointment is a transport reference; it is not a loading plan.
+    String CONFIRMED_APPOINTMENT_AT =
+        "(SELECT MAX(fa.appointment_at) FROM ll_inbound_plan_pallet_allocation pa " +
+        "JOIN ll_inbound_plan_line al ON al.id=pa.line_id AND al.customer_id=pa.customer_id AND al.plan_id=p.plan_id " +
+        "JOIN ll_inbound_fba_appointment_item fi ON fi.order_id=al.order_id AND fi.customer_id=al.customer_id " +
+        "JOIN ll_inbound_fba_appointment fa ON fa.id=fi.appointment_id " +
+        "WHERE pa.pallet_id=p.id AND pa.customer_id=ip.customer_id AND fi.active=1 AND fa.appointment_status='SUCCESS' " +
+        "AND fi.fba_warehouse_code=fa.fba_warehouse_code " +
+        "AND fa.fba_warehouse_code=COALESCE(NULLIF(TRIM(p.destination_warehouse_code),''),NULLIF(TRIM(al.fba_warehouse_code),'')))";
     // Billing volume weight is never a substitute for physical cargo mass.
     String SOURCE_GROSS_WEIGHT =
         "COALESCE((SELECT CASE WHEN COUNT(*)>0 AND COUNT(*)=COUNT(d.gross_weight_kg) AND MIN(d.gross_weight_kg)>0 " +
@@ -40,12 +49,7 @@ public interface DispatchCandidateMapper {
         " * a.allocated_volume_cbm / l.volume_cbm ELSE " + SOURCE_GROSS_WEIGHT +
         " / NULLIF((SELECT COUNT(*) FROM ll_inbound_plan_pallet_allocation a2 WHERE a2.line_id=a.line_id),0) END),0) ELSE NULL END AS grossWeightKg," +
         "MIN(ip.container_no) AS containerNo," +
-        "(SELECT MAX(fa.appointment_at) FROM ll_inbound_fba_appointment_item fi " +
-        "JOIN ll_inbound_fba_appointment fa ON fa.id=fi.appointment_id WHERE fi.line_id IN " +
-        "(SELECT pa.line_id FROM ll_inbound_plan_pallet_allocation pa WHERE pa.pallet_id=p.id)) AS appointmentAt," +
-        "(SELECT MAX(fa.expected_loading_at) FROM ll_inbound_fba_appointment_item fi " +
-        "JOIN ll_inbound_fba_appointment fa ON fa.id=fi.appointment_id WHERE fi.line_id IN " +
-        "(SELECT pa.line_id FROM ll_inbound_plan_pallet_allocation pa WHERE pa.pallet_id=p.id)) AS expectedLoadingAt," +
+        CONFIRMED_APPOINTMENT_AT + " AS appointmentAt,NULL AS expectedLoadingAt," +
         "CASE WHEN p.warehouse_pallet_id IS NOT NULL THEN (SELECT MIN(pos.overseas_warehouse_id) " +
         "FROM ll_inventory_position pos WHERE pos.customer_id=ip.customer_id AND pos.pallet_id=p.warehouse_pallet_id " +
         "AND pos.available_packages > 0) ELSE COALESCE(NULLIF(CAST(ip.overseas_warehouse_id AS CHAR),'')," +
@@ -148,12 +152,7 @@ public interface DispatchCandidateMapper {
         " * a.allocated_volume_cbm / l.volume_cbm ELSE " + SOURCE_GROSS_WEIGHT +
         " / NULLIF((SELECT COUNT(*) FROM ll_inbound_plan_pallet_allocation a2 WHERE a2.line_id=a.line_id),0) END),0) ELSE NULL END AS grossWeightKg," +
         "MIN(ip.container_no) AS containerNo," +
-        "(SELECT MAX(fa.appointment_at) FROM ll_inbound_fba_appointment_item fi " +
-        "JOIN ll_inbound_fba_appointment fa ON fa.id=fi.appointment_id WHERE fi.line_id IN " +
-        "(SELECT pa.line_id FROM ll_inbound_plan_pallet_allocation pa WHERE pa.pallet_id=p.id)) AS appointmentAt," +
-        "(SELECT MAX(fa.expected_loading_at) FROM ll_inbound_fba_appointment_item fi " +
-        "JOIN ll_inbound_fba_appointment fa ON fa.id=fi.appointment_id WHERE fi.line_id IN " +
-        "(SELECT pa.line_id FROM ll_inbound_plan_pallet_allocation pa WHERE pa.pallet_id=p.id)) AS expectedLoadingAt," +
+        CONFIRMED_APPOINTMENT_AT + " AS appointmentAt,NULL AS expectedLoadingAt," +
         "CASE WHEN p.warehouse_pallet_id IS NOT NULL THEN (SELECT MIN(pos.overseas_warehouse_id) " +
         "FROM ll_inventory_position pos WHERE pos.customer_id=ip.customer_id AND pos.pallet_id=p.warehouse_pallet_id " +
         "AND pos.available_packages > 0) ELSE COALESCE(NULLIF(CAST(ip.overseas_warehouse_id AS CHAR),'')," +

lastleg-service/src/main/java/com/baiyue/lastleg/fleet/business/FleetAppointmentSourceAdapter.java

@@ -14,4 +14,19 @@ public class FleetAppointmentSourceAdapter implements AppointmentExternalSourceG
         return sources.resolve(refs.stream().map(r->new FleetPoolSourceResolver.SourceRef(r.customerId(),r.bookingNo())).toList())
             .stream().map(s->new Source(s.customerId(),s.bookingNo(),s.tripNo(),s.bookingStatus(),s.warehouseId(),s.destinationKey(),s.lastlegOrderId(),s.packageCount(),s.recordVersion())).toList();
     }
+    @Override
+    public List<Source> resolveOrders(List<OrderRef> refs) {
+        if (refs == null || refs.isEmpty()) return List.of();
+        if (refs.size() > 100 || refs.stream().anyMatch(java.util.Objects::isNull))
+            throw new IllegalArgumentException("订单来源每次最多100条，且不能包含空项");
+        return sources.resolveOrders(refs.stream().map(r -> new FleetPoolSourceResolver.OrderRef(r.customerId(), r.orderId())).toList())
+            .stream().map(s -> new Source(s.customerId(), s.bookingNo(), s.tripNo(), s.bookingStatus(), s.warehouseId(),
+                s.destinationKey(), s.lastlegOrderId(), s.packageCount(), s.recordVersion())).toList();
+    }
+    @Override
+    public void lockForAppointment(List<SourceRef> refs) {
+        if (refs == null || refs.size() > 100 || refs.stream().anyMatch(java.util.Objects::isNull))
+            throw new IllegalArgumentException("预约来源须完整，每次最多100条");
+        sources.lockForAppointment(refs.stream().map(r -> new FleetPoolSourceResolver.SourceRef(r.customerId(), r.bookingNo())).toList());
+    }
 }

lastleg-service/src/main/java/com/baiyue/lastleg/fleet/business/FleetPoolOrderBridge.java

@@ -33,11 +33,14 @@ public class FleetPoolOrderBridge {
     private final LastlegOrderNoGenerator numbers;
     private final ObjectMapper json;
     private final DeliverySourceEvidenceMapper deliveryEvidence;
+    private final com.baiyue.lastleg.appointmentplanning.AppointmentSourceLinker appointmentSources;
     public FleetPoolOrderBridge(FleetPoolOrderMapper links,LocalLooseboardOrderMapper loose,
         LocalLooseboardHistoryMapper looseHistory,UsTruckOrderMapper trucks,
-        UsTruckOrderStatusHistoryMapper truckHistory,LastlegOrderNoGenerator numbers,ObjectMapper json,DeliverySourceEvidenceMapper deliveryEvidence) {
+        UsTruckOrderStatusHistoryMapper truckHistory,LastlegOrderNoGenerator numbers,ObjectMapper json,DeliverySourceEvidenceMapper deliveryEvidence,
+        com.baiyue.lastleg.appointmentplanning.AppointmentSourceLinker appointmentSources) {
         this.links=links;this.loose=loose;this.looseHistory=looseHistory;this.trucks=trucks;
         this.truckHistory=truckHistory;this.numbers=numbers;this.json=json;this.deliveryEvidence=deliveryEvidence;
+        this.appointmentSources=appointmentSources;
     }
     @Transactional(readOnly=true)
     public Map<Long,String> fulfillmentStages(List<Long> bookingIds) {
@@ -100,6 +103,7 @@ public class FleetPoolOrderBridge {
             if(order.getLastlegOrderId()!=null&&!order.getLastlegOrderId().equals(lastlegOrderId))throw conflict("散板商业单已存在另一尾程来源");
             order.setLastlegOrderId(lastlegOrderId);order.setVersion(order.getVersion()+1);order.setUpdatedAt(row.getUpdatedAt());loose.updateById(order);
         }
+        appointmentSources.materialized(customerId, bookingNo, lastlegOrderId);
     }
     @Transactional(propagation=Propagation.MANDATORY)
     public void receiving(String customerId,String incomingNo,String operator) {

lastleg-service/src/main/java/com/baiyue/lastleg/fleet/business/FleetPoolOrderMapper.java

@@ -7,6 +7,8 @@ import java.util.List;
 
 @Mapper
 public interface FleetPoolOrderMapper extends BaseMapper<FleetPoolOrderLink> {
+    @Select("SELECT customer_id,booking_no FROM ll_fleet_external_booking WHERE booking_no=#{bookingNo} AND offer_id IS NOT NULL FOR UPDATE")
+    FleetPoolSourceResolver.SourceRef lockAppointmentSource(String bookingNo);
     @Select({"<script>SELECT b.customer_id,b.booking_no,b.trip_no,b.status AS booking_status,",
         "t.warehouse_id,b.destination_key,b.destination_label,b.incoming_no,",
         "l.lastleg_order_id,l.business_order_no,l.fulfillment_stage,b.record_version,",
@@ -16,6 +18,16 @@ public interface FleetPoolOrderMapper extends BaseMapper<FleetPoolOrderLink> {
         "WHERE b.offer_id IS NOT NULL AND <foreach collection='sources' item='s' open='(' separator=' OR ' close=')'>",
         "(b.customer_id=#{s.customerId} AND b.booking_no=#{s.bookingNo})</foreach></script>"})
     List<FleetPoolSourceResolver.SourceRow> resolveSources(@Param("sources") List<FleetPoolSourceResolver.SourceRef> sources);
+    @Select({"<script>SELECT b.customer_id,b.booking_no,b.trip_no,b.status AS booking_status,",
+        "t.warehouse_id,b.destination_key,b.destination_label,b.incoming_no,",
+        "l.lastleg_order_id,l.business_order_no,l.fulfillment_stage,b.record_version,",
+        "b.cargo_json,b.expected_pallet_count,b.estimated_arrival_at",
+        "FROM ll_fleet_pool_order_link l JOIN ll_fleet_external_booking b ON b.id=l.booking_id AND b.customer_id=l.customer_id",
+        "JOIN ll_fleet_trip t ON t.id=b.trip_id",
+        "JOIN ll_order o ON o.id=l.lastleg_order_id AND o.customer_id=l.customer_id",
+        "WHERE b.offer_id IS NOT NULL AND <foreach collection='orders' item='o' open='(' separator=' OR ' close=')'>",
+        "(l.customer_id=#{o.customerId} AND l.lastleg_order_id=#{o.orderId})</foreach></script>"})
+    List<FleetPoolSourceResolver.SourceRow> resolveOrderSources(@Param("orders") List<FleetPoolSourceResolver.OrderRef> orders);
     @Select("SELECT * FROM ll_fleet_pool_order_link WHERE booking_id=#{id} FOR UPDATE")
     FleetPoolOrderLink lockBooking(long id);
     @Select("SELECT * FROM ll_fleet_pool_order_link WHERE booking_no=#{no} FOR UPDATE")

lastleg-service/src/main/java/com/baiyue/lastleg/fleet/business/FleetPoolOrderQueries.java

@@ -43,7 +43,7 @@ public class FleetPoolOrderQueries {
             row.getTripNo(),row.getPlannedDepartureAt()==null?null:row.getPlannedDepartureAt().toInstant(java.time.ZoneOffset.UTC),row.getOriginWarehouseName(),row.getDestinationLabel(),
             row.getDeliveryMode(),row.getDeliveryInstructions(),row.getFulfillmentStage(),row.getStageOccurredAt()==null?null:row.getStageOccurredAt().atZone(java.time.ZoneId.systemDefault()).toInstant(),
             row.getAgreedFreightAmount(),row.getCurrency(),row.getIncomingNo(),row.getDispatchNo(),row.getDeliveryNo(),
-            signed,unsigned,returned,exception,"此订单由拼车承运实际履约推进，请从来货、排车和签收入口操作");
+            signed,unsigned,returned,exception,"此订单已关联拼车承运，状态随实际收货、排车和签收更新，无需重复下单。");
     }
     private static ResponseStatusException conflict(String message){return new ResponseStatusException(HttpStatus.CONFLICT,message);}
 }

lastleg-service/src/main/java/com/baiyue/lastleg/fleet/business/FleetPoolSourceResolver.java

@@ -8,6 +8,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class FleetPoolSourceResolver {
     public record SourceRef(String customerId, String bookingNo) { }
+    public record OrderRef(String customerId, Long orderId) { }
     public record Source(String customerId, String bookingNo, String tripNo, String bookingStatus,
         String warehouseId, String destinationKey, String destinationLabel, String incomingNo,
         Long lastlegOrderId, String businessOrderNo, String fulfillmentStage, Long recordVersion, Integer packageCount, Integer expectedPalletCount, java.time.LocalDateTime estimatedArrivalAt) { }
@@ -19,12 +20,43 @@ public class FleetPoolSourceResolver {
     private final FleetPoolOrderMapper links;
     public FleetPoolSourceResolver(FleetPoolOrderMapper links,com.fasterxml.jackson.databind.ObjectMapper json) { this.links = links; this.json=json; }
 
+    @Transactional(propagation = org.springframework.transaction.annotation.Propagation.MANDATORY)
+    public void lockForAppointment(List<SourceRef> sources) {
+        if (!org.springframework.transaction.support.TransactionSynchronizationManager.isActualTransactionActive())
+            throw new IllegalStateException("预约来源锁必须在调用方事务内获取");
+        if (sources == null || sources.size() > 100 || sources.stream().anyMatch(s -> s == null
+            || s.customerId() == null || s.customerId().isBlank() || s.bookingNo() == null || s.bookingNo().isBlank()))
+            throw new IllegalArgumentException("来源须包含客户及登记业务号，每次最多100条");
+        // Lock the original booking, not the optional commercial link: an inquiry may have no incoming yet.
+        // One unique-key lookup at a time gives concurrent batches the same lock order.
+        for (var source : sources.stream().distinct().sorted(java.util.Comparator.comparing(SourceRef::bookingNo)
+            .thenComparing(SourceRef::customerId)).toList()) {
+            var locked = links.lockAppointmentSource(source.bookingNo());
+            if (locked == null || !source.equals(locked))
+                throw new org.springframework.web.server.ResponseStatusException(org.springframework.http.HttpStatus.CONFLICT,
+                    "预约货源不存在或客户归属不一致，请重新核对");
+        }
+    }
+
     @Transactional(readOnly = true)
     public List<Source> resolve(List<SourceRef> sources) {
         if (sources == null || sources.isEmpty()) return List.of();
         if (sources.size() > 100 || sources.stream().anyMatch(s -> s == null || s.customerId() == null || s.customerId().isBlank() || s.bookingNo() == null || s.bookingNo().isBlank()))
             throw new IllegalArgumentException("来源须包含客户及登记业务号，每次最多100条");
-        return links.resolveSources(sources.stream().distinct().toList()).stream().map(row -> {
+        return project(links.resolveSources(sources.stream().distinct().toList()));
+    }
+
+    @Transactional(readOnly = true)
+    public List<Source> resolveOrders(List<OrderRef> orders) {
+        if (orders == null || orders.isEmpty()) return List.of();
+        if (orders.size() > 100 || orders.stream().anyMatch(o -> o == null || o.customerId() == null
+            || o.customerId().isBlank() || o.orderId() == null || o.orderId() <= 0))
+            throw new IllegalArgumentException("来源须包含客户及有效订单，每次最多100条");
+        return project(links.resolveOrderSources(orders.stream().distinct().toList()));
+    }
+
+    private List<Source> project(List<SourceRow> rows) {
+        return rows.stream().map(row -> {
             Integer packages;
             try {
                 var value=json.readTree(row.cargoJson()).get("packageCount");

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/controller/InboundPlanController.java

@@ -160,7 +160,7 @@ public class InboundPlanController {
         @PathVariable String appointmentNo,
         @Valid @RequestBody UpdateFbaAppointmentRequest request) {
         requireAppointmentPlatform(user);
-        return ApiResponse.success(appointmentService.update(appointmentNo, request));
+        return ApiResponse.success(appointmentService.update(String.valueOf(user.userId()), appointmentNo, request));
     }
 
     @DeleteMapping("/fba-appointments/{appointmentNo}")
@@ -169,12 +169,12 @@ public class InboundPlanController {
     public ApiResponse<Void> deleteFbaAppointment(@AuthenticationPrincipal AuthenticatedUser user,
         @PathVariable String appointmentNo, @RequestParam int version) {
         requireAppointmentPlatform(user);
-        appointmentService.delete(appointmentNo, version);
+        appointmentService.delete(String.valueOf(user.userId()), appointmentNo, version);
         return ApiResponse.success(null);
     }
 
     private void requireAppointmentPlatform(AuthenticatedUser user) {
-        if (user == null || user.tenantId() == null) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
+        if (user == null || user.userId() == null || user.tenantId() == null) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
         if (!"PLATFORM".equals(user.appCode()) || user.tenantId() != 0L) {
             throw new ResponseStatusException(HttpStatus.FORBIDDEN, "预约由平台统一管理");
         }

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/dto/BatchFbaAppointmentRequest.java

@@ -9,12 +9,10 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 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,
-    LocalDateTime appointmentEndAt
+    @NotEmpty @Size(max = 100) List<@NotNull Long> lineIds,
+    @NotBlank String originWarehouseId,
+    @NotBlank @Size(max=64) String fbaWarehouseCode,
+    @NotNull @jakarta.validation.Valid FbaAppointmentDetails details,
+    @NotBlank @Size(max = 64) String idempotencyKey
 ) {
 }

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/dto/FbaAppointmentDetails.java

@@ -0,0 +1,16 @@
+package com.baiyue.lastleg.inboundplan.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import java.time.LocalDateTime;
+
+/** Planned windows and the receiving party's confirmation are separate facts. */
+public record FbaAppointmentDetails(
+    java.time.LocalDate plannedDate,
+    LocalDateTime plannedAt, LocalDateTime plannedEndAt,
+    @Size(max=128) String confirmationNo,
+    LocalDateTime appointmentAt, LocalDateTime appointmentEndAt,
+    @NotBlank @Size(max=32) String appointmentStatus,
+    @Size(max=1000) String appointmentRemark,
+    @Size(max=6) String startOffset, @Size(max=6) String endOffset
+) { }

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/dto/FbaAppointmentResponse.java

@@ -6,20 +6,27 @@ import java.util.List;
 public record FbaAppointmentResponse(
     Long id,
     String appointmentNo,
+    String confirmationNo,
+    java.time.LocalDate plannedDate,
+    LocalDateTime plannedAt,
+    LocalDateTime plannedEndAt,
     LocalDateTime appointmentAt,
-    LocalDateTime expectedLoadingAt,
+    LocalDateTime appointmentEndAt,
+    java.time.Instant appointmentStartUtc,
+    java.time.Instant appointmentEndUtc,
+    String timezone,
     String appointmentStatus,
     String appointmentRemark,
+    String originWarehouseId,
     String fbaWarehouseCode,
     int selectedCount,
     String createdBy,
     LocalDateTime createdAt,
     LocalDateTime updatedAt,
     List<Item> items,
-    LocalDateTime appointmentEndAt,
     Integer version
 ) {
-    public record Item(Long id, Long planId, Long lineId, Long orderId, String inboundCode,
-                       String fbaWarehouseCode, String customerId) {
+    public record Item(Long id, String sourceKey, String sourceVersion, Long orderId, String inboundCode,
+                       String fbaWarehouseCode, String customerId, Integer packageCount) {
     }
 }

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/dto/SourceFbaAppointmentRequest.java

@@ -0,0 +1,14 @@
+package com.baiyue.lastleg.inboundplan.dto;
+
+import com.baiyue.lastleg.appointmentplanning.AppointmentCoverageService.SourceRef;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import java.util.List;
+
+public record SourceFbaAppointmentRequest(
+    @NotEmpty @Size(max=100) List<@NotNull SourceRef> sources,
+    @NotBlank String originWarehouseId,
+    @NotBlank @Size(max=64) String fbaWarehouseCode,
+    @NotNull @Valid FbaAppointmentDetails details,
+    @NotBlank @Size(max=64) String idempotencyKey
+) { }

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/dto/UpdateFbaAppointmentRequest.java

@@ -7,11 +7,8 @@ import jakarta.validation.constraints.Size;
 import java.time.LocalDateTime;
 
 public record UpdateFbaAppointmentRequest(
-    @NotNull LocalDateTime appointmentAt,
-    @NotNull LocalDateTime expectedLoadingAt,
-    @NotBlank @Size(max = 32) String appointmentStatus,
-    @Size(max = 1000) String appointmentRemark,
-    LocalDateTime appointmentEndAt,
-    @NotNull @jakarta.validation.constraints.Min(0) Integer version
+    @NotNull @jakarta.validation.Valid FbaAppointmentDetails details,
+    @NotNull @jakarta.validation.constraints.Min(0) Integer version,
+    @NotBlank @Size(max = 64) String idempotencyKey
 ) {
 }

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/entity/InboundFbaAppointment.java

@@ -13,11 +13,26 @@ public class InboundFbaAppointment {
     @TableId(type = IdType.INPUT)
     private Long id;
     private String appointmentNo;
+    @com.baomidou.mybatisplus.annotation.TableField(updateStrategy = com.baomidou.mybatisplus.annotation.FieldStrategy.ALWAYS)
+    private String confirmationNo;
+    @com.baomidou.mybatisplus.annotation.TableField(updateStrategy = com.baomidou.mybatisplus.annotation.FieldStrategy.ALWAYS)
+    private java.time.LocalDate plannedDate;
+    @com.baomidou.mybatisplus.annotation.TableField(updateStrategy = com.baomidou.mybatisplus.annotation.FieldStrategy.ALWAYS)
+    private LocalDateTime plannedAt;
+    @com.baomidou.mybatisplus.annotation.TableField(updateStrategy = com.baomidou.mybatisplus.annotation.FieldStrategy.ALWAYS)
+    private LocalDateTime plannedEndAt;
+    @com.baomidou.mybatisplus.annotation.TableField(updateStrategy = com.baomidou.mybatisplus.annotation.FieldStrategy.ALWAYS)
     private LocalDateTime appointmentAt;
     @com.baomidou.mybatisplus.annotation.TableField(updateStrategy = com.baomidou.mybatisplus.annotation.FieldStrategy.ALWAYS)
     private LocalDateTime appointmentEndAt;
     private Integer version;
-    private LocalDateTime expectedLoadingAt;
+    @com.baomidou.mybatisplus.annotation.TableField(updateStrategy = com.baomidou.mybatisplus.annotation.FieldStrategy.ALWAYS)
+    private LocalDateTime appointmentStartUtc;
+    @com.baomidou.mybatisplus.annotation.TableField(updateStrategy = com.baomidou.mybatisplus.annotation.FieldStrategy.ALWAYS)
+    private LocalDateTime appointmentEndUtc;
+    @com.baomidou.mybatisplus.annotation.TableField(updateStrategy = com.baomidou.mybatisplus.annotation.FieldStrategy.ALWAYS)
+    private String timezone;
+    private String originWarehouseId;
     private String appointmentStatus;
     @com.baomidou.mybatisplus.annotation.TableField(updateStrategy = com.baomidou.mybatisplus.annotation.FieldStrategy.ALWAYS)
     private String appointmentRemark;

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/entity/InboundFbaAppointmentItem.java

@@ -14,9 +14,15 @@ public class InboundFbaAppointmentItem {
     private Long id;
     private Long appointmentId;
     private String customerId;
-    private Long planId;
-    private Long lineId;
+    private String sourceKey;
+    @com.baomidou.mybatisplus.annotation.TableField(updateStrategy = com.baomidou.mybatisplus.annotation.FieldStrategy.ALWAYS)
+    private String sourceVersion;
+    @com.baomidou.mybatisplus.annotation.TableField(updateStrategy = com.baomidou.mybatisplus.annotation.FieldStrategy.ALWAYS)
+    private Integer packageCount;
+    private Boolean active;
+    @com.baomidou.mybatisplus.annotation.TableField(updateStrategy = com.baomidou.mybatisplus.annotation.FieldStrategy.ALWAYS)
     private Long orderId;
+    @com.baomidou.mybatisplus.annotation.TableField(updateStrategy = com.baomidou.mybatisplus.annotation.FieldStrategy.ALWAYS)
     private String inboundCode;
     private String fbaWarehouseCode;
     private LocalDateTime createdAt;

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/mapper/FbaAppointmentCommandMapper.java

@@ -0,0 +1,14 @@
+package com.baiyue.lastleg.inboundplan.mapper;
+
+import org.apache.ibatis.annotations.*;
+
+@Mapper
+public interface FbaAppointmentCommandMapper {
+    record Command(String requestHash,String responseJson) { }
+    @Select("SELECT request_hash AS requestHash,response_json AS responseJson FROM ll_fba_appointment_command WHERE command_key=#{key}")
+    Command find(@Param("key") String key);
+    @Insert("INSERT INTO ll_fba_appointment_command(command_key,request_hash,operation,operator_id,created_at) VALUES(#{key},#{hash},#{operation},#{operator},#{createdAt})")
+    int begin(@Param("key") String key,@Param("hash") String hash,@Param("operation") String operation,@Param("operator") String operator,@Param("createdAt") java.time.LocalDateTime createdAt);
+    @Update("UPDATE ll_fba_appointment_command SET appointment_no=#{appointmentNo},response_json=#{response} WHERE command_key=#{key} AND response_json IS NULL")
+    int finish(@Param("key") String key,@Param("appointmentNo") String appointmentNo,@Param("response") String response);
+}

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/mapper/InboundFbaAppointmentQueryMapper.java

@@ -2,6 +2,7 @@ package com.baiyue.lastleg.inboundplan.mapper;
 
 import com.baiyue.lastleg.inboundplan.model.FbaAppointmentLineSnapshot;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -9,21 +10,33 @@ import java.util.List;
 
 @Mapper
 public interface InboundFbaAppointmentQueryMapper {
+    @Select("<script>SELECT id FROM ll_order WHERE id IN <foreach collection='ids' item='id' open='(' separator=',' close=')'>#{id}</foreach> ORDER BY id FOR UPDATE</script>")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE, useCache = false)
+    List<Long> lockOrders(@Param("ids") List<Long> ids);
+
+    @Select("<script>SELECT COUNT(*) FROM ll_inbound_fba_appointment_item WHERE active=1 " +
+        "<if test='excludedId != null'>AND appointment_id&lt;&gt;#{excludedId} </if>AND (source_key IN " +
+        "<foreach collection='keys' item='key' open='(' separator=',' close=')'>#{key}</foreach> " +
+        "<if test='orderIds != null and !orderIds.isEmpty()'>OR order_id IN <foreach collection='orderIds' item='id' open='(' separator=',' close=')'>#{id}</foreach></if>)</script>")
+    long countActiveSources(@Param("keys") List<String> keys,@Param("orderIds") List<Long> orderIds,@Param("excludedId") Long excludedId);
+
+    @Select("<script>SELECT COUNT(*) FROM ll_order o "+com.baiyue.lastleg.appointmentplanning.AppointmentCoverageMapper.TRANSFER_JOIN+
+        " WHERE o.id IN <foreach collection='ids' item='id' open='(' separator=',' close=')'>#{id}</foreach> AND ("+
+        com.baiyue.lastleg.appointmentplanning.AppointmentCoverageMapper.SHIPMENT_MISSING+") </script>")
+    long countMissingShipmentReferences(@Param("ids") List<Long> ids);
     @Select("<script>" +
         "SELECT l.id AS lineId,l.plan_id AS planId,l.order_id AS orderId,l.inbound_code AS inboundCode," +
         "l.fba_warehouse_code AS fbaWarehouseCode,p.customer_id AS customerId " +
         "FROM ll_inbound_plan_line l JOIN ll_inbound_plan p ON p.id=l.plan_id " +
         "WHERE l.id IN " +
         "<foreach collection='lineIds' item='id' open='(' separator=',' close=')'>#{id}</foreach> " +
-        "ORDER BY l.id FOR UPDATE" +
+        "ORDER BY l.id" +
         "</script>")
-    List<FbaAppointmentLineSnapshot> lockLines(@Param("lineIds") List<Long> lineIds);
+    List<FbaAppointmentLineSnapshot> selectedLines(@Param("lineIds") List<Long> lineIds);
 
-    @Select("<script>SELECT COUNT(*) FROM ll_inbound_fba_appointment_item i " +
-        "JOIN ll_inbound_fba_appointment a ON a.id=i.appointment_id " +
-        "WHERE a.appointment_status NOT IN ('CANCELLED','FAILED') " +
-        "<if test='excludedId != null'>AND a.id&lt;&gt;#{excludedId} </if>AND i.line_id IN " +
-        "<foreach collection='lineIds' item='id' open='(' separator=',' close=')'>#{id}</foreach></script>")
+    @Select("<script>SELECT COUNT(*) FROM ll_inbound_fba_appointment_item i WHERE i.active=1 " +
+        "<if test='excludedId != null'>AND i.appointment_id&lt;&gt;#{excludedId} </if>AND i.order_id IN " +
+        "(SELECT l.order_id FROM ll_inbound_plan_line l WHERE l.id IN <foreach collection='lineIds' item='id' open='(' separator=',' close=')'>#{id}</foreach>)</script>")
     long countActiveAppointments(@Param("lineIds") List<Long> lineIds, @Param("excludedId") Long excludedId);
 
     @Select("""

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/mapper/InboundPlanMapper.java

@@ -24,9 +24,9 @@ public interface InboundPlanMapper extends BaseMapper<InboundPlan> {
         "<if test='q.fbaWarehouseCode != null and q.fbaWarehouseCode != \"\"'> AND l.fba_warehouse_code=#{q.fbaWarehouseCode}</if>" +
         "<if test='q.appointmentStatus != null and q.appointmentStatus != \"\" and q.appointmentStatus != \"NOT_APPOINTED\"'> " +
         "AND EXISTS (SELECT 1 FROM ll_inbound_fba_appointment_item ai JOIN ll_inbound_fba_appointment a ON a.id=ai.appointment_id " +
-        "WHERE ai.plan_id=p.id AND ai.customer_id=#{customerId} AND a.appointment_status=#{q.appointmentStatus})</if>" +
+        "WHERE ai.order_id=p.source_order_id AND ai.customer_id=#{customerId} AND a.appointment_status=#{q.appointmentStatus})</if>" +
         "<if test='q.appointmentStatus == \"NOT_APPOINTED\"'> AND NOT EXISTS (SELECT 1 FROM ll_inbound_fba_appointment_item ai " +
-        "WHERE ai.plan_id=p.id)</if>" +
+        "WHERE ai.order_id=p.source_order_id AND ai.customer_id=p.customer_id AND ai.active=1)</if>" +
         "<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>";
 
@@ -35,7 +35,7 @@ public interface InboundPlanMapper extends BaseMapper<InboundPlan> {
         "l.destination_warehouse_id,l.destination_warehouse_code,l.destination_warehouse_name,l.fba_warehouse_code," +
         "COALESCE(l.required_package_count,o.package_count,0) package_count,p.total_volume_cbm,p.pallet_count,p.status," +
         "COALESCE((SELECT a.appointment_status FROM ll_inbound_fba_appointment_item ai " +
-        "JOIN ll_inbound_fba_appointment a ON a.id=ai.appointment_id WHERE ai.plan_id=p.id " +
+        "JOIN ll_inbound_fba_appointment a ON a.id=ai.appointment_id WHERE ai.order_id=p.source_order_id AND ai.customer_id=p.customer_id " +
         "ORDER BY a.created_at DESC,a.id DESC LIMIT 1),'NOT_APPOINTED') appointment_status,p.created_at,p.updated_at" +
         PAGE_FROM + " ORDER BY p.created_at DESC,p.id DESC LIMIT #{limit} OFFSET #{offset}</script>")
     List<InboundPlanSummary> pageRows(@Param("customerId") String customerId,

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/mapper/InboundPlanQueryMapper.java

@@ -20,10 +20,10 @@ public interface InboundPlanQueryMapper {
         " JOIN ll_inbound_plan p ON p.id=l.plan_id" +
         " JOIN ll_order o ON o.id=l.order_id AND o.customer_id=p.customer_id" +
         "<if test='customerId != null and customerId != \"\"'> AND p.customer_id=#{customerId} AND o.customer_id=#{customerId}</if>" +
-        " LEFT JOIN ll_inbound_fba_appointment_item ai ON ai.line_id=l.id" +
+        " LEFT JOIN ll_inbound_fba_appointment_item ai ON ai.order_id=l.order_id AND ai.customer_id=p.customer_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 ai2.customer_id=p.customer_id" +
+        " WHERE ai2.order_id=l.order_id AND ai2.customer_id=p.customer_id AND ai2.fba_warehouse_code=l.fba_warehouse_code" +
         " ORDER BY a2.created_at DESC,ai2.id DESC LIMIT 1)" +
         " LEFT JOIN ll_inbound_fba_appointment a ON a.id=ai.appointment_id" +
         " WHERE 1=1" +
@@ -35,7 +35,7 @@ public interface InboundPlanQueryMapper {
         "<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>" +
+        "<choose><when test='q.appointmentStatus == \"UNAPPOINTED\"'> AND (ai.id IS NULL OR ai.active=0)</when>" +
         "<when test='q.appointmentStatus != null and q.appointmentStatus != \"\"'> AND a.appointment_status=#{q.appointmentStatus}</when></choose>" +
         "<choose><when test='q.dispatchStatus == \"SCHEDULED\"'> AND " + SCHEDULED_DISPATCH + "</when>" +
         "<when test='q.dispatchStatus == \"UNSCHEDULED\"'> AND NOT " + SCHEDULED_DISPATCH + "</when></choose>" +
@@ -57,7 +57,7 @@ public interface InboundPlanQueryMapper {
         "l.planned_pallet_count palletCount,p.assigned_flag assigned,p.merge_required mergeAllowed," +
         "p.urgent_flag urgent,p.status status,a.appointment_no appointmentNo," +
         "a.appointment_status appointmentStatus,a.appointment_at appointmentAt," +
-        "a.expected_loading_at expectedLoadingAt," +
+        "NULL expectedLoadingAt," +
         "CASE WHEN " + SCHEDULED_DISPATCH +
         " THEN 'SCHEDULED' ELSE 'UNSCHEDULED' END dispatchStatus,p.created_at createdAt,p.version version" +
         FROM_AND_FILTER + " ORDER BY p.created_at DESC,l.id DESC LIMIT #{limit} OFFSET #{offset}</script>")

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/InboundFbaAppointmentService.java

@@ -2,274 +2,230 @@ package com.baiyue.lastleg.inboundplan.service;
 
 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;
-import com.baiyue.lastleg.inboundplan.mapper.InboundFbaAppointmentMapper;
-import com.baiyue.lastleg.inboundplan.mapper.InboundFbaAppointmentQueryMapper;
-import com.baiyue.lastleg.inboundplan.model.FbaAppointmentLineSnapshot;
+import com.baiyue.lastleg.inboundplan.dto.*;
+import com.baiyue.lastleg.inboundplan.entity.*;
+import com.baiyue.lastleg.inboundplan.mapper.*;
 import com.baiyue.lastleg.inboundplan.model.FbaAppointmentStatus;
+import com.baiyue.lastleg.appointmentplanning.*;
+import com.baiyue.common.core.api.PageResult;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.annotation.Resource;
-import org.springframework.http.HttpStatus;
 import org.springframework.dao.DuplicateKeyException;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.server.ResponseStatusException;
-
-import java.time.LocalDateTime;
-import java.time.LocalDate;
+import java.time.*;
 import java.time.temporal.ChronoUnit;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 @Service
 public class InboundFbaAppointmentService {
     @Resource private InboundFbaAppointmentMapper appointmentMapper;
     @Resource private InboundFbaAppointmentItemMapper itemMapper;
     @Resource private InboundFbaAppointmentQueryMapper queryMapper;
+    @Resource private FbaAppointmentCommandMapper commands;
+    @Resource private AppointmentSourceService sources;
+    @Resource private AppointmentBatchPreviewMapper flags;
+    @Resource private ObjectMapper json;
 
-    /** A bounded calendar read uses two batch queries, never one detail query per appointment. */
-    @Transactional(readOnly = true)
-    public List<FbaAppointmentResponse> calendar(LocalDate from, LocalDate to) {
-        if (from == null || to == null || !to.isAfter(from) || ChronoUnit.DAYS.between(from, to) > 42) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "日历查询范围必须为 1 至 42 天");
-        }
-        List<InboundFbaAppointment> appointments = appointmentMapper.selectList(
-            new LambdaQueryWrapper<InboundFbaAppointment>()
-                .ge(InboundFbaAppointment::getAppointmentAt, from.atStartOfDay())
-                .lt(InboundFbaAppointment::getAppointmentAt, to.atStartOfDay())
-                .orderByAsc(InboundFbaAppointment::getAppointmentAt, InboundFbaAppointment::getId));
-        if (appointments.isEmpty()) return List.of();
-        var groupedItems = itemMapper.selectList(new LambdaQueryWrapper<InboundFbaAppointmentItem>()
-                .in(InboundFbaAppointmentItem::getAppointmentId,
-                    appointments.stream().map(InboundFbaAppointment::getId).toList())
-                .orderByAsc(InboundFbaAppointmentItem::getLineId))
-            .stream().collect(java.util.stream.Collectors.groupingBy(InboundFbaAppointmentItem::getAppointmentId));
-        return appointments.stream().map(appointment -> response(appointment,
-            groupedItems.getOrDefault(appointment.getId(), List.of()))).toList();
+    @Transactional(readOnly=true)
+    public List<FbaAppointmentResponse> calendar(LocalDate from,LocalDate to) {
+        if(from==null || to==null || !to.isAfter(from) || ChronoUnit.DAYS.between(from,to)>42) throw bad("日历查询范围必须为1至42天");
+        var query=new LambdaQueryWrapper<InboundFbaAppointment>()
+            .notIn(InboundFbaAppointment::getAppointmentStatus,List.of("CANCELLED","FAILED"))
+            .apply("COALESCE(appointment_at,planned_at,planned_date)>={0} AND COALESCE(appointment_at,planned_at,planned_date)<{1}",from.atStartOfDay(),to.atStartOfDay())
+            .orderByAsc(InboundFbaAppointment::getId);
+        return responses(appointmentMapper.selectList(query));
+    }
+    @Transactional(readOnly=true)
+    public PageResult<FbaAppointmentResponse> unscheduled(int page,int size) {
+        if(page<1 || size<1 || size>100) throw bad("分页参数无效");
+        var query=new LambdaQueryWrapper<InboundFbaAppointment>()
+            .isNull(InboundFbaAppointment::getAppointmentAt).isNull(InboundFbaAppointment::getPlannedAt)
+            .isNull(InboundFbaAppointment::getPlannedDate)
+            .notIn(InboundFbaAppointment::getAppointmentStatus,List.of("CANCELLED","FAILED"));
+        long total=appointmentMapper.selectCount(query);
+        var rows=appointmentMapper.selectList(query.orderByDesc(InboundFbaAppointment::getCreatedAt)
+            .last("LIMIT "+size+" OFFSET "+(long)(page-1)*size));
+        return new PageResult<>(responses(rows),page,size,total,(total+size-1)/size);
     }
 
-    @Transactional(isolation = org.springframework.transaction.annotation.Isolation.READ_COMMITTED)
-    public FbaAppointmentResponse batchCreate(String operatorId,
-                                               BatchFbaAppointmentRequest request) {
-        List<Long> lineIds = List.copyOf(request.lineIds());
-        if (new HashSet<>(lineIds).size() != lineIds.size()) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Selected inbound lines contain duplicates");
-        }
-        String appointmentNo = requiredTrimmed(request.appointmentNo(), "Appointment number is required");
-        String status = normalizeStatus(request.appointmentStatus());
-        String remark = trimToNull(request.appointmentRemark());
-        validateWindow(request.appointmentAt(), request.appointmentEndAt());
-
-        InboundFbaAppointment existing = find(appointmentNo);
-        if (existing != null) {
-            return verifyReplay(existing, lineIds, request.appointmentAt(), request.expectedLoadingAt(), status, remark, request.appointmentEndAt());
-        }
-
-        List<FbaAppointmentLineSnapshot> lines = queryMapper.lockLines(lineIds);
-        if (lines.size() != lineIds.size()) {
-            throw new ResponseStatusException(HttpStatus.NOT_FOUND,
-                "所选入仓明细不存在，请刷新后重试");
-        }
-        String fbaWarehouseCode = commonFbaWarehouse(lines);
-
-        // The row locks serialize concurrent submissions selecting the same inbound lines.
-        existing = find(appointmentNo);
-        if (existing != null) {
-            return verifyReplay(existing, lineIds, request.appointmentAt(), request.expectedLoadingAt(), status, remark, request.appointmentEndAt());
-        }
-
-        if (queryMapper.countActiveAppointments(lineIds, null) > 0) {
-            throw new ResponseStatusException(HttpStatus.CONFLICT, "所选货物已有有效预约，请编辑原预约或先取消");
-        }
-
-        LocalDateTime now = LocalDateTime.now();
-        InboundFbaAppointment appointment = new InboundFbaAppointment();
+    @Transactional(isolation=org.springframework.transaction.annotation.Isolation.READ_COMMITTED)
+    public FbaAppointmentResponse batchCreate(String operatorId,BatchFbaAppointmentRequest request) {
+        return command("CREATE_FROM_LINES",operatorId,request.idempotencyKey(),request,()->{
+            var ids=List.copyOf(request.lineIds());
+            if(ids.isEmpty() || ids.size()>100 || new HashSet<>(ids).size()!=ids.size()) throw bad("请选择不重复的入仓明细，每次最多100条");
+            var lines=queryMapper.selectedLines(ids);
+            if(lines.size()!=ids.size()) throw missing();
+            var refs=sources.canonicalOrders(lines.stream().map(line->new AppointmentExternalSourceGateway.OrderRef(line.customerId(),line.orderId())).distinct().toList());
+            return create(operatorId,refs,request.originWarehouseId(),request.fbaWarehouseCode(),request.details());
+        });
+    }
+    @Transactional(isolation=org.springframework.transaction.annotation.Isolation.READ_COMMITTED)
+    public FbaAppointmentResponse createFromSources(String operatorId,SourceFbaAppointmentRequest request) {
+        return command("CREATE_FROM_SOURCES",operatorId,request.idempotencyKey(),request,()->create(operatorId,request.sources(),request.originWarehouseId(),request.fbaWarehouseCode(),request.details()));
+    }
+    private FbaAppointmentResponse create(String operator,List<AppointmentCoverageService.SourceRef> refs,String expectedOrigin,String expectedDestination,FbaAppointmentDetails details) {
+        var resolved=resolveForWrite(refs,null);
+        var group=group(resolved);
+        if(clean(expectedOrigin)==null || clean(expectedDestination)==null) throw bad("请选择接仓点和目的仓后重新核对货物");
+        if(!Objects.equals(group.originWarehouseId(),expectedOrigin) || !Objects.equals(group.destinationKey(),"FBA:"+expectedDestination)) throw conflict("接仓点或目的仓已变化，请重新核对预约货物");
+        var appointment=new InboundFbaAppointment();
         appointment.setId(IdWorker.getId());
-        appointment.setAppointmentNo(appointmentNo);
-        appointment.setAppointmentAt(request.appointmentAt());
-        appointment.setAppointmentEndAt(request.appointmentEndAt());
-        appointment.setVersion(0);
-        appointment.setExpectedLoadingAt(request.expectedLoadingAt());
-        appointment.setAppointmentStatus(status);
-        appointment.setAppointmentRemark(remark);
-        appointment.setFbaWarehouseCode(fbaWarehouseCode);
-        appointment.setSelectedCount(lines.size());
-        appointment.setCreatedBy(trimToNull(operatorId));
-        appointment.setCreatedAt(now);
-        appointment.setUpdatedAt(now);
-        try {
-            appointmentMapper.insert(appointment);
-        } catch (DuplicateKeyException exception) {
-            InboundFbaAppointment concurrent = find(appointmentNo);
-            if (concurrent != null) {
-                return verifyReplay(concurrent, lineIds, request.appointmentAt(), request.expectedLoadingAt(), status, remark, request.appointmentEndAt());
-            }
-            throw exception;
-        }
-
-        for (FbaAppointmentLineSnapshot line : lines) {
-            InboundFbaAppointmentItem item = new InboundFbaAppointmentItem();
-            item.setId(IdWorker.getId());
-            item.setAppointmentId(appointment.getId());
-            item.setCustomerId(line.customerId());
-            item.setPlanId(line.planId());
-            item.setLineId(line.lineId());
-            item.setOrderId(line.orderId());
-            item.setInboundCode(line.inboundCode());
-            item.setFbaWarehouseCode(line.fbaWarehouseCode());
-            item.setCreatedAt(now);
-            itemMapper.insert(item);
-        }
-        return response(appointment, items(appointment.getId()));
+        appointment.setAppointmentNo("AP-"+LocalDate.now(ZoneOffset.UTC).toString().replace("-","")+"-"+UUID.randomUUID().toString().replace("-","").substring(0,12).toUpperCase(Locale.ROOT));
+        appointment.setOriginWarehouseId(group.originWarehouseId());
+        appointment.setFbaWarehouseCode(resolved.get(0).destinationWarehouseCode());
+        appointment.setSelectedCount(resolved.size());appointment.setVersion(0);
+        appointment.setCreatedBy(operator);appointment.setCreatedAt(now());appointment.setUpdatedAt(appointment.getCreatedAt());
+        apply(appointment,details,resolved);
+        if(Set.of("FAILED","CANCELLED").contains(appointment.getAppointmentStatus())) throw bad("新安排请先保存待确认或登记已取得的正式确认");
+        try {appointmentMapper.insert(appointment);}
+        catch(DuplicateKeyException duplicate){throw conflict("该目的仓的外部约号已有记录，请继续原预约");}
+        writeItems(appointment,resolved,List.of());
+        return response(appointment,items(appointment.getId()));
     }
 
-    @Transactional(readOnly = true)
+    @Transactional(readOnly=true)
     public FbaAppointmentResponse detail(String appointmentNo) {
-        InboundFbaAppointment appointment = find(requiredTrimmed(appointmentNo, "Appointment number is required"));
-        if (appointment == null) {
-            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "FBA appointment not found");
-        }
-        return response(appointment, items(appointment.getId()));
+        var appointment=find(appointmentNo,false);if(appointment==null) throw missing();
+        return response(appointment,items(appointment.getId()));
     }
-
-    @Transactional(isolation = org.springframework.transaction.annotation.Isolation.READ_COMMITTED)
-    public FbaAppointmentResponse update(String appointmentNo,
-                                         UpdateFbaAppointmentRequest request) {
-        InboundFbaAppointment appointment = find(requiredTrimmed(appointmentNo, "Appointment number is required"));
-        if (appointment == null) {
-            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "FBA appointment not found");
-        }
-        String status = normalizeStatus(request.appointmentStatus());
-        validateWindow(request.appointmentAt(), request.appointmentEndAt());
-        if (request.version() == null || !Objects.equals(appointment.getVersion(), request.version())) {
-            throw new ResponseStatusException(HttpStatus.CONFLICT, "预约已被其他人修改，请重新打开后再保存");
-        }
-        List<Long> lineIds = items(appointment.getId()).stream().map(InboundFbaAppointmentItem::getLineId).sorted().toList();
-        if (!lineIds.isEmpty()) {
-            queryMapper.lockLines(lineIds);
-            if (!Set.of("FAILED", "CANCELLED").contains(status)
-                && queryMapper.countActiveAppointments(lineIds, appointment.getId()) > 0) {
-                throw new ResponseStatusException(HttpStatus.CONFLICT, "所选货物已有其他有效预约，不能恢复当前预约");
+    @Transactional(isolation=org.springframework.transaction.annotation.Isolation.READ_COMMITTED)
+    public FbaAppointmentResponse update(String operatorId,String appointmentNo,UpdateFbaAppointmentRequest request) {
+        return command("UPDATE:"+appointmentNo,operatorId,request.idempotencyKey(),request,()->{
+            var appointment=find(appointmentNo,true);if(appointment==null) throw missing();
+            if(!Objects.equals(appointment.getVersion(),request.version())) throw conflict("预约已更新，请重新读取后操作");
+            if(queryMapper.countActiveDispatches(appointment.getId())>0) throw conflict("已关联有效排车，请先核对并处理运输安排后再改约");
+            var current=items(appointment.getId());
+            String status=status(request.details().appointmentStatus());
+            if(Set.of("FAILED","CANCELLED").contains(status)) {
+                if(clean(request.details().appointmentRemark())==null) throw bad("取消或未约成时请填写原因");
+                // Keep the last planned and confirmed times as historical facts.
+                appointment.setAppointmentStatus(status);appointment.setAppointmentRemark(request.details().appointmentRemark().trim());
+                current.forEach(item->{item.setActive(false);itemMapper.updateById(item);});
+            } else {
+                var refs=current.stream().map(item->new AppointmentCoverageService.SourceRef(item.getCustomerId(),item.getSourceKey(),"FBA:"+appointment.getFbaWarehouseCode())).toList();
+                var resolved=resolveForWrite(refs,appointment.getId());
+                if(!Objects.equals(group(resolved).originWarehouseId(),appointment.getOriginWarehouseId())) throw conflict("接仓点已变化，请重新核对安排");
+                if("SUCCESS".equals(appointment.getAppointmentStatus()) && !"SUCCESS".equals(status)) throw bad("已确认预约不能直接退回待确认，请记录取消原因后重新安排");
+                apply(appointment,request.details(),resolved);
+                writeItems(appointment,resolved,current);
             }
+            appointment.setVersion(request.version()+1);appointment.setUpdatedAt(now());
+            if(appointmentMapper.update(appointment,new LambdaQueryWrapper<InboundFbaAppointment>().eq(InboundFbaAppointment::getId,appointment.getId()).eq(InboundFbaAppointment::getVersion,request.version()))!=1) throw conflict("预约版本已变化");
+            return response(appointment,items(appointment.getId()));
+        });
+    }
+    @Transactional(isolation=org.springframework.transaction.annotation.Isolation.READ_COMMITTED)
+    public void delete(String operatorId,String appointmentNo,int version) {
+        command("CANCEL:"+appointmentNo,operatorId,"CANCEL:"+appointmentNo+":"+version,version,()->{
+            var appointment=find(appointmentNo,true);if(appointment==null) throw missing();
+            if(!Objects.equals(appointment.getVersion(),version)) throw conflict("预约已更新，请重新读取后操作");
+            if(queryMapper.countActiveDispatches(appointment.getId())>0) throw conflict("预约货物已关联排车，不允许取消，请先处理关联排车");
+            appointment.setAppointmentStatus("CANCELLED");appointment.setAppointmentRemark("操作员取消预约安排");
+            appointment.setVersion(version+1);appointment.setUpdatedAt(now());appointmentMapper.updateById(appointment);
+            var rows=items(appointment.getId());rows.forEach(item->{item.setActive(false);itemMapper.updateById(item);});
+            return response(appointment,rows);
+        });
+    }
+
+    private List<AppointmentSourceService.Source> resolveForWrite(List<AppointmentCoverageService.SourceRef> refs,Long excludedId) {
+        sources.lockForWrite(refs);
+        var resolved=sources.resolveBatch(refs);
+        var ids=resolved.stream().map(AppointmentSourceService.Source::orderId).filter(Objects::nonNull).distinct().sorted().toList();
+        if(!ids.isEmpty()) {
+            if(queryMapper.lockOrders(ids).size()!=ids.size()) throw conflict("货源已变化，请重新查询");
+            // Re-read after acquiring row locks; a pre-lock snapshot must not authorize a write.
+            resolved=sources.resolveBatch(refs);
+            var locked=Set.copyOf(ids);
+            if(resolved.stream().map(AppointmentSourceService.Source::orderId).filter(Objects::nonNull).anyMatch(id->!locked.contains(id))) throw conflict("来货关联已变化，请重新提交安排");
+            var states=flags.flags(ids);
+            if(states.size()!=ids.size() || states.stream().anyMatch(s->s.detained() || s.mixedDestinations())) throw conflict("货物暂扣或含多个目的地，请先核对");
         }
-        appointment.setAppointmentAt(request.appointmentAt());
-        appointment.setExpectedLoadingAt(request.expectedLoadingAt());
-        appointment.setAppointmentStatus(status);
-        appointment.setAppointmentEndAt(request.appointmentEndAt());
-        appointment.setVersion(request.version() + 1);
-        appointment.setAppointmentRemark(trimToNull(request.appointmentRemark()));
-        appointment.setUpdatedAt(LocalDateTime.now());
-        if (appointmentMapper.update(appointment, new LambdaQueryWrapper<InboundFbaAppointment>()
-            .eq(InboundFbaAppointment::getId, appointment.getId())
-            .eq(InboundFbaAppointment::getVersion, request.version())) != 1) {
-            throw new ResponseStatusException(HttpStatus.CONFLICT, "预约已被其他人修改，请重新打开后再保存");
-        }
-        return response(appointment, items(appointment.getId()));
+        if(resolved.stream().anyMatch(s->!s.canFollowup())) throw conflict("所选来源不再具备安排资格");
+        if(queryMapper.countActiveSources(resolved.stream().map(AppointmentSourceService.Source::sourceKey).toList(),ids,excludedId)>0) throw conflict("所选货物已有有效预约安排，请继续原单");
+        return resolved;
     }
-
-    @Transactional(isolation = org.springframework.transaction.annotation.Isolation.READ_COMMITTED)
-    public void delete(String appointmentNo, int version) {
-        InboundFbaAppointment appointment = find(requiredTrimmed(appointmentNo, "预约编号不能为空"));
-        if (appointment == null) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "预约不存在");
-        List<Long> lineIds = items(appointment.getId()).stream().map(InboundFbaAppointmentItem::getLineId).sorted().toList();
-        if (!lineIds.isEmpty()) queryMapper.lockLines(lineIds);
-        if (queryMapper.countActiveDispatches(appointment.getId()) > 0) {
-            throw new ResponseStatusException(HttpStatus.CONFLICT, "预约货物已关联排车，不允许删除，请先处理关联排车");
-        }
-        if (appointmentMapper.delete(new LambdaQueryWrapper<InboundFbaAppointment>()
-            .eq(InboundFbaAppointment::getId, appointment.getId())
-            .eq(InboundFbaAppointment::getVersion, version)) != 1) {
-            throw new ResponseStatusException(HttpStatus.CONFLICT, "预约已被其他人修改，请刷新后重试");
-        }
-        itemMapper.delete(new LambdaQueryWrapper<InboundFbaAppointmentItem>()
-            .eq(InboundFbaAppointmentItem::getAppointmentId, appointment.getId()));
+    private AppointmentPlanningPolicy.Group group(List<AppointmentSourceService.Source> rows) {
+        try { return AppointmentPlanningPolicy.group(rows.stream().map(s->new AppointmentPlanningPolicy.Cargo(s.sourceKey(),s.customerId(),s.originWarehouseId(),s.destinationKey(),"US","US",s.packages(),null,null,s.canFollowup(),String.join("；",s.blockReasons()))).toList()); }
+        catch(IllegalArgumentException error) {throw bad(error.getMessage());}
     }
-
-    private FbaAppointmentResponse verifyReplay(InboundFbaAppointment existing, List<Long> requestedLineIds,
-                                                LocalDateTime appointmentAt, LocalDateTime expectedLoadingAt,
-                                                String status, String remark, LocalDateTime appointmentEndAt) {
-        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.getAppointmentEndAt(), appointmentEndAt)
-            || !Objects.equals(existing.getExpectedLoadingAt(), expectedLoadingAt)
-            || !Objects.equals(existing.getAppointmentStatus(), status)
-            || !Objects.equals(existing.getAppointmentRemark(), remark)
-            || existingLineIds.size() != requestedLineIds.size()
-            || !existingLineIds.equals(new HashSet<>(requestedLineIds))) {
-            throw new ResponseStatusException(HttpStatus.CONFLICT,
-                "Appointment number already exists with different appointment data");
-        }
-        return response(existing, existingItems);
-    }
-
-    private String commonFbaWarehouse(List<FbaAppointmentLineSnapshot> lines) {
-        List<String> warehouses = lines.stream().map(FbaAppointmentLineSnapshot::fbaWarehouseCode)
-            .map(InboundFbaAppointmentService::trimToNull).toList();
-        if (warehouses.stream().anyMatch(Objects::isNull) || new HashSet<>(warehouses).size() != 1) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
-                "Selected inbound lines must belong to the same non-empty FBA warehouse");
-        }
-        return warehouses.get(0);
-    }
-
-    private InboundFbaAppointment find(String appointmentNo) {
-        LambdaQueryWrapper<InboundFbaAppointment> wrapper = new LambdaQueryWrapper<InboundFbaAppointment>()
-            .eq(InboundFbaAppointment::getAppointmentNo, appointmentNo);
-        return appointmentMapper.selectOne(wrapper);
-    }
-
-    private List<InboundFbaAppointmentItem> items(Long appointmentId) {
-        return itemMapper.selectList(new LambdaQueryWrapper<InboundFbaAppointmentItem>()
-            .eq(InboundFbaAppointmentItem::getAppointmentId, appointmentId)
-            .orderByAsc(InboundFbaAppointmentItem::getLineId));
-    }
-
-    private FbaAppointmentResponse response(InboundFbaAppointment appointment,
-                                            List<InboundFbaAppointmentItem> items) {
-        return new FbaAppointmentResponse(appointment.getId(),
-            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(),
-                item.getLineId(), item.getOrderId(), item.getInboundCode(), item.getFbaWarehouseCode(), item.getCustomerId())).toList(),
-            appointment.getAppointmentEndAt(), appointment.getVersion());
-    }
-
-    private static void validateWindow(LocalDateTime start, LocalDateTime end) {
-        if (start == null || (end != null && !end.isAfter(start))) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "预约结束时间必须晚于开始时间");
+    private void apply(InboundFbaAppointment appointment,FbaAppointmentDetails details,List<AppointmentSourceService.Source> rows) {
+        String status=status(details.appointmentStatus());
+        String timezone=sources.destinationTimezone(appointment.getFbaWarehouseCode());
+        if(details.plannedAt()==null && details.plannedEndAt()!=null || details.plannedAt()!=null && details.plannedEndAt()!=null && !details.plannedEndAt().isAfter(details.plannedAt())) throw bad("计划结束时间必须晚于开始时间");
+        if(details.plannedDate()!=null && details.plannedAt()!=null && !details.plannedDate().equals(details.plannedAt().toLocalDate())) throw bad("计划日期与开始时段不一致，请核对");
+        appointment.setPlannedDate(details.plannedAt()==null?details.plannedDate():details.plannedAt().toLocalDate());
+        appointment.setPlannedAt(details.plannedAt());appointment.setPlannedEndAt(details.plannedEndAt());appointment.setTimezone(timezone);
+        appointment.setAppointmentStatus(status);appointment.setAppointmentRemark(clean(details.appointmentRemark()));
+        if("SUCCESS".equals(status)) {
+            if(clean(details.confirmationNo())==null || details.appointmentAt()==null) throw bad("登记对方确认时请填写外部约号和确认时间");
+            var ids=rows.stream().map(AppointmentSourceService.Source::orderId).filter(Objects::nonNull).distinct().toList();
+            if(ids.size()!=rows.size() || rows.stream().anyMatch(s->s.packages()==null || s.packages()<=0) || queryMapper.countMissingShipmentReferences(ids)>0) throw bad("正式确认前请核实货量并补齐真实FBA货件号或追踪号");
+            final AppointmentTimePolicy.Window window;
+            try {window=AppointmentTimePolicy.resolve(details.appointmentAt(),details.appointmentEndAt(),timezone,offset(details.startOffset()),offset(details.endOffset()));}
+            catch(IllegalArgumentException | DateTimeException error) {throw bad(error.getMessage());}
+            appointment.setConfirmationNo(details.confirmationNo().trim());appointment.setAppointmentAt(details.appointmentAt());appointment.setAppointmentEndAt(details.appointmentEndAt());
+            appointment.setAppointmentStartUtc(LocalDateTime.ofInstant(window.start(),ZoneOffset.UTC));appointment.setAppointmentEndUtc(window.end()==null?null:LocalDateTime.ofInstant(window.end(),ZoneOffset.UTC));
+        } else {
+            if(clean(details.confirmationNo())!=null || details.appointmentAt()!=null || details.appointmentEndAt()!=null) throw bad("待确认安排请填写计划时间；取得对方确认后再登记外部约号和确认时段");
+            appointment.setConfirmationNo(null);appointment.setAppointmentAt(null);appointment.setAppointmentEndAt(null);appointment.setAppointmentStartUtc(null);appointment.setAppointmentEndUtc(null);
         }
     }
-
-    private static String normalizeStatus(String value) {
-        String normalized = requiredTrimmed(value, "Appointment status is required").toUpperCase(Locale.ROOT);
-        try {
-            return FbaAppointmentStatus.valueOf(normalized).name();
-        } catch (IllegalArgumentException exception) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
-                "Appointment status must be PENDING, SUCCESS, FAILED or CANCELLED");
+    private void writeItems(InboundFbaAppointment appointment,List<AppointmentSourceService.Source> rows,List<InboundFbaAppointmentItem> previous) {
+        var existing=previous.stream().collect(Collectors.toMap(InboundFbaAppointmentItem::getSourceKey,item->item));
+        for(var source:rows) {
+            var item=existing.get(source.sourceKey());boolean fresh=item==null;
+            if(fresh){item=new InboundFbaAppointmentItem();item.setId(IdWorker.getId());item.setAppointmentId(appointment.getId());item.setCreatedAt(now());}
+            item.setSourceKey(source.sourceKey());item.setSourceVersion(source.sourceVersion());item.setCustomerId(source.customerId());item.setOrderId(source.orderId());item.setInboundCode(source.inboundCode());
+            item.setFbaWarehouseCode(source.destinationWarehouseCode());item.setPackageCount(source.packages());item.setActive(true);
+            try {if(fresh)itemMapper.insert(item);else itemMapper.updateById(item);}
+            catch(DuplicateKeyException duplicate){throw conflict("所选货物刚被其他安排占用，请刷新后核对");}
         }
     }
-
-    private static String requiredTrimmed(String value, String message) {
-        String normalized = trimToNull(value);
-        if (normalized == null) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, message);
-        }
-        return normalized;
+    private FbaAppointmentResponse command(String operation,String operator,String key,Object request,Supplier<FbaAppointmentResponse> action) {
+        if(clean(operator)==null || clean(key)==null || key.length()>128) throw bad("缺少操作人或有效请求标识");
+        final String hash;
+        try {hash=HexFormat.of().formatHex(java.security.MessageDigest.getInstance("SHA-256").digest((operation+"\n"+operator+"\n"+json.writeValueAsString(request)).getBytes(java.nio.charset.StandardCharsets.UTF_8)));}
+        catch(Exception error){throw new IllegalStateException("无法记录预约命令",error);}
+        var existing=commands.find(key);
+        if(existing!=null)return replay(existing,hash);
+        try {commands.begin(key,hash,operation,operator,now());}
+        catch(DuplicateKeyException duplicate){return replay(commands.find(key),hash);}
+        var response=action.get();
+        try {if(commands.finish(key,response.appointmentNo(),json.writeValueAsString(response))!=1)throw conflict("预约命令结果未能保存");}
+        catch(com.fasterxml.jackson.core.JsonProcessingException error){throw new IllegalStateException("无法保存预约命令结果",error);}
+        return response;
     }
-
-    private static String trimToNull(String value) {
-        return value == null || value.isBlank() ? null : value.trim();
+    private FbaAppointmentResponse replay(FbaAppointmentCommandMapper.Command value,String hash) {
+        if(value==null || !hash.equals(value.requestHash()) || value.responseJson()==null)throw conflict("重复请求内容不一致或结果尚未就绪，请重新核对");
+        try {return json.readValue(value.responseJson(),FbaAppointmentResponse.class);}
+        catch(com.fasterxml.jackson.core.JsonProcessingException error){throw new IllegalStateException("预约命令记录不可读",error);}
     }
+    private InboundFbaAppointment find(String number,boolean lock) {
+        if(clean(number)==null)throw bad("预约单号不能为空");
+        var query=new LambdaQueryWrapper<InboundFbaAppointment>().eq(InboundFbaAppointment::getAppointmentNo,number.trim());if(lock)query.last("FOR UPDATE");return appointmentMapper.selectOne(query);
+    }
+    private List<InboundFbaAppointmentItem> items(Long id) {return itemMapper.selectList(new LambdaQueryWrapper<InboundFbaAppointmentItem>().eq(InboundFbaAppointmentItem::getAppointmentId,id).orderByAsc(InboundFbaAppointmentItem::getId));}
+    private List<FbaAppointmentResponse> responses(List<InboundFbaAppointment> rows) {
+        if(rows.isEmpty())return List.of();
+        var grouped=itemMapper.selectList(new LambdaQueryWrapper<InboundFbaAppointmentItem>().in(InboundFbaAppointmentItem::getAppointmentId,rows.stream().map(InboundFbaAppointment::getId).toList()).orderByAsc(InboundFbaAppointmentItem::getId)).stream().collect(Collectors.groupingBy(InboundFbaAppointmentItem::getAppointmentId));
+        return rows.stream().map(row->response(row,grouped.getOrDefault(row.getId(),List.of()))).toList();
+    }
+    private FbaAppointmentResponse response(InboundFbaAppointment row,List<InboundFbaAppointmentItem> items) {
+        return new FbaAppointmentResponse(row.getId(),row.getAppointmentNo(),row.getConfirmationNo(),row.getPlannedDate(),row.getPlannedAt(),row.getPlannedEndAt(),row.getAppointmentAt(),row.getAppointmentEndAt(),
+            utc(row.getAppointmentStartUtc()),utc(row.getAppointmentEndUtc()),row.getTimezone(),row.getAppointmentStatus(),row.getAppointmentRemark(),row.getOriginWarehouseId(),row.getFbaWarehouseCode(),row.getSelectedCount(),row.getCreatedBy(),row.getCreatedAt(),row.getUpdatedAt(),
+            items.stream().map(item->new FbaAppointmentResponse.Item(item.getId(),item.getSourceKey(),item.getSourceVersion(),item.getOrderId(),item.getInboundCode(),item.getFbaWarehouseCode(),item.getCustomerId(),item.getPackageCount())).toList(),row.getVersion());
+    }
+    private static String clean(String value){return value==null || value.isBlank()?null:value.trim();}
+    private static String status(String value){try{return FbaAppointmentStatus.valueOf(value.trim().toUpperCase(Locale.ROOT)).name();}catch(RuntimeException error){throw bad("请选择有效预约状态");}}
+    private static ZoneOffset offset(String value){return clean(value)==null?null:ZoneOffset.of(value);}
+    private static Instant utc(LocalDateTime value){return value==null?null:value.toInstant(ZoneOffset.UTC);}
+    private static LocalDateTime now(){return LocalDateTime.now(ZoneOffset.UTC).truncatedTo(ChronoUnit.MILLIS);}
+    private static ResponseStatusException bad(String message){return new ResponseStatusException(HttpStatus.BAD_REQUEST,message);}
+    private static ResponseStatusException conflict(String message){return new ResponseStatusException(HttpStatus.CONFLICT,message);}
+    private static ResponseStatusException missing(){return new ResponseStatusException(HttpStatus.NOT_FOUND,"预约或所选货物不存在");}
 }

lastleg-service/src/main/java/com/baiyue/lastleg/looseboard/service/LocalLooseboardService.java

@@ -407,6 +407,6 @@ public class LocalLooseboardService {
         return new ResponseStatusException(HttpStatus.CONFLICT, message);
     }
     private static ResponseStatusException notFound() {
-        return new ResponseStatusException(HttpStatus.NOT_FOUND, "Local looseboard order not found");
+        return new ResponseStatusException(HttpStatus.NOT_FOUND, "本土散板订单不存在或无权查看");
     }
 }