diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
index 7afdfe3b7..6741ff5f7 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
@@ -8,7 +8,8 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="-cyz";
+	public static final String DEVAUTH ="-tjj";
+
 
 	/**
 	 * 工厂对接服务名称
diff --git a/blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java b/blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java
index 9dcf841d5..8800f0e51 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/serviceConstant/ServiceConstant.java
@@ -187,4 +187,6 @@ public interface ServiceConstant {
 	 * 配送方式 -- 送货
 	 */
 	String DELIVERY_GOODS_WAY = "1";
+
+	String RESERVATION_STATE_CANCEL = "4";
 }
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java
index fae6754a5..1bdb5e259 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java
@@ -115,6 +115,11 @@ public class DistributionReservationEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "备货区编号")
 	private String goodsAreaId;
+	/**
+	 * 备货区名称
+	 */
+	@ApiModelProperty(value = "备货区名称")
+	private String goodsAreaName;
 	/**
 	 * 备注
 	 */
@@ -177,6 +182,18 @@ public class DistributionReservationEntity extends TenantEntity {
 	@TableField(exist = false)
 	@ApiModelProperty(value = "服务号")
 	private String serviceNumber;
+
+	/**
+	 * 预约取消原因
+	 */
+	@ApiModelProperty(value = "预约取消原因")
+	private String cancelReason;
+
+	/**
+	 * 是否加急
+	 */
+	@ApiModelProperty(value = "是否加急")
+	private Integer isUrgent;
 	/**
 	/**
 	 * 预留1
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsShelfDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsShelfDTO.java
index 52918b889..9f5e757c1 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsShelfDTO.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsShelfDTO.java
@@ -33,7 +33,7 @@ import java.util.List;
 public class BasicdataGoodsShelfDTO extends BasicdataGoodsShelfEntity {
 	private static final long serialVersionUID = 1L;
 
-	List<String> goodsAreaInfo;
+	String goodsAreaInfo;
 
 
 
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml
index 1c85051e0..905f29eaa 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml
@@ -66,7 +66,7 @@
             goods_allocation.create_time,
             goods_allocation.update_user,
             goods_allocation.update_time,
-            goods_allocation.status,
+            goods_allocation.STATUS,
             goods_allocation.is_deleted,
             goods_allocation.create_dept,
             goods_allocation.id,
@@ -87,18 +87,13 @@
             goods_allocation.qr_code_url,
             goods_allocation.template_id,
             goods_shelf.goods_shelf_name AS goodsShelfName,
-            goods_area.headline AS goodsAreaName,
-            warehouse.name AS warehouseName
+            goods_area.headline AS goodsAreaName
         FROM
             logpm_warehouse_goods_allocation AS goods_allocation
             INNER JOIN logpm_warehouse_goods_shelf AS goods_shelf ON goods_allocation.goods_shelf_id = goods_shelf.id
             INNER JOIN logpm_warehouse_goods_area AS goods_area ON goods_allocation.goods_area_id = goods_area.id
-            INNER JOIN logpm_warehouse_warehouse AS warehouse ON goods_allocation.warehouse_id = warehouse.id
         <where>
             goods_allocation.is_deleted = 0
-            <if test="po.warehouseId!=null and po.warehouseId!=''">
-              AND  goods_allocation.warehouse_id=#{po.warehouseId}
-            </if>
             <if test="po.goodsAreaId!=null and po.goodsAreaId!=''">
                 AND  goods_allocation.goods_area_id=#{po.goodsAreaId}
             </if>
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml
index f5e80e493..3b682235d 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml
@@ -78,17 +78,12 @@
             goods_shelf.qr_code,
             goods_shelf.qr_code_url,
             goods_shelf.template_id,
-            warehouse.name AS warehouseName,
             goods_area.headline AS goodsAreaName
         FROM
             logpm_warehouse_goods_shelf AS goods_shelf
             INNER JOIN logpm_warehouse_goods_area AS goods_area ON goods_shelf.goods_area_id = goods_area.id
-            INNER JOIN logpm_warehouse_warehouse AS warehouse ON goods_area.warehouse_id = warehouse.id
         <where>
             goods_shelf.is_deleted=0
-            <if test="po.warehouseId != null and po.warehouseId!= ''">
-                and goods_area.warehouse_id = #{po.warehouseId}
-            </if>
             <if test="po.goodsAreaId != null and po.goodsAreaId!= ''">
                 and goods_shelf.goods_area_id = #{po.goodsAreaId}
             </if>
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 39a8e9f07..f40f61237 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
@@ -177,9 +177,9 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 			log.error("参数异常:["+basicdataGoodsShelfDTO+"]");
 			return result;
 		}
-			BasicdataGoodsShelfEntity basicdataGoodsShelfEntity = new BasicdataGoodsShelfEntity();
-			BeanUtils.copyProperties(basicdataGoodsShelfDTO,basicdataGoodsShelfEntity);
-			result = SqlHelper.retBool(basicdataGoodsShelfMapper.updateById(basicdataGoodsShelfEntity));
+		BasicdataGoodsShelfEntity goodsShelfEntity = this.getById(basicdataGoodsShelfDTO.getId());
+		BeanUtils.copyProperties(basicdataGoodsShelfDTO,goodsShelfEntity);
+			result = SqlHelper.retBool(basicdataGoodsShelfMapper.updateById(goodsShelfEntity));
 		return result;
 	}
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java
index cd63c47e0..19556b550 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java
@@ -79,6 +79,8 @@ public class DistributionReservationController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入distrbutionReservation")
 	public R<IPage<DistributionReservationEntity>> list(@ApiIgnore @RequestParam Map<String, Object> distrbutionReservation, Query query) {
 		IPage<DistributionReservationEntity> pages = reservationService.page(Condition.getPage(query), Condition.getQueryWrapper(distrbutionReservation, DistributionReservationEntity.class));
+
+
 		return R.data(pages);
 	}
 
@@ -176,7 +178,7 @@ public class DistributionReservationController extends BladeController {
 	}
 
 	/**
-	 * 批量预约转备货任务
+	 * 查询预约
 	 */
 	@GetMapping("/getReservationAddr")
 	@ApiOperationSupport(order = 7)
@@ -187,7 +189,7 @@ public class DistributionReservationController extends BladeController {
 	}
 
 	/**
-	 * 批量预约转配送任务
+	 * 市配订单转配送任务
 	 */
 	@PostMapping("/deliveryTask")
 	@ApiOperationSupport(order = 7)
@@ -219,4 +221,16 @@ public class DistributionReservationController extends BladeController {
 		R<?> result = reservationService.deliveryBusinessTask(allocationDTO);
 		return result;
 	}
+
+
+	/**
+	 * 取消预约
+	 */
+	@PutMapping("/cancelReservation")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "取消预约")
+	public R cancelReservation(@RequestBody DistributionReservationDTO reservationDTO) {
+		boolean result = reservationService.cancelReservation(reservationDTO);
+		return R.status(result);
+	}
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java
index 983cbf894..6beebf05c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java
@@ -73,4 +73,6 @@ public class DistributionDeliveryAllocationDTO {
 	 */
 	@ApiModelProperty(value = "商配订单信息")
 	private List<DistributionStockArticleDTO> stockArticle;
+
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationDTO.java
index a3ccd9e2b..056219aa8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationDTO.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationDTO.java
@@ -70,4 +70,6 @@ public class DistributionReservationDTO extends DistributionReservationEntity {
 
 
 
+
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
index 5203a2b51..30a2e4f21 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
@@ -32,10 +32,13 @@
         <result column="order_source" property="orderSource"/>
         <result column="stockup_status" property="stockupStatus"/>
         <result column="goods_shelf_id" property="goodsAreaId"/>
+        <result column="goods_shelf_name" property="goodsAreaName"/>
         <result column="reservation_num" property="reservationNum"/>
         <result column="reservation_code" property="reservationCode"/>
         <result column="period_of_time" property="periodOfTime"/>
         <result column="fee" property="fee"/>
+        <result column="cancel_reason" property="cancelReason"/>
+        <result column="is_urgent" property="isUrgent"/>
         <result column="reserve1" property="reserve1"/>
         <result column="reserve2" property="reserve2"/>
         <result column="reserve3" property="reserve3"/>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java
index bf97a971e..bf138df4f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java
@@ -118,4 +118,12 @@ public interface IDistributionReservationService extends BaseService<Distributio
 	 * @return
 	 */
 	R<?> deliveryBusinessTask(DistributionDeliveryAllocationDTO allocationDTO);
+
+	/**
+	 *
+	 * @param allocationDTO
+	 * @return
+	 */
+	boolean cancelReservation(DistributionReservationDTO reservationDTO);
+
 }
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 7bbdbbe80..c7d4d4ccd 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
@@ -299,12 +299,15 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
 			Date date = format.parse(stockUpDate);
 			String goddsAreaId = (String) stockUpInfo.get("stockupArea");
+			String stockupAreaName = (String) stockUpInfo.get("goodsAreaName");
 			DistributionStockupEntity stockupEntity = new DistributionStockupEntity();
 			stockupEntity.setGoodsAreaId(Long.parseLong(goddsAreaId));
 			//设置备货任务指派状态---未指派
-			stockupEntity.setAssignStatus("1");
-			//设置备货任务状态---待备货
-			stockupEntity.setStockupStatus("2");
+			stockupEntity.setAssignStatus(ServiceConstant.STOCkUP_ASSIGNSTATUS_ABSENCE);
+			//设置备货任务状态---未备货
+			stockupEntity.setStockupStatus(ServiceConstant.STOCkUP_STATE_NOT_EXECUTION);
+			//设置订单类型提交给备货任务
+			stockupEntity.setTypeService(ServiceConstant.DELIVERY_TYPE_CUSTOMER);
 			//设置备货任务备货时间
 			stockupEntity.setStockupDate(date);
 			//保存备货任务数据获取备货数据ID
@@ -318,7 +321,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					return R.fail("预约信息状态异常!!!");
 				}
 				//修改预约备货状态
-				reservationEntity.setStockupStatus("2");
+				reservationEntity.setStockupStatus(ServiceConstant.STOCKUP_STATE_WAIT_EXECUTION);
+				reservationEntity.setGoodsAreaName(stockupAreaName);
 				reservationEntity.setGoodsAreaId(goddsAreaId);
 				result = SqlHelper.retBool(distributionReservationMapper.updateById(reservationEntity));
 				//构建中间表信息
@@ -377,7 +381,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		distributionStockupEntity.setAssignTime(new Date());
 		distributionStockupEntity.setForkliftId(stockup.getForkliftId());
 		distributionStockupEntity.setStockupUser(AuthUtil.getUserId().toString());
-		distributionStockupEntity.setStockupStatus(ServiceConstant.STOCKUP_STATE_WAIT_EXECUTION);
+		distributionStockupEntity.setStockupStatus(ServiceConstant.STOCkUP_STATE_NOT_EXECUTION);
 		distributionStockupEntity.setTypeService(ServiceConstant.DELIVERY_TYPE_CUSTOMER);
 		distributionStockupService.save(distributionStockupEntity);
 		DistributionDeliveryListEntity distributionDeliveryListEntity = new DistributionDeliveryListEntity();
@@ -406,7 +410,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		StringBuilder vehicleNubs = new StringBuilder();
 		//司机名称拼接
 		StringBuilder driverNames = new StringBuilder();
-
 		ids.forEach(i->{
 			//查询备货任务
 			map.put("reservationId",i);
@@ -793,7 +796,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		stockupEntity.setTypeService(ServiceConstant.DELIVERY_TYPE_BUSINESS);
 		stockupEntity.setAssignTime(new Date());
 		stockupEntity.setAssignStatus(ServiceConstant.STOCkUP_ASSIGNSTATUS_ALREADY);
-		stockupEntity.setStockupStatus(ServiceConstant.STOCKUP_STATE_WAIT_EXECUTION);
+		stockupEntity.setStockupStatus(ServiceConstant.STOCkUP_STATE_NOT_EXECUTION);
 		//2、添加备货任务
 		distributionStockupService.save(stockupEntity);
 		//4、维护配送表数据
@@ -977,4 +980,23 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		distributionDeliveryListService.updateById(distributionDeliveryListEntity);
 		return R.status(true);
 	}
+
+	@Override
+	@Transactional
+	public boolean cancelReservation(DistributionReservationDTO reservationDTO) {
+		if (Func.isEmpty(reservationDTO)){
+			log.error("参数异常allocationDTO+{"+reservationDTO+"}");
+			return false;
+		}
+		DistributionReservationEntity reservationEntity = this.getById(reservationDTO.getId());
+		if (Func.isEmpty(reservationEntity)){
+			log.error("参数异常reservationEntity+{"+reservationEntity+"}");
+			return false;
+		}
+		boolean result = false;
+		reservationEntity.setCancelReason(reservationDTO.getCancelReason());
+		reservationEntity.setReservationStatus(ServiceConstant.RESERVATION_STATE_CANCEL);
+		result = this.updateById(reservationEntity);
+		return result;
+	}
 }