废弃 ，换标文件上传 ，排车托盘锁粒度

lastleg-service/src/test/java/com/baiyue/lastleg/model/LastlegOrderTypeTest.java

@@ -11,11 +11,13 @@ class LastlegOrderTypeTest {
     void exposesTheSupportedBusinessTypes() {
         assertEquals(
                 Arrays.asList("FIRST_LEG", "RELABEL_APPLICATION", "WAREHOUSE_TRANSFER",
-                        "LOCAL_LOOSEBOARD", "RETURN_RELABEL", "ONE_CLICK_DROPSHIP"),
+                        "LOCAL_LOOSEBOARD", "RETURN_RELABEL", "ONE_CLICK_DROPSHIP", "CARGO_DISCARD"),
                 Arrays.stream(LastlegOrderType.values()).map(Enum::name).toList());
         assertEquals("换标下单", LastlegOrderType.RELABEL_APPLICATION.label());
         assertEquals("本土散板", LastlegOrderType.LOCAL_LOOSEBOARD.label());
         assertEquals("一件代发", LastlegOrderType.labelOf("ONE_CLICK_DROPSHIP"));
+        assertEquals("货物废弃订单", LastlegOrderType.CARGO_DISCARD.label());
+        assertEquals("货物废弃订单", LastlegOrderType.labelOf("CARGO_DISCARD"));
         assertEquals("LEGACY_TYPE", LastlegOrderType.labelOf("LEGACY_TYPE"));
     }
 }

lastleg-service/src/test/java/com/baiyue/lastleg/relabel/service/RelabelApplicationServiceTest.java

@@ -440,7 +440,7 @@ class RelabelApplicationServiceTest {
         assertEquals("READY_FOR_DISPATCH", transfer.getStatus());
         assertNotNull(transfer.getRelabelCompletedAt());
         assertEquals("READY_FOR_DISPATCH", transferOrder.getCurrentStatus());
-        assertEquals(RelabelApplicationService.READY_FOR_OUTBOUND, transferOrder.getRelabelStatus());
+        assertEquals("COMPLETED", transferOrder.getRelabelStatus());
         verify(warehouseTransfers).updateById(transfer);
         verify(orders).updateById(transferOrder);
     }