From 138b0433421e639b69dbf6fc085678e41896e057 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Sun, 24 Mar 2024 11:13:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=A4=87=E8=B4=A7?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=BA=93=E5=AD=98=E5=93=81=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E6=B2=A1=E6=9C=89=E5=B8=A6=E4=B8=8A=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionStockListMapper.xml      | 5 ++++-
 .../service/impl/WarehouseRetentionRecordServiceImpl.java    | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

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 8ac7206aa..4a9b6713c 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
@@ -531,7 +531,10 @@
         order_package_code = #{orderPackageCode}
         AND conditions = 2
         ) t
-        LEFT JOIN logpm_distribution_stock_list ldsl ON ldsl.incoming_batch = t.order_code and  ldsl.cargo_number=t.material_code
+        LEFT JOIN logpm_distribution_stock_list ldsl ON ldsl.incoming_batch = t.order_code
+        where
+        ldsl.cargo_number=t.material_code
+        and ldsl.is_deleted=0
     </select>
     <select id="getMerchantStockList" resultType="com.logpm.distribution.entity.DistributionStockListEntity">
         SELECT * FROM logpm_distribution_stock_list WHERE  tenant_id = #{tenantId} AND cargo_number= #{materielCode}
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java
index 0afc49bfa..c8136adbb 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java
@@ -315,6 +315,9 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 							//零担
 							saveFlah.set(distributionDeliveryListClient.retentionDeliveryReservationZeroPackage(rs.getDeliveryId(), rs.getReservationId(), rs.getOrderPackageId(),rs.getRetentionQuantity(),rs.getOrderId()));
 							break;
+						default:
+							log.error(">>>>> rs.getConditions()={}",rs.getConditions());
+
 					}
 				}
 			});