优化

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

@@ -25,6 +25,7 @@ public final class ContainerDtos {
         @Size(max = 64) String cabinetNo,
         @Size(max = 128) String billOfLadingNo,
         @Size(max = 128) String keyword,
+        @Positive Long customerId,
         @Positive Long warehouseId,
         @Size(max = 32) String containerType,
         @Positive Long shippingCompanyId,

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

@@ -18,6 +18,7 @@ public final class LoadingListDtos {
     public record PreloadQuery(
         @Size(max = 128) String keyword,
         String status,
+        @Positive Long customerId,
         @Min(1) Long warehouseId,
         LocalDateTime createdFrom,
         LocalDateTime createdTo,
@@ -32,6 +33,7 @@ public final class LoadingListDtos {
 
     public record ConfirmedQuery(
         @Size(max = 128) String keyword,
+        @Positive Long customerId,
         @Min(1) Long warehouseId,
         LocalDateTime createdFrom,
         LocalDateTime createdTo,

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

@@ -1,7 +1,7 @@
 package com.baiyue.firstleg.dto;
 import jakarta.validation.constraints.*; import java.math.BigDecimal; import java.time.LocalDateTime;
 public final class TruckAppointmentDtos { private TruckAppointmentDtos(){}
- public record Query(@Size(max=64) String keyword, com.baiyue.firstleg.domain.TruckAppointmentStatus status, @Positive Long containerBookingId, @Min(1) long page, @Min(1) @Max(200) long size){ public Query{if(page==0)page=1;if(size==0)size=20;} }
+ public record Query(@Size(max=64) String keyword, com.baiyue.firstleg.domain.TruckAppointmentStatus status, @Positive Long customerId, @Positive Long containerBookingId, @Min(1) long page, @Min(1) @Max(200) long size){ public Query{if(page==0)page=1;if(size==0)size=20;} }
  public record SaveRequest(@Positive Long outboundOrderId,@Positive Long oceanBookingId,@Positive Long containerBookingId,@Positive Long loadingPlanId,@Positive Long warehouseId,@Positive Long customerId,@Size(max=128) String customerName,@Positive Long carrierId,@Size(max=128) String carrierName,@Size(max=64) String fleetContact,@Size(max=32) String fleetPhone,@Size(max=64) String driverName,@Size(max=32) String driverPhone,@Size(max=32) String driverIdCard,@Size(max=32) String vehicleNo,@Size(max=128) String storeName,@Size(max=64) String storeContact,@Size(max=32) String storePhone,@Size(max=255) String storeAddress,@Size(max=64) String storeCity,@Size(max=16) String storeZipcode,@PositiveOrZero Integer packageCount,@DecimalMin("0") BigDecimal grossWeightKg,@DecimalMin("0") BigDecimal volumeCbm,@PositiveOrZero Integer palletCount,@Size(max=255) String poNo,@NotNull LocalDateTime plannedLoadingAt,@PositiveOrZero Integer transitMinutes,@DecimalMin("0") BigDecimal payableAmount,@DecimalMin("0") BigDecimal receivableAmount,@Size(max=8) String currency,@Size(max=1000) String remark,@NotNull @PositiveOrZero Integer expectedVersion){}
  public record ActionRequest(@NotNull @PositiveOrZero Integer expectedVersion,@Size(max=500) String reason){}
  public record AttachmentRequest(@NotNull @Positive Long fileId,@Size(max=64) String attachmentType,@Size(max=255) String fileName,@Size(max=128) String fileHash){ }

firstleg/src/main/java/com/baiyue/firstleg/mapper/ContainerBookingMapper.java

@@ -24,6 +24,12 @@ public interface ContainerBookingMapper extends BaseMapper<ContainerBookingEntit
          WHERE (#{query.containerNo} IS NULL OR b.container_no = #{query.containerNo})
            AND (#{query.cabinetNo} IS NULL OR b.cabinet_no = #{query.cabinetNo})
            AND (#{query.billOfLadingNo} IS NULL OR b.bill_of_lading_no = #{query.billOfLadingNo})
+           AND (#{query.customerId} IS NULL OR EXISTS (
+               SELECT 1 FROM fl_loading_plan_item customer_item
+                WHERE customer_item.loading_plan_id = p.id
+                  AND customer_item.deleted = 0
+                  AND customer_item.account_id = #{query.customerId}
+           ))
            AND (#{query.warehouseId} IS NULL OR b.warehouse_id = #{query.warehouseId})
            AND (#{query.containerType} IS NULL OR b.container_type = #{query.containerType})
            AND (#{query.shippingCompanyId} IS NULL OR b.shipping_company_id = #{query.shippingCompanyId})

firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingListQueryMapper.java

@@ -51,6 +51,7 @@ public interface LoadingListQueryMapper {
            AND EXISTS (SELECT 1 FROM fl_loading_plan_item active_item
                         WHERE active_item.loading_plan_id = p.id AND active_item.deleted = 0)
         <if test="query.status != null and query.status != ''">AND p.plan_status = #{query.status}</if>
+        <if test="query.customerId != null">AND EXISTS (SELECT 1 FROM fl_loading_plan_item customer_item WHERE customer_item.loading_plan_id = p.id AND customer_item.deleted = 0 AND customer_item.account_id = #{query.customerId})</if>
         <if test="query.keyword != null and query.keyword != ''">
            AND (p.plan_no LIKE CONCAT('%', #{query.keyword}, '%')
              OR b.container_no LIKE CONCAT('%', #{query.keyword}, '%')
@@ -74,6 +75,7 @@ public interface LoadingListQueryMapper {
           JOIN fl_container_booking b ON b.id = p.container_booking_id
           LEFT JOIN fl_loading_plan_item i ON i.loading_plan_id = p.id AND i.deleted = 0
          WHERE p.plan_status = 'COMPLETED'
+        <if test="query.customerId != null">AND EXISTS (SELECT 1 FROM fl_loading_plan_item customer_item WHERE customer_item.loading_plan_id = p.id AND customer_item.deleted = 0 AND customer_item.account_id = #{query.customerId})</if>
         <if test="query.keyword != null and query.keyword != ''">
            AND (p.plan_no LIKE CONCAT('%', #{query.keyword}, '%')
              OR b.container_no LIKE CONCAT('%', #{query.keyword}, '%')

firstleg/src/main/java/com/baiyue/firstleg/mapper/TruckAppointmentMapper.java

@@ -1,7 +1,7 @@
 package com.baiyue.firstleg.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baiyue.firstleg.dto.TruckAppointmentDtos.Query; import com.baiyue.firstleg.entity.TruckAppointmentEntity; import org.apache.ibatis.annotations.*;
 @Mapper public interface TruckAppointmentMapper extends BaseMapper<TruckAppointmentEntity>{
- @Select("<script>SELECT * FROM fl_truck_appointment WHERE (#{q.keyword} IS NULL OR appointment_no LIKE CONCAT('%',#{q.keyword},'%') OR vehicle_no LIKE CONCAT('%',#{q.keyword},'%') OR carrier_name LIKE CONCAT('%',#{q.keyword},'%')) AND (#{q.status} IS NULL OR status=#{q.status}) AND (#{q.containerBookingId} IS NULL OR container_booking_id=#{q.containerBookingId}) ORDER BY updated_at DESC,id DESC</script>") Page<TruckAppointmentEntity> page(Page<TruckAppointmentEntity> p,@Param("q") Query q);
+ @Select("<script>SELECT * FROM fl_truck_appointment WHERE (#{q.keyword} IS NULL OR appointment_no LIKE CONCAT('%',#{q.keyword},'%') OR vehicle_no LIKE CONCAT('%',#{q.keyword},'%') OR carrier_name LIKE CONCAT('%',#{q.keyword},'%')) AND (#{q.status} IS NULL OR status=#{q.status}) AND (#{q.customerId} IS NULL OR customer_id=#{q.customerId}) AND (#{q.containerBookingId} IS NULL OR container_booking_id=#{q.containerBookingId}) ORDER BY updated_at DESC,id DESC</script>") Page<TruckAppointmentEntity> page(Page<TruckAppointmentEntity> p,@Param("q") Query q);
  @Update("UPDATE fl_truck_appointment SET status=#{toStatus}, actual_arrived_warehouse_at=CASE WHEN #{toStatus}='ARRIVED_WAREHOUSE' THEN CURRENT_TIMESTAMP(3) ELSE actual_arrived_warehouse_at END, actual_loading_at=CASE WHEN #{toStatus}='LOADING' THEN CURRENT_TIMESTAMP(3) ELSE actual_loading_at END, actual_departed_at=CASE WHEN #{toStatus}='DEPARTED' THEN CURRENT_TIMESTAMP(3) ELSE actual_departed_at END, revision=revision+1, version=version+1, updated_at=CURRENT_TIMESTAMP(3) WHERE id=#{id} AND status=#{fromStatus} AND version=#{version}") int transition(@Param("id") long id,@Param("fromStatus") String from,@Param("toStatus") String to,@Param("version") int version);
  @Update("UPDATE fl_truck_appointment SET planned_loading_at=#{at}, revision=revision+1, version=version+1, status='RESCHEDULED', remark=#{reason}, updated_at=CURRENT_TIMESTAMP(3) WHERE id=#{id} AND version=#{version}") int reschedule(@Param("id") long id,@Param("at") java.time.LocalDateTime at,@Param("reason") String reason,@Param("version") int version);
  @Update("UPDATE fl_truck_appointment SET vehicle_no=#{e.vehicleNo},driver_name=#{e.driverName},driver_phone=#{e.driverPhone},payable_amount=#{e.payableAmount},receivable_amount=#{e.receivableAmount},planned_loading_at=#{e.plannedLoadingAt},remark=#{e.remark},version=version+1,revision=revision+1,updated_at=CURRENT_TIMESTAMP(3) WHERE id=#{e.id} AND version=#{version}") int updateEdit(@Param("e") TruckAppointmentEntity e,@Param("version") int version);

firstleg/src/main/java/com/baiyue/firstleg/pricing/ActivePriceBookEstimator.java

@@ -73,8 +73,9 @@ public class ActivePriceBookEstimator {
     }
 
     private Estimate estimateRegion(long versionId, String channelCode, EstimateRequest request) {
-        if (request.destinationType() != PricingDestinationType.FBA) {
-            throw validation("海派渠道仅支持FBA目的仓参考估价");
+        if (request.destinationType() != PricingDestinationType.FBA
+            && request.destinationType() != PricingDestinationType.OVERSEAS) {
+            throw validation("海派渠道仅支持平台FBA仓或海外中转仓参考估价");
         }
         if (request.pricingTaxMode() == null) {
             throw validation("请选择包税或不包税报价");
@@ -95,7 +96,7 @@ public class ActivePriceBookEstimator {
 
     private PriceRegion resolveWarehouseRegion(Long warehouseId) {
         if (warehouseId == null || warehouseId <= 0) {
-            throw validation("请提供目的仓区域或平台FBA仓，以确定海派区域");
+            throw validation("请提供目的仓区域、平台FBA仓或海外中转仓，以确定海派区域");
         }
         return warehouseRegionResolver.resolve(warehouseId);
     }

firstleg/src/main/java/com/baiyue/firstleg/pricing/PriceBookWarehouseRegionResolver.java

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
-/** Resolves a platform FBA warehouse to the fixed sea-parcel price region. */
+/** Resolves a platform destination warehouse to the fixed sea-parcel price region. */
 @Component
 public class PriceBookWarehouseRegionResolver {
     @Resource private PriceBookWarehouseClient warehouses;
@@ -20,7 +20,7 @@ public class PriceBookWarehouseRegionResolver {
 
     public PriceRegion resolve(long warehouseId) {
         if (warehouseId <= 0) {
-            throw validation("请提供目的仓区域或平台FBA仓，以确定海派区域");
+            throw validation("请提供目的仓区域、平台FBA仓或海外中转仓，以确定海派区域");
         }
         try {
             ApiResponse<PriceBookWarehouseClient.Detail> response = warehouses.active(internalToken, 0L, warehouseId);
@@ -28,12 +28,13 @@ public class PriceBookWarehouseRegionResolver {
                 throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "目的仓服务暂时不可用");
             }
             if (!response.successful() || response.data() == null || response.data().warehouse() == null) {
-                throw validation("目的仓不是可用的平台FBA仓");
+                throw validation("目的仓不是可用的平台目的仓");
             }
             var warehouse = response.data().warehouse();
             if (!Long.valueOf(warehouseId).equals(warehouse.id()) || !Long.valueOf(0L).equals(warehouse.tenantId())
-                || !"FBA".equals(warehouse.warehouseType()) || !"ACTIVE".equals(warehouse.status())) {
-                throw validation("目的仓不是可用的平台FBA仓");
+                || !("FBA".equals(warehouse.warehouseType()) || "OVERSEAS".equals(warehouse.warehouseType()))
+                || !"ACTIVE".equals(warehouse.status())) {
+                throw validation("目的仓不是可用的平台FBA仓或海外中转仓");
             }
             String postalCode = response.data().addresses() == null ? null : response.data().addresses().stream()
                 .filter(address -> address != null && StringUtils.hasText(address.postalCode()))

firstleg/src/main/java/com/baiyue/firstleg/service/ContainerService.java

@@ -191,7 +191,7 @@ public class ContainerService {
     }
     private static Query normalize(Query q) {
         return new Query(trim(q.containerNo()), trim(q.cabinetNo()), trim(q.billOfLadingNo()), trim(q.keyword()),
-            q.warehouseId(), trim(q.containerType()), q.shippingCompanyId(), trim(q.departurePortCode()),
+            q.customerId(), q.warehouseId(), trim(q.containerType()), q.shippingCompanyId(), trim(q.departurePortCode()),
             trim(q.destinationPortCode()), trim(q.destinationWarehouseCode()), q.status(), q.estimatedSailingFrom(),
             q.estimatedSailingTo(), q.page(), q.size());
     }

firstleg/src/main/java/com/baiyue/firstleg/service/FbaPricingService.java

@@ -227,9 +227,8 @@ public class FbaPricingService {
             || inbound.getActualVolumeCbm() == null || inbound.getActualVolumeCbm().signum() <= 0) {
             throw conflict("审核通过的测量快照必须包含大于零的实重和体积");
         }
-        if (inbound.getCustomerId() == null || inbound.getWarehouseId() == null
-            || !StringUtils.hasText(inbound.getChannelCode())) {
-            throw conflict("入库单缺少客户、起运仓或渠道匹配维度");
+        if (inbound.getWarehouseId() == null || !StringUtils.hasText(inbound.getChannelCode())) {
+            throw conflict("入库单缺少起运仓或渠道匹配维度");
         }
         return inbound;
     }

firstleg/src/main/java/com/baiyue/firstleg/service/LoadingListService.java

@@ -71,13 +71,13 @@ public class LoadingListService {
         if (StringUtils.hasText(status) && !PRELOAD_STATUSES.contains(status)) {
             throw badRequest("预装清单状态只能是 EDITING 或 LOADING");
         }
-        return repository.preloadPage(new PreloadQuery(trim(query.keyword()), status,
+        return repository.preloadPage(new PreloadQuery(trim(query.keyword()), status, query.customerId(),
             query.warehouseId(), query.createdFrom(), query.createdTo(), query.page(), query.size()));
     }
 
     public PageResult<ConfirmedSummary> confirmedPage(ConfirmedQuery query) {
         validateRange(query.createdFrom(), query.createdTo());
-        return repository.confirmedPage(new ConfirmedQuery(trim(query.keyword()), query.warehouseId(),
+        return repository.confirmedPage(new ConfirmedQuery(trim(query.keyword()), query.customerId(), query.warehouseId(),
             query.createdFrom(), query.createdTo(), query.page(), query.size()));
     }