From 1623ac6026e8a339cb8db09df942a95a503d0e90 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 15 Jan 2024 17:25:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=96=B0=E5=A2=9E=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=93=81=E8=BF=87=E6=BB=A4=E6=97=A0=E6=95=88=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/mapper/DistributionStockListMapper.xml   | 2 +-
 .../service/impl/DistributionDeliveryListServiceImpl.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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, "配送单信息不存在");