From 58d5c3b462259913a746d4083e783420883dbe94 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 11 May 2024 16:57:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E6=8E=A8=E9=80=81=E8=80=81?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionReservationMapper.java    | 2 +-
 .../distribution/mapper/DistributionReservationMapper.xml     | 1 +
 .../distribution/mapper/DistrilbutionBillLadingMapper.xml     | 4 ++--
 .../service/impl/DistributionReservationServiceImpl.java      | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
index a1f3f5734..e8f25d816 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
@@ -70,7 +70,7 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	List<DistributionStockupOrderListVO> selectStockupOrderList(@Param("reservationId")Long reservationId,@Param("isZero") String isZero);
 
     List<DistributionStockupStockListVO> selectStockupStockList(@Param("reservationId")Long reservationId);
-	List<DistributionStockupStockListVO> selectStockupStockListNew(@Param("reservationId")Long reservationId,@Param("warehouseId")Long warehouseId,@Param("mallName")String mallName);
+	List<DistributionStockupStockListVO> selectStockupStockListNew(@Param("reservationId")Long reservationId,@Param("warehouseId")Long warehouseId,@Param("mallName")String mallName,@Param("cargoNumber")String cargoNumber);
     Integer selectOrderNumByReservationId(@Param("reservationId")Long reservationId);
 
 	Integer selectPlanNum(@Param("reservationId")Long reservationId);
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
index 90c473006..3b41295ea 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
@@ -1038,6 +1038,7 @@
         WHERE
             stock_list_status IN ( '1', '3' )
             AND reservation_id = #{reservationId}
+            AND is_deleted = 0
     </select>
     <select id="selectReservationPackageByReservationId"
             resultType="com.logpm.distribution.entity.DistributionReservationPackageEntity">
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
index 715b9c9c2..7c4b98051 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
@@ -749,7 +749,7 @@
     <select id="getSignPushDataDTO" resultType="com.logpm.oldproject.dto.SignPushDataDTO">
         SELECT
         ldbl.id,
-        ldbl.warehouse_id AS warehouseId,
+        lww.old_id AS warehouseId,
         lww.name AS warehouseName,
         3 AS type,
         3 AS finishState,
@@ -843,7 +843,7 @@
     <select id="selectPushOldPackageSigning" resultType="com.logpm.oldproject.dto.SignPushDataUnitDTO">
         SELECT
         ldbls.id AS id,
-        ldsa.warehouse_id AS warehouse_id,
+        ldsa.old_id AS warehouse_id,
         ldbls.create_user AS distribution_contact_id,
         ldbls.bill_lading_id AS distributionId,
         ldbl.pickup_batch AS transNo,
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index 3c3808946..ca091cfc0 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -3003,8 +3003,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	}
 
 	@Override
-	public List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId,Long warehouseId,String mallName) {
-		return baseMapper.selectStockupStockListNew(reservationId,warehouseId,mallName);
+	public List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId,Long warehouseId,String mallName,String cargoNumber) {
+		return baseMapper.selectStockupStockListNew(reservationId,warehouseId,mallName,cargoNumber);
 	}
 
 	@Override