diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliverySelfEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliverySelfEntity.java
index f4361f67a..aac613b59 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliverySelfEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliverySelfEntity.java
@@ -103,6 +103,11 @@ public class DistributionDeliverySelfEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
+	/**
+	 * 发车时间
+	 */
+	@ApiModelProperty(value = "发车时间")
+	private String departureTime;
 
 
 }
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryTripartiteEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryTripartiteEntity.java
index 24ce59c33..c2ada7530 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryTripartiteEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryTripartiteEntity.java
@@ -93,6 +93,11 @@ public class DistributionDeliveryTripartiteEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
+	/**
+	 * 发车时间
+	 */
+	@ApiModelProperty(value = "发车时间")
+	private String departureTime;
 	/**
 	 * 配送ID
 	 */
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 526313efc..ba12b37fb 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
@@ -84,7 +84,7 @@ public class BasicdataGoodsAreaController extends BladeController {
 		IPage<BasicdataGoodsAreaVO> list = basicdataGoodsAreaService.getBasicdataGoodsAreaList(basicdataGoodsArea,page);
 // WarehouseGoodsAreaWrapper.build().pageVO(list)
 //		IPage<BasicdataGoodsAreaVO> pages = basicdataGoodsAreaService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataGoodsArea, BasicdataGoodsAreaEntity.class));
-		return R.data(list);
+		return R.data(WarehouseGoodsAreaWrapper.build().pageVO(list));
 	}
 
 	/**
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java
index 200083cd2..845eb70e4 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java
@@ -49,6 +49,7 @@ import java.util.ArrayList;
 import java.util.Map;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -110,11 +111,16 @@ public class BasicdataWarehouseController extends BladeController {
 		}else {myWarehouseList.add(myCurrentWarehouse);}
 
 		if (myWarehouseList.size()==0){
-
+			return R.data(null);
 		}
+		List<Long> collect = myWarehouseList.stream()
+			.map(BasicdataWarehouseEntity::getId)
+			.collect(Collectors.toList());
 		QueryWrapper<BasicdataWarehouseEntity> qw = Condition.getQueryWrapper(warehouseWarehouse, BasicdataWarehouseEntity.class);
-		qw.apply(startDate != null, "date_format (start_date,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')", startDate)
-			.apply(endDate != null, "date_format (end_date,'%Y-%m-%d') <= date_format ({0},'%Y-%m-%d')", endDate);
+		qw.lambda().apply(startDate != null, "date_format (start_date,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')", startDate)
+			.apply(endDate != null, "date_format (end_date,'%Y-%m-%d') <= date_format ({0},'%Y-%m-%d')", endDate)
+			.in(BasicdataWarehouseEntity::getId,collect
+			);
 //		qw.lambda().eq(BasicdataWarehouseEntity::getTenantId, AuthUtil.getTenantId());
 //		qw.lambda().eq(BasicdataWarehouseEntity::getDepartment, deptId);
 		IPage<BasicdataWarehouseEntity> page = warehouseService.page(Condition.getPage(query), qw);
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 fb7768908..b7b0e7636 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
@@ -629,12 +629,12 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 			return R.fail("有货物,无法删除");
 		}
 		//禁用对应下面的货位
-		basicdataGoodsAllocationService.update(new UpdateWrapper<BasicdataGoodsAllocationEntity>().lambda()
-			.set(BasicdataGoodsAllocationEntity::getEnableStatus,1)
-			.in(BasicdataGoodsAllocationEntity::getGoodsShelfId,ids)
+		boolean update = basicdataGoodsAllocationService.update(new UpdateWrapper<BasicdataGoodsAllocationEntity>().lambda()
+			.set(BasicdataGoodsAllocationEntity::getEnableStatus, 2)
+			.in(BasicdataGoodsAllocationEntity::getGoodsShelfId, ids)
 		);
 		return R.status(this.update(new UpdateWrapper<BasicdataGoodsShelfEntity>().lambda()
-			.set(BasicdataGoodsShelfEntity::getEnableStatus,1)
+			.set(BasicdataGoodsShelfEntity::getEnableStatus,2)
 			.in(BasicdataGoodsShelfEntity::getId,ids)
 		));
 	}
@@ -643,11 +643,11 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 	public R enableGoodsArea(List<Long> ids) {
 		//启用对应下面的货位
 		basicdataGoodsAllocationService.update(new UpdateWrapper<BasicdataGoodsAllocationEntity>().lambda()
-			.set(BasicdataGoodsAllocationEntity::getEnableStatus,2)
+			.set(BasicdataGoodsAllocationEntity::getEnableStatus,1)
 			.in(BasicdataGoodsAllocationEntity::getGoodsShelfId,ids)
 		);
 		return R.status(this.update(new UpdateWrapper<BasicdataGoodsShelfEntity>().lambda()
-			.set(BasicdataGoodsShelfEntity::getEnableStatus,2)
+			.set(BasicdataGoodsShelfEntity::getEnableStatus,1)
 			.in(BasicdataGoodsShelfEntity::getId,ids)
 		));
 	}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
index ec74ffebc..8e397361f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
@@ -165,6 +165,21 @@ public class DistributionDeliveryAppController {
 		return msg;
 	}
 
+	/**
+	 * 配送管理 发车
+	 */
+	@PostMapping("/start")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "发车", notes = "传入DistrilbutionloadingscanDTO")
+	public R loadinginventoryDe(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+		if (null == distrilbutionloadingscanDTO.getDeliveryId() || null == distrilbutionloadingscanDTO.getLoadingId()){
+			return R.fail("参数不全");
+		}
+		R msg	= distributionDeliveryListService.loadingStart(distrilbutionloadingscanDTO);
+		return msg;
+	}
+
+
 	/**
 	 * 配送管理 装车确认(一键确认)
 	 */
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
index 3a6e55d2c..f6ebf8797 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
@@ -198,4 +198,10 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 * @return
 	 */
 	IPage<DistributionStockArticleVO> selectDiscussStockArticleInfoList(Map<String, Object> params, Query query);
+	/**
+	 * 发车
+	 * @param distrilbutionloadingscanDTO
+	 * @return
+	 */
+	R loadingStart(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 4c660c7df..a5b052749 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -1991,4 +1991,26 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 		return distributionStockArticleVOIPage;
 	}
+
+	@Override
+	public R loadingStart(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+		//获取当前用户司机
+		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
+		String format = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+		String loadingId = distrilbutionloadingscanDTO.getLoadingId();
+		Boolean b = false;
+		if (distributionDeliveryListEntity.getKind().equals("1")) {
+		b = distributionDeliverySelfService.update(new UpdateWrapper<DistributionDeliverySelfEntity>().lambda()
+			 .eq(DistributionDeliverySelfEntity::getId,loadingId)
+			 .set(DistributionDeliverySelfEntity::getDepartureTime,format)
+		 );
+		} else {
+		b =	distributionDeliveryTripartiteService.update(new UpdateWrapper<DistributionDeliveryTripartiteEntity>().lambda()
+				.eq(DistributionDeliveryTripartiteEntity::getId,loadingId)
+				.set(DistributionDeliveryTripartiteEntity::getDepartureTime,format)
+			);
+
+		}
+		return R.status(b);
+	}
 }