自提推送老系统

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);

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">

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,

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