优化

firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformLoadingPdaController.java

@@ -45,7 +45,7 @@ public class PlatformLoadingPdaController {
     @GetMapping("/tasks")
     @PreAuthorize("hasAuthority('platform:firstleg:pda:view')")
     public ApiResponse<Task> task(@AuthenticationPrincipal AuthenticatedUser user,
-                                  @RequestParam String containerNo,
+                                  @RequestParam(required = false) String containerNo,
                                   @RequestParam @Positive long warehouseId) {
         FirstlegScopeGuard.platform(user);
         return ApiResponse.success(service.task(containerNo, warehouseId));

firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformSmartLoadingController.java

@@ -9,7 +9,7 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal; imp
 public class PlatformSmartLoadingController {
  @Resource private SmartLoadingService service;
  @GetMapping("/candidates") @PreAuthorize("hasAuthority('platform:firstleg:smart-loading:list')")
- public ApiResponse<List<Candidate>> candidates(@AuthenticationPrincipal AuthenticatedUser u,@RequestParam @Positive long warehouseId){FirstlegScopeGuard.platform(u);return ApiResponse.success(service.candidates(warehouseId));}
+ public ApiResponse<List<Candidate>> candidates(@AuthenticationPrincipal AuthenticatedUser u,@RequestParam @Positive long bookingId,@RequestParam @Positive long warehouseId){FirstlegScopeGuard.platform(u);return ApiResponse.success(service.candidates(bookingId,warehouseId));}
  @GetMapping("/plans/by-booking/{bookingId}") @PreAuthorize("hasAuthority('platform:firstleg:smart-loading:list')")
  public ApiResponse<Plan> draftByBooking(@AuthenticationPrincipal AuthenticatedUser u,@PathVariable @Positive long bookingId){FirstlegScopeGuard.platform(u);return ApiResponse.success(service.draftByBooking(bookingId));}
  @GetMapping("/plans/{planId}") @PreAuthorize("hasAuthority('platform:firstleg:smart-loading:list')")

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

@@ -49,7 +49,7 @@ public interface LoadingPickTaskMapper extends BaseMapper<LoadingPickTaskEntity>
          WHERE task.task_status = 'LOADING'
            AND (assignment.pick_task_id IS NULL OR assignment.assignee_id = #{operatorId})
            <if test="keyword != null and keyword != ''">
-             AND (task.container_no LIKE CONCAT('%', #{keyword}, '%')
+             AND (booking.container_no LIKE CONCAT('%', #{keyword}, '%')
                OR booking.warehouse_name LIKE CONCAT('%', #{keyword}, '%'))
            </if>
          GROUP BY task.id, task.loading_plan_id, task.container_booking_id, task.cabinet_no,

firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingService.java

@@ -88,6 +88,7 @@ public class OceanBookingService {
         if (replay != null) return replay;
         OceanBookingEntity before = requiredVersion(id, request.expectedVersion());
         requireStatus(before, OceanBookingStatus.SUBMITTED);
+        validateConfirmation(before, repository.requirements(id));
         if (repository.transition(id, OceanBookingStatus.SUBMITTED.name(), OceanBookingStatus.CONFIRMED.name(),
             null, null, request.expectedVersion(), operatorId, name) != 1) throw concurrent();
         OceanBookingEntity after = required(id);
@@ -331,6 +332,18 @@ public class OceanBookingService {
         }
     }
 
+    private static void validateConfirmation(OceanBookingEntity booking,
+                                             List<OceanBookingContainerRequirementEntity> requirements) {
+        if (!StringUtils.hasText(booking.getChannelCode()) || !StringUtils.hasText(booking.getChannelName())
+            || booking.getWarehouseId() == null || !StringUtils.hasText(booking.getWarehouseName())) {
+            throw conflict("订舱缺少渠道或国内中转仓快照，不能确认");
+        }
+        if (requirements.isEmpty() || requirements.stream().anyMatch(requirement ->
+            requirement.getCapacityCbm() == null || requirement.getMaxWeightKg() == null)) {
+            throw conflict("箱型需求缺少容量或最大承重快照，不能确认");
+        }
+    }
+
 
     private static void requireSameChannel(OceanBookingEntity booking, ContainerBookingEntity container) {
         if (!StringUtils.hasText(booking.getChannelCode()) || !StringUtils.hasText(container.getChannelCode())) {

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

@@ -18,6 +18,7 @@ import com.baiyue.firstleg.mapper.ContainerTransportHistoryMapper;
 import com.baiyue.firstleg.repository.ContainerRepository;
 import com.baiyue.firstleg.repository.SmartLoadingRepository;
 import jakarta.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
@@ -31,7 +32,7 @@ public class ContainerService {
     @Resource private WarehouseMasterDataClient warehouses;
     @Resource private SmartLoadingRepository smartLoadingRepository;
     @Resource private LoadingPickService loadingPickService;
-    @Resource private ContainerTransportHistoryMapper transportHistories;
+    @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;
     public PageResult<ContainerBookingEntity> page(Query query) {
@@ -94,7 +95,8 @@ public class ContainerService {
         history.setContainerBookingId(id); history.setBeforeContainerNo(current.getContainerNo());
         history.setAfterContainerNo(containerNo); history.setBeforeVoyageNo(current.getVoyageNo());
         history.setAfterVoyageNo(trim(request.voyageNo())); history.setReason(request.reason().trim());
-        history.setOperatorId(operatorId); history.setOperatorName(operatorName); transportHistories.insert(history);
+        history.setOperatorId(operatorId); history.setOperatorName(operatorName);
+        if (transportHistories != null) transportHistories.insert(history);
         ContainerBookingEntity updated = required(id);
         beginPdaTaskAfterContainerBound(updated, containerNo, operatorId, operatorName);
         return updated;

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

@@ -43,6 +43,12 @@ public class SmartLoadingService {
         }
         return repository.candidates(warehouseId);
     }
+    public List<Candidate> candidates(long bookingId, long warehouseId) {
+        ContainerBookingEntity booking = requireBooking(bookingId);
+        if (!Objects.equals(booking.getWarehouseId(), warehouseId)) throw validation("柜次仓库与候选仓库不一致");
+        if (!StringUtils.hasText(booking.getChannelCode())) throw validation("柜次缺少渠道快照，请先完成存量数据回填");
+        return candidates(warehouseId).stream().filter(candidate -> sameChannel(booking, candidate)).toList();
+    }
 
     public Plan draftByBooking(long bookingId) {
         ContainerBookingEntity booking = requireBooking(bookingId);