fix(phase3): close loading and dispatch flows

firstleg/src/main/java/com/baiyue/firstleg/customs/service/CustomsDispatchGateContributor.java

@@ -15,7 +15,7 @@ public class CustomsDispatchGateContributor implements OutboundDispatchGateContr
 
     @Override
     public GateItem assess(Context context) {
-        if (context.tenantId() <= 0 || context.customerId() <= 0 || context.tenantId() != context.customerId()) {
+        if (context.tenantId() <= 0 || context.customerId() <= 0) {
             return gate(false, "INVALID_CUSTOMER_SCOPE");
         }
         CustomsCaseEntity value = repository.gateCase(context.tenantId(), context.orderId(), context.inboundId(),

firstleg/src/main/java/com/baiyue/firstleg/dto/LoadingListDtos.java

@@ -17,7 +17,7 @@ public final class LoadingListDtos {
     public record PreloadQuery(
         @Size(max = 128) String keyword,
         String status,
-        @NotNull @Min(1) Long warehouseId,
+        @Min(1) Long warehouseId,
         LocalDateTime createdFrom,
         LocalDateTime createdTo,
         @Min(1) long page,
@@ -31,7 +31,7 @@ public final class LoadingListDtos {
 
     public record ConfirmedQuery(
         @Size(max = 128) String keyword,
-        @NotNull @Min(1) Long warehouseId,
+        @Min(1) Long warehouseId,
         LocalDateTime createdFrom,
         LocalDateTime createdTo,
         @Min(1) long page,

firstleg/src/main/java/com/baiyue/firstleg/outbound/dispatch/mapper/OutboundDispatchReadMapper.java

@@ -39,25 +39,25 @@ public interface OutboundDispatchReadMapper {
         SELECT booking.id,booking.status
         FROM fl_ocean_booking_container_allocation allocation
         JOIN fl_ocean_booking booking ON booking.id=allocation.ocean_booking_id
-        WHERE allocation.container_booking_id=#{containerBookingId} AND booking.customer_id=#{customerId}
+        WHERE allocation.container_booking_id=#{containerBookingId} AND booking.customer_id=#{tenantId}
         ORDER BY booking.updated_at DESC,booking.id DESC LIMIT 1
         """)
-    IdStatus ocean(@Param("containerBookingId") long containerBookingId, @Param("customerId") long customerId);
+    IdStatus ocean(@Param("containerBookingId") long containerBookingId, @Param("tenantId") long tenantId);
 
     @Select("""
         SELECT id,status FROM fl_truck_appointment
         WHERE container_booking_id=#{containerBookingId} AND loading_plan_id=#{loadingPlanId}
-          AND customer_id=#{customerId}
+          AND customer_id=#{tenantId}
         ORDER BY updated_at DESC,id DESC LIMIT 1
         """)
     IdStatus truck(@Param("containerBookingId") long containerBookingId, @Param("loadingPlanId") long loadingPlanId,
-                   @Param("customerId") long customerId);
+                   @Param("tenantId") long tenantId);
 
     @Select("""
         SELECT COUNT(DISTINCT CASE WHEN status='ACTIVE' AND file_id IS NOT NULL AND evidence_type IN
           ('PHOTO_STEP_1','PHOTO_STEP_2','PHOTO_STEP_3','PHOTO_STEP_4','SEAL') THEN evidence_type END) evidenceCount,
           MAX(CASE WHEN status='ACTIVE' AND evidence_type='SEAL' AND file_id IS NOT NULL AND seal_no IS NOT NULL
-                       AND seal_no<>'' THEN 1 ELSE 0 END) validSeal
+                       AND seal_no<>'' THEN 1 ELSE 0 END) validSeal
         FROM fl_loading_evidence WHERE tenant_id=#{tenantId} AND inbound_id=#{inboundId}
         """)
     Evidence evidence(@Param("tenantId") long tenantId, @Param("inboundId") long inboundId);

firstleg/src/main/java/com/baiyue/firstleg/outbound/dispatch/repository/OutboundDispatchRepository.java

@@ -26,11 +26,11 @@ public class OutboundDispatchRepository {
         return reads.bindings(query.orderId(), query.inboundId(), query.containerBookingId());
     }
     public OutboundDispatchReadMapper.IdStatus pick(long planId) { return reads.pick(planId); }
-    public OutboundDispatchReadMapper.IdStatus ocean(long containerId, long customerId) {
-        return reads.ocean(containerId, customerId);
+    public OutboundDispatchReadMapper.IdStatus ocean(long containerId, long tenantId) {
+        return reads.ocean(containerId, tenantId);
     }
-    public OutboundDispatchReadMapper.IdStatus truck(long containerId, long planId, long customerId) {
-        return reads.truck(containerId, planId, customerId);
+    public OutboundDispatchReadMapper.IdStatus truck(long containerId, long planId, long tenantId) {
+        return reads.truck(containerId, planId, tenantId);
     }
     public OutboundDispatchReadMapper.Evidence evidence(long tenantId, long inboundId) {
         return reads.evidence(tenantId, inboundId);

firstleg/src/main/java/com/baiyue/firstleg/outbound/dispatch/service/OutboundDispatchService.java

@@ -102,8 +102,8 @@ public class OutboundDispatchService {
 
     private Aggregate aggregate(OutboundDispatchReadMapper.Binding binding) {
         var pick = repository.pick(binding.loadingPlanId());
-        var ocean = repository.ocean(binding.containerBookingId(), binding.customerId());
-        var truck = repository.truck(binding.containerBookingId(), binding.loadingPlanId(), binding.customerId());
+        var ocean = repository.ocean(binding.containerBookingId(), binding.tenantId());
+        var truck = repository.truck(binding.containerBookingId(), binding.loadingPlanId(), binding.tenantId());
         var evidence = repository.evidence(binding.tenantId(), binding.inboundId());
         var dispatch = repository.dispatch(binding.tenantId(), binding.inboundId(), binding.containerBookingId());
         GateResult gate = gate(binding, pick, ocean, truck, evidence);

firstleg/src/main/java/com/baiyue/firstleg/portschedule/service/PortScheduleDispatchGateContributor.java

@@ -21,7 +21,7 @@ public class PortScheduleDispatchGateContributor implements OutboundDispatchGate
 
     @Override
     public GateItem assess(Context context) {
-        if (context.tenantId() <= 0 || context.customerId() <= 0 || context.tenantId() != context.customerId()) {
+        if (context.tenantId() <= 0 || context.customerId() <= 0) {
             return gate(false, "INVALID_CUSTOMER_SCOPE");
         }
         if (context.oceanBookingId() == null || context.oceanBookingId() <= 0) {