diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockArticleCopyEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockArticleCopyEntity.java
index 74a52dc49..cce6888d1 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockArticleCopyEntity.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockArticleCopyEntity.java
@@ -36,7 +36,7 @@ import java.util.Date;
  */
 @Data
 @TableName("logpm_distribution_stock_article")
-@ApiModel(value = "DistributionStockArticle对象", description = "配送在库订单")
+@ApiModel(value = "WarehouseStockArticleCopyEntity对象", description = "配送在库订单")
 @EqualsAndHashCode(callSuper = true)
 public class WarehouseStockArticleCopyEntity extends TenantEntity {
 
@@ -429,7 +429,7 @@ public class WarehouseStockArticleCopyEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "工厂车次")
 	private String factoryTrain;
-
+	@ApiModelProperty(value = "是否零担 0否 1是")
 	private String isZero;//是否零担 0否 1是
 
 
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockArticleCopyVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockArticleCopyVO.java
index 621687276..bfc53e13e 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockArticleCopyVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockArticleCopyVO.java
@@ -19,6 +19,9 @@ package com.logpm.warehouse.vo;
 
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 
+import com.logpm.warehouse.entity.WarehouseStockArticleCopyEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -34,12 +37,14 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class WarehouseStockArticleCopyVO extends DistributionStockArticleEntity {
+@ApiModel(value = "WarehouseStockArticleCopyVO对象", description = "配送在库订单")
+public class WarehouseStockArticleCopyVO extends WarehouseStockArticleCopyEntity{
 	private static final long serialVersionUID = 1L;
 
 	/**
 	 * 剩余数量
 	 */
+	@ApiModelProperty(value = "剩余数量")
 	private Integer residueNumber;
 	private List<ZeroOrderAllocationVO> list = new ArrayList<>();
 
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListCopyVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListCopyVO.java
index 531124b17..6edefaa77 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListCopyVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListCopyVO.java
@@ -18,6 +18,7 @@ package com.logpm.warehouse.vo;
 
 
 import com.logpm.warehouse.entity.WarehouseStockListCopyEntity;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -30,6 +31,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "WarehouseStockListCopyVO对象", description = "库存品管理VO")
 public class WarehouseStockListCopyVO extends WarehouseStockListCopyEntity {
 	private static final long serialVersionUID = 1L;
 	/**
@@ -40,6 +42,7 @@ public class WarehouseStockListCopyVO extends WarehouseStockListCopyEntity {
 	/**
 	 * 添加数量
 	 */
+	@ApiModelProperty(value = "添加数量")
 	private Integer inventoryQuantity;
 
 	/**
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseVisualizationVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseVisualizationVO.java
index 700d7f915..79276631f 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseVisualizationVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseVisualizationVO.java
@@ -17,6 +17,7 @@
 package com.logpm.warehouse.vo;
 
 import com.logpm.warehouse.entity.WarehouseParcelListcopyEntity;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -30,6 +31,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "WarehouseVisualizationVO对象", description = "在库订单包件清单VO")
 public class WarehouseVisualizationVO extends WarehouseParcelListcopyEntity {
 	private static final long serialVersionUID = 1L;
 	/**
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/locationsnubVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/locationsnubVO.java
index c908e3e3d..3957813e8 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/locationsnubVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/locationsnubVO.java
@@ -1,24 +1,32 @@
 package com.logpm.warehouse.vo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ApiModel(value = "locationsnubVO对象", description = "货位统计")
 public class locationsnubVO {
 	/**
 	 * 总货位
 	 */
+	@ApiModelProperty(value = "总货位")
 	private Integer cargoNub;
 	/**
 	 * 使用货位
 	 */
+	@ApiModelProperty(value = "使用货位")
 	private Integer employNub;
 	/**
 	 * 可用货位
 	 */
+	@ApiModelProperty(value = "可用货位")
 	private Integer unusedNub;
 	/**
 	 * 禁用货位
 	 */
+
+	@ApiModelProperty(value = "禁用货位")
 	private Integer disableNub;
 
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java
index b1be44807..bc6a067c2 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java
@@ -154,11 +154,10 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 		log.info("当前登陆人>>>>>>>>>>>>{}",user);
 		String shelfCode =basicdataGoodsShelfDTO.getGoodsAreaName();
 		basicdataGoodsShelfEntity.setQrCode(shelfCode);
-		basicdataGoodsShelfEntity.setGoodsShelfName(shelfCode);
 		result = this.save(basicdataGoodsShelfEntity);
 		//这里需要根据货架的列数和层数进行货位信息的生成
-		Integer rowNum = basicdataGoodsShelfEntity.getRowNum();
-		Integer storeyNum = basicdataGoodsShelfEntity.getStoreyNum();
+//		Integer rowNum = basicdataGoodsShelfEntity.getRowNum();
+//		Integer storeyNum = basicdataGoodsShelfEntity.getStoreyNum();
 		//查询租户对应的库位码前缀规则
 		//String allocationCode = basicTenantCodeClient.shelfCode(user.getTenantId(),"5");
 //		ArrayList<BasicdataGoodsAllocationEntity> arrayList = new ArrayList<>();
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/WarehouseParcelListWrapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/WarehouseParcelListWrapper.java
index d5d93751d..866ec8422 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/WarehouseParcelListWrapper.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/WarehouseParcelListWrapper.java
@@ -29,14 +29,14 @@ import org.springblade.system.feign.IUserClient;
  */
 
 public class WarehouseParcelListWrapper extends BaseEntityWrapper<WarehouseParcelListVO, WarehouseParcelListVO>  {
-	IUserClient userCliient = SpringUtil.getBean(IUserClient.class);
+	IUserClient userClient = SpringUtil.getBean(IUserClient.class);
 	public static WarehouseParcelListWrapper build() {
 		return new WarehouseParcelListWrapper();
  	}
 
 	@Override
 	public WarehouseParcelListVO entityVO(WarehouseParcelListVO warehouseParcelListVO) {
-		//warehouseParcelListVO.setOperateUserName(userCliient.userInfoById(warehouseParcelListVO.getOperateUser()).getData().getName());
+		warehouseParcelListVO.setOperateUserName(userClient.userInfoById(warehouseParcelListVO.getOperateUser()).getData().getName());
 		return warehouseParcelListVO;
 	}
 
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 e67b93dc1..df68794a1 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
@@ -114,8 +114,8 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位 可视化 查询仓库货区
 	 */
 	@GetMapping("/storeCargo")
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "货位 可视化", notes = "传入warehouseGoodsAllocation")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "货位 查询仓库货区", notes = "传入warehouseGoodsAllocation")
 	public R<List <WarehouseVisCargo>> storeCargo() {
 		List <WarehouseVisCargo> pages = warehouseGoodsAllocationService.selectVisCargo();
 		return R.data(pages);
@@ -125,7 +125,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位上架 查询包件
 	 */
 	@GetMapping("/wrap")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "货位上架 查询包件", notes = "传入warehouseGoodsAllocation")
 	public R<IPage <WarehouseVisualizationVO>> wrap(WarehouseVisualizationDTO warehouseGoodsAllocation, Query query) {
 		IPage <WarehouseVisualizationVO> pages = warehouseGoodsAllocationService.selectwrap(warehouseGoodsAllocation,Condition.getPage(query));
@@ -136,7 +136,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位上架 查询订单
 	 */
 	@GetMapping("/order")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "货位上架 查询订单", notes = "传入warehouseGoodsAllocation")
 	public R<IPage <WarehouseStockArticleCopyVO>> order(WarehouseStockArticleCopyDTO warehouseGoodsAllocation, Query query) {
 		IPage <WarehouseStockArticleCopyVO> pages = warehouseGoodsAllocationService.selectorder(warehouseGoodsAllocation,Condition.getPage(query));
@@ -147,7 +147,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位上架 查询服务号
 	 */
 	@GetMapping("/servicenub")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "货位上架 查询服务号", notes = "传入warehouseGoodsAllocation")
 	public R<IPage <WarehouseStockArticleCopyVO>> servicenub(WarehouseStockArticleCopyDTO warehouseGoodsAllocation, Query query) {
 		IPage <WarehouseStockArticleCopyVO> pages = warehouseGoodsAllocationService.selectservicenub(warehouseGoodsAllocation,Condition.getPage(query));
@@ -159,7 +159,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位上架 查询托盘
 	 */
 	@GetMapping("/tray")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "货位上架 查询托盘", notes = "传入warehouseGoodsAllocation")
 	public R<IPage <WarehouseTrayVO>> tray(WarehouseTrayDTO warehouseTrayDTO, Query query) {
 		IPage <WarehouseTrayVO> pages = warehouseGoodsAllocationService.selectTray(warehouseTrayDTO,Condition.getPage(query));
@@ -170,7 +170,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位上架 查询库存品
 	 */
 	@GetMapping("/Inventory")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "货位上架 查询库存品", notes = "传入warehouseGoodsAllocation")
 	public R<IPage <WarehouseStockListCopyVO>> Inventory(WarehouseStockListCopyDTO warehouseGoodsAllocation, Query query) {
 		IPage <WarehouseStockListCopyVO> pages = warehouseGoodsAllocationService.selectInventory(warehouseGoodsAllocation,Condition.getPage(query));
@@ -181,7 +181,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位上架 查询零担
 	 */
 	@GetMapping("/ZeroOrder")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "货位上架 查询零担", notes = "传入warehouseGoodsAllocation")
 	public R<IPage <WarehouseStockArticleCopyVO>> ZeroOrder(WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO, Query query) {
 		IPage <WarehouseStockArticleCopyVO> pages = warehouseGoodsAllocationService.selectZeroOrder(warehouseStockArticleCopyDTO,Condition.getPage(query));
@@ -193,7 +193,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位上架 订单上架
 	 */
 	@PostMapping("/upOrder")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 11)
 	@ApiOperation(value = "货位上架 订单上架", notes = "传入updownTypeDTO")
 	public R  uporder(@RequestBody UpdownTypeDTO updownTypeDTO) {
 		List<UpShelfOrderDTO> upShelfOrderList = updownTypeDTO.getUpShelfOrderList();
@@ -211,7 +211,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位上架 服务号上架
 	 */
 	@PostMapping("/upService")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "货位上架 服务号上架", notes = "传入updownTypeDTO")
 	public R  upservice(@RequestBody UpdownTypeDTO updownTypeDTO) {
 		//取出服务号
@@ -232,7 +232,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位上架 包条上架
 	 */
 	@PostMapping("/upPackage")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 13)
 	@ApiOperation(value = "货位上架 包条上架", notes = "传入updownTypeDTO")
 	public R  upPackage(@RequestBody UpdownTypeDTO updownTypeDTO) {
 		//取出包条Id
@@ -248,7 +248,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位上架 托盘上架
 	 */
 	@PostMapping("/upTray")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 14)
 	@ApiOperation(value = "货位上架 托盘上架", notes = "传入updownTypeDTO")
 	public R  upTray(@RequestBody UpdownTypeDTO updownTypeDTO) {
 		String trayCode = updownTypeDTO.getCode();//托盘码
@@ -264,7 +264,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位上架 库存品上架
 	 */
 	@PostMapping("/upStock")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 15)
 	@ApiOperation(value = "货位上架 库存品上架", notes = "传入updownTypeDTO")
 	public R  upStock(@RequestBody UpdownTypeDTO updownTypeDTO) {
 		Long allocationId = updownTypeDTO.getAllocationId();//库位编码
@@ -280,7 +280,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位上架 零担上架
 	 */
 	@PostMapping("/upZeroOrder")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 16)
 	@ApiOperation(value = "货位上架 零担上架", notes = "传入updownTypeDTO")
 	public R  upZeroOrder(@RequestBody UpdownTypeDTO updownTypeDTO) {
 		Long allocationId = updownTypeDTO.getAllocationId();//库位编码
@@ -295,7 +295,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位 可视化查询
 	 */
 	@GetMapping("/Visualization")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 17)
 	@ApiOperation(value = "货位 可视化", notes = "传入warehouseGoodsAllocation")
 	public R<List <List<WarehouseGoodsAllocationVO>>> Visualization(WarehouseGoodsAllocationVO warehouseGoodsAllocation) {
 //		if (null !=bladeRedis.get(Url+"/Visualization")){
@@ -310,22 +310,22 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位 统计所有库位数量
 	 */
 	@GetMapping("/locationsnub")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 18)
 	@ApiOperation(value = "货位 统计所有库位数量")
 	public R locationsnub() {
-		if (null !=bladeRedis.get(Url+"/locationsnub)")){
-			log.info("缓存取值>>>>>>>>>>");
-			return R.data(bladeRedis.get(Url+"/locationsnub"));
-		}
+//		if (null !=bladeRedis.get(Url+"/locationsnub)")){
+//			log.info("缓存取值>>>>>>>>>>");
+//			return R.data(bladeRedis.get(Url+"/locationsnub"));
+//		}
 		locationsnubVO locationsnubVO = warehouseGoodsAllocationService.selectlocationsnub();
-		bladeRedis.setEx(Url+"/locationsnub",locationsnubVO,360L);
+		//bladeRedis.setEx(Url+"/locationsnub",locationsnubVO,360L);
 		return R.data(locationsnubVO);
 	}
 	/**
 	 * 货位 统计每个货区数量
 	 */
 	@GetMapping("/cargoNub")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 19)
 	@ApiOperation(value = "货位 统计每个货区数量")
 	public R cargoNub() {
 		if (null !=bladeRedis.get(Url+"/cargoNub")){
@@ -340,7 +340,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位 查询包件
 	 */
 	@GetMapping("/selectWrap")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 20)
 	@ApiOperation(value = "货位 查询包件", notes = "传入warehouseGoodsAllocation")
 	public R<IPage <WarehouseVisualizationVO>> selectWrap(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, Query query) {
 		IPage <WarehouseVisualizationVO> pages = warehouseGoodsAllocationService.selectAllwrap(warehouseGoodsAllocation,Condition.getPage(query));
@@ -351,7 +351,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位 查询库存品
 	 */
 	@GetMapping("/selectInventory")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 21)
 	@ApiOperation(value = "货位 查询库存品", notes = "传入warehouseGoodsAllocation")
 	public R<IPage <WarehouseStockListCopyVO>> selectInventory(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, Query query) {
 		IPage <WarehouseStockListCopyVO> pages = warehouseGoodsAllocationService.selectAllInventory(warehouseGoodsAllocation,Condition.getPage(query));
@@ -362,7 +362,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位 查询零担
 	 */
 	@GetMapping("/selectZeroOrder")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 22)
 	@ApiOperation(value = "货位 查询零担", notes = "传入warehouseGoodsAllocation")
 	public R<IPage <WarehouseStockArticleCopyVO>> selectZeroOrder(WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO, Query query) {
 		IPage <WarehouseStockArticleCopyVO> pages = warehouseGoodsAllocationService.selectAllZeroOrder(warehouseStockArticleCopyDTO,Condition.getPage(query));
@@ -373,7 +373,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位 查询托盘
 	 */
 	@GetMapping("/selectTray")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 23)
 	@ApiOperation(value = "货位 查询托盘", notes = "传入warehouseGoodsAllocation")
 	public R<IPage <WarehouseTrayVO>> selectTray(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, Query query) {
 		IPage <WarehouseTrayVO> pages = warehouseGoodsAllocationService.selectAllTray(warehouseGoodsAllocation,Condition.getPage(query));
@@ -385,7 +385,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位 下架包件
 	 */
 	@PostMapping("/downPackage")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 24)
 	@ApiOperation(value = "货位 下架包件", notes = "传入warehouseGoodsAllocation")
 	public R downPackage(@RequestBody UpdownTypeDTO updownTypeDTO) {
 		List<UpShelfPackageDTO> upShelfPackageList = updownTypeDTO.getUpShelfPackageList();
@@ -399,7 +399,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位 下架零担
 	 */
 	@PostMapping("/downZeroOrder")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 25)
 	@ApiOperation(value = "货位 下架零担", notes = "传入warehouseGoodsAllocation")
 	public R downZeroOrder(@RequestBody UpdownTypeDTO updownTypeDTO) {
 		List<UpShelfZeroOrderDTO> upShelfZeroOrderList = updownTypeDTO.getUpShelfZeroOrderList();
@@ -413,7 +413,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位 下架库存品
 	 */
 	@PostMapping("/downStock")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 26)
 	@ApiOperation(value = "货位 下架库存品", notes = "传入warehouseGoodsAllocation")
 	public R downStock(@RequestBody UpdownTypeDTO updownTypeDTO) {
 		List<UpShelfStockDTO> upShelfStockList = updownTypeDTO.getUpShelfStockList();
@@ -428,7 +428,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位 下架托盘
 	 */
 	@PostMapping("/downTray")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 27)
 	@ApiOperation(value = "货位 下架托盘", notes = "传入updownTypeDTO")
 	public R downTray(@RequestBody UpdownTypeDTO updownTypeDTO) {
 		List<String> trayCodes = updownTypeDTO.getTrayCodes();
@@ -451,7 +451,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 
 
 	@PostMapping("/downAllocation")
-	@ApiOperationSupport(order = 1)
+	@ApiOperationSupport(order = 28)
 	@ApiOperation(value = "货位 下架货位", notes = "传入trayTypeDTO")
 	public R downAllocation(@RequestParam String ids) {
 		try{
@@ -476,7 +476,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位 新增
 	 */
 	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
+	@ApiOperationSupport(order = 29)
 	@ApiOperation(value = "新增", notes = "传入warehouseGoodsAllocation")
 	public R save(@Valid @RequestBody WarehouseGoodsAllocationEntity warehouseGoodsAllocation) {
 		return R.status(warehouseGoodsAllocationService.save(warehouseGoodsAllocation));
@@ -486,7 +486,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位 修改
 	 */
 	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
+	@ApiOperationSupport(order = 30)
 	@ApiOperation(value = "修改", notes = "传入warehouseGoodsAllocation")
 	public R update(@Valid @RequestBody WarehouseGoodsAllocationEntity warehouseGoodsAllocation) {
 		return R.status(warehouseGoodsAllocationService.updateById(warehouseGoodsAllocation));
@@ -496,7 +496,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位 新增或修改
 	 */
 	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
+	@ApiOperationSupport(order = 31)
 	@ApiOperation(value = "新增或修改", notes = "传入warehouseGoodsAllocation")
 	public R submit(@Valid @RequestBody WarehouseGoodsAllocationEntity warehouseGoodsAllocation) {
 		return R.status(warehouseGoodsAllocationService.saveOrUpdate(warehouseGoodsAllocation));
@@ -506,7 +506,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 货位 删除
 	 */
 	@PostMapping("/remove")
-	@ApiOperationSupport(order = 7)
+	@ApiOperationSupport(order = 32)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(warehouseGoodsAllocationService.deleteLogic(Func.toLongList(ids)));
@@ -517,7 +517,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 	 * 导出数据
 	 */
 	@GetMapping("/export-warehouseGoodsAllocation")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 33)
 	@ApiOperation(value = "导出数据", notes = "传入warehouseGoodsAllocation")
 	public void exportWarehouseGoodsAllocation(@ApiIgnore @RequestParam Map<String, Object> warehouseGoodsAllocation, BladeUser bladeUser, HttpServletResponse response) {
 		QueryWrapper<WarehouseGoodsAllocationEntity> queryWrapper = Condition.getQueryWrapper(warehouseGoodsAllocation, WarehouseGoodsAllocationEntity.class);
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfOrderDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfOrderDTO.java
index 2d8ddb6e5..6f2d2fa83 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfOrderDTO.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfOrderDTO.java
@@ -1,13 +1,17 @@
 package com.logpm.warehouse.dto;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
+@ApiModel(value = "UpShelfOrderDTO对象", description = "订单DTO")
 public class UpShelfOrderDTO implements Serializable {
-
+	@ApiModelProperty(name = "服务号",notes = "服务号")
 	private String serviceNumber;//服务号
+	@ApiModelProperty(name = "订单号",notes = "订单号")
 	private String orderCode;//订单号
 
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfPackageDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfPackageDTO.java
index 08e91d710..1eea1fce3 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfPackageDTO.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfPackageDTO.java
@@ -1,12 +1,15 @@
 package com.logpm.warehouse.dto;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
+@ApiModel(value = "UpShelfPackageDTO对象", description = "包件DTO")
 public class UpShelfPackageDTO implements Serializable {
-
+	@ApiModelProperty(name = "包件码",notes = "包件码")
 	private String  orderPackageCode;//包件码
 
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfStockDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfStockDTO.java
index 4f778bb74..30899e49f 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfStockDTO.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfStockDTO.java
@@ -1,15 +1,21 @@
 package com.logpm.warehouse.dto;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
+@ApiModel(value = "UpShelfStockDTO对象", description = "库存品DTO")
 public class UpShelfStockDTO implements Serializable {
 
 	private Long marketId;
+	@ApiModelProperty(name = "物料编码",notes = "物料编码")
 	private String materialCode;//物料编码
+	@ApiModelProperty(name = "录入数量",notes = "录入数量")
 	private Integer enterNum;//录入数量
+	@ApiModelProperty(name = "库位id",notes = "库位id")
 	private Long allocationId;//库位id
 
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfZeroOrderDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfZeroOrderDTO.java
index 7f28351ac..9f88c6117 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfZeroOrderDTO.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfZeroOrderDTO.java
@@ -1,15 +1,21 @@
 package com.logpm.warehouse.dto;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
+@ApiModel(value = "UpShelfZeroOrderDTO对象", description = "零担DTO")
 public class UpShelfZeroOrderDTO implements Serializable {
-
+	@ApiModelProperty(name = "运单号",notes = "运单号")
 	private String waybillCode;//运单号
+	@ApiModelProperty(name = "订单号",notes = "订单号")
 	private String orderCode;//订单号
+	@ApiModelProperty(name = "录入数量",notes = "录入数量")
 	private Integer enterNum;//录入数量
+	@ApiModelProperty(name = "库位id",notes = "库位id")
 	private Long allocationId;//库位id
 
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpdownTypeDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpdownTypeDTO.java
index 81c4f411f..3ab4ecb97 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpdownTypeDTO.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpdownTypeDTO.java
@@ -1,5 +1,7 @@
 package com.logpm.warehouse.dto;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -7,37 +9,46 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Data
+@ApiModel(value = "UpdownTypeDTO对象", description = "上下架DTO")
 public class UpdownTypeDTO implements Serializable {
 
+	@ApiModelProperty(name = "库位Id",notes = "库位Id")
 	private Long allocationId;
+	@ApiModelProperty(name = "来源库位码",notes = "来源库位码")
 	private String sourceAllocation;//来源库位码
+	@ApiModelProperty(name = "目标库位码",notes = "目标库位码")
 	private String targetAllocation;//目标库位码
+	@ApiModelProperty(name = "移库方式",notes = "移库方式 1货物 2托盘")
 	private Integer moveType;//移库方式 1货物 2托盘
-
+	@ApiModelProperty(name = "移库方式",notes = "上架扫描类型 1服务号 2订单自编码 3包条码 4托盘码")
 	private Integer upshelfScanType;//上架扫描类型 1服务号 2订单自编码 3包条码 4托盘码
+	@ApiModelProperty(name = "码值",notes = "码值")
 	private String code;//码值
 
-
+	@ApiModelProperty(name = "下架类型 1按件下架 2零担下架 3库存品下架 4按库位下架 5按托盘下架",notes = "下架类型 1按件下架 2零担下架 3库存品下架 4按库位下架 5按托盘下架")
 	private Integer downShelfType;//下架类型 1按件下架 2零担下架 3库存品下架 4按库位下架 5按托盘下架
-
+	@ApiModelProperty(name = "订单列表",notes = "订单列表")
 	private List<UpShelfOrderDTO> upShelfOrderList = new ArrayList<>();
+	@ApiModelProperty(name = "包件列表",notes = "包件列表")
 	private List<UpShelfPackageDTO> upShelfPackageList = new ArrayList<>();
-
+	@ApiModelProperty(name = "零担列表",notes = "零担列表")
 	private List<UpShelfZeroOrderDTO> upShelfZeroOrderList = new ArrayList<>();
+	@ApiModelProperty(name = "库存品列表",notes = "库存品列表")
 	private List<UpShelfStockDTO> upShelfStockList = new ArrayList<>();
-
+	@ApiModelProperty(name = "零担类型 1订单号 2运单号",notes = "零担类型 1订单号 2运单号")
 	private Integer zeroType;//1订单号 2运单号
+	@ApiModelProperty(name = "库存品类型 1物料编码 2物料名称",notes = "库存品类型 1物料编码 2物料名称")
 	private Integer stockType;//1物料编码 2物料名称
 
 	private String value;
 
 	private Long marketId;
-
+	@ApiModelProperty(name = "托盘码",notes = "托盘码")
 	private String trayCode;//托盘码
-
+	@ApiModelProperty(name = "包件码",notes = "包件码")
 	private String orderPackageCode;//包件码
 
-
+	@ApiModelProperty(name = "托盘码列表",notes = "托盘码列表")
 	private List<String>  trayCodes;//托盘码s
 
 }
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 bdad929e5..615c9828c 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
@@ -58,10 +58,13 @@
          <where>
              ldsa.is_deleted = 0 and ldsa.is_zero ='0'
              <if test="param.customerName!=null and param.customerName!=''">
-                 and ldpl.customer_name like concat('%',#{param.customerName},'%')
+                 and ldsa.customer_name like concat('%',#{param.customerName},'%')
              </if>
              <if test="param.serviceNumber!=null and param.serviceNumber!=''">
-                 and ldpl.service_number like concat('%',#{param.serviceNumber},'%')
+                 and ldsa.service_number like concat('%',#{param.serviceNumber},'%')
+             </if>
+              <if test="param.warehouseId!=null and param.warehouseId!=''">
+                 and ldsa.warehouse_id = #{param.warehouseId}
              </if>
         </where>   GROUP BY ldsa.service_number
     </select>
@@ -109,6 +112,9 @@
             <if test="param.palletCode!=null and param.palletCode!=''">
                 and ldpl.pallet_code like concat('%',#{param.palletCode},'%')
             </if>
+            <if test="param.warehouseId!=null and param.warehouseId!=''">
+                and lwt.warehouse_id = #{param.warehouseId}
+            </if>
         </where>
         GROUP BY  lwt.id
     </select>