Merge origin/test into dev

firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingListQueryMapperContractTest.java

@@ -60,6 +60,9 @@ class LoadingListQueryMapperContractTest {
         assertThat(items)
             .contains("i.order_id", "i.order_no", "b.container_no")
             .contains("b.record_status='ACTIVE'")
+            .contains("NULLIF(i.pallet_count,0)")
+            .contains("fl_inbound_weight_result weight")
+            .contains("weight.recognition_status='CONFIRMED'")
             .contains("i.loading_plan_id = #{planId}")
             .contains("i.deleted = 0");
     }

firstleg/src/test/java/com/baiyue/firstleg/repository/PdaSplitSettlementSqlContractTest.java

@@ -124,6 +124,17 @@ class PdaSplitSettlementSqlContractTest {
             .contains("split_status='FULLY_SPLIT'");
     }
 
+    @Test
+    void partialPickingConvergesPalletSnapshotWithActualCartons() throws Exception {
+        String converge = InboundSplitSettlementMapper.class.getMethod("convergePartialPlanItem",
+                long.class, long.class, String.class)
+            .getAnnotation(Update.class).value()[0];
+        assertThat(converge)
+            .contains("plan_item.pallet_count = CEIL")
+            .contains("pick_item.picked_package_count / NULLIF(plan_item.package_count,0)")
+            .contains("plan_item.package_count = pick_item.picked_package_count");
+    }
+
     @Test
     void keepsAllocationConfirmedUntilReleaseStep() throws Exception {
         String consume = InboundPalletAllocationMapper.class.getMethod("consume",

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

@@ -16,6 +16,7 @@ import com.baiyue.firstleg.entity.ContainerBookingEntity;
 import com.baiyue.firstleg.entity.LoadingPlanEntity;
 import com.baiyue.firstleg.entity.LoadingPlanHistoryEntity;
 import com.baiyue.firstleg.entity.LoadingPlanItemEntity;
+import com.baiyue.firstleg.entity.InboundOrderEntity;
 import com.baiyue.firstleg.repository.SmartLoadingRepository;
 import com.baiyue.firstleg.loading.bridge.service.LoadingModelBridgeService;
 import com.baiyue.firstleg.split.service.SplitPreloadService;
@@ -300,6 +301,9 @@ class SmartLoadingServiceTest {
     @Test
     void snapshotsCargoFields() {
         stubAssignment();
+        InboundOrderEntity inbound = new InboundOrderEntity();
+        inbound.setId(10L); inbound.setTenantId(9L); inbound.setTotalPackageCount(10); inbound.setPalletCount(4);
+        when(repository.inbound(9L, 10L)).thenReturn(inbound);
         when(cargoClient.detail(anyString(), eq(9L), eq(30L), eq(20L))).thenReturn(ApiResponse.success(
             new OrderCargoClient.CargoBinding(20L, 30L, 1, "中文品名", 10,
                 new BigDecimal("20"), new BigDecimal("2"), "SKU-1", "English name",
@@ -320,6 +324,7 @@ class SmartLoadingServiceTest {
         assertThat(saved.getProductNameEn()).isEqualTo("English name");
         assertThat(saved.getUnitsPerCarton()).isEqualTo(4);
         assertThat(saved.getProductQuantity()).isEqualTo(20);
+        assertThat(saved.getPalletCount()).isEqualTo(2);
         assertThat(saved.getNetWeightKg()).isEqualByComparingTo("7.5");
         assertThat(saved.getCustomerRemark()).isEqualTo("客户备注");
         assertThat(saved.getInternalRemark()).isEqualTo("最新内部备注");
@@ -354,6 +359,8 @@ class SmartLoadingServiceTest {
         when(repository.items(1)).thenReturn(List.of());
         when(repository.candidate(100, 10, 20)).thenReturn(candidate(10));
         when(repository.activeItem(1L, 9L, 20L)).thenReturn(null);
+        when(loadingPickService.mutationSnapshot(1L)).thenReturn(
+            new LoadingPickService.MutationSnapshot(77L, "LOADING", 6, Map.of()));
         when(cargoClient.detail(anyString(), anyLong(), anyLong(), anyLong())).thenReturn(ApiResponse.success(
             new OrderCargoClient.CargoBinding(20L, 30L, 1, "货物", 1,
                 BigDecimal.ONE, BigDecimal.ONE, null, null, null, null, null, null)));
@@ -361,14 +368,15 @@ class SmartLoadingServiceTest {
         Plan result = service.assign(1, new AssignRequest(10L, 20L, 1, 5, "assign-loading"), 7, "u");
 
         assertThat(result.status()).isEqualTo("LOADING");
-        verify(splitPreloadService).ensureForRunningLoadingAllocation(9L, 10L, 7L, "u");
-        verify(splitPreloadService, never()).ensurePendingForLoadingAllocation(anyLong(), anyLong(), anyLong(), anyString());
-        var order = inOrder(loadingPickService, repository, loadingModelBridge);
+        var order = inOrder(loadingPickService, splitPreloadService, repository, loadingModelBridge);
         order.verify(loadingPickService).lockMutable(1L);
+        order.verify(splitPreloadService).ensureForRunningLoadingAllocation(9L, 10L, 7L, "u");
         order.verify(repository).touch(1, 5, 7, "u");
         order.verify(loadingModelBridge).bindIncrementalAllocation(1L, 9L, 10L,
             7L, "u", "assign-loading");
         order.verify(loadingPickService).sync(eq(1L), any(LoadingPlanItemEntity.class));
+        verify(splitPreloadService, never()).ensurePendingForLoadingAllocation(
+            anyLong(), anyLong(), anyLong(), anyString());
     }
 
     @Test

firstleg/src/test/java/com/baiyue/firstleg/split/service/SplitPreloadServiceTest.java

@@ -92,4 +92,14 @@ class SplitPreloadServiceTest {
         verify(repository, never()).createPlan(any());
     }
 
+    @Test
+    void runningLoadingAllocationStillRejectsConfirmingPreload() {
+        when(repository.findInbound(10, 20)).thenReturn(new InboundSnapshot(20L, 10L, "WAIT_SPLIT", 3));
+        PreloadPlanEntity plan = new PreloadPlanEntity();
+        plan.setStatus("CONFIRMING");
+        when(repository.findPlan(10, 20)).thenReturn(plan);
+
+        assertThatThrownBy(() -> service.ensureForRunningLoadingAllocation(10, 20, 7, "admin"))
+            .hasMessageContaining("已进入确认流程");
+    }
 }