diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentCompleteSetOfEquipmentLabelPrintingDeliveryItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentCompleteSetOfEquipmentLabelPrintingDeliveryItemServiceImpl.java
index 3e5853f4..5f0b2612 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentCompleteSetOfEquipmentLabelPrintingDeliveryItemServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentCompleteSetOfEquipmentLabelPrintingDeliveryItemServiceImpl.java
@@ -78,6 +78,7 @@ public class WmsShipmentCompleteSetOfEquipmentLabelPrintingDeliveryItemServiceIm
     @Override
     public void updateDeliveryItemStatus(List<Long> ids, List<WmsShipmentCompleteSetOfEquipmentLabelPrintingDeliveryItem> preFetchedItems) {
         Map<Long, Long> id2PrePackagingCodeIdMap = preFetchedItems.stream()
+                .filter(item -> item.getPackagingCodeId() != null)
                 .collect(Collectors.toMap(WmsShipmentCompleteSetOfEquipmentLabelPrintingDeliveryItem::getId, WmsShipmentCompleteSetOfEquipmentLabelPrintingDeliveryItem::getPackagingCodeId, (oldVal, newVal) -> newVal));
 
         List<WmsShipmentCompleteSetOfEquipmentLabelPrintingDeliveryItem> items = this.lambdaQuery()
diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/CompleteSetOfEquipmentLabelPrintingController.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/CompleteSetOfEquipmentLabelPrintingController.java
index 592eca52..f88d23f6 100644
--- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/CompleteSetOfEquipmentLabelPrintingController.java
+++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/CompleteSetOfEquipmentLabelPrintingController.java
@@ -1122,8 +1122,13 @@ public class CompleteSetOfEquipmentLabelPrintingController extends BaseControlle
         // 在更新为null前先获取packagingCodeId
         List<WmsShipmentCompleteSetOfEquipmentLabelPrintingDeliveryItem> itemsBeforeUpdate = deliveryItemService.lambdaQuery()
                 .in(WmsShipmentCompleteSetOfEquipmentLabelPrintingDeliveryItem::getId, ids)
+                .eq(WmsShipmentCompleteSetOfEquipmentLabelPrintingDeliveryItem::getDeliveryStatus, CompleteSetDeliveryStatus.Packed.getState())
                 .list();
 
+        if (CollectionUtil.isEmpty(itemsBeforeUpdate) || itemsBeforeUpdate.size() != ids.size()) {
+            throw new NflgException(STATE.BusinessError, "请选择已装箱的数据");
+        }
+
         deliveryItemService.lambdaUpdate()
                 .set(WmsShipmentCompleteSetOfEquipmentLabelPrintingDeliveryItem::getBoxNo, null)
                 .set(WmsShipmentCompleteSetOfEquipmentLabelPrintingDeliveryItem::getPackagingCodeId, null)