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

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

@@ -0,0 +1,29 @@
+package com.baiyue.lastleg.fleet.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baiyue.lastleg.looseboard.entity.LocalLooseboardOrder;
+import org.apache.ibatis.annotations.*;
+import java.util.Collection;
+import java.util.List;
+
+@Mapper
+public interface FleetLooseboardDemandMapper {
+    /** 分页读取未匹配且没有独立实物履约的客户散板需求。 */
+    @Select("<script>SELECT o.* FROM ll_local_looseboard_order o WHERE o.status='PENDING_ACCEPTANCE' AND o.lastleg_order_id IS NULL "
+        + "AND NOT EXISTS (SELECT 1 FROM ll_fleet_external_booking b WHERE b.customer_id=o.customer_id AND b.source_looseboard_order_id=o.id AND b.status!='CANCELLED') "
+        + "<if test='keyword != null and keyword != &quot;&quot;'>AND (o.order_no LIKE CONCAT('%',#{keyword},'%') OR o.origin LIKE CONCAT('%',#{keyword},'%') OR o.destination LIKE CONCAT('%',#{keyword},'%'))</if> "
+        + "ORDER BY o.created_at DESC,o.id DESC</script>")
+    Page<LocalLooseboardOrder> pending(Page<LocalLooseboardOrder> page,@Param("keyword") String keyword);
+    /** 原单锁内查询生效匹配，防止跨车次重复接单。 */
+    @Select("SELECT 1 FROM ll_fleet_external_booking WHERE customer_id=#{customer} AND source_looseboard_order_id=#{id} AND status!='CANCELLED' LIMIT 1 FOR UPDATE")
+    Integer active(@Param("customer") String customer,@Param("id") long id);
+    /** 保存预订不可变来源，取消后保留历史。 */
+    @Update("UPDATE ll_fleet_external_booking SET source_looseboard_order_id=#{id} WHERE id=#{booking} AND customer_id=#{customer} AND source_looseboard_order_id IS NULL")
+    int attach(@Param("booking") long booking,@Param("customer") String customer,@Param("id") long id);
+    /** 锁定当前预订对应的同客户原单。 */
+    @Select("SELECT o.* FROM ll_local_looseboard_order o JOIN ll_fleet_external_booking b ON b.source_looseboard_order_id=o.id AND b.customer_id=o.customer_id WHERE b.id=#{booking} AND b.customer_id=#{customer} FOR UPDATE")
+    LocalLooseboardOrder source(@Param("booking") long booking,@Param("customer") String customer);
+    /** 批量读取草稿或取消记录的原单编号。 */
+    @Select("<script>SELECT b.id AS booking_id,o.order_no AS business_order_no FROM ll_fleet_external_booking b JOIN ll_local_looseboard_order o ON o.id=b.source_looseboard_order_id AND o.customer_id=b.customer_id WHERE b.id IN <foreach collection='ids' item='id' open='(' separator=',' close=')'>#{id}</foreach></script>")
+    List<FleetPoolOrderLink> sourceNumbers(@Param("ids") Collection<Long> ids);
+}

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

@@ -0,0 +1,28 @@
+package com.baiyue.lastleg.fleet.business;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baiyue.lastleg.looseboard.entity.LocalLooseboardOrder;
+import com.baiyue.lastleg.looseboard.mapper.LocalLooseboardOrderMapper;
+import org.springframework.stereotype.Repository;
+import java.util.Collection;
+import java.util.List;
+
+@Repository
+public class FleetLooseboardDemandRepository {
+    private final FleetLooseboardDemandMapper demands;
+    private final LocalLooseboardOrderMapper orders;
+    /** 注入需求查询和原单仓储。 */
+    public FleetLooseboardDemandRepository(FleetLooseboardDemandMapper demands,LocalLooseboardOrderMapper orders) { this.demands=demands;this.orders=orders; }
+    /** 分页读取待匹配原单。 */
+    public Page<LocalLooseboardOrder> pending(int page,int size,String keyword) { return demands.pending(Page.of(page,size),keyword); }
+    /** 锁定客户原单。 */
+    public LocalLooseboardOrder lock(String customer,String number) { return orders.lockNo(customer,number); }
+    /** 核对生效匹配。 */
+    public boolean active(String customer,long id) { return demands.active(customer,id)!=null; }
+    /** 关联不可变来源。 */
+    public int attach(long booking,String customer,long id) { return demands.attach(booking,customer,id); }
+    /** 锁定匹配来源。 */
+    public LocalLooseboardOrder source(long booking,String customer) { return demands.source(booking,customer); }
+    /** 批量读取原单编号。 */
+    public List<FleetPoolOrderLink> sourceNumbers(Collection<Long> ids) { return demands.sourceNumbers(ids); }
+}

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

@@ -0,0 +1,52 @@
+package com.baiyue.lastleg.fleet.business;
+
+import com.baiyue.common.core.api.PageResult;
+import com.baiyue.lastleg.looseboard.entity.LocalLooseboardOrder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.server.ResponseStatusException;
+import org.springframework.http.HttpStatus;
+import java.util.Objects;
+
+@Service
+public class FleetLooseboardDemandService {
+    private final FleetLooseboardDemandRepository repository;
+    /** 注入原单需求仓储。 */
+    public FleetLooseboardDemandService(FleetLooseboardDemandRepository repository) { this.repository=repository; }
+    /** 已授权平台入口读取待匹配原单。 */
+    @Transactional(readOnly=true)
+    public PageResult<Demand> pending(int page,int size,String keyword) {
+        var rows=repository.pending(page,size,keyword);
+        return new PageResult<>(rows.getRecords().stream().map(Demand::from).toList(),rows.getCurrent(),rows.getSize(),rows.getTotal(),rows.getPages());
+    }
+    public record Demand(String orderNo,String customerId,long version,String origin,String destination,String productName,
+        Integer estimatedPalletCount,Integer packageCount,java.math.BigDecimal totalWeightKg,java.math.BigDecimal totalVolumeCbm,
+        String currency,String originContactName,String originContactPhone,String remark) {
+        /** 仅输出匹配所需资料，不泄露原单幂等键与请求哈希。 */
+        static Demand from(LocalLooseboardOrder o) { return new Demand(o.getOrderNo(),o.getCustomerId(),o.getVersion(),o.getOrigin(),o.getDestination(),o.getProductName(),o.getEstimatedPalletCount(),o.getPackageCount(),o.getTotalWeightKg(),o.getTotalVolumeCbm(),o.getCurrency(),o.getOriginContactName(),o.getOriginContactPhone(),o.getRemark()); }
+    }
+    /** 锁定原单并校验客户、版本与唯一匹配，不预留容量。 */
+    @Transactional(propagation=org.springframework.transaction.annotation.Propagation.MANDATORY)
+    public LocalLooseboardOrder prepare(String customer,String type,String number,Long version) {
+        if(number==null||number.isBlank()) { if(version!=null)throw conflict("来源版本必须与散板原单一起提交"); return null; }
+        if(!"LOCAL_LOOSEBOARD".equals(type))throw conflict("散板原单只能匹配本土散板承运");
+        var order=repository.lock(customer,number);
+        if(order==null||version==null||!Objects.equals(version,order.getVersion()))throw conflict("散板原单不存在或已变化，请刷新待匹配需求");
+        if(!"PENDING_ACCEPTANCE".equals(order.getStatus())||order.getLastlegOrderId()!=null||repository.active(customer,order.getId()))throw conflict("散板原单已有承运或独立履约，请核对原单");
+        return order;
+    }
+    /** 原单锁保持到事务提交，跨车次匹配只允许成功一次。 */
+    @Transactional(propagation=org.springframework.transaction.annotation.Propagation.MANDATORY)
+    public void attach(long booking,LocalLooseboardOrder order) {
+        if(order!=null&&repository.attach(booking,order.getCustomerId(),order.getId())!=1)throw conflict("原单匹配失败，请刷新重试");
+    }
+    /** 匹配后禁止改写业务类型或替换来源，允许省略已有来源参数。 */
+    @Transactional(propagation=org.springframework.transaction.annotation.Propagation.MANDATORY)
+    public void validateEdit(long booking,String customer,String type,String number) {
+        var source=repository.source(booking,customer);
+        if(source!=null&&(!"LOCAL_LOOSEBOARD".equals(type)||number!=null&&!number.equals(source.getOrderNo())))throw conflict("已匹配散板原单不能替换，请取消登记后重新匹配");
+        if(source==null&&number!=null&&!number.isBlank())throw conflict("请从待匹配散板需求创建新的登记");
+    }
+    /** 返回业务冲突。 */
+    private static ResponseStatusException conflict(String message) { return new ResponseStatusException(HttpStatus.CONFLICT,message); }
+}

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

@@ -20,6 +20,7 @@ import static com.baiyue.lastleg.fleet.business.FleetPoolOrderModels.*;
 /** Same-database bridge. Never creates inventory, publishes fees, or locks a parent trip. */
 @Service
 public class FleetPoolOrderBridge {
+    @jakarta.annotation.Resource private FleetLooseboardDemandRepository demands;
     private final FleetPoolOrderRepository repository;
     private final FleetPoolOrderNumberGenerator numbers;
     private final ObjectMapper json;
@@ -47,16 +48,20 @@ public class FleetPoolOrderBridge {
         validate(in);
         String hash=hash(in); var prior=repository.lockBooking(in.bookingId());
         if(prior!=null){if(!hash.equals(prior.getCreationRequestHash()))throw conflict("同一承运来源不能创建不同商业订单");return ref(prior);}
+        var source=demands.source(in.bookingId(),in.customerId());
+        if(source!=null&&(!"LOCAL_LOOSEBOARD".equals(in.businessType())||!"PENDING_ACCEPTANCE".equals(source.getStatus())||source.getLastlegOrderId()!=null))throw conflict("散板原单履约状态已变化");
         var now=LocalDateTime.now();var row=new FleetPoolOrderLink();
         row.setId(IdWorker.getId());row.setBookingId(in.bookingId());row.setBookingNo(in.bookingNo());
-        row.setCustomerId(in.customerId());row.setBusinessType(in.businessType());row.setBusinessOrderId(IdWorker.getId());
-        row.setBusinessOrderNo(numbers.next("US_TRUCK".equals(in.businessType())?"TRUCK":"LOOSEBOARD",in.destinationLabel(),row.getBusinessOrderId()));
+        row.setCustomerId(in.customerId());row.setBusinessType(in.businessType());row.setBusinessOrderId(source==null?IdWorker.getId():source.getId());
+        row.setBusinessOrderNo(source==null?numbers.next("US_TRUCK".equals(in.businessType())?"TRUCK":"LOOSEBOARD",in.destinationLabel(),row.getBusinessOrderId()):source.getOrderNo());
         row.setWarehouseId(in.warehouseId());row.setDestinationKey(in.destinationKey());
         row.setDeliveryMode(in.deliveryMode());row.setDeliveryInstructions(in.deliveryInstructions());
         row.setFulfillmentStage("WAITING_INBOUND");row.setStageOccurredAt(now);row.setRecordVersion(0L);
         row.setCreationRequestHash(hash);row.setCreatedBy(operator);row.setCreatedAt(now);row.setUpdatedAt(now);
         String transport=in.destinationKey().startsWith("FBA:")?"WAREHOUSE_TO_WAREHOUSE":"WAREHOUSE_TO_DOOR";
-        if("LOCAL_LOOSEBOARD".equals(in.businessType())) {
+        if(source!=null) {
+            source.setStatus("WAITING_INBOUND");source.setVersion(source.getVersion()+1);source.setUpdatedAt(now);repository.updateLoose(source);
+        } else if("LOCAL_LOOSEBOARD".equals(in.businessType())) {
             var order=new LocalLooseboardOrder();order.setId(row.getBusinessOrderId());order.setCustomerId(in.customerId());order.setOrderNo(row.getBusinessOrderNo());
             order.setTransportType(transport);
             // 货名与预计托数沿真实询价保存；不从数量推断打盘服务，也不预设取送时间。
@@ -79,7 +84,7 @@ public class FleetPoolOrderBridge {
             order.setRequestHash(hash);order.setCreatedBy(operator);order.setVersion(0L);order.setCreatedAt(now);order.setUpdatedAt(now);
             repository.insertTruck(order); // No simulated ll_us_truck_order_pallet rows.
         }
-        repository.insertLink(row);history(row,null,row.getFulfillmentStage(),operator,"确认承运并建立商业委托",now);
+        repository.insertLink(row);history(row,source==null?null:"PENDING_ACCEPTANCE",row.getFulfillmentStage(),operator,source==null?"确认承运并建立商业委托":"原单匹配车次并确认承运",now);
         return ref(row);
     }
     /** 锁定预订并关联唯一真实来货，不创建第二份实物来源。 */
@@ -177,6 +182,7 @@ public class FleetPoolOrderBridge {
     /** 批量读取预订的业务编号。 */
     public Map<Long,String> businessOrderNumbers(Collection<Long> ids) {
         if(ids==null||ids.isEmpty())return Map.of();var result=new HashMap<Long,String>();
+        demands.sourceNumbers(ids).forEach(row->result.put(row.getBookingId(),row.getBusinessOrderNo()));
         repository.bookings(ids).forEach(row->result.put(row.getBookingId(),row.getBusinessOrderNo()));return result;
     }
     static void validate(ConfirmedBooking in) {

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

@@ -38,7 +38,9 @@ public interface FleetPoolOrderMapper extends BaseMapper<FleetPoolOrderLink> {
     FleetPoolOrderLink lockIncoming(@Param("customerId") String customerId,@Param("no") String no);
     @Select("SELECT * FROM ll_fleet_pool_order_link WHERE customer_id=#{customerId} AND dispatch_no=#{no} ORDER BY id FOR UPDATE")
     List<FleetPoolOrderLink> lockDispatch(@Param("customerId") String customerId,@Param("no") String no);
-    @Select("SELECT COUNT(*) FROM ll_fleet_pool_order_link WHERE customer_id=#{customerId} AND business_type=#{type} AND business_order_id=#{id}")
+    /** 原单锁内使用当前读，避免等待匹配提交后仍按旧快照放行独立修改。 */
+    @Select("SELECT COALESCE((SELECT 1 FROM ll_fleet_pool_order_link WHERE customer_id=#{customerId} AND business_type=#{type} AND business_order_id=#{id} LIMIT 1 FOR UPDATE),0) + "
+        + "COALESCE((SELECT 1 FROM ll_fleet_external_booking WHERE customer_id=#{customerId} AND #{type}='LOCAL_LOOSEBOARD' AND source_looseboard_order_id=#{id} AND status!='CANCELLED' LIMIT 1 FOR UPDATE),0)")
     int linked(@Param("customerId") String customerId,@Param("type") String type,@Param("id") long id);
     @Select("SELECT COUNT(*) FROM ll_fleet_pool_order_link WHERE customer_id=#{customerId} AND incoming_no=#{no}")
     int linkedIncoming(@Param("customerId") String customerId,@Param("no") String no);

lastleg-service/src/main/java/com/baiyue/lastleg/fleet/trip/FleetCapacityOfferModels.java

@@ -36,7 +36,16 @@ public final class FleetCapacityOfferModels {
         @NotBlank @Pattern(regexp="SELF_DELIVERY|MANUAL_PICKUP_TO_WAREHOUSE") String deliveryMode,
         Instant estimatedArrivalAt,@Min(1) Integer expectedPalletCount,
         @NotNull @Valid FleetBookingModels.Cargo cargo,@Valid FleetQuoteCandidateModels.QuoteRef quoteRef,
-        @NotBlank @Size(min=8,max=128) String idempotencyKey) { }
+        @NotBlank @Size(min=8,max=128) String idempotencyKey,
+        @Size(max=64) String sourceOrderNo,@Min(0) Long sourceOrderVersion) {
+        /** 保留无原单人工登记的构造方式。 */
+        public InquiryWrite(Long tripRecordVersion,Long offerRecordVersion,Long recordVersion,Long customerId,
+            String businessType,String deliveryMode,Instant estimatedArrivalAt,Integer expectedPalletCount,
+            FleetBookingModels.Cargo cargo,FleetQuoteCandidateModels.QuoteRef quoteRef,String idempotencyKey) {
+            this(tripRecordVersion,offerRecordVersion,recordVersion,customerId,businessType,deliveryMode,
+                estimatedArrivalAt,expectedPalletCount,cargo,quoteRef,idempotencyKey,null,null);
+        }
+    }
     public record InquiryCommand(@NotNull @Min(0) Long tripRecordVersion,@NotNull @Min(0) Long offerRecordVersion,
         @NotNull @Min(0) Long recordVersion,@NotBlank @Size(min=8,max=128) String idempotencyKey,
         @Size(max=1000) String reason) { }

lastleg-service/src/main/java/com/baiyue/lastleg/fleet/trip/FleetCapacityOfferService.java

@@ -25,6 +25,7 @@ import java.util.*;
 
 @Service
 public class FleetCapacityOfferService {
+    @jakarta.annotation.Resource private com.baiyue.lastleg.fleet.business.FleetLooseboardDemandService demands;
     public static final String LIST="platform:fleet:capacity-offer:list", MANAGE="platform:fleet:capacity-offer:manage";
     private final FleetCapacityOfferMapper offers;
     private final FleetCapacityOfferCommandMapper commands;
@@ -50,6 +51,11 @@ public class FleetCapacityOfferService {
         this.offers=offers;this.commands=commands;this.trips=trips;this.bookings=bookings;this.bookingService=bookingService;
         this.reservations=reservations;this.execution=execution;this.customers=customers;this.orders=orders;this.json=json;this.clock=clock;
     }
+    /** 平台需求池分页读取客户已下的散板原单。 */
+    @Transactional(readOnly=true)
+    public PageResult<com.baiyue.lastleg.fleet.business.FleetLooseboardDemandService.Demand> pendingDemands(FleetCapacityOfferModels.InquiryQuery query) {
+        writePermission("inquiry-create");return demands.pending(query.page(),query.size(),query.keyword());
+    }
     @Transactional(readOnly=true,isolation=Isolation.REPEATABLE_READ)
     public PageResult<FleetCapacityOfferModels.Offer> page(FleetCapacityOfferModels.Query query){
         readPermission();
@@ -171,17 +177,20 @@ public class FleetCapacityOfferService {
         touch(row);var result=new FleetCapacityOfferModels.OfferResult(project(row,trip),false);
         saveCommand(trip,action,number,request.idempotencyKey(),request,result);return result;
     }
+    /** 同一事务登记意向及原单来源，确认前不占位。 */
     @Transactional
     public FleetCapacityOfferModels.InquiryResult createInquiry(String number,FleetCapacityOfferModels.InquiryWrite request){
         writePermission("inquiry-create");var initial=offer(number,false);var trip=trip(initial.getTripNo(),true);var row=offer(number,true);
         var replay=replay(trip,"INQUIRY_CREATE",number,request.idempotencyKey(),request,FleetCapacityOfferModels.InquiryResult.class);
         if(replay!=null)return replayed(replay);
         versions(trip,row,request.tripRecordVersion(),request.offerRecordVersion());requireInquiryOpen(row,trip);validateInquiry(trip,request);
+        var source=demands.prepare(request.customerId().toString(),request.businessType(),request.sourceOrderNo(),request.sourceOrderVersion());
         var created=bookingService.create(trip.getTripNo(),operator(),new FleetBookingModels.Create(trip.getRecordVersion(),request.customerId(),request.cargo(),"POOL:"+hash(Arrays.asList(number,request.idempotencyKey())),request.quoteRef()));
         if(created.replayed())throw conflict("意向创建记录不完整，请保留原请求联系调度核对");
         var booking=bookings.lock(trip.getId(),created.booking().bookingNo());booking.setOfferId(row.getId());booking.setSalesOwnerUserId(operator());apply(booking,request);
-        bookings.updateById(booking);var result=inquiryResult(row,booking);saveCommand(trip,"INQUIRY_CREATE",number,request.idempotencyKey(),request,result);return result;
+        bookings.updateById(booking);demands.attach(booking.getId(),source);var result=inquiryResult(row,booking);saveCommand(trip,"INQUIRY_CREATE",number,request.idempotencyKey(),request,result);return result;
     }
+    /** 编辑登记资料时保持客户及原单来源不可变。 */
     @Transactional
     public FleetCapacityOfferModels.InquiryResult updateInquiry(String number,FleetCapacityOfferModels.InquiryWrite request){
         writePermission("inquiry-edit");var initial=inquiryRow(number);own(initial);var trip=trip(initial.getTripNo(),true);var row=offers.lock(offers.selectById(initial.getOfferId()).getOfferNo());
@@ -189,6 +198,7 @@ public class FleetCapacityOfferService {
         var replay=replay(trip,"INQUIRY_EDIT",number,request.idempotencyKey(),request,FleetCapacityOfferModels.InquiryResult.class);if(replay!=null)return replayed(replay);
         versions(trip,row,request.tripRecordVersion(),request.offerRecordVersion());requireInquiryOpen(row,trip);validateInquiry(trip,request);
         if(!Objects.equals(booking.getCustomerId(),request.customerId().toString()))throw conflict("意向客户不能改写，请取消草稿后重新登记");
+        demands.validateEdit(booking.getId(),booking.getCustomerId(),request.businessType(),request.sourceOrderNo());
         if(request.recordVersion()==null)throw bad("缺少意向版本");
         bookingService.updatePool(trip.getTripNo(),number,operator(),new FleetBookingModels.Update(trip.getRecordVersion(),request.recordVersion(),request.cargo(),request.quoteRef()));
         booking=bookings.lock(trip.getId(),number);apply(booking,request);bookings.updateById(booking);

lastleg-service/src/main/java/com/baiyue/lastleg/fleet/trip/FleetTransportVehicleGuard.java

@@ -0,0 +1,20 @@
+package com.baiyue.lastleg.fleet.trip;
+
+import com.baiyue.lastleg.masterdata.vehicle.application.port.out.VehicleRepository;
+import org.springframework.stereotype.Service;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.server.ResponseStatusException;
+
+/** 运输执行仍由车队应用边界核对车辆主档，不向排车暴露车辆持久化。 */
+@Service
+public class FleetTransportVehicleGuard {
+    private final VehicleRepository vehicles;
+    /** 复用车辆应用端口及其行锁。 */
+    public FleetTransportVehicleGuard(VehicleRepository vehicles){this.vehicles=vehicles;}
+    /** 发车核对实时车辆资格，并冻结当次有效容量供业务量复核。 */
+    public void validate(FleetTripEntity trip){
+        var vehicle=vehicles.lockById(trip.getVehicleId()).orElseThrow(()->new ResponseStatusException(HttpStatus.CONFLICT,"车辆不存在"));
+        if(!"OVERSEAS".equals(vehicle.region()) || !"IN_SERVICE".equals(vehicle.status()))throw new ResponseStatusException(HttpStatus.CONFLICT,"当前车辆不可出车");
+        trip.setMaxPalletSpaces(vehicle.maxPalletSpaces());trip.setMaxLoadKg(vehicle.maxLoadKg());trip.setMaxVolumeCbm(vehicle.maxVolumeCbm());
+    }
+}

lastleg-service/src/main/java/com/baiyue/lastleg/fleet/trip/FleetTripExecutionService.java

@@ -276,7 +276,7 @@ public class FleetTripExecutionService {
     }
     /** 出库装载只能用于派送车次，取货必须沿专用运输链执行。 */
     private static void requireVersionAndPlan(FleetTripEntity trip, long version) {
-        if ("PICKUP".equals(trip.getTripPurpose())) throw conflict("取货车次请使用取货任务操作");
+        if (java.util.Set.of("PICKUP","LOCAL_TRUCK").contains(java.util.Objects.toString(trip.getTripPurpose(),""))) throw conflict("运输排车请使用对应运输任务操作");
         if (trip.getRecordVersion() != version) throw conflict("车次已被修改，请刷新后重新确认");
         if (!"PLANNED".equals(trip.getStatus())) throw conflict("仅计划中的车次允许此操作");
     }

lastleg-service/src/main/java/com/baiyue/lastleg/fleet/trip/FleetTripService.java

@@ -27,6 +27,7 @@ import java.util.*;
 
 @Service
 public class FleetTripService {
+    @org.springframework.beans.factory.annotation.Autowired(required=false) private org.springframework.context.ApplicationEventPublisher transportEvents;
     @jakarta.annotation.Resource private com.baiyue.lastleg.fleet.trip.work.AppointmentWorkTripChanges workChanges;
     @jakarta.annotation.Resource private com.baiyue.lastleg.appointmentwork.AppointmentWorkDispatchPort appointmentAllocations;
     private final FleetTripRepository repository;
@@ -101,6 +102,12 @@ public class FleetTripService {
         return createPlan(operator, request, "PICKUP");
     }
 
+    /** 本土卡车运输使用同一资源占用与司机资格规则。 */
+    @Transactional
+    public FleetTripModels.Detail createLocalTruck(String operator, FleetTripModels.Create request) {
+        return createPlan(operator, request, "LOCAL_TRUCK");
+    }
+
     /** 主单创建事务内建立空资源记录，允许未知计划/临时资料，审核时再核齐。 */
     @Transactional(propagation = org.springframework.transaction.annotation.Propagation.MANDATORY)
     public FleetExecutionModels.DispatchShell createDispatchShell(String operator, FleetExecutionModels.DispatchShellRequest request) {
@@ -376,7 +383,7 @@ public class FleetTripService {
 
     /** 两类车次共用建档逻辑，幂等摘要包含用途以防串用。 */
     private FleetTripModels.Detail createPlan(String operator, FleetTripModels.Create request, String purpose) {
-        String hash = hash(("PICKUP".equals(purpose) ? "PICKUP:" : "") + write(request));
+        String hash = hash(("DELIVERY".equals(purpose) ? "" : purpose+":") + write(request));
         var existing = repository.findCreated(operator, request.idempotencyKey());
         if (existing != null) return replay(existing, hash);
         validatePlan(request.plannedDepartureAt(), request.expectedDriverEndAt(), request.stops());
@@ -447,7 +454,7 @@ public class FleetTripService {
         bookingReservations.requireRoute(trip, request.stops());
         if (trip.getDriverId() != null) drivers.requireDispatchable(trip.getDriverId(), request.expectedDriverEndAt());
         boolean unchangedRoute = response(trip).stops().equals(request.stops());
-        if ("PICKUP".equals(trip.getTripPurpose()) && !unchangedRoute) throw conflict("取货路线由原单地址和入仓仓库确定，不能修改为出库路线");
+        if (Set.of("PICKUP","LOCAL_TRUCK").contains(Objects.toString(trip.getTripPurpose(),"")) && !unchangedRoute) throw conflict("运输路线由原单确定，不能修改来源地址");
         boolean unchangedPlan = unchangedRoute && trip.getPlannedDepartureAt().equals(utc(request.plannedDepartureAt()))
             && trip.getExpectedDriverEndAt().equals(utc(request.expectedDriverEndAt()));
         trip.setPlannedDepartureAt(utc(request.plannedDepartureAt())); trip.setExpectedDriverEndAt(utc(request.expectedDriverEndAt()));
@@ -643,6 +650,7 @@ public class FleetTripService {
     }
     /** 为当前版本保存操作人、原因和完整车次历史。 */
     private void record(FleetTripEntity trip, String action, String reason, String operator) {
+        if(transportEvents!=null)transportEvents.publishEvent(new TransportTripChanged(trip,action,reason,operator));
         workChanges.changed(trip);
         var event = new FleetTripHistory(); event.setId(IdWorker.getId()); event.setTripId(trip.getId()); event.setRecordVersion(trip.getRecordVersion());
         event.setAction(action); event.setReason(trim(reason)); event.setOperatorId(operator); event.setOccurredAt(trip.getUpdatedAt());

lastleg-service/src/main/java/com/baiyue/lastleg/fleet/trip/PlatformFleetCapacityOfferController.java

@@ -29,6 +29,9 @@ public class PlatformFleetCapacityOfferController {
     public ApiResponse<FleetCapacityOfferModels.OfferResult> resume(@PathVariable String offerNo,@Valid @RequestBody FleetCapacityOfferModels.Command request){return ApiResponse.success(service.command(offerNo,"RESUME",request));}
     @PostMapping("/{offerNo}/close") @PreAuthorize("hasAuthority('platform:fleet:capacity-offer:manage')")
     public ApiResponse<FleetCapacityOfferModels.OfferResult> close(@PathVariable String offerNo,@Valid @RequestBody FleetCapacityOfferModels.Command request){return ApiResponse.success(service.command(offerNo,"CLOSE",request));}
+    /** 读取客户已提交、等待车次匹配的散板原单。 */
+    @GetMapping("/pending-looseboard-demands") @PreAuthorize("hasAuthority('platform:fleet:capacity-offer:manage') or (hasAuthority('platform:fleet:capacity-offer:list') and hasAuthority('platform:fleet:capacity-offer:inquiry-create'))")
+    public ApiResponse<PageResult<com.baiyue.lastleg.fleet.business.FleetLooseboardDemandService.Demand>> pendingDemands(@Valid FleetCapacityOfferModels.InquiryQuery query){return ApiResponse.success(service.pendingDemands(query));}
     @GetMapping("/inquiries") @PreAuthorize("hasAnyAuthority('platform:fleet:capacity-offer:list','platform:fleet:capacity-offer:manage')")
     public ApiResponse<PageResult<FleetCapacityOfferModels.Inquiry>> inquiries(@Valid FleetCapacityOfferModels.InquiryQuery query){return ApiResponse.success(service.inquiries(query));}
     @GetMapping("/inquiries/{bookingNo}") @PreAuthorize("hasAnyAuthority('platform:fleet:capacity-offer:list','platform:fleet:capacity-offer:manage')")

lastleg-service/src/main/java/com/baiyue/lastleg/fleet/trip/TransportTripChanged.java

@@ -0,0 +1,5 @@
+package com.baiyue.lastleg.fleet.trip;
+
+
+/** 同步事务内的运输事实；任一投影失败时原执行一起回滚。 */
+public record TransportTripChanged(FleetTripEntity trip,String action,String reason,String operator) { }