Merge branch 'dev-lyhfive' of http://git.buggoglobal.com/java-project/baiyue-firstleg into dev

lastleg-service/src/main/java/com/baiyue/lastleg/service/LoadingCompletedConsumer.java

@@ -82,8 +82,8 @@ public class LoadingCompletedConsumer {
         // The loading-plan and container-shipping events are independent aggregate streams.
         // Seeding the shipping version from the loading-plan version makes a valid first node
         // (aggregateVersion=0) look stale whenever the loading plan has a higher version.
-        String orderNo = orderNoGenerator.next();
         JsonNode rawOrders = envelope.payload().path("orders");
+        String orderNo = orderNoGenerator.forContainerNo(payload.containerNo());
         for (int index = 0; index < payload.orders().size(); index++) {
             var source = payload.orders().get(index);
             JsonNode rawSource = rawOrders.isArray() && index < rawOrders.size() ? rawOrders.get(index) : objectMapper.createObjectNode();
@@ -216,7 +216,9 @@ public class LoadingCompletedConsumer {
         order.setOverseasWarehouseId(null); order.setOverseasWarehouseName(null);
         order.setFbaWarehouseCode(source.destinationWarehouseCode()); order.setContainerNo(containerNo);
         order.setContainerStatus("待转柜"); order.setAbnormal(false); order.setDetained(false);
-        order.setPackageCount(source.packageCount()); order.setPalletCount(dropshipPallets.size());
+        order.setPackageCount(source.packageCount());
+        order.setPalletCount("ONE_CLICK_DROPSHIP".equals(orderType)
+            ? dropshipPallets.size() : Objects.requireNonNullElse(source.palletCount(), 0));
         order.setProductQuantity(source.productQuantity()); order.setVolumeCbm(source.volumeCbm());
         order.setEstimatedWarehouseAt(parsePlannedArrival(payload.estimatedWarehouseArrivalAt()));
         order.setVolumeWeightKg(source.items().stream().map(FirstLegLoadingPlanCompletedV1.Item::dimensionalWeightKg)