优化

firstleg/src/main/java/com/baiyue/firstleg/customs/entity/CustomsSubmissionBatchEntity.java

@@ -11,6 +11,7 @@ public class CustomsSubmissionBatchEntity {
     private Long customsCaseId;
     private String batchNo;
     private Integer batchVersion;
+    private Long customsAgentId;
     private String customsAgentName;
     private String externalReference;
     private String fileSnapshotJson;

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

@@ -181,6 +181,7 @@ public class CustomsService {
         batch.setId(IdWorker.getId()); batch.setCustomsCaseId(caseId); batch.setBatchVersion(repository.batches(caseId).size() + 1);
         batch.setBatchNo("CB" + batch.getId());
         var customsAgent = suppliers.customs(request.customsAgentId(), request.customsAgentName());
+        batch.setCustomsAgentId(customsAgent == null ? null : customsAgent.supplierId());
         batch.setCustomsAgentName(customsAgent == null ? null : customsAgent.name());
         batch.setExternalReference(trim(request.externalReference())); batch.setFileSnapshotJson(json(current.stream()
             .map(v -> Map.of("documentId", v.getId(), "fileId", v.getFileId(), "itemCode", v.getChecklistItemCode(),

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

@@ -64,6 +64,7 @@ public final class ContainerDtos {
         @Size(max = 128) String destinationWarehouseName,
         @DecimalMin(value = "0", inclusive = false) BigDecimal capacityCbm,
         @DecimalMin(value = "0", inclusive = false) BigDecimal maxWeightKg,
+        @Positive Long terminalTruckingCompanyId,
         @Size(max = 128) String terminalTruckingCompany,
         LocalDateTime loadingAt,
         LocalDateTime estimatedSailingAt,

firstleg/src/main/java/com/baiyue/firstleg/entity/ContainerBookingEntity.java

@@ -42,6 +42,7 @@ public class ContainerBookingEntity {
     private String destinationWarehouseName;
     private BigDecimal capacityCbm;
     private BigDecimal maxWeightKg;
+    private Long terminalTruckingCompanyId;
     private String terminalTruckingCompany;
     private LocalDateTime loadingAt;
     private LocalDateTime estimatedSailingAt;

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

@@ -85,7 +85,8 @@ public interface ContainerBookingMapper extends BaseMapper<ContainerBookingEntit
           departure_port_name=#{value.departurePortName}, destination_port_code=#{value.destinationPortCode},
           destination_port_name=#{value.destinationPortName}, destination_warehouse_code=#{value.destinationWarehouseCode},
           destination_warehouse_name=#{value.destinationWarehouseName}, capacity_cbm=#{value.capacityCbm},
-          max_weight_kg=#{value.maxWeightKg}, terminal_trucking_company=#{value.terminalTruckingCompany},
+          max_weight_kg=#{value.maxWeightKg}, terminal_trucking_company_id=#{value.terminalTruckingCompanyId},
+          terminal_trucking_company=#{value.terminalTruckingCompany},
           loading_at=#{value.loadingAt}, estimated_sailing_at=#{value.estimatedSailingAt},
           actual_sailing_at=#{value.actualSailingAt}, estimated_port_arrival_at=#{value.estimatedPortArrivalAt},
           actual_port_arrival_at=#{value.actualPortArrivalAt},

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

@@ -44,6 +44,7 @@ public class ContainerService {
     @Resource private LoadingPickService loadingPickService;
     @Resource private PriceBookQueryRepository priceBooks;
     @Resource private OceanBookingRepository oceanBookings;
+    @Resource private WarehouseSupplierSnapshotService suppliers;
     @Autowired(required = false) private ContainerTransportHistoryMapper transportHistories;
     @Value("${baiyue.security.internal-service-token:}") private String internalToken;
     @Value("${baiyue.warehouse.public-tenant-id:0}") private long publicWarehouseTenantId;
@@ -130,9 +131,12 @@ public class ContainerService {
         }
         validateSchedule(request.data());
         WarehouseMasterDataClient.Warehouse warehouse = requireDomesticTransitWarehouse(request.data().warehouseId());
+        var trucking = suppliers.trucking(request.data().terminalTruckingCompanyId(), request.data().terminalTruckingCompany());
         ensureUnique(trim(request.data().containerNo()), request.data().cabinetNo().trim(), id);
         copy(current, request.data());
         current.setWarehouseId(warehouse.id()); current.setWarehouseName(warehouse.warehouseName());
+        current.setTerminalTruckingCompanyId(trucking == null ? null : trucking.supplierId());
+        current.setTerminalTruckingCompany(trucking == null ? null : trucking.name());
         try {
             if (repository.updateDraft(current, request.version(), operatorId, operatorName) != 1) {
                 throw conflict("货柜状态或版本已变化，请刷新后重试");