桥接事件

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

@@ -109,9 +109,19 @@ public class LoadingCompletedOutboxService {
         Map<Long, List<String>> result = new java.util.LinkedHashMap<>();
         for (Row row : rows) {
             if (dropship(row.getBusinessType())) continue;
+            if (row.getSkuCode() == null || row.getSkuCode().isBlank()) {
+                throw new BizException(ResultCode.CONFLICT, "装柜明细缺少 SKU，不能建立箱唛与 SKU 的对应关系");
+            }
             List<String> labels = Objects.requireNonNullElse(cartonManifestMapper.labelPool(row.getAccountId(),
                 row.getSourceInboundId(), row.getSourceInboundDetailId()), List.of());
             if (labels.isEmpty()) throw new BizException(ResultCode.CONFLICT, "装柜明细没有已打印的可用箱唛池，不能生成海外交接事件");
+            if (labels.stream().anyMatch(label -> label == null || label.isBlank())
+                || labels.stream().distinct().count() != labels.size()) {
+                throw new BizException(ResultCode.CONFLICT, "装柜明细箱唛池包含空值或重复箱号");
+            }
+            if (labels.size() < Objects.requireNonNullElse(row.getPackageCount(), 0)) {
+                throw new BizException(ResultCode.CONFLICT, "装柜明细箱唛数量少于实装箱数，不能生成海外交接事件");
+            }
             result.put(row.getLoadingPlanItemId(), labels);
         }
         return result;

firstleg/src/test/java/com/baiyue/firstleg/service/LoadingCompletedOutboxServiceTest.java

@@ -19,6 +19,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.verify;
@@ -52,10 +53,21 @@ class LoadingCompletedOutboxServiceTest {
         assertThat(first.payload().get("orders")).hasSize(2);
         assertThat(first.payload().at("/orders/0/sourceInboundId").asText()).isEqualTo("100");
         assertThat(first.payload().at("/orders/0/items/0/sourceInboundDetailId").asText()).isEqualTo("101");
+        assertThat(first.payload().at("/orders/0/items/0/skuCode").asText()).isEqualTo("SKU101");
+        assertThat(first.payload().at("/orders/0/items/0/cartonMarks/0").asText()).isEqualTo("BOX-POOL-1");
         assertThat(rows.get(0).getEventKey()).isEqualTo("FIRSTLEG_LOADING_COMPLETED:90:11:2");
         assertThat(first.eventVersion()).isEqualTo(2);
     }
 
+    @Test void rejectsOrdinaryItemWhenSkuToCartonMappingCannotBeBuilt() {
+        Row value = row(11, 100, 101);
+        value.setSkuCode(null);
+        when(snapshots.rows(90L)).thenReturn(List.of(value));
+
+        assertThatThrownBy(() -> service.publish(90L))
+            .hasMessageContaining("缺少 SKU");
+    }
+
     @Test void snapshotOnlyPublishesFinalizedLoadedInbounds() throws Exception {
         String sql = String.join(" ", LoadingCompletedEventMapper.class.getMethod("rows", long.class)
             .getAnnotation(Select.class).value()).replaceAll("\\s+", " ");