diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java
index fb4f0e68e..dcd90ee54 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java
@@ -500,16 +500,6 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	}
 
 
-	/**
-	 * 备货库位 查询包件
-	 */
-	@GetMapping("/selectStockUpAllocationWrap")
-	@ApiOperationSupport(order = 20)
-	@ApiOperation(value = "货位 查询包件", notes = "传入warehouseGoodsAllocation")
-	public R<IPage<WarehouseVisualizationVO>> selectStockUpAllocationWrap(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, Query query) {
-		IPage<WarehouseVisualizationVO> pages = warehouseGoodsAllocationService.selectStockUpAllocationWrap(warehouseGoodsAllocation, Condition.getPage(query));
-		return R.data(WarehouseVisualizaVOWrapper.build().pageVO(pages));
-	}
 
 	/**
 	 * 货位 查询库存品
@@ -522,6 +512,8 @@ public class WarehouseGoodsAllocationController extends BladeController {
 		return R.data(pages);
 	}
 
+
+
 	/**
 	 * 货位 查询零担
 	 */
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseGoodsAllocationDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseGoodsAllocationDTO.java
index 73badf72a..a62a5037f 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseGoodsAllocationDTO.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseGoodsAllocationDTO.java
@@ -46,5 +46,9 @@ public class WarehouseGoodsAllocationDTO extends WarehouseGoodsAllocationEntity
 	 * 物料编码
 	 */
 	private String	materialCode;
+	/**
+	 * 物料编码
+	 */
+	private String	areaType;
 
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockArticleZationDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockArticleZationDTO.java
index 3efe88d52..8f0dabf69 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockArticleZationDTO.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockArticleZationDTO.java
@@ -39,4 +39,6 @@ public class WarehouseStockArticleZationDTO extends DistributionStockArticleEnti
 	 * 仓库Id
 	 */
 	private List<Long> warehouseIdList;
+
+	private String areaType;
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java
index 3e5458050..c5a27a752 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java
@@ -132,6 +132,13 @@ public interface WarehouseGoodsAllocationMapper extends BaseMapper<WarehouseGood
 	 */
 	List<WarehouseStockListZationVO> selectAllInventory(IPage<WarehouseStockListZationVO> page, @Param("param") WarehouseGoodsAllocationDTO warehouseGoodsAllocation);
 
+	/**
+	 * 查询货位库存品
+	 *
+	 * @return
+	 */
+	List<WarehouseStockListZationVO> selectStockUpInventory(IPage<WarehouseStockListZationVO> page, @Param("param") WarehouseGoodsAllocationDTO warehouseGoodsAllocation);
+
 	/**
 	 *货位上架  查询库存品
 	 *
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
index f4aa6dfbc..ff0b64dac 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
@@ -231,6 +231,38 @@
             </if>
         </where>
     </select>
+
+
+     <select id="selectStockUpInventory" resultType="com.logpm.warehouse.vo.WarehouseStockListZationVO">
+        SELECT
+        ldsl.order_code orderCode,
+        ldsl.service_number serviceNumber,
+        ldsl.description_goods descriptionGoods,
+        ldsl.cargo_number cargoNumber,
+        ldsl.cargo_norms cargoNorms,
+        ldsl.cargo_unit cargoUnit,
+        ldsl.market_id marketId,
+        ldsl.market_name marketName,
+        ldsl.incoming_batch incomingBatch,
+        lbm.product_code materialCode,
+        ldsl.sku sku,
+        ldsl.stock_list_code stockListCode,
+        lwtg.tray_code trayCode,
+         lwug.num num,
+         lwug.position_code positionCode
+        FROM
+        logpm_distribution_stock_list ldsl
+        JOIN logpm_warehouse_updown_goods lwug ON ldsl.material_id = lwug.association_id and ldsl.incoming_batch = lwug.incoming_batch and ldsl.market_id = lwug.market_id
+        left join logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldsl.material_id
+        left join logpm_basicdata_material lbm on lbm.id =ldsl.material_id
+        <where>
+            lwug.association_type = 4  AND ldsl.is_deleted = 0 and lwug.allocation_id
+            = #{param.id}
+            <if test="param.materialCode!=null and param.materialCode !=''">
+                and lbm.product_code like concat('%',#{param.materialCode},'%')
+            </if>
+        </where>
+    </select>
     <select id="selectInventory" resultType="com.logpm.warehouse.vo.WarehouseStockListZationVO">
 <!--&#45;&#45;         SELECT
 &#45;&#45;         ldsl.id id,
@@ -499,7 +531,7 @@
         logpm_warehouse_updown_stockup_area AS lwusu
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON lwusu.association_id = ldpl.id
         WHERE
-        lwusu.goods_type = 1
+        lwusu.goods_type = 1 AND lwusu.is_deleted = 0 AND lwusu.allocation_type = 2
     </select>
     <select id="selectStockUpZeroOrder" resultType="com.logpm.warehouse.vo.WarehouseStockArticleZationVO">
         SELECT ldsa.*,lwug.num num
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java
index 549125ba5..a977d33ab 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java
@@ -86,6 +86,7 @@ public interface IWarehouseGoodsAllocationService extends BaseService<WarehouseG
 	 * 查询货位库存品
 	 */
 	IPage<WarehouseStockListZationVO> selectAllInventory(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, IPage<WarehouseStockListZationVO> page);
+
 	/**
 	 * 货位上架 查询库存品
 	 */
@@ -126,13 +127,6 @@ public interface IWarehouseGoodsAllocationService extends BaseService<WarehouseG
 	 */
     List<WarehouseGoodsAllocationEntity> selectAllocationInfo(List<Long> lss);
 
-	/**
-	 * 查询备货库位包件
-	 * @param warehouseGoodsAllocation
-	 * @param page
-	 * @return
-	 */
-	IPage<WarehouseVisualizationVO> selectStockUpAllocationWrap(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, IPage<WarehouseVisualizationVO> page);
 
 
 	/**
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java
index 877d88174..2d06f0494 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java
@@ -188,18 +188,46 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 
 	@Override
 	public IPage<WarehouseVisualizationVO> selectAllwrap(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, IPage<WarehouseVisualizationVO> page) {
+
 		//查询货位包件
-		List<WarehouseVisualizationVO> list= baseMapper.selectAllwrap(page,warehouseGoodsAllocation);
+		List<WarehouseVisualizationVO> list= null ;
+		switch (warehouseGoodsAllocation.getAreaType()){
+			case "1": list= baseMapper.selectStockUpAllocationWrap(page,warehouseGoodsAllocation);
+			break;
+			case "2": list= baseMapper.selectAllwrap(page,warehouseGoodsAllocation);
+			break;
+		}
 		return page.setRecords(list);
 	}
 
 	@Override
 	public IPage<WarehouseStockListZationVO> selectAllInventory(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, IPage<WarehouseStockListZationVO> page) {
+		List<WarehouseStockListZationVO> list = null;
+		switch (warehouseGoodsAllocation.getAreaType()){
+			case "1": list= baseMapper.selectStockUpInventory(page,warehouseGoodsAllocation);
+				break;
+			case "2": list= baseMapper.selectAllInventory(page,warehouseGoodsAllocation);
+				break;
+		}
 		//查询货位库存品
-		List<WarehouseStockListZationVO> list = baseMapper.selectAllInventory(page,warehouseGoodsAllocation);
 		return page.setRecords(list);
 	}
 
+	@Override
+	public IPage<WarehouseStockArticleZationVO> selectAllZeroOrder(WarehouseStockArticleZationDTO warehouseStockArticleZationDTO, IPage<WarehouseStockArticleZationVO> page) {
+		//查询库位的零担
+		List<WarehouseStockArticleZationVO>	list = null;
+		switch (warehouseStockArticleZationDTO.getAreaType()){
+			case "1": list= baseMapper.selectStockUpZeroOrder(page, warehouseStockArticleZationDTO);
+				break;
+			case "2": list= baseMapper.selectAllZeroOrder(page,warehouseStockArticleZationDTO);
+				break;
+		}
+		return page.setRecords(list);
+	}
+
+
+
 	@Override
 	public IPage<WarehouseStockListZationVO> selectInventory(WarehouseStockListZationDTO warehouseGoodsAllocation, IPage<WarehouseStockListZationVO> page) {
 		//查询没有上架的库存品
@@ -270,31 +298,7 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 
 
 
-	@Override
-	public IPage<WarehouseStockArticleZationVO> selectAllZeroOrder(WarehouseStockArticleZationDTO warehouseStockArticleZationDTO, IPage<WarehouseStockArticleZationVO> page) {
-		//查询库位的零担
-		List<WarehouseStockArticleZationVO>	list = baseMapper.selectAllZeroOrder(page, warehouseStockArticleZationDTO);
-//		for (WarehouseStockArticleZationVO warehouseStockArticleZationVO : list) {
-//			List<WarehouseUpdownGoodsEntity>  warehouseUpdownGoodsEntityList= warehouseUpdownGoodsService.list(new QueryWrapper<WarehouseUpdownGoodsEntity>().lambda()
-//				.eq(WarehouseUpdownGoodsEntity::getAssociationValue, warehouseStockArticleZationVO.getOrderCode())
-//				.eq(WarehouseUpdownGoodsEntity::getAssociationType,"1")
-//			);
-//			Integer useNum = 0;
-//			Integer totalNumber = warehouseStockArticleZationVO.getTotalNumber();//合同数量
-//			List<ZeroOrderAllocationVO> ls = new ArrayList<>();
-//			for (WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity : warehouseUpdownGoodsEntityList) {
-//				Integer num = warehouseUpdownGoodsEntity.getNum();
-//				useNum = useNum +num;
-//				ZeroOrderAllocationVO zeroOrderAllocationVO = new ZeroOrderAllocationVO();
-//				zeroOrderAllocationVO.setAllocation(warehouseUpdownGoodsEntity.getPositionCode());
-//				zeroOrderAllocationVO.setNum(num);
-//				ls.add(zeroOrderAllocationVO);
-//			}
-//			warehouseStockArticleZationVO.setResidueNumber(totalNumber-useNum);
-//			warehouseStockArticleZationVO.setList(ls);
-//		}
-		return page.setRecords(list);
-	}
+
 
 	@Override
 	public locationsnubVO selectlocationsnub(Long warehouseId) {
@@ -413,16 +417,7 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 		return baseMapper.selectAllocationInfo(lss);
 	}
 
-	/**
-	 * @param warehouseGoodsAllocation
-	 * @param page
-	 * @return
-	 */
-	@Override
-	public IPage<WarehouseVisualizationVO> selectStockUpAllocationWrap(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, IPage<WarehouseVisualizationVO> page) {
-		List<WarehouseVisualizationVO> list= baseMapper.selectStockUpAllocationWrap(page,warehouseGoodsAllocation);
-		return page.setRecords(list);
-	}
+
 
 	/**
 	 * @param warehouseStockArticleZationDTO