diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownGoodsEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownGoodsEntity.java
index 6a4cdd76e..9bf1f21e8 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownGoodsEntity.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownGoodsEntity.java
@@ -57,7 +57,7 @@ public class WarehouseUpdownGoodsEntity extends TenantEntity {
 	private String goodsType ;
 	/** 关联id */
 	@ApiModelProperty(name = "关联id",notes = "")
-	private String associationId ;
+	private Long associationId ;
 	/** 关联值 */
 	@ApiModelProperty(name = "关联值",notes = "")
 	private String associationValue ;
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownGoodsLogEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownGoodsLogEntity.java
index 62db59d3c..9f0bf5a74 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownGoodsLogEntity.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownGoodsLogEntity.java
@@ -28,30 +28,33 @@ public class WarehouseUpdownGoodsLogEntity extends TenantEntity {
 	/** 预留5 */
 	@ApiModelProperty(name = "预留5",notes = "")
 	private String reserve5 ;
-	/** 仓库id */
-	@ApiModelProperty(name = "仓库id",notes = "")
-	private Long warehouseId ;
-	/** 仓库名称 */
-	@ApiModelProperty(name = "仓库名称",notes = "")
-	private String warehouseName ;
-	/** 订单自编码 */
-	@ApiModelProperty(name = "订单自编码",notes = "")
-	private String orderCode ;
-	/** 包件编码 */
-	@ApiModelProperty(name = "包件编码",notes = "")
-	private String orderPackageCode ;
-	/** 上架类型;1=上架,2=下架 */
-	@ApiModelProperty(name = "上架类型",notes = "1=上架,2=下架")
-	private Integer bindingType ;
+	/** 上架方式id */
+	@ApiModelProperty(name = "上架方式id",notes = "")
+	private Long updownTypeId ;
 	/** 货区id */
 	@ApiModelProperty(name = "货区id",notes = "")
-	private Long goodsAreaId ;
+	private String areaId ;
+	/** 货区名称 */
+	@ApiModelProperty(name = "货区名称",notes = "")
+	private String areaTitle ;
 	/** 货架id */
 	@ApiModelProperty(name = "货架id",notes = "")
-	private Long goodsShelfId ;
+	private String shelfId ;
+	/** 货架名称 */
+	@ApiModelProperty(name = "货架名称",notes = "")
+	private String shelfTitle ;
 	/** 货位id */
 	@ApiModelProperty(name = "货位id",notes = "")
-	private Long goodsAllocationId ;
+	private String allocationId ;
+	/** 货位名称 */
+	@ApiModelProperty(name = "货位名称",notes = "")
+	private String allocationTitle ;
+	/** 完整货位 */
+	@ApiModelProperty(name = "完整货位",notes = "")
+	private String positionCode ;
+	/** 上架类型;1=上架,2=下架 */
+	@ApiModelProperty(name = "上架类型",notes = "1=上架,2=下架")
+	private Integer bindingType ;
 	/** 是否整托;0不是 1是 */
 	@ApiModelProperty(name = "是否整托",notes = "0不是 1是")
 	private Integer isAlltrays ;
@@ -66,16 +69,10 @@ public class WarehouseUpdownGoodsLogEntity extends TenantEntity {
 	private String associationValue ;
 	/** 关联id */
 	@ApiModelProperty(name = "关联id",notes = "")
-	private String associationId ;
+	private Long associationId ;
 	/** 上下架数量 */
 	@ApiModelProperty(name = "上下架数量",notes = "")
 	private Integer num ;
-	/** 是否为零担;1=是，2=否 */
-	@ApiModelProperty(name = "是否为零担",notes = "1=是，2=否")
-	private Integer isZero ;
-	/** 上架方式id */
-	@ApiModelProperty(name = "上架方式id",notes = "")
-	private Long updownTypeId ;
 	/** 备注 */
 	@ApiModelProperty(name = "备注",notes = "")
 	private String remark ;
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownTypeEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownTypeEntity.java
index a08e6a6b5..5f278589c 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownTypeEntity.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownTypeEntity.java
@@ -64,5 +64,11 @@ public class WarehouseUpdownTypeEntity extends TenantEntity {
 	/** 订单总数量 */
 	@ApiModelProperty(name = "订单总数量",notes = "")
 	private Integer orderTotalNum ;
+	/** 总数量 */
+	@ApiModelProperty(name = "库存品数量",notes = "")
+	private Integer stockNum ;
+	/** 订单总数量 */
+	@ApiModelProperty(name = "库存品总数量",notes = "")
+	private Integer stockTotalNum ;
 
 }
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java
index df1066080..04edc5f76 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java
@@ -15,5 +15,7 @@ public class UpShelfDataVO implements Serializable {
 	private Integer completeSet;//是否齐套1否 2是
 	private Long marketId;//商场id
 	private String marketName;//商场名称
+	private String materialCode;//物料编码
+	private String materialName;//物料名称
 
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java
index 543062ae5..a291b2c81 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java
@@ -86,9 +86,17 @@ public class WarehouseUpdownTypeApiController {
 			log.error(method+"系统异常，联系管理员",e);
 			return R.fail(500,"系统异常，联系管理员");
 		}
+	}
+
+	@ResponseBody
+	@PostMapping("/upShelfScanAllocation")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "上架扫描库位", notes = "传入trayTypeDTO")
+	public R upShelfScanAllocation(@RequestBody UpdownTypeDTO updownTypeDTO) {
+		String method = "###########upShelfScanAllocation: ";
+		log.info(method + "上架扫描库位 updownTypeDTO={}", updownTypeDTO);
 
 
-	}
 
 
 	//---------------------------------下架--------------------------
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java
index 582c521cb..9e384577a 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java
@@ -53,6 +53,11 @@ public interface WarehouseUpdownGoodsMapper extends BaseMapper<WarehouseUpdownGo
 	List<WarehouseUpdownGoodsExcel> exportWarehouseUpdownGoods(@Param("ew") Wrapper<WarehouseUpdownGoodsEntity> queryWrapper);
 
     List<UpShelfDataVO> findPackageByUpdownTypeId(@Param("updownTypeId") Long updownTypeId);
+
+	List<UpShelfDataVO> findZeroByUpdownTypeId(@Param("updownTypeId") Long updownTypeId);
+
+	List<UpShelfDataVO> findStockByUpdownTypeId(@Param("updownTypeId") Long updownTypeId);
+
 //	/**
 //	 * 根据货位查询货物
 //	 *
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml
index 3ca5f9c0e..50272fca7 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml
@@ -77,7 +77,48 @@
 
 
     <select id="findPackageByUpdownTypeId" resultType="com.logpm.warehouse.vo.UpShelfDataVO">
+        select ldsa.service_number serviceNum,
+               ldsa.order_code orderCode,
+               ldsa.complete_set completeSet,
+               max(ldsa.total_number) totalNum,
+               sum(ldpl.quantity) shelfNum
+        from logpm_warehouse_updown_goods lwug
+                 left join logpm_distribution_parcel_list ldpl on ldpl.id = lwug.association_id and ldpl.is_deleted = 0
+                 left join logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id and ldsa.is_deleted = 0
+        where lwug.association_type = 3
+          and lwug.is_deleted = 0
+          and lwug.updown_type_id = #{updownTypeId}
+        group by ldsa.service_number,
+                 ldsa.order_code,
+                 ldsa.complete_set
+    </select>
+
+    <select id="findZeroByUpdownTypeId" resultType="com.logpm.warehouse.vo.UpShelfDataVO">
+        select ldsa.order_code orderCode,
+               ldsa.total_number totalNum,
+               lwug.num shelfNum,
+               ldsa.complete_set completeSet
+        from logpm_warehouse_updown_goods lwug
+                 left join logpm_distribution_stock_article ldsa on ldsa.id = lwug.association_id and ldsa.is_deleted = 0
+        where lwug.is_deleted = 0
+          and lwug.association_type = 1
+          and lwug.updown_type_id = #{updownTypeId}
+    </select>
 
+    <select id="findStockByUpdownTypeId" resultType="com.logpm.warehouse.vo.UpShelfDataVO">
+        select lbm.product_code materialCode,
+               lbm.`name` materialName,
+               ldsl.order_code orderCode,
+               ldsl.market_id marketId,
+               ldsl.market_name marketName,
+               ldsl.quantity_stock totalNum,
+               lwug.num 	shelfNum
+        from logpm_warehouse_updown_goods lwug
+                 left join logpm_basicdata_material lbm on lbm.id = lwug.association_id and lbm.is_deleted = 0
+                 left join logpm_distribution_stock_list ldsl on ldsl.material_id = lwug.association_id and ldsl.market_id = lwug.market_id and ldsl.is_deleted = 0
+        where lwug.is_deleted = 0
+          and lwug.association_type = 4
+          and lwug.updown_type_id = #{updownTypeId}
     </select>
 
 </mapper>
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java
index 19652ae32..ac30ab67e 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java
@@ -65,4 +65,8 @@ public interface IWarehouseUpdownGoodsService extends BaseService<WarehouseUpdow
 	Integer selectCountByAllo(Long alloId);
 
 	List<UpShelfDataVO> findPackageByUpdownTypeId(Long updownTypeId);
+
+	List<UpShelfDataVO> findZeroByUpdownTypeId(Long updownTypeId);
+
+	List<UpShelfDataVO> findStockByUpdownTypeId(Long updownTypeId);
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java
index 831755c0b..5fee0ae7f 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java
@@ -71,4 +71,14 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl<WarehouseUp
 		return baseMapper.findPackageByUpdownTypeId(updownTypeId);
 	}
 
+	@Override
+	public List<UpShelfDataVO> findZeroByUpdownTypeId(Long updownTypeId) {
+		return baseMapper.findZeroByUpdownTypeId(updownTypeId);
+	}
+
+	@Override
+	public List<UpShelfDataVO> findStockByUpdownTypeId(Long updownTypeId) {
+		return baseMapper.findStockByUpdownTypeId(updownTypeId);
+	}
+
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
index 14cfa7ded..84e926a68 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
@@ -261,14 +261,20 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				log.warn("#############upShelfScanAllocation: 库位暂无数据 allocationId={}",allocationId);
 				return upShelfAllocationVO;
 			}else{
+				upShelfAllocationVO.setTotalNum(updownTypeEntity.getTotalNum());
+				upShelfAllocationVO.setOrderTotalnum(updownTypeEntity.getOrderTotalNum());
+				upShelfAllocationVO.setStockNum(updownTypeEntity.getStockNum());
+				upShelfAllocationVO.setStockTotalNum(updownTypeEntity.getStockTotalNum());
 				Long updownTypeId = updownTypeEntity.getId();//库位打包货物方式id
 				//同一个货位上能存所有类型的货物，所以要分三类来查 association_type 1订单号（零担） 3包件码（订单号） 4库存品
 				List<UpShelfDataVO> packageList = warehouseUpdownGoodsService.findPackageByUpdownTypeId(updownTypeId);
-
-
+				List<UpShelfDataVO> zeroList = warehouseUpdownGoodsService.findZeroByUpdownTypeId(updownTypeId);
+				List<UpShelfDataVO> stockList = warehouseUpdownGoodsService.findStockByUpdownTypeId(updownTypeId);
+				upShelfAllocationVO.getList().addAll(packageList);
+				upShelfAllocationVO.getList().addAll(zeroList);
+				upShelfAllocationVO.getList().addAll(stockList);
+				return upShelfAllocationVO;
 			}
-
-
 		}else {
 			//有托盘就查询托盘上的数据
 			Long trayId = basicdataTrayEntity.getId();
@@ -300,6 +306,5 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			upShelfAllocationVO.setList(listByTrayTypeId);
 			return upShelfAllocationVO;
 		}
-		return null;
 	}
 }