合并代码

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java

@@ -70,8 +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);
-
+	List<DistributionStockupStockListVO> selectStockupStockListNew(@Param("reservationId")Long reservationId,@Param("warehouseId")Long warehouseId,@Param("mallName")String mallName);
     Integer selectOrderNumByReservationId(@Param("reservationId")Long reservationId);
 
 	Integer selectPlanNum(@Param("reservationId")Long reservationId);
@@ -119,8 +118,8 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 
 	/**
 	 * 查询预约单下指定订单包件列表
-	 * @param id
-	 * @param id1
+	 * @param orderIds
+	 * @param param
 	 * @return
 	 */
 	IPage<DistributionParcelListEntity> getReservationPackage(IPage<DistributionParcelListEntity> page,@Param("orderIds") List<Long> orderIds,@Param("param")Map<String,Object> param);
@@ -133,8 +132,8 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 
 	/**
 	 * 通过预约和订单查询预约订单中间表
-	 * @param id
-	 * @param id1
+	 * @param reservationId
+	 * @param warehourseId
 	 * @return
 	 */
 	List<DistributionParcelListEntity> selectPackageByReservationAndStockArticle(@Param("reservationId") Long reservationId,@Param("stockArticleId") Long stockArticleId,@Param("warehourseId") Long warehourseId);