diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
index 43d368afc..d62f25cd4 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
@@ -452,7 +452,7 @@
             FROM
             logpm_distribution_stock_list ldsl
         <where>
-            ldsl.service_type = #{par.serviceType} and ldsl.warehouse_id = #{par.warehouseId} and ldsl.is_deleted = 0
+            ldsl.service_type = #{par.serviceType} and ldsl.warehouse_id = #{par.warehouseId} and ldsl.is_deleted = 0 and (ldsl.quantity_stock - ldsl.quantity_occupied) > 0
             <if test="par.incomingBatch != null and par.incomingBatch != ''">
               and  ldsl.incoming_batch like concat('%',#{par.incomingBatch},'%')
             </if>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 71cb1a046..3ba29e112 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -6110,7 +6110,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		for (String id : idArray) {
 
 			//查询对应配送单
-			DistributionDeliveryListEntity deliveryListEntity = baseMapper.selectById(id);//配送单
+			DistributionDeliveryListEntity deliveryListEntity = baseMapper.selectById(Long.parseLong(id));//配送单
 			if (Objects.isNull(deliveryListEntity)) {
 				log.warn("#########handleShangPeiData: 配送单信息不存在 deliveryListEntityId={}", id);
 				throw new CustomerException(403, "配送单信息不存在");