firstleg/src/main/java/com/baiyue/firstleg/sailingcalendar/dto/SailingCalendarDtos.java

@@ -197,7 +197,8 @@ public final class SailingCalendarDtos {
                                String channelCode, String channelName, String vesselName, String voyageNo,
                                String departurePortCode, String destinationPortCode, LocalDateTime etdAt,
                                LocalDateTime cutoffAt, String status, Integer version,
-                               VolumeSummary volumeSummary) {}
+                               VolumeSummary volumeSummary, Long templateId, Long channelId,
+                               LocalDateTime etaAt, String sourceType, BigDecimal plannedCapacityCbm) {}
     public record VolumeSummary(BigDecimal actualReceivedCbm, BigDecimal catchableForecastCbm,
                                 BigDecimal riskUnmatchedCbm, int bookedContainerCount,
                                 int recommendedContainerCount, int pendingContainerCount,

firstleg/src/main/java/com/baiyue/firstleg/sailingcalendar/service/SailingCalendarService.java

@@ -403,7 +403,7 @@ public class SailingCalendarService {
     private void recordHistory(long sailingId, String action, String fromStatus, String toStatus, String reason, long operatorId, String operatorName, LocalDateTime at) {
         SailingHistoryEntity history = new SailingHistoryEntity(); history.setId(IdWorker.getId()); history.setSailingId(sailingId); history.setAction(action); history.setFromStatus(fromStatus); history.setToStatus(toStatus); history.setReason(reason); history.setOperatorId(operatorId); history.setOperatorName(operatorName); history.setCreatedAt(at); repository.insertHistory(history);
     }
-    private CalendarItem item(SailingEntity v) { return new CalendarItem(v.getId(), v.getSailingNo(), v.getWarehouseId(), v.getWarehouseNameSnapshot(), v.getChannelCodeSnapshot(), v.getChannelNameSnapshot(), v.getVesselName(), v.getVoyageNo(), v.getDeparturePortCode(), v.getDestinationPortCode(), v.getEtdAt(), v.getWarehouseCutoffAt(), v.getStatus(), v.getVersion(), summary(v)); }
+    private CalendarItem item(SailingEntity v) { return new CalendarItem(v.getId(), v.getSailingNo(), v.getWarehouseId(), v.getWarehouseNameSnapshot(), v.getChannelCodeSnapshot(), v.getChannelNameSnapshot(), v.getVesselName(), v.getVoyageNo(), v.getDeparturePortCode(), v.getDestinationPortCode(), v.getEtdAt(), v.getWarehouseCutoffAt(), v.getStatus(), v.getVersion(), summary(v), v.getTemplateId(), v.getChannelId(), v.getEtaAt(), v.getSourceType(), v.getPlannedCapacityCbm()); }
     private VolumeSummary summary(SailingEntity v) {
         SailingCalendarDisplayMapper.ReceiptSummary received = repository.receiptSummary(v);
         BigDecimal eligibleActual = received == null ? BigDecimal.ZERO : nvl(received.catchableCbm());