java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test #17

Merged
admin merged 127 commits from test into main 2026-09-28 16:00:14 +08:00
Conversation 0 Commits 127 Files Changed 283
+2 -2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c266cdee9a - Show all commits
firstleg/src/main/java/com/baiyue/firstleg/customs/container/dto/ContainerCustomsDtos.java
+1 -1
View File
@@ -27,7 +27,7 @@ public final class ContainerCustomsDtos {
String merchantStatus, String merchantStatus,
int version, int taxRefundCount, int coveredTaxRefundCount, long actualBoxCount, int version, int taxRefundCount, int coveredTaxRefundCount, long actualBoxCount,
List<InboundView> inbounds, List<DocumentView> documents, List<InboundView> inbounds, List<DocumentView> documents,
LocalDateTime startedAt, LocalDateTime completedAt) {} LocalDateTime startedAt, LocalDateTime completedAt, LocalDateTime brokerSubmittedAt) {}
public record ScopeRequest(@NotEmpty @Size(max = 200) List<@Positive Long> inboundIds, public record ScopeRequest(@NotEmpty @Size(max = 200) List<@Positive Long> inboundIds,
@Min(0) int expectedVersion) {} @Min(0) int expectedVersion) {}
firstleg/src/main/java/com/baiyue/firstleg/customs/container/service/ContainerCustomsService.java
+1 -1
View File
@@ -426,7 +426,7 @@ public class ContainerCustomsService {
String merchantStatus=tenantId==null?null:merchantStatus(container.status(),refund,coveredRefund); String merchantStatus=tenantId==null?null:merchantStatus(container.status(),refund,coveredRefund);
return new ContainerView(container.id(), container.loadingPlanId(), container.containerBookingId(), plan.planNo(), return new ContainerView(container.id(), container.loadingPlanId(), container.containerBookingId(), plan.planNo(),
plan.cabinetNo(), plan.containerNo(), container.status(), !rows.isEmpty(), merchantStatus, container.version(), refund, coveredRefund, plan.cabinetNo(), plan.containerNo(), container.status(), !rows.isEmpty(), merchantStatus, container.version(), refund, coveredRefund,
actualBoxCount, inbounds, documentViews, container.startedAt(), container.completedAt()); actualBoxCount, inbounds, documentViews, container.startedAt(), container.completedAt(), container.brokerSubmittedAt());
} }
private DocumentView documentView(DocumentRow source, boolean merchant) { private DocumentView documentView(DocumentRow source, boolean merchant) {