diff --git a/firstleg/src/main/java/com/baiyue/firstleg/mapper/DropshipPalletizationMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/mapper/DropshipPalletizationMapper.java index c3674d0a7..6bcaff395 100644 --- a/firstleg/src/main/java/com/baiyue/firstleg/mapper/DropshipPalletizationMapper.java +++ b/firstleg/src/main/java/com/baiyue/firstleg/mapper/DropshipPalletizationMapper.java @@ -207,8 +207,8 @@ public interface DropshipPalletizationMapper { @Select(""" SELECT c.tenant_id,c.inbound_id,o.inbound_code, CASE REPLACE(UPPER(COALESCE(o.destination_code,'')),'.','') - WHEN 'NJDF' THEN '纽约 NJDF' - WHEN 'CADF' THEN '洛杉矶 CADF' + WHEN 'NJDF' THEN 'NJDF' + WHEN 'CADF' THEN 'CADF' ELSE REPLACE(COALESCE(NULLIF(o.destination_name,''),NULLIF(o.destination_code,''),'—'),'.','') END destination_warehouse, COUNT(DISTINCT c.id) carton_count, @@ -222,8 +222,8 @@ public interface DropshipPalletizationMapper { UNION ALL SELECT p.tenant_id,p.inbound_id,o.inbound_code, CASE REPLACE(UPPER(COALESCE(o.destination_code,'')),'.','') - WHEN 'NJDF' THEN '纽约 NJDF' - WHEN 'CADF' THEN '洛杉矶 CADF' + WHEN 'NJDF' THEN 'NJDF' + WHEN 'CADF' THEN 'CADF' ELSE REPLACE(COALESCE(NULLIF(o.destination_name,''),NULLIF(o.destination_code,''),'—'),'.','') END destination_warehouse, 0 carton_count,0 item_quantity diff --git a/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingServiceTest.java index 07d011809..773b5efa3 100644 --- a/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingServiceTest.java +++ b/firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingServiceTest.java @@ -49,7 +49,7 @@ class OceanBookingServiceTest { MockitoAnnotations.openMocks(this); objectMapper = new ObjectMapper().findAndRegisterModules(); lenient().when(customers.active(eq(100L), any())).thenReturn( - new com.baiyue.firstleg.client.IamCustomerSnapshotClient.Customer(100L, "C100", "客户", "ACTIVE", null, null)); + new com.baiyue.firstleg.client.IamCustomerSnapshotClient.Customer(100L, "C100", "客户", null, "ACTIVE", null, null)); lenient().when(documentNumbers.next("OB")).thenReturn("OB-260818-0001"); var field = OceanBookingService.class.getDeclaredField("objectMapper"); field.setAccessible(true); diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java index af6b08ff9..2d6c609de 100644 --- a/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java +++ b/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java @@ -65,7 +65,7 @@ class InboundCartonLabelPrintServiceTest { assertThat(request.getValue().pageSpec().heightMm()).isEqualByComparingTo("297"); assertThat(request.getValue().documents()).singleElement().satisfies(document -> { assertThat(document.palletNo()).isEqualTo("DP-260911-0001"); - assertThat(document.destinationWarehouse()).isEqualTo("纽约 NJDF"); + assertThat(document.destinationWarehouse()).isEqualTo("NJDF"); assertThat(document.palletSequence()).isEqualTo(1); assertThat(document.totalPallets()).isEqualTo(2); assertThat(document.inboundRows()).singleElement().satisfies(row -> { @@ -248,7 +248,7 @@ class InboundCartonLabelPrintServiceTest { inbound.setTenantId(10001L); inbound.setInboundId(70001L); inbound.setInboundCode("PCHK2608040174"); - inbound.setDestinationWarehouse("纽约 NJDF"); + inbound.setDestinationWarehouse("NJDF"); inbound.setCartonCount(palletId == 90001L ? 1 : 0); inbound.setItemQuantity(palletId == 90001L ? 19 : 0); when(palletization.printInboundRows(palletId)).thenReturn(List.of(inbound)); diff --git a/print/output/pdf/dropship-pallet-a4-v2-preview.pdf b/print/output/pdf/dropship-pallet-a4-v2-preview.pdf index 26657aeb5..6cc08e92c 100644 Binary files a/print/output/pdf/dropship-pallet-a4-v2-preview.pdf and b/print/output/pdf/dropship-pallet-a4-v2-preview.pdf differ diff --git a/print/src/test/java/com/baiyue/print/controller/InternalPdfControllerTest.java b/print/src/test/java/com/baiyue/print/controller/InternalPdfControllerTest.java index 7580e4193..a0e7e4e40 100644 --- a/print/src/test/java/com/baiyue/print/controller/InternalPdfControllerTest.java +++ b/print/src/test/java/com/baiyue/print/controller/InternalPdfControllerTest.java @@ -273,7 +273,7 @@ class InternalPdfControllerTest { "downloadFileName": "DP-260911-0034-A4托盘信息单.pdf", "documents": [{ "palletNo": "DP-260911-0034", - "destinationWarehouse": "纽约 NJDF", + "destinationWarehouse": "NJDF", "palletSequence": 1, "totalPallets": 3, "barcodeContent": "DP-260911-0034", diff --git a/print/src/test/java/com/baiyue/print/service/DropshipPalletA4PdfServiceGenerationTest.java b/print/src/test/java/com/baiyue/print/service/DropshipPalletA4PdfServiceGenerationTest.java index d6deed2ee..cf2a311f8 100644 --- a/print/src/test/java/com/baiyue/print/service/DropshipPalletA4PdfServiceGenerationTest.java +++ b/print/src/test/java/com/baiyue/print/service/DropshipPalletA4PdfServiceGenerationTest.java @@ -27,7 +27,7 @@ class DropshipPalletA4PdfServiceGenerationTest { @Test void generatesOneA4PageWithPalletBarcodeAndSkuDetails() throws Exception { DropshipPalletA4PdfDtos.Document document = new DropshipPalletA4PdfDtos.Document( - "DP-260911-0034", "纽约 NJDF", 1, 3, "DP-260911-0034", + "DP-260911-0034", "NJDF", 1, 3, "DP-260911-0034", List.of(new DropshipPalletA4PdfDtos.InboundRow( "NYEXX2609110249", "小虫科技", 3, 90)), List.of( @@ -64,7 +64,7 @@ class DropshipPalletA4PdfServiceGenerationTest { "SKU-" + String.format("%03d", index), 2, index * 5, "5-10")); } DropshipPalletA4PdfDtos.Document document = new DropshipPalletA4PdfDtos.Document( - "DP-260911-0034", "纽约 NJDF", 1, 1, + "DP-260911-0034", "NJDF", 1, 1, "DP-260911-0034", inboundRows, rows); var generated = service.generate(new DropshipPalletA4PdfDtos.Request( DropshipPalletA4PdfDtos.TEMPLATE, @@ -85,7 +85,7 @@ class DropshipPalletA4PdfServiceGenerationTest { rows.add(new DropshipPalletA4PdfDtos.SkuRow("SKU-" + index, 1, 1, "1")); } DropshipPalletA4PdfDtos.Document document = new DropshipPalletA4PdfDtos.Document( - "DP-260911-0034", "纽约 NJDF", 1, 1, "DP-260911-0034", + "DP-260911-0034", "NJDF", 1, 1, "DP-260911-0034", List.of(new DropshipPalletA4PdfDtos.InboundRow("INBOUND", "客户", 35, 35)), rows); assertThatThrownBy(() -> service.generate(new DropshipPalletA4PdfDtos.Request(