优化

2026-09-15 14:18:18 +08:00
parent 6a2075fe4b
commit a474ca4d93
35 changed files with 751 additions and 228 deletions
@@ -122,20 +122,6 @@ public class PlatformTerminalDrayageController {
            containerBookingId, user.userId(), user.username(), key, request), user.permissions()));
    }

-    @PostMapping("/{containerBookingId}/pickup")
-    @PreAuthorize("hasAuthority('platform:firstleg:terminal-drayage:pickup:confirm')")
-    @Operation(summary = "确认目的港实际提柜")
-    @BusinessAudit(event = "TERMINAL_DRAYAGE_RECORD_PICKUP", resourceType = "CONTAINER",
-        resourceId = "#containerBookingId", description = "确认目的港实际提柜")
-    public ApiResponse<View> recordPickup(@AuthenticationPrincipal AuthenticatedUser user,
-                                          @PathVariable @Positive long containerBookingId,
-                                          @RequestHeader("Idempotency-Key") String key,
-                                          @Valid @RequestBody ActualTimeRequest request) {
-        FirstlegScopeGuard.platform(user);
-        return ApiResponse.success(service.authorize(service.recordPickup(
-            containerBookingId, user.userId(), user.username(), key, request), user.permissions()));
-    }
-
    @PostMapping("/{containerBookingId}/empty-return")
    @PreAuthorize("hasAuthority('platform:firstleg:terminal-drayage:empty-return:confirm')")
    @Operation(summary = "确认实际还空柜")
@@ -17,7 +17,6 @@ public class TerminalDrayageEntity {
    private Long fleetSupplierId;
    private String fleetSupplierName;
    private LocalDateTime pickupAppointmentAt;
-    private LocalDateTime actualPickupAt;
    private LocalDateTime estimatedEmptyReturnAt;
    private LocalDateTime actualEmptyReturnAt;
    private Integer version;
@@ -69,7 +69,7 @@ public interface TerminalDrayageMapper extends BaseMapper<TerminalDrayageEntity>
    @Update("""
        UPDATE fl_terminal_drayage SET fleet_supplier_id=#{value.fleetSupplierId},
          fleet_supplier_name=#{value.fleetSupplierName},pickup_appointment_at=#{value.pickupAppointmentAt},
-          actual_pickup_at=#{value.actualPickupAt},estimated_empty_return_at=#{value.estimatedEmptyReturnAt},
+          estimated_empty_return_at=#{value.estimatedEmptyReturnAt},
          actual_empty_return_at=#{value.actualEmptyReturnAt},updated_by=#{operatorId},
          updated_by_name=#{operatorName},updated_at=CURRENT_TIMESTAMP(3),version=version+1
         WHERE container_booking_id=#{value.containerBookingId} AND version=#{expectedVersion}
@@ -135,35 +135,6 @@ public class TerminalDrayageService {
            request.reason(), operatorId, operatorName);
    }

-    @Transactional
-    public View recordPickup(long containerBookingId, long operatorId, String operatorName, String key,
-                             ActualTimeRequest request) {
-        String action = "RECORD_PICKUP";
-        WorkContext context = requiredLockedContext(containerBookingId);
-        View replay = replay(context, action, key, request);
-        if (replay != null) return replay;
-        requireAtLeast(context, CarrierScheduleNode.PICKUP_READY, "货柜尚未清关放行，不允许确认实际提柜");
-        TerminalDrayageEntity value = requiredAggregate(containerBookingId);
-        requireVersion(value, request.expectedVersion());
-        if (value.getFleetSupplierId() == null || value.getPickupAppointmentAt() == null) {
-            throw conflict("选择码头车队并预约提柜后才能确认实际提柜");
-        }
-        if (actualPickupAt(context, value) != null) throw conflict("实际提柜时间已确认");
-        if (context.facts() != null && context.facts().latestActualAt() != null
-            && request.actualAt().isBefore(context.facts().latestActualAt())) {
-            throw badRequest("实际提柜时间不能早于当前实际船节点时间");
-        }
-        advanceNode(context, CarrierScheduleNode.PICKED_UP, request.actualAt(), action, key,
-            request.remark(), operatorId, operatorName);
-        int fromVersion = version(value);
-        String fromStatus = status(context, value);
-        value.setActualPickupAt(request.actualAt());
-        applyAuthoritativeDeadline(context, value);
-        persist(value, fromVersion, operatorId, operatorName);
-        return finish(requiredContext(containerBookingId), value, action, key, request, fromStatus,
-            fromVersion, request.remark(), operatorId, operatorName);
-    }
-
    @Transactional
    public View recordEmptyReturn(long containerBookingId, long operatorId, String operatorName, String key,
                                  ActualTimeRequest request) {
@@ -297,9 +268,6 @@ public class TerminalDrayageService {
            result.add("SELECT_FLEET");
            if (value != null && value.getFleetSupplierId() != null) result.add("SCHEDULE_PICKUP");
        }
-        if (current != null && current.sequence() >= CarrierScheduleNode.PICKUP_READY.sequence()
-            && value != null && value.getFleetSupplierId() != null && value.getPickupAppointmentAt() != null
-            && actualPickupAt(context, value) == null) result.add("RECORD_PICKUP");
        if (context.base().unloadingCompletedAt() != null
            && actualEmptyReturnAt(context, value) == null) result.add("RECORD_EMPTY_RETURN");
        return List.copyOf(result);
@@ -333,8 +301,8 @@ public class TerminalDrayageService {
    }

    private LocalDateTime actualPickupAt(WorkContext context, TerminalDrayageEntity value) {
-        return value != null && value.getActualPickupAt() != null ? value.getActualPickupAt()
-            : context.facts() == null ? null : context.facts().pickedUpAt();
+        if (context.facts() != null && context.facts().pickedUpAt() != null) return context.facts().pickedUpAt();
+        return context.base().unloadingCompletedAt();
    }

    private LocalDateTime actualEmptyReturnAt(WorkContext context, TerminalDrayageEntity value) {
@@ -400,7 +368,6 @@ public class TerminalDrayageService {
            case "SELECT_FLEET" -> "platform:firstleg:terminal-drayage:fleet:edit";
            case "SEND_PICKUP_EMAIL" -> "platform:firstleg:terminal-drayage:fleet:edit";
            case "SCHEDULE_PICKUP" -> "platform:firstleg:terminal-drayage:pickup-appointment:edit";
-            case "RECORD_PICKUP" -> "platform:firstleg:terminal-drayage:pickup:confirm";
            case "RECORD_EMPTY_RETURN" -> "platform:firstleg:terminal-drayage:empty-return:confirm";
            default -> "";
        };
@@ -7,7 +7,6 @@ CREATE TABLE IF NOT EXISTS fl_terminal_drayage (
  fleet_supplier_id BIGINT UNSIGNED NULL COMMENT 'Warehouse ACTIVE/TRUCKING供应商ID快照',
  fleet_supplier_name VARCHAR(128) NULL COMMENT 'Warehouse供应商名称快照',
  pickup_appointment_at DATETIME(3) NULL COMMENT '预约提柜时间',
-  actual_pickup_at DATETIME(3) NULL COMMENT '实际提柜时间',
  estimated_empty_return_at DATETIME(3) NULL COMMENT '服务端按卸柜完成时间加72小时计算的预计还柜时间',
  actual_empty_return_at DATETIME(3) NULL COMMENT '实际还空柜时间',
  version INT UNSIGNED NOT NULL DEFAULT 1 COMMENT '乐观锁版本号',
@@ -20,10 +19,7 @@ CREATE TABLE IF NOT EXISTS fl_terminal_drayage (
  PRIMARY KEY(id),
  UNIQUE KEY uk_terminal_drayage_container(container_booking_id),
  KEY idx_terminal_drayage_warning(actual_empty_return_at,estimated_empty_return_at),
-  CONSTRAINT fk_terminal_drayage_container FOREIGN KEY(container_booking_id) REFERENCES fl_container_booking(id),
-  CONSTRAINT chk_terminal_drayage_times CHECK(
-    (actual_pickup_at IS NULL OR pickup_appointment_at IS NOT NULL) AND
-    (actual_empty_return_at IS NULL OR actual_pickup_at IS NULL OR actual_empty_return_at >= actual_pickup_at))
+  CONSTRAINT fk_terminal_drayage_container FOREIGN KEY(container_booking_id) REFERENCES fl_container_booking(id)
 ) ENGINE=InnoDB COMMENT='目的港货柜级码头拖车与还空事实';

 CREATE TABLE IF NOT EXISTS fl_terminal_drayage_mail (
@@ -54,7 +50,7 @@ CREATE TABLE IF NOT EXISTS fl_terminal_drayage_history (
  id BIGINT UNSIGNED NOT NULL COMMENT '历史ID',
  drayage_id BIGINT UNSIGNED NOT NULL COMMENT '码头拖车聚合ID',
  container_booking_id BIGINT UNSIGNED NOT NULL COMMENT '货柜ID快照',
-  action VARCHAR(32) NOT NULL COMMENT 'SELECT_FLEET/SCHEDULE_PICKUP/RECORD_PICKUP/RECORD_EMPTY_RETURN',
+  action VARCHAR(32) NOT NULL COMMENT 'SELECT_FLEET/SCHEDULE_PICKUP/RECORD_EMPTY_RETURN',
  from_status VARCHAR(32) NOT NULL COMMENT '操作前状态',
  to_status VARCHAR(32) NOT NULL COMMENT '操作后状态',
  from_version INT UNSIGNED NOT NULL COMMENT '操作前版本',
@@ -67,7 +63,7 @@ CREATE TABLE IF NOT EXISTS fl_terminal_drayage_history (
  KEY idx_terminal_drayage_history(container_booking_id,created_at,id),
  CONSTRAINT fk_terminal_drayage_history FOREIGN KEY(drayage_id) REFERENCES fl_terminal_drayage(id),
  CONSTRAINT chk_terminal_drayage_history_action CHECK(action IN
-    ('SELECT_FLEET','SEND_PICKUP_EMAIL','SCHEDULE_PICKUP','RECORD_PICKUP','RECORD_EMPTY_RETURN'))
+    ('SELECT_FLEET','SEND_PICKUP_EMAIL','SCHEDULE_PICKUP','RECORD_EMPTY_RETURN'))
 ) ENGINE=InnoDB COMMENT='目的港码头拖车不可变操作历史';

 CREATE TABLE IF NOT EXISTS fl_terminal_drayage_operation (
@@ -2143,7 +2143,7 @@ components:
        allowedActions:
          type: array
          description: 已同时按真实业务状态与当前用户权限裁剪
-          items: {type: string, enum: [EDIT_CONTAINER, MANAGE_CUSTOMS, CONFIRM_OUTBOUND, MANAGE_DESTINATION_DOCUMENTS, SELECT_FLEET, SCHEDULE_PICKUP, RECORD_PICKUP, RECORD_EMPTY_RETURN, SEND_PICKUP_EMAIL]}
+          items: {type: string, enum: [EDIT_CONTAINER, MANAGE_CUSTOMS, CONFIRM_OUTBOUND, MANAGE_DESTINATION_DOCUMENTS, SELECT_FLEET, SCHEDULE_PICKUP, RECORD_EMPTY_RETURN, SEND_PICKUP_EMAIL]}
        actualFacts: {$ref: '#/components/schemas/ContainerActualFacts'}
        terminalDrayage: {$ref: '#/components/schemas/ContainerTerminalDrayage'}
    ContainerWorkbenchStatusSummary:
@@ -2185,12 +2185,12 @@ components:
        fleetSupplierId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
        fleetSupplierName: {type: string, nullable: true}
        pickupAppointmentAt: {type: string, format: date-time, nullable: true}
-        actualPickupAt: {type: string, format: date-time, nullable: true}
+        actualPickupAt: {type: string, format: date-time, nullable: true, description: 优先使用实际船节点提柜时间；缺失时在海外PDA确认整柜拆柜完成后使用卸柜完成时间}
        estimatedEmptyReturnAt: {type: string, format: date-time, nullable: true, description: unloadingCompletedAt加72小时}
        actualEmptyReturnAt: {type: string, format: date-time, nullable: true}
        unloadingCompletedAt: {type: string, format: date-time, nullable: true}
        emptyReturnWarning: {type: object, nullable: true}
-        allowedActions: {type: array, items: {type: string, enum: [SELECT_FLEET, SCHEDULE_PICKUP, RECORD_PICKUP, RECORD_EMPTY_RETURN, SEND_PICKUP_EMAIL]}}
+        allowedActions: {type: array, items: {type: string, enum: [SELECT_FLEET, SCHEDULE_PICKUP, RECORD_EMPTY_RETURN, SEND_PICKUP_EMAIL]}}
    ContainerBooking:
      type: object
      required: [id, bookingNo, cabinetNo, sourceType, recordStatus, warehouseId, warehouseName, channelGroupCode, containerType, capacityCbm, maxWeightKg, planStatus, exceptionActive, destinationClearanceDocumentStatus, customsDeclarationDocumentStatus, deliveryOrderDocumentStatus, version]
@@ -38,13 +38,6 @@ paths:
      parameters: [{$ref: '#/components/parameters/ContainerBookingId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
      requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/PickupAppointmentRequest'}}}}
      responses: {'200': {$ref: '#/components/responses/ViewResponse'}}
-  /api/platform/v1/terminal-drayages/{containerBookingId}/pickup:
-    post:
-      summary: 清关可提柜后确认实际提柜并推进PICKED_UP节点
-      x-permission: platform:firstleg:terminal-drayage:pickup:confirm
-      parameters: [{$ref: '#/components/parameters/ContainerBookingId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
-      requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/ActualTimeRequest'}}}}
-      responses: {'200': {$ref: '#/components/responses/ViewResponse'}}
  /api/platform/v1/terminal-drayages/{containerBookingId}/empty-return:
    post:
      summary: 海外卸柜收货完成后确认实际还柜并推进EMPTY_RETURNED节点
@@ -153,12 +146,12 @@ components:
        fleetSupplierId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
        fleetSupplierName: {type: string, nullable: true}
        pickupAppointmentAt: {type: string, format: date-time, nullable: true}
-        actualPickupAt: {type: string, format: date-time, nullable: true}
+        actualPickupAt: {type: string, format: date-time, nullable: true, description: 优先使用实际船节点提柜时间；缺失时在海外PDA确认整柜拆柜完成后使用卸柜完成时间}
        estimatedEmptyReturnAt: {type: string, format: date-time, nullable: true, description: 服务端权威值，卸柜完成时间加72小时}
        actualEmptyReturnAt: {type: string, format: date-time, nullable: true}
        unloadingCompletedAt: {type: string, format: date-time, nullable: true}
        emptyReturnWarning: {$ref: '#/components/schemas/Warning'}
-        allowedActions: {type: array, items: {type: string, enum: [SELECT_FLEET, SCHEDULE_PICKUP, RECORD_PICKUP, RECORD_EMPTY_RETURN, SEND_PICKUP_EMAIL]}}
+        allowedActions: {type: array, items: {type: string, enum: [SELECT_FLEET, SCHEDULE_PICKUP, RECORD_EMPTY_RETURN, SEND_PICKUP_EMAIL]}}
        actualFacts: {$ref: '#/components/schemas/ContainerActualFacts'}
        updatedAt: {type: string, format: date-time, nullable: true}
    ContainerActualFacts:
@@ -181,7 +174,7 @@ components:
      type: object
      required: [action, fromStatus, toStatus, fromVersion, toVersion, operatorId, createdAt]
      properties:
-        action: {type: string, enum: [SELECT_FLEET, SCHEDULE_PICKUP, RECORD_PICKUP, RECORD_EMPTY_RETURN, SEND_PICKUP_EMAIL]}
+        action: {type: string, enum: [SELECT_FLEET, SCHEDULE_PICKUP, RECORD_EMPTY_RETURN, SEND_PICKUP_EMAIL]}
        fromStatus: {type: string}
        toStatus: {type: string}
        fromVersion: {type: integer, minimum: 0}