优化

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/gateway/HttpWarehouseResourceGateway.java

@@ -179,15 +179,14 @@ public class HttpWarehouseResourceGateway implements WarehouseResourceGateway {
             .header("X-Internal-Service-Token", internalToken).retrieve()
             .onStatus(HttpStatusCode::isError, (request, result) -> { throw palletLookupFailure(result.getStatusCode()); })
             .body(WarehousePalletResponse.class);
-        if (response == null || response.data() == null) throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE,
-            "Warehouse pallet service returned no usable response");
+        requirePalletResponse(response);
         return new WarehousePalletReference(response.data().id(), response.data().palletCode(), response.data().warehouseId(),
             response.data().locationId(), response.data().status(), response.data().fbaWarehouseCode(),
             response.data().unitPrice(), response.data().version());
     }
 
     private ResponseStatusException palletLookupFailure(HttpStatusCode status) {
-        return new ResponseStatusException(status.value() == 404 ? HttpStatus.NOT_FOUND
+        return new ResponseStatusException(status.value() == 409 ? HttpStatus.CONFLICT : status.value() == 404 ? HttpStatus.NOT_FOUND
             : (status.is4xxClientError() ? HttpStatus.BAD_REQUEST : HttpStatus.SERVICE_UNAVAILABLE),
             status.value() == 404 ? "Warehouse pallet was not found" : "Warehouse pallet lookup failed");
     }
@@ -199,14 +198,23 @@ public class HttpWarehouseResourceGateway implements WarehouseResourceGateway {
             .retrieve().onStatus(HttpStatusCode::isError, (request, result) -> {
                 throw palletLookupFailure(result.getStatusCode());
             }).body(WarehousePalletResponse.class);
+        requirePalletResponse(response);
+        return response;
+    }
+
+    /** 托盘状态冲突是业务拒绝，不能把HTTP 200内的A0409误报为仓储服务不可用。 */
+    private void requirePalletResponse(WarehousePalletResponse response) {
+        if (response != null && "A0409".equals(response.code())) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT,
+                response.message() == null || response.message().isBlank() ? "Warehouse pallet state conflicts with this operation" : response.message());
+        }
         if (response != null && "A0404".equals(response.code())) {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Warehouse pallet was not found");
         }
-        if (response == null || response.data() == null) {
+        if (response == null || !"200".equals(response.code()) || response.data() == null) {
             throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE,
                 "Warehouse pallet service returned no usable response");
         }
-        return response;
     }
 
     private WarehousePalletReference reference(WarehousePalletData pallet) {

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/ContainerInboundPlanConversionCoordinator.java

@@ -292,7 +292,7 @@ public class ContainerInboundPlanConversionCoordinator {
                 ? plans.existingPlanIdentity(order.customerId(), Long.parseLong(order.orderId())) : null;
             long planId = existing == null ? IdWorker.getId() : existing.planId();
             String planNo = existing == null
-                ? numbers.next("INBOUND_PLAN", order.destinationWarehouseCode(), planId) : existing.planNo();
+                ? numbers.next("INBOUND_PLAN") : existing.planNo();
             if (existing != null && existing.palletCount() != targetPalletCount) {
                 throw new ResponseStatusException(HttpStatus.CONFLICT, "人工计划托数与柜级预览已不一致");
             }

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/InboundFbaAppointmentService.java

@@ -23,6 +23,8 @@ import java.util.stream.Collectors;
 
 @Service
 public class InboundFbaAppointmentService {
+    @jakarta.annotation.Resource private com.baiyue.lastleg.service.LastlegDocumentNumberGenerator documentNumbers;
+
     @Resource private InboundFbaAppointmentMapper appointmentMapper;
     @Resource private InboundFbaAppointmentItemMapper itemMapper;
     @Resource private InboundFbaAppointmentQueryMapper queryMapper;
@@ -76,6 +78,7 @@ public class InboundFbaAppointmentService {
                 new AppointmentCoverageService.SourceRef(source.customerId(),source.sourceKey(),source.destinationKey())).toList(),
             request.originWarehouseId(),request.fbaWarehouseCode(),request.details()));
     }
+    /** 校验预约覆盖的来源单据，首次创建时分配 YY 预约号。 */
     private FbaAppointmentResponse create(String operator,List<AppointmentCoverageService.SourceRef> refs,String expectedOrigin,String expectedDestination,FbaAppointmentDetails details) {
         var resolved=resolveForWrite(refs);
         var group=group(resolved);
@@ -83,7 +86,7 @@ public class InboundFbaAppointmentService {
         if(!Objects.equals(group.originWarehouseId(),expectedOrigin) || !Objects.equals(group.destinationKey(),"FBA:"+expectedDestination)) throw conflict("接仓点或目的仓已变化，请重新核对预约货物");
         var appointment=new InboundFbaAppointment();
         appointment.setId(IdWorker.getId());
-        appointment.setAppointmentNo("AP-"+LocalDate.now(ZoneOffset.UTC).toString().replace("-","")+"-"+UUID.randomUUID().toString().replace("-","").substring(0,12).toUpperCase(Locale.ROOT));
+        appointment.setAppointmentNo(documentNumbers.next("YY"));
         appointment.setOriginWarehouseId(group.originWarehouseId());
         appointment.setFbaWarehouseCode(resolved.get(0).destinationWarehouseCode());
         appointment.setSelectedCount(resolved.size());appointment.setVersion(0);
@@ -261,6 +264,7 @@ public class InboundFbaAppointmentService {
         appointment.setAppointmentStartUtc(null);appointment.setAppointmentEndUtc(null);
     }
 
+    /** 重新分组预约来源，新建预约分配 YY 编号并保留覆盖约束。 */
     @Transactional(isolation=org.springframework.transaction.annotation.Isolation.READ_COMMITTED)
     public RepartitionFbaAppointmentsResponse repartition(String operator,RepartitionFbaAppointmentsRequest request) {
         validateRepartition(request);
@@ -330,7 +334,7 @@ public class InboundFbaAppointmentService {
                     var rows=batch.allocations().stream().map(a->bySource.get(a.sourceKey())).toList();
                     var quantities=batch.allocations().stream().collect(Collectors.toMap(RepartitionFbaAppointmentsRequest.Allocation::sourceKey,RepartitionFbaAppointmentsRequest.Allocation::packageCount));
                     var row=new InboundFbaAppointment();row.setId(IdWorker.getId());
-                    row.setAppointmentNo("AP-"+LocalDate.now(ZoneOffset.UTC).toString().replace("-","")+"-"+UUID.randomUUID().toString().replace("-","").substring(0,12).toUpperCase(Locale.ROOT));
+                    row.setAppointmentNo(documentNumbers.next("YY"));
                     row.setOriginWarehouseId(grouped.originWarehouseId());row.setFbaWarehouseCode(rows.get(0).destinationWarehouseCode());row.setSelectedCount(rows.size());row.setVersion(0);
                     row.setCreatedBy(operator);row.setCreatedAt(now());row.setUpdatedAt(row.getCreatedAt());
                     apply(row,new FbaAppointmentDetails(batch.plannedDate(),null,null,null,null,null,"PENDING",batch.remark(),null,null),rows,evidence);
@@ -471,7 +475,7 @@ public class InboundFbaAppointmentService {
         }
         if(laterAmounts.isEmpty()) throw bad("本次货量没有变化，无需创建变化记录");
         var laterRows=resolved.stream().filter(s->laterAmounts.containsKey(s.sourceKey())).toList();
-        var later=new InboundFbaAppointment();later.setId(IdWorker.getId());later.setAppointmentNo("AP-"+LocalDate.now(ZoneOffset.UTC).toString().replace("-","")+"-"+UUID.randomUUID().toString().replace("-","").substring(0,12).toUpperCase(Locale.ROOT));
+        var later=new InboundFbaAppointment();later.setId(IdWorker.getId());later.setAppointmentNo(documentNumbers.next("YY"));
         later.setOriginWarehouseId(original.getOriginWarehouseId());later.setFbaWarehouseCode(original.getFbaWarehouseCode());later.setVersion(0);later.setSelectedCount(laterRows.size());later.setCreatedBy(operator);later.setCreatedAt(now());later.setUpdatedAt(now());
         apply(later,new FbaAppointmentDetails(intent.laterDate(),null,null,null,null,null,"PENDING",intent.reason(),null,null),laterRows,evidence);
         appointmentMapper.insert(later);writeItems(later,laterRows,List.of(),evidence,laterAmounts);

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/InboundPlanService.java

@@ -456,6 +456,7 @@ public class InboundPlanService {
             receivingWarehouse, plannedArrivalDate, null, Map.of());
     }
 
+    /** 创建入仓计划，复用预分配编号或首次分配 IP 日流水。 */
     private InboundPlanResponse createPlan(String customerId, Long selectedOrderId,
                                            List<SourceOrderSnapshot> orders, List<String> sourcePalletNos,
                                            List<WholePalletInput> wholePallets, ManualInboundPlanRequest manual,
@@ -468,7 +469,7 @@ public class InboundPlanService {
         InboundPlan plan = new InboundPlan();
         plan.setId(preparedPlan == null ? IdWorker.getId() : preparedPlan.planId());
         plan.setPlanNo(preparedPlan == null
-            ? orderNoGenerator.next("INBOUND_PLAN", orders.get(0).destinationWarehouseCode(), plan.getId())
+            ? orderNoGenerator.next("INBOUND_PLAN")
             : preparedPlan.planNo());
         plan.setCustomerId(customerId);
         plan.setSourceOrderId(selectedOrderId);