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:
liuyihe
2026-10-10 13:48:25 +08:00
parent 721d92ac7b
commit 12a5093b41
26 changed files with 1347 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lastleg-service/src/test/java/com/baiyue/lastleg/delivery/service/DeliveryTransferServiceTest.java
+32
View File
@@ -236,6 +236,38 @@ class DeliveryTransferServiceTest {
assertEquals(1, delivery.getValue().getPackageCount());
}
@Test
void partialSkuOutboundDistributesSixPiecesAcrossTwoFivePieceSources() {
var first = returnCarton("RC-1", null); first.setId(901L); first.setTotalQuantity(5L);
var second = returnCarton("RC-2", null); second.setId(902L); second.setTotalQuantity(5L);
when(returnCartons.lockMark("RC-1")).thenReturn(first); when(returnCartons.lockMark("RC-2")).thenReturn(second);
var line = new ReturnInventoryCartonItem(); line.setSkuCode("SKU-A"); line.setQuantity(5L);
when(returnCartonItems.lockCarton(901L)).thenReturn(List.of(line));
when(returnCartonItems.lockCarton(902L)).thenReturn(List.of(line));
service.createReturnOutbound("TENANT-A", "U-1", new DeliveryRequests.ReturnOutbound("receiver", "WH-1", "RT-1",
List.of("RC-1", "RC-2"), null, "partial-six", "SKU-A", "BOX", 6L));
var capture = ArgumentCaptor.forClass(OutboundPalletItem.class);
verify(outboundPallets, org.mockito.Mockito.times(2)).insert(capture.capture());
assertEquals(List.of(5L, 1L), capture.getAllValues().stream().map(OutboundPalletItem::getReturnSkuQuantity).toList());
}
@Test
void singleSkuReturnOutboundAcceptsPackedSingleSkuButKeepsCartonScanning() {
ReturnInventoryCarton carton = returnCarton("RC-BOX", "PAL-1");
carton.setSourceUnitType("BOX"); carton.setTotalQuantity(5L);
ReturnInventoryCartonItem line = new ReturnInventoryCartonItem();
line.setSkuCode("SKU-A"); line.setQuantity(5L);
when(returnCartons.lockMark("RC-BOX")).thenReturn(carton);
when(returnCartonItems.lockCarton(carton.getId())).thenReturn(List.of(line));
service.createReturnOutbound("TENANT-A", "U-1",
new DeliveryRequests.ReturnOutbound("receiver", "WH-1", "RT-1", List.of("RC-BOX"), null, "packed-sku", "SKU-A"));
ArgumentCaptor<OutboundPalletItem> item = ArgumentCaptor.forClass(OutboundPalletItem.class);
verify(outboundPallets).insert(item.capture());
assertNull(item.getValue().getSkuCode());
assertEquals("RC-BOX", item.getValue().getCartonMarks());
assertEquals("OUTBOUND_PENDING", carton.getStatus());
}
@Test
void singleSkuReturnOutboundRejectsMixedCarton() {
ReturnInventoryCarton mixed = returnCarton("RC-MIXED", null);
lastleg-service/src/test/java/com/baiyue/lastleg/delivery/service/ReturnOutboundClosureTest.java
+11 -2
View File
@@ -71,9 +71,18 @@ class ReturnOutboundClosureTest {
verify(outbounds, times(1)).insert(any(OutboundOrder.class));
}
@Test void preventsSingleSkuBypassingExistingBox() {
@Test void singleSkuPackedBoxKeepsCartonScanAndPieceSnapshot() {
service.createReturnOutbound("C1", "USER", command("SKU1"));
verify(items).insert(argThat((OutboundPalletItem i) -> i.getSkuCode() == null && Long.valueOf(6L).equals(i.getReturnSkuQuantity())));
assertThat(carton.getStatus()).isEqualTo("OUTBOUND_PENDING");
}
@Test void singleSkuCannotConsumeMixedSkuCarton() {
ReturnInventoryCartonItem other = new ReturnInventoryCartonItem(); other.setSkuCode("SKU2"); other.setQuantity(1L);
var first = contents.lockCarton(10L).get(0);
when(contents.lockCarton(10L)).thenReturn(List.of(first, other));
assertThatThrownBy(() -> service.createReturnOutbound("C1", "USER", command("SKU1")))
.isInstanceOf(ResponseStatusException.class).hasMessageContaining("按箱唛");
.isInstanceOf(ResponseStatusException.class).hasMessageContaining("SKU");
verify(outbounds, never()).insert(any(OutboundOrder.class));
}