java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
ouyangxq
2026-09-14 15:51:52 +08:00
parent 13d2fe8e3a
commit f9fa859391
7 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firstleg/src/main/java/com/baiyue/firstleg/mapper/DropshipPalletizationMapper.java
+10 -2
View File
@@ -206,7 +206,11 @@ public interface DropshipPalletizationMapper {
@Select("""
SELECT c.tenant_id,c.inbound_id,o.inbound_code,
COALESCE(NULLIF(o.destination_name,''),NULLIF(o.destination_code,''),'—') destination_warehouse,
CASE REPLACE(UPPER(COALESCE(o.destination_code,'')),'.','')
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,
SUM(COALESCE(q.item_quantity,c.actual_sku_quantity,0)) item_quantity
FROM fl_dropship_pallet_carton c
@@ -217,7 +221,11 @@ public interface DropshipPalletizationMapper {
GROUP BY c.tenant_id,c.inbound_id,o.inbound_code,o.destination_name,o.destination_code
UNION ALL
SELECT p.tenant_id,p.inbound_id,o.inbound_code,
COALESCE(NULLIF(o.destination_name,''),NULLIF(o.destination_code,''),'—') destination_warehouse,
CASE REPLACE(UPPER(COALESCE(o.destination_code,'')),'.','')
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
FROM fl_dropship_pallet p
JOIN fl_inbound_order o ON o.id=p.inbound_id AND o.tenant_id=p.tenant_id
firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java
+2 -2
View File
@@ -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("纽约 N.JDF");
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("纽约 N.JDF");
inbound.setDestinationWarehouse("纽约 NJDF");
inbound.setCartonCount(palletId == 90001L ? 1 : 0);
inbound.setItemQuantity(palletId == 90001L ? 19 : 0);
when(palletization.printInboundRows(palletId)).thenReturn(List.of(inbound));