diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
index c3cb57b..209367e 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
@@ -357,6 +357,10 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
         }
 
         for (InventoryDetail inventoryDetail : inventoryList) {
+            BigDecimal inventoryQty = inventoryDetail.getQty().subtract(inventoryDetail.getTaskQty());
+            if (inventoryQty.compareTo(BigDecimal.ZERO) == 0) {
+                continue;
+            }
             // 判断需要配盘数量是否等于0，等于0代表配盘完毕，完毕就退出内循环
             if (shipmentQty.compareTo(BigDecimal.ZERO) == 0) {
                 break;
@@ -367,7 +371,6 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
             CombinationModel combinationModel = new CombinationModel();
             combinationModel.setShipmentDetail(shipmentDetail);
             combinationModel.setInventoryDetail(inventoryDetail);
-            BigDecimal inventoryQty = inventoryDetail.getQty().subtract(inventoryDetail.getTaskQty());
             if (inventoryQty.compareTo(shipmentQty) >= 0) {
                 combinationModel.setShipQty(shipmentQty);
                 shipmentQty = BigDecimal.ZERO;