修改备货的时候 查询货位的问题

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java

@@ -41,6 +41,9 @@ public class DistributionStockupStockListVO implements Serializable {
 	private Integer unpack;//是否拆包 0 没有 1 拆了
 	private String sourceType;//是否拆包 1 订单 2导入
 
+
+
+
 	// 货位ID 集合
 	private String allocations;
 

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);
+    List<DistributionStockupStockListVO> selectStockupStockListNew(@Param("reservationId")Long reservationId,@Param("warehouseId") Long warehouseId);
 
     Integer selectOrderNumByReservationId(@Param("reservationId")Long reservationId);
 

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

@@ -317,8 +317,8 @@
         (SELECT SUM(aldrs.reality_num) FROM logpm_distribution_reservation_stocklist AS aldrs WHERE aldrs.reservation_id = #{reservationId} AND aldrs.stocklist_id in (t.aaa)) AS realNum,
         (SELECT SUM(newldrs.reservation_num) FROM logpm_distribution_reservation_stocklist AS newldrs WHERE newldrs.reservation_id = #{reservationId} AND newldrs.stocklist_id in (t.aaa)) AS planNum,
         (
-        select GROUP_CONCAT( DISTINCT (allocation_id)) from logpm_warehouse_updown_goods where association_value =ldslNew.cargo_number or association_value in (
-        SELECT order_package_code from logpm_distribution_parcel_list where conditions=2 and material_code=ldslNew.cargo_number)
+        select GROUP_CONCAT( DISTINCT (allocation_id)) from logpm_warehouse_updown_goods where association_value =ldslNew.cargo_number and warehouse_id=#{warehouseId} or association_value in (
+        SELECT order_package_code from logpm_distribution_parcel_list where conditions=2 and material_code=ldslNew.cargo_number and warehouse_id=#{warehouseId} )
         ) as allocations
         FROM
         (

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java

@@ -173,7 +173,7 @@ public interface IDistributionReservationService extends BaseService<Distributio
 
 	List<DistributionStockupOrderListVO> selectStockupOrderList(Long reservationId,String isZero);
 
-	List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId);
+	List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId,Long warehouseId);
 
     Integer selectOrderNumByReservationId(Long reservationId);
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

@@ -2863,8 +2863,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	}
 
 	@Override
-	public List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId) {
-		return baseMapper.selectStockupStockListNew(reservationId);
+	public List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId,Long warehouseId) {
+		return baseMapper.selectStockupStockListNew(reservationId,warehouseId);
 	}
 
 	@Override

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

@@ -1135,7 +1135,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 	@Override
 	public List<DistributionStockupStockListVO> selectStockupStockList(StockupDTO stockupDTO) {
+
+
 		Long reservationId = stockupDTO.getReservationId();//预约单id
+		DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
+
 		if (stockupDTO.getTypeService().equals("3")) {
 			//自
 			List<DistributionStockupStockListVO> list = distributionStockupService.selectStockupSelf(reservationId);
@@ -1163,7 +1167,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		} else {
 
 			//商，市
-			List<DistributionStockupStockListVO> list = distributionReservationService.selectStockupStockList(reservationId);
+			List<DistributionStockupStockListVO> list = distributionReservationService.selectStockupStockList(reservationId,reservationEntity.getWarehouseId());
 			for (int i = 0; i < list.size(); i++) {
 				DistributionStockupStockListVO distributionStockupStockListVO = list.get(i);
 				if (distributionStockupStockListVO.getPlanNum().equals(distributionStockupStockListVO.getRealNum())) {