优化

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/service/DeliveryDocumentService.java

@@ -138,7 +138,10 @@ public class DeliveryDocumentService {
             .eq(LastlegOrder::getCustomerId, delivery.getCustomerId())
             .eq(LastlegOrder::getDeliveryOrderNo, delivery.getDeliveryNo()));
         for (LastlegOrder order : completedOrders) {
-            order.setSubOrderStatus("DELIVERY:DELIVERED");
+            // Preserve the outbound leg when receipt completion closes delivery.
+            // Sub-order status is a composite fact; replacing it with DELIVERY alone
+            // makes a successfully departed outbound appear unfinished or disappear.
+            order.setSubOrderStatus("OUTBOUND:OUTBOUNDED;DELIVERY:DELIVERED");
             order.setUpdatedAt(now);
             lastlegOrders.updateById(order);
         }

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/pda/service/DispatchPdaWorkflowService.java

@@ -3,6 +3,7 @@ package com.baiyue.lastleg.dispatch.pda.service;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baiyue.lastleg.delivery.entity.OutboundOrder;
 import com.baiyue.lastleg.delivery.mapper.OutboundOrderMapper;
+import com.baiyue.lastleg.delivery.mapper.OutboundPalletItemMapper;
 import com.baiyue.lastleg.dispatch.entity.DispatchItem;
 import com.baiyue.lastleg.dispatch.entity.DispatchOrder;
 import com.baiyue.lastleg.dispatch.entity.DispatchPalletLock;
@@ -37,6 +38,7 @@ import java.util.stream.Collectors;
 public class DispatchPdaWorkflowService {
     @Resource private DispatchOrderMapper orders;
     @Resource private OutboundOrderMapper outboundOrders;
+    @Resource private OutboundPalletItemMapper outboundPalletItems;
     @Resource private DispatchItemMapper items;
     @Resource private DispatchPdaTaskMapper tasks;
     @Resource private DispatchPdaPickMapper picks;
@@ -227,6 +229,17 @@ public class DispatchPdaWorkflowService {
         long shipped = dispatchPicks.stream().mapToLong(p -> n(p.getPackages())).sum();
         LocalDateTime now = LocalDateTime.now();
         pickAttribution.depart(customerId, outbound.getOutboundNo(), order.getDispatchNo(), dispatchPicks, now);
+        if (outboundPalletItems != null) {
+            for (var outboundItem : outboundPalletItems.findByOutbound(customerId, outbound.getId())) {
+                boolean selected = dispatchItems.stream().anyMatch(item -> Objects.equals(item.getWarehousePalletId(), outboundItem.getWarehousePalletId())
+                    && Objects.equals(item.getInboundCode(), outboundItem.getInboundCode()));
+                if (selected) {
+                    outboundItem.setPickedPackageCount(outboundItem.getPackageCount());
+                    outboundItem.setStatus("PICKED");
+                    outboundPalletItems.updateById(outboundItem);
+                }
+            }
+        }
         for (DispatchItem item : dispatchItems) {
             if (item.getOrderId() != null) warehouseTransfers.markOutboundByOrder(customerId, item.getOrderId(), now);
             if ("RELABEL_ORDER".equals(item.getSourceBusinessType()) && item.getSourceBusinessNo() != null) {

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/pda/service/DispatchPickOrderAttributionService.java

@@ -94,6 +94,9 @@ public class DispatchPickOrderAttributionService {
             if (before == null || orders.transferPickedToShipped(customerId, entry.getKey(), entry.getValue(), outboundNo) != 1) {
                 throw conflict("Tail-leg order picked packages are inconsistent");
             }
+            if (orders.markDispatchOutbound(customerId, entry.getKey()) != 1) {
+                throw conflict("Tail-leg outbound sub-order status could not be synchronized");
+            }
             long shipped = value(before.getShippedPackageCount()) + entry.getValue();
             String to = shipped == value(before.getPackageCount()) ? "COMPLETED" : "PARTIALLY_SHIPPED";
             LastlegOrderStatusHistory row = new LastlegOrderStatusHistory();

lastleg-service/src/main/java/com/baiyue/lastleg/mapper/LastlegOrderMapper.java

@@ -230,6 +230,10 @@ public interface LastlegOrderMapper extends BaseMapper<LastlegOrder> {
     int transferPickedToShipped(@Param("customerId") String customerId, @Param("id") Long id,
                                 @Param("packages") long packages, @Param("outboundNo") String outboundNo);
 
+    @Update("UPDATE ll_order SET sub_order_status='OUTBOUND:OUTBOUNDED;DELIVERY:WAIT_DELIVERY',updated_at=NOW() " +
+        "WHERE customer_id=#{customerId} AND id=#{id}")
+    int markDispatchOutbound(@Param("customerId") String customerId, @Param("id") Long id);
+
     @Update("UPDATE ll_order SET pallet_merge_flag=#{flag}," +
         "pallet_merge_batch_id=CASE WHEN #{flag} IS NULL THEN NULL ELSE pallet_merge_batch_id END," +
         "updated_at=#{updatedAt} " +