diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java
index 62e938604..8478ed6d1 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java
@@ -214,6 +214,19 @@ public class BasicdataGoodsAreaController extends BladeController {
 	}
 
 
+	/**
+	 * 仓库 自定义分页
+	 */
+	@GetMapping("/getStockUpArea")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入warehouseWarehouse")
+	public R getStockUpArea(BasicdataGoodsAreaEntity warehouseWarehouse) {
+//		List<BasicdataGoodsAreaVO> pages = basicdataGoodsAreaService.stockUp(warehouseWarehouse);
+		R result = basicdataGoodsAreaService.getStockUpArea();
+		return result;
+	}
+
+
 	/**
 	 * 导出数据
 	 */
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java
index be86b708a..53d80a3bb 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java
@@ -80,4 +80,11 @@ public interface BasicdataGoodsAreaMapper extends BaseMapper<BasicdataGoodsAreaE
 	List<BasicdatavisualizationSheetTwo> exportWarehouseByallocation(@Param("areaId") Long areaId);
 
 	List<BasicdatavisualizationSheetThree> exportWarehouseByStrip(@Param("areaId") Long areaId);
+
+	/**
+	 * 查询仓库下的备货区
+	 * @param department
+	 * @return
+	 */
+	List<BasicdataGoodsAreaVO> selectStockUpArea(@Param("id")Long id,@Param("department") Long department);
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml
index d4305e43b..019f1f5e5 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml
@@ -242,4 +242,12 @@
             ldpl.warehouse_id =#{areaId}
         </where>
     </select>
+    <select id="selectStockUpArea" resultType="com.logpm.basicdata.vo.BasicdataGoodsAreaVO">
+        select wga.id, wga.headline, wga.enable_status, wga.area_type, ww.name
+        from logpm_warehouse_goods_area wga
+                 left JOIN logpm_warehouse_warehouse ww on wga.warehouse_id = ww.id
+        where wga.warehouse_id in (select id from logpm_warehouse_warehouse where department = #{department} AND id = #{id})
+          and wga.area_type = 1
+          and wga.enable_status = 1
+    </select>
 </mapper>
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java
index a7ad7d6fd..d61d7f798 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java
@@ -119,4 +119,10 @@ public interface IBasicdataGoodsAreaService extends BaseService<BasicdataGoodsAr
 	 */
 	void visualizationwarehouse(Long areaId, HttpServletResponse response);
 
+	/**
+	 * 查询当前操作人仓库下的备货区信息
+	 * @return
+	 */
+	R getStockUpArea();
+
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java
index 4b425c8b7..3c34c7719 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java
@@ -369,6 +369,21 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 		//return warehouseGoodsAreaList;
 	}
 
+	@Override
+	public R getStockUpArea() {
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseService.getMyCurrentWarehouse();
+		if (Func.isEmpty(myCurrentWarehouse)){
+			log.error("#########当前仓库信息错误:{}",myCurrentWarehouse);
+			return R.fail("无仓库信息!!!");
+		}
+		if (Func.isEmpty(myCurrentWarehouse.getDepartment())){
+			log.error("#########当前仓库部门信息错误:{}",myCurrentWarehouse.getDepartment());
+			return R.fail("仓库无部门信息!!!");
+		}
+		List<BasicdataGoodsAreaVO> goodsAreaVOS = baseMapper.selectStockUpArea(myCurrentWarehouse.getId(),myCurrentWarehouse.getDepartment());
+		return R.data(goodsAreaVOS);
+	}
+
 
 	public String countUniqueProperties(String initial){
 
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 433d34837..ec154d596 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
@@ -651,8 +651,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			DistributionStockupEntity stockupEntity = new DistributionStockupEntity();
 			BladeUser user = AuthUtil.getUser();
 			stockupEntity.setStockupUser(user.getUserName());
-			stockupEntity.setStockupArea(stockupAreaName);
-			stockupEntity.setGoodsAreaId(Long.parseLong(goddsAreaId));
+			if (Func.isNotEmpty(goddsAreaId)){
+				stockupEntity.setStockupArea(stockupAreaName);
+				stockupEntity.setGoodsAreaId(Long.parseLong(goddsAreaId));
+			}
 			//编码生成规则 BH+仓库编码+年月日+序号00001
 			stockupEntity.setStockupCode(bianMa());
 			//设置备货任务指派状态---未指派
@@ -669,26 +671,38 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			result = distributionStockupService.save(stockupEntity);
 			Long id = stockupEntity.getId();
 			List<Long> reservationIds = Func.toLongList(ids);
-			for (Long reservationId : reservationIds) {
-				DistributionReservationEntity reservationEntity = distributionReservationMapper.selectById(reservationId);
-				if (Func.isEmpty(reservationEntity) || !reservationEntity.getReservationStatus().equals("20")) {
-					log.error("reservationEntity参数异常:+{" + reservationEntity + "}");
-					return R.fail("预约信息状态异常!!!");
-				}
-				//修改预约备货状态
-				reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
-				result = SqlHelper.retBool(distributionReservationMapper.updateById(reservationEntity));
-				//构建中间表信息
-				DistributionStockupInfoEntity reservationStockupEntity = new DistributionStockupInfoEntity();
-				reservationStockupEntity.setStockupId(id);
-				reservationStockupEntity.setStockUpType(StockupTypeConstant.shipei.getValue());
-				reservationStockupEntity.setReservationId(reservationEntity.getId());
-				result = distributionStockupInfoService.save(reservationStockupEntity);
-				if (!result) {
-					log.error("sql执行异常:+{" + result + "}");
-					return R.fail("请稍后再试");
-				}
+			List<DistributionReservationEntity> reservationEntityList = distributionReservationMapper.selectList(Wrappers.<DistributionReservationEntity>query().lambda().in(DistributionReservationEntity::getId, reservationIds));
+			if (Func.isNotEmpty(reservationEntityList)){
+				reservationEntityList.forEach(r->{
+					r.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
+					distributionReservationMapper.updateById(r);
+					DistributionStockupInfoEntity reservationStockupEntity = new DistributionStockupInfoEntity();
+					reservationStockupEntity.setStockupId(id);
+					reservationStockupEntity.setStockUpType(StockupTypeConstant.shipei.getValue());
+					reservationStockupEntity.setReservationId(r.getId());
+					distributionStockupInfoService.save(reservationStockupEntity);
+				});
 			}
+//			for (Long reservationId : reservationIds) {
+//				DistributionReservationEntity reservationEntity = distributionReservationMapper.selectById(reservationId);
+//				if (Func.isEmpty(reservationEntity) || !reservationEntity.getReservationStatus().equals("20")) {
+//					log.error("reservationEntity参数异常:+{" + reservationEntity + "}");
+//					return R.fail("预约信息状态异常!!!");
+//				}
+//				//修改预约备货状态
+//				reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
+//				result = SqlHelper.retBool(distributionReservationMapper.updateById(reservationEntity));
+//				//构建中间表信息
+//				DistributionStockupInfoEntity reservationStockupEntity = new DistributionStockupInfoEntity();
+//				reservationStockupEntity.setStockupId(id);
+//				reservationStockupEntity.setStockUpType(StockupTypeConstant.shipei.getValue());
+//				reservationStockupEntity.setReservationId(reservationEntity.getId());
+//				result = distributionStockupInfoService.save(reservationStockupEntity);
+//				if (!result) {
+//					log.error("sql执行异常:+{" + result + "}");
+//					return R.fail("请稍后再试");
+//				}
+//			}
 		} catch (ParseException e) {
 			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 			log.error("执行异常:+{" + e.getMessage() + "}");