优化

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

@@ -32,7 +32,7 @@ class IamCustomerSnapshotServiceTest {
     @Test
     void resolvesExactlyOneActiveCustomerAndUsesServerName() {
         var customer = new IamCustomerSnapshotClient.Customer(
-            7L, "C-7", "Canonical Customer", "ACTIVE", null, null);
+            7L, "C-7", "Canonical Customer", "Short Name", "ACTIVE", null, null);
         when(client.page("internal-token", 1, 2, null, "ACTIVE", 7L))
             .thenReturn(ApiResponse.success(new PageResult<>(List.of(customer), 1, 2, 1, 1)));
 
@@ -50,10 +50,20 @@ class IamCustomerSnapshotServiceTest {
             .isInstanceOf(BizException.class).hasMessageContaining("不存在或未启用");
 
         var customer = new IamCustomerSnapshotClient.Customer(
-            7L, "C-7", "Canonical Customer", "ACTIVE", null, null);
+            7L, "C-7", "Canonical Customer", "Short Name", "ACTIVE", null, null);
         when(client.page("internal-token", 1, 2, null, "ACTIVE", 7L))
             .thenReturn(ApiResponse.success(new PageResult<>(List.of(customer), 1, 2, 1, 1)));
         assertThatThrownBy(() -> service.active(7L, "Forged Customer"))
             .isInstanceOf(BizException.class).hasMessageContaining("不一致");
     }
+
+    @Test
+    void resolvesCustomerNicknameForPalletDocument() {
+        var customer = new IamCustomerSnapshotClient.Customer(
+            7L, "C-7", "Canonical Customer", "  Short Name  ", "ACTIVE", null, null);
+        when(client.page("internal-token", 1, 2, null, null, 7L))
+            .thenReturn(ApiResponse.success(new PageResult<>(List.of(customer), 1, 2, 1, 1)));
+
+        assertThat(service.customerNickname(7L)).isEqualTo("Short Name");
+    }
 }

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

@@ -6,6 +6,7 @@ import com.baiyue.firstleg.client.PrintPdfClient;
 import com.baiyue.firstleg.dto.InboundCartonLabels;
 import com.baiyue.firstleg.dto.DropshipPalletizationDtos.Pallet;
 import com.baiyue.firstleg.dto.DropshipPalletizationDtos.SkuItem;
+import com.baiyue.firstleg.mapper.DropshipPalletizationMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,17 +30,22 @@ import static org.mockito.Mockito.when;
 class InboundCartonLabelPrintServiceTest {
     private final InboundCartonLabelService labels = mock(InboundCartonLabelService.class);
     private final PrintPdfClient print = mock(PrintPdfClient.class);
+    private final DropshipPalletizationMapper palletization = mock(DropshipPalletizationMapper.class);
+    private final IamCustomerSnapshotService customerSnapshots = mock(IamCustomerSnapshotService.class);
     private InboundCartonLabelPrintService service;
 
     @BeforeEach
     void setUp() {
         service = new InboundCartonLabelPrintService(labels, print, new ObjectMapper());
         ReflectionTestUtils.setField(service, "internalToken", "internal-token");
+        ReflectionTestUtils.setField(service, "palletizationMapper", palletization);
+        ReflectionTestUtils.setField(service, "customerSnapshots", customerSnapshots);
     }
 
     @Test
     void dropshipPalletLabelIsAvailableBeforeSeal() {
         Pallet open = dropshipPallet("OPEN");
+        stubPalletFacts(90001L, 1, 2);
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_PDF);
         when(print.generateDropshipPalletA4Documents(org.mockito.ArgumentMatchers.anyString(),
@@ -54,17 +60,25 @@ class InboundCartonLabelPrintServiceTest {
             ArgumentCaptor.forClass(PrintPdfClient.DropshipPalletA4PdfRequest.class);
         verify(print).generateDropshipPalletA4Documents(org.mockito.ArgumentMatchers.eq("internal-token"),
             org.mockito.ArgumentMatchers.eq("request-open"), request.capture());
-        assertThat(request.getValue().templateCode()).isEqualTo("DROPSHIP_PALLET_A4_V1");
+        assertThat(request.getValue().templateCode()).isEqualTo("DROPSHIP_PALLET_A4_V2");
         assertThat(request.getValue().pageSpec().widthMm()).isEqualByComparingTo("210");
         assertThat(request.getValue().pageSpec().heightMm()).isEqualByComparingTo("297");
         assertThat(request.getValue().documents()).singleElement().satisfies(document -> {
             assertThat(document.palletNo()).isEqualTo("DP-260911-0001");
-            assertThat(document.inboundCodes()).isEqualTo("PCHK2608040174");
+            assertThat(document.destinationWarehouse()).isEqualTo("纽约 N.JDF");
+            assertThat(document.palletSequence()).isEqualTo(1);
+            assertThat(document.totalPallets()).isEqualTo(2);
+            assertThat(document.inboundRows()).singleElement().satisfies(row -> {
+                assertThat(row.inboundCode()).isEqualTo("PCHK2608040174");
+                assertThat(row.customerNickname()).isEqualTo("小虫科技");
+                assertThat(row.cartonCount()).isEqualTo(1);
+                assertThat(row.itemQuantity()).isEqualTo(19);
+            });
             assertThat(document.skuRows()).singleElement().satisfies(row -> {
                 assertThat(row.skuCode()).isEqualTo("SKU-1");
-                assertThat(row.cargoName()).isEqualTo("音箱");
                 assertThat(row.cartonCount()).isEqualTo(1);
-                assertThat(row.skuQuantity()).isEqualTo(19);
+                assertThat(row.itemQuantity()).isEqualTo(19);
+                assertThat(row.unitsPerCarton()).isEqualTo("19");
             });
         });
     }
@@ -74,6 +88,8 @@ class InboundCartonLabelPrintServiceTest {
         Pallet first = dropshipPallet("OPEN");
         Pallet second = new Pallet(90002L, "DP-260911-0002", "OPEN", 0, 0, 0,
             BigDecimal.ZERO, BigDecimal.ZERO, 1, List.of(), List.of(), null);
+        stubPalletFacts(90001L, 1, 2);
+        stubPalletFacts(90002L, 2, 2);
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_PDF);
         when(print.generateDropshipPalletA4Documents(org.mockito.ArgumentMatchers.anyString(),
@@ -225,4 +241,27 @@ class InboundCartonLabelPrintServiceTest {
         return new Pallet(90001L, "DP-260911-0001", status, 1, 1, 0,
             BigDecimal.ONE, BigDecimal.ONE, 1, List.of(item), List.of(), null);
     }
+
+    private void stubPalletFacts(long palletId, int sequence, int total) {
+        DropshipPalletizationMapper.PrintInboundRow inbound =
+            new DropshipPalletizationMapper.PrintInboundRow();
+        inbound.setTenantId(10001L);
+        inbound.setInboundId(70001L);
+        inbound.setInboundCode("PCHK2608040174");
+        inbound.setDestinationWarehouse("纽约 N.JDF");
+        inbound.setCartonCount(palletId == 90001L ? 1 : 0);
+        inbound.setItemQuantity(palletId == 90001L ? 19 : 0);
+        when(palletization.printInboundRows(palletId)).thenReturn(List.of(inbound));
+        DropshipPalletizationMapper.PrintSkuRow sku = new DropshipPalletizationMapper.PrintSkuRow();
+        sku.setSkuCode("SKU-1");
+        sku.setCartonCount(1);
+        sku.setItemQuantity(19);
+        sku.setMinUnitsPerCarton(19);
+        sku.setMaxUnitsPerCarton(19);
+        when(palletization.printSkuRows(palletId))
+            .thenReturn(palletId == 90001L ? List.of(sku) : List.of());
+        when(palletization.palletPosition(palletId))
+            .thenReturn(new DropshipPalletizationMapper.PalletPosition(sequence, total));
+        when(customerSnapshots.customerNickname(10001L)).thenReturn("小虫科技");
+    }
 }