包件、订单、预约、备货状态调整

blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java

@@ -15,13 +15,15 @@ public class DictBizConstant {
 
 	public static final String BASIC_GROUNDING = "basic_grounding";//上架状态
 	public static final String STOCKUP_STATUS = "stockup_status";//备货状态
-	public static final String RESERVATION_STATUS = "order_reservation_status";//预约状态
+	public static final String ORDER_RESERVATION_STATUS = "order_reservation_status";//订单预约状态
+	public static final String RESERVATION_STATUS = "reservation_status";//预约状态
 
 
 	public static final String ORDER_PACKAGE_STATUS = "order_package_status";//配送包件状态
 	public static final String ORDER_PACKAGE_FREEZE_STATUS = "order_package_freeze_status";//包间冻结状态
 	public static final String ORDER_PACKAGE_STOCKUP_STATUS = "order_package_stockup_status";//包间备货状态
 	public static final String ORDER_PACKAGE_GROUNDING_STATUS = "order_package_grounding_status";//包间上架状态
+	public static final String ORDER_PACKAGE_RESERVATION_STATUS = "order_package_reservation_status";//包件预约状态
 	public static final String STOCK_ALLOCATION = "stock_assign_status";//包间上架状态
 
 
@@ -34,6 +36,17 @@ public class DictBizConstant {
 	//--------------2023-08-03 ---------------------
 	public static final String ADD_VALUE_SERVE_TYPE = "addvalue_serve_type";//增值服务类型
 
+	//--------------2023-08-04 ---------------------
+
+	public static final String DELIVERY_WAY = "delivery_way";//增值服务类型
+
+	// --------------2023-08-05 ---------------------
+
+	public static final String DISTRIBUTION_DELIVERY_STATUS = "distribution_delivery_status";//配送状态
+
+	public static final String DISTRIBUTION_DELIVERY_KiIND = "distribution_deliverylist_kind";//配送种类
+
+
 
 
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java

@@ -239,6 +239,8 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	private Integer source;
 
 
+
+
 //	/**
 //	 * 定位打卡地址
 //	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java

@@ -96,7 +96,7 @@ public class DistributionReservationEntity extends TenantEntity {
 	@ApiModelProperty(value = "收件人电话")
 	private String deliveryPhone;
 	/**
-	 * 预约信息状态;预约列表信息状态；1-待确认、2-已确认
+	 * 预约信息状态;预约列表信息状态；10-待确认、20-已确认
 	 */
 	@ApiModelProperty(value = "预约信息状态;预约列表信息状态；1-待确认、2-已确认")
 	private String reservationStatus;
@@ -175,6 +175,11 @@ public class DistributionReservationEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "费用汇总")
 	private BigDecimal fee;
+	/**
+	 * 费用汇总
+	 */
+	@ApiModelProperty(value = "费用汇总")
+	private BigDecimal collectionFee;
 	/**
 	 * 服务类型
 	 */
@@ -185,7 +190,7 @@ public class DistributionReservationEntity extends TenantEntity {
 	/**
 	 * 服务号
 	 */
-	@TableField(exist = false)
+//	@TableField(exist = false)
 	@ApiModelProperty(value = "服务号")
 	private String serviceNumber;
 
@@ -199,7 +204,7 @@ public class DistributionReservationEntity extends TenantEntity {
 	 * 是否加急
 	 */
 	@ApiModelProperty(value = "是否加急")
-	private Integer isUrgent;
+	private String isUrgent;
 	/**
 	/**
 	 * 预留1

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java

@@ -93,6 +93,18 @@ public class DistributionDeliveryListVO extends DistributionDeliveryListEntity {
 	@ApiModelProperty(value = "预约信息")
 	private DistributionReservationVO reservationInfo;
 
+	/**
+	 * 配送状态字典
+	 */
+	@ApiModelProperty(value = "配送状态字典")
+	private String deliveryStatusName;
+
+	/**
+	 * 配送状态字典
+	 */
+	@ApiModelProperty(value = "配送状态字典")
+	private String kindName;
+
 
 
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java

@@ -43,6 +43,12 @@ public class DistributionReservationVO extends DistributionReservationEntity {
 
 	private String deliveryTypeName;
 
+	private String reservationStatusName;
+
+	private String stockupStatusName;
+
+
+
 
 	/**
 	 * 库存品信息列表

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java

@@ -21,6 +21,7 @@ import com.logpm.distribution.dto.DistributionDeliveryListDTO;
 import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO;
 import com.logpm.distribution.service.IDistributionDeliveryInfoService;
 import com.logpm.distribution.vo.*;
+import com.logpm.distribution.wrapper.DistributionDeliveryListWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -131,9 +132,9 @@ public class DistributionDeliveryListController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distributionDeliveryList")
-	public R<IPage<DistributionDeliveryListEntity>> list(@ApiIgnore @RequestParam Map<String, Object> distributionDeliveryList, Query query) {
+	public R<IPage<DistributionDeliveryListVO>> list(@ApiIgnore @RequestParam Map<String, Object> distributionDeliveryList, Query query) {
 		IPage<DistributionDeliveryListEntity> pages = distributionDeliveryListService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionDeliveryList, DistributionDeliveryListEntity.class));
-		return R.data(pages);
+		return R.data(DistributionDeliveryListWrapper.build().pageVO(pages));
 	}
 
 
@@ -186,8 +187,8 @@ public class DistributionDeliveryListController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入distributionDeliveryList")
 	public R<IPage<DistributionDeliveryListVO>> page(DistributionDeliveryListDTO distributionDeliveryList, Query query) {
-		IPage<DistributionDeliveryListVO> pages = distributionDeliveryListService.selectDistributionDeliveryListPage(Condition.getPage(query), distributionDeliveryList);
-		return R.data(pages);
+		IPage<DistributionDeliveryListEntity> pages = distributionDeliveryListService.selectDistributionDeliveryListPage(Condition.getPage(query), distributionDeliveryList);
+		return R.data(DistributionDeliveryListWrapper.build().pageVO(pages));
 	}
 
 	/**
@@ -292,6 +293,18 @@ public class DistributionDeliveryListController extends BladeController {
 	}
 
 
+	/**
+	 * 配送客户列表
+	 */
+	@GetMapping("/getMarketDeliveryList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "customArgs")
+	public R<DistributionDeliveryListVO> getMarketDeliveryList(@RequestParam String id) {
+		DistributionDeliveryListVO deliveryListVO = distributionDeliveryListService.getMarketDeliveryList(id);
+		return R.data(deliveryListVO);
+	}
+
+
 
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java

@@ -18,6 +18,7 @@ package com.logpm.distribution.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.distribution.dto.DistributionDeliveryAllocationDTO;
 import com.logpm.distribution.dto.DistributionReservationDTO;
@@ -39,6 +40,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -182,9 +184,9 @@ public class DistributionReservationController extends BladeController {
 	@GetMapping("/getReservationAddr")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "查询指定预约信息地址")
-	public R<List<DistributionReservationEntity>> getReservationAddr(@ApiParam(value = "主键集合", required = true)@RequestParam String ids) {
-		List<DistributionReservationEntity> result = reservationService.getReservationAddr(ids);
-		return R.data(result);
+	public R<IPage<DistributionReservationVO>> getReservationAddr(@ApiParam(value = "主键集合", required = true)@RequestParam String ids) {
+		IPage<DistributionReservationEntity> result = reservationService.getReservationAddr(ids);
+		return R.data(DistributionReservationWrapper.build().pageVO(result));
 	}
 
 	/**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java

@@ -96,6 +96,14 @@ public class DistributionStockupDTO{
 	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
 	private Date stockupDate;
 
+	/**
+	 * 出库时间
+	 */
+	@ApiModelProperty(value = "出库时间")
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+	private Date outboundDate;
+
+
 
 
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java

@@ -47,7 +47,7 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
 	 * @param distributionDeliveryList
 	 * @return
 	 */
-	List<DistributionDeliveryListVO> selectDistributionDeliveryListPage(IPage page, @Param("param") DistributionDeliveryListDTO distributionDeliveryList);
+	List<DistributionDeliveryListEntity> selectDistributionDeliveryListPage(IPage page, @Param("param") DistributionDeliveryListDTO distributionDeliveryList);
 
 
 	/**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@@ -51,7 +51,7 @@
     </update>
 
 
-    <select id="selectDistributionDeliveryListPage" resultType="com.logpm.distribution.vo.DistributionDeliveryListVO">
+    <select id="selectDistributionDeliveryListPage" resultType="com.logpm.distribution.entity.DistributionDeliveryListEntity">
         SELECT
         lddl.id id,
         lddl.train_number trainNumber,

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java

@@ -83,6 +83,8 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	 */
 	DistributionReservationVO getReservationInfo(@Param("id")String id);
 
+	DistributionReservationVO getMarketReservationInfo(@Param("id")String id);
+
 	List<DistributionReservationEntity> getDeliveryReservation(@Param("id")Long id);
 
 	Integer getReservationNumByReservationIdAndStockListId(@Param("reservationId") Long reservationId, @Param("stockListId")Long stockListId);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -49,7 +49,7 @@
     <update id="addReservations" parameterType="java.util.List">
             UPDATE logpm_distribution_reservation
             <set>
-                reservation_status='2'
+                reservation_status='20'
             </set>
                 WHERE is_deleted=0
                 and
@@ -486,5 +486,58 @@
         WHERE
             reservation_id = #{reservationId}
     </select>
+    <select id="getMarketReservationInfo" resultType="com.logpm.distribution.vo.DistributionReservationVO">
+        SELECT
+                ldr.id,
+             ldr.tenant_id,
+             ldr.create_user,
+             ldr.create_time,
+             ldr.update_user,
+             ldr.update_time,
+             ldr.status,
+             ldr.is_deleted,
+             ldr.create_dept,
+             ldr.stock_article_id,
+             ldr.mall_id,
+             ldr.mall_name,
+             ldr.store_id,
+             ldr.store_name,
+             ldr.consignee,
+             ldr.delivery_address,
+             ldr.reservation_date,
+             ldr.serve_type,
+             ldr.delivery_way,
+             ldr.delivery_type,
+             ldr.collect_fee,
+             ldr.other_fee,
+             ldr.replace_fee,
+             ldr.delivery_phone,
+             ldr.reservation_status,
+             ldr.order_source,
+             ldr.stockup_status,
+             ldr.goods_area_name,
+             ldr.goods_area_id,
+             ldr.reserve1,
+             ldr.reserve2,
+             ldr.reserve3,
+             ldr.reserve4,
+             ldr.reserve5,
+             ldr.remarks,
+             ldr.shopping_id,
+             ldr.period_of_time,
+             ldr.fee,
+             ldr.reservation_num,
+             ldr.reservation_stock_list_num,
+             ldr.reservation_code,
+             ldr.service_number,
+             ldr.cancel_reason,
+             ldr.is_urgent,
+             ldr.collection_fee
+        FROM
+            logpm_distribution_signfor AS lds
+            INNER JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id
+        WHERE
+            lds.delivery_id = #{id}
+    </select>
 
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.mapper;
 
+import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionReservationStocklistEntity;
 import com.logpm.distribution.vo.DistributionReservationStocklistVO;
 import com.logpm.distribution.excel.DistributionReservationStocklistExcel;
@@ -62,4 +63,12 @@ public interface DistributionReservationStocklistMapper extends BaseMapper<Distr
 	 * @return
 	 */
 	Integer getStockListTotal(@Param("ids")List<Long> ids);
+
+	/**
+	 *
+	 * @param id
+	 * @param stockArticleId
+	 * @return
+	 */
+    List<DistributionParcelListEntity> selectReservationPackageNum(@Param("reservationId")Long id,@Param("stockArticleId") Long stockArticleId);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationStocklistMapper.xml

@@ -46,5 +46,61 @@
                 </foreach>
         </where>
     </select>
+    <select id="selectReservationPackageNum" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
+        SELECT
+            ldpl.id,
+            ldpl.tenant_id,
+            ldpl.create_user,
+            ldpl.create_time,
+            ldpl.update_user,
+            ldpl.update_time,
+            ldpl.status,
+            ldpl.is_deleted,
+            ldpl.create_dept,
+            ldpl.reserve1,
+            ldpl.reserve2,
+            ldpl.reserve3,
+            ldpl.reserve4,
+            ldpl.reserve5,
+            ldpl.warehouse_id,
+            ldpl.warehouse,
+            ldpl.conditions,
+            ldpl.order_package_code,
+            ldpl.cargo_title,
+            ldpl.shelf_title,
+            ldpl.goods_allocation,
+            ldpl.pallet,
+            ldpl.firsts,
+            ldpl.second,
+            ldpl.third_product,
+            ldpl.quantity,
+            ldpl.train_number,
+            ldpl.stock_article_id,
+            ldpl.order_code,
+            ldpl.service_number,
+            ldpl.material_id,
+            ldpl.material_name,
+            ldpl.material_code,
+            ldpl.material_unit,
+            ldpl.brand_id,
+            ldpl.brand_name,
+            ldpl.order_package_status,
+            ldpl.order_package_freeze_status,
+            ldpl.order_package_grounding_status,
+            ldpl.order_package_stockup_status,
+            ldpl.order_package_reservation_status
+        FROM
+            logpm_distribution_reservation_package AS ldrp
+            INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id
+            <where>
+                <if test="reservationId != '' and reservationId != null">
+                 and   ldrp.reservation_id =#{reservationId}
+
+                </if>
+                <if test="stockArticleId != '' and stockArticleId != null">
+                    AND ldrp.stock_article_id =#{stockArticleId}
+                </if>
+            </where>
+    </select>
 
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -111,7 +111,7 @@
             FROM
                 logpm_distribution_stockup_info
             WHERE
-            reservation_id = #{id})
+            stockup_id = #{id})
     </select>
     <select id="getDeliveryStockupInfo" resultType="com.logpm.distribution.vo.DistributionStockupVO">
         SELECT DISTINCT

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java

@@ -50,7 +50,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 * @param distributionDeliveryList
 	 * @return
 	 */
-	IPage<DistributionDeliveryListVO> selectDistributionDeliveryListPage(IPage<DistributionDeliveryListVO> page, DistributionDeliveryListDTO distributionDeliveryList);
+	IPage<DistributionDeliveryListEntity> selectDistributionDeliveryListPage(IPage<DistributionDeliveryListEntity> page, DistributionDeliveryListDTO distributionDeliveryList);
 
 
 	/**
@@ -165,4 +165,11 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 * @return
 	 */
 	R loadinginventoryDe(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
+
+	/**
+	 * 查询市配配送列表信息
+	 * @param id
+	 * @return
+	 */
+	DistributionDeliveryListVO getMarketDeliveryList(String id);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java

@@ -90,7 +90,7 @@ public interface IDistributionReservationService extends BaseService<Distributio
 	 * @param ids id字符串
 	 * @return
 	 */
-    List<DistributionReservationEntity> getReservationAddr(String ids);
+    IPage<DistributionReservationEntity> getReservationAddr(String ids);
 
 	/**
 	 * 批量转配送任务

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -96,7 +96,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	private final IDictBizClient dictBizClient;
 
 	@Override
-	public IPage<DistributionDeliveryListVO> selectDistributionDeliveryListPage(IPage<DistributionDeliveryListVO> page, DistributionDeliveryListDTO distributionDeliveryList) {
+	public IPage<DistributionDeliveryListEntity> selectDistributionDeliveryListPage(IPage<DistributionDeliveryListEntity> page, DistributionDeliveryListDTO distributionDeliveryList) {
 		//转换创建时间
 		if (null != distributionDeliveryList.getCreateTime()) {
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -1525,6 +1525,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		return R.status(b);
 	}
 
+
+
 	@Override
 	public List<DistributionAppDeliverySelfVO> selectDistributionAppDeliverySelfVOList(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
 		//查询该配送类型
@@ -1562,4 +1564,42 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 		return page.setRecords(parcelListVOS);
 	}
+
+	@Override
+	public DistributionDeliveryListVO getMarketDeliveryList(String id) {
+		if (Func.isEmpty(id)){
+			log.error("参数异常id+{"+id+"}");
+		}
+		//查询配送下的预约信息和配送司机信息
+		DistributionDeliveryListEntity deliveryListEntity = this.getById(id);
+		DistributionDeliveryListVO  deliveryListVO = Func.copy(deliveryListEntity, DistributionDeliveryListVO.class);
+		switch (deliveryListEntity.getKind()){
+			case "1":
+				//查询自主配送
+				QueryWrapper<DistributionDeliverySelfEntity> qw = new QueryWrapper<>();
+				qw.lambda().eq(DistributionDeliverySelfEntity::getDeliveryId,id);
+				List<DistributionDeliverySelfEntity> distributionDeliverySelfEntities = distributionDeliverySelfService.getBaseMapper().selectList(qw);
+				List<DistributionDeliverySelfVO> deliverySelfVOS = new ArrayList<>();
+				distributionDeliverySelfEntities.forEach(s-> {
+					DistributionDeliverySelfVO deliverySelfVO = Func.copy(s, DistributionDeliverySelfVO.class);
+					deliverySelfVOS.add(deliverySelfVO);
+				});
+				deliveryListVO.setDeliverySelfVO(deliverySelfVOS);
+				break;
+			case "2":
+				QueryWrapper<DistributionDeliveryTripartiteEntity> tqw = new QueryWrapper<>();
+				tqw.lambda().eq(DistributionDeliveryTripartiteEntity::getDeliveryId,id);
+				DistributionDeliveryTripartiteEntity tripartiteEntity = distributionDeliveryTripartiteService.getBaseMapper().selectOne(tqw);
+				DistributionDeliveryTripartiteVO deliveryTripartiteVO = Func.copy(tripartiteEntity, DistributionDeliveryTripartiteVO.class);
+				deliveryListVO.setDeliveryTripartiteVO(deliveryTripartiteVO);
+				break;
+		}
+		//查询备货信息进行数据回显
+		//2、查询出备货信息
+		DistributionStockupVO stockupEntity = distributionStockupMapper.getDeliveryStockupInfo(id);
+		deliveryListVO.setStockupInfo(stockupEntity);
+		DistributionReservationVO reservationVOS = distributionReservationMapper.getMarketReservationInfo(id);
+		deliveryListVO.setReservationInfo(reservationVOS);
+		return deliveryListVO;
+	}
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.logpm.distribution.dto.*;
 import com.logpm.distribution.entity.*;
@@ -31,6 +32,7 @@ import org.springblade.common.constant.DistributionTypeConstant;
 import org.springblade.common.constant.delivery.DeliveryStatusConstant;
 import org.springblade.common.constant.order.OrderReservationStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant;
+import org.springblade.common.constant.orderpackage.OrderPackageStockupStatusConstant;
 import org.springblade.common.constant.reservation.ReservationDeliveryTypeConstant;
 import org.springblade.common.constant.reservation.ReservationStatusConstant;
 import org.springblade.common.constant.reservation.ReservationStockupStatusConstant;
@@ -220,13 +222,17 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 
 		List<String> arrayList = new ArrayList<>();
 		//服务号拼接
-		HashSet serviceNumber = new HashSet();
+//		HashSet serviceNumber = new HashSet();
+		HashSet<String> serviceNumber = new HashSet<>();
+
 		AtomicReference<BigDecimal> initTotal = new AtomicReference<>(BigDecimal.ZERO);
+
 		//存在订单构建预约订单关联信息
 		if (!Func.isEmpty(stockArticleList)) {
 			//存在订单的情况下才会对预约和包件的关系进行维护
 			//选择了订单但是未进行包件的选择，默认选择了订单下的所有在库包件
 			stockArticleList.forEach(s -> {
+				serviceNumber.add(s.getServiceNumber());
 				DistributionStockArticleEntity stockArticleEntity = Func.copy(s, DistributionStockArticleEntity.class);
 				DistributionReservationStockarticleEntity distributionReservationStockarticleEntity = new DistributionReservationStockarticleEntity();
 				//预约订单数量
@@ -263,7 +269,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						distributionReservationPackageEntity.setReservationId(reservationId);
 						distributionReservationPackageEntity.setParceListId(p.getId());
 						distributionReservationPackageEntity.setStockArticleId(s.getId());
-						distributionReservationPackageMapper.insert(distributionReservationPackageEntity);
+						distributionReservationPackageService.save(distributionReservationPackageEntity);
 						packageNum.getAndAdd(p.getQuantity());
 						p.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
 //						p.setBrandId(p.getBrandId());
@@ -280,23 +286,17 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						s.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
 					}else {
 						s.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
-
 					}
 				}
 				distributionReservationStockarticleEntity.setReservationNum(packageNum.get());
 				//订单无数据源，不需要进行包件信息维护
 				//修改订单状态为已预约
-// 				TODO 需要根据订单预约的包件数量是否等于订单总包件数量，存入 部分预约和已预约的状态值
-//				s.setReservationStatus(30+"");
-//				s.setOrderStatus(ServiceConstant.ORDER_STATE_ALREADY_RESERVATION);
-
 				stockArticleCount.getAndAdd(s.getReservationNum());
 //				DistributionStockArticleEntity stockArticleEntity = Func.copy(s, DistributionStockArticleEntity.class);
 				distributionStockArticleService.updateById(s);
 				//拼接订单自编号
 				arrayList.add(s.getOrderCode());
 				//拼接服务号
-				serviceNumber.add(s.getServiceNumber());
 //				//订单增值服务费
 //				initTotal.accumulateAndGet(new BigDecimal(s.getFee().toString()), BigDecimal::add);
 //				//订单协商费用
@@ -356,8 +356,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		//设置预约为市配
 		reservationEntity.setDeliveryType(DistributionTypeConstant.shipie.getValue());
 		//设置预约配送方式为送货
-		reservationEntity.setDeliveryWay(ServiceConstant.DELIVERY_GOODS_WAY);
-		reservationEntity.setServiceNumber(String.join(",", serviceNumber));
+		reservationEntity.setDeliveryWay(ReservationDeliveryTypeConstant.songhuo.getValue());
+		String s = String.join(",", serviceNumber);
+		reservationEntity.setServiceNumber(s);
 		reservationEntity.setReservationNum(stockArticleCount.get() );
 		reservationEntity.setReservationStockListNum(stockListCount.get() );
 		distributionReservationMapper.updateById(reservationEntity);
@@ -401,14 +402,12 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			List<Long> reservationIds = Func.toLongList(ids);
 			for (Long reservationId : reservationIds) {
 				DistributionReservationEntity reservationEntity = distributionReservationMapper.selectById(reservationId);
-				if (Func.isEmpty(reservationEntity) || !reservationEntity.getReservationStatus().equals("2")) {
+				if (Func.isEmpty(reservationEntity) || !reservationEntity.getReservationStatus().equals("20")) {
 					log.error("reservationEntity参数异常:+{" + reservationEntity + "}");
 					return R.fail("预约信息状态异常!!!");
 				}
 				//修改预约备货状态
 				reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
-//				reservationEntity.setGoodsAreaName(stockupAreaName);
-//				reservationEntity.setGoodsAreaId(Long.parseLong(goddsAreaId));
 				result = SqlHelper.retBool(distributionReservationMapper.updateById(reservationEntity));
 				//构建中间表信息
 				DistributionStockupInfoEntity reservationStockupEntity = new DistributionStockupInfoEntity();
@@ -430,11 +429,12 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	}
 
 	@Override
-	public List<DistributionReservationEntity> getReservationAddr(String ids) {
+	public IPage<DistributionReservationEntity> getReservationAddr(String ids) {
 		if (Func.isBlank(ids)) {
 			return null;
 		}
 		String[] split = ids.split(",");
+
 		List<DistributionReservationEntity> distributionReservationVOS = new ArrayList<>();
 		if (split.length == 1) {
 			DistributionReservationEntity reservationEntity = this.getBaseMapper().selectById(ids);
@@ -445,7 +445,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				distributionReservationVOS.add(reservationEntity);
 			}
 		}
-		return distributionReservationVOS;
+
+		Page<DistributionReservationEntity> distributionReservationVOPage = new Page<>();
+		Page<DistributionReservationEntity> resultPage = distributionReservationVOPage.setRecords(distributionReservationVOS);
+		return resultPage;
 	}
 
 	@Override
@@ -463,33 +466,37 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		DistributionStockupDTO stockup = allocationDTO.getStockup();
 		DistributionStockupEntity stockupentity = Func.copy(stockup, DistributionStockupEntity.class);
 		List<Long> ids = Func.toLongList(reservationIds);
-		boolean flag = Func.isEmpty(stockupentity);
 		DistributionStockupEntity distributionStockupEntity = Func.copy(stockup, DistributionStockupEntity.class);
 		Integer stockListTotal = distributionReservationStocklistMapper.getStockListTotal(ids);
-		if (!flag){
-			BladeUser user = AuthUtil.getUser();
-			distributionStockupEntity.setStockupUser(user.getUserName());
-			distributionStockupEntity.setAssignStatus(StockAssignStatusConstant.yizhipai.getValue());
+		//这里判断是否选择了司机
+		if (Func.isEmpty(stockupentity.getForkliftId())){
+			//这里就是米有选择司机
+			distributionStockupEntity.setAssignStatus(StockAssignStatusConstant.weizhipai.getValue());
+			distributionStockupEntity.setStockupStatus(StockupStatusConstant.weibeihuo.getValue());
+		}else {
 			distributionStockupEntity.setAssignTime(new Date());
-			distributionStockupEntity.setStockupUser(user.getUserName());
-			distributionStockupEntity.setStockupUserId(user.getUserId());
+			distributionStockupEntity.setAssignStatus(StockAssignStatusConstant.yizhipai.getValue());
+			distributionStockupEntity.setStockupStatus(StockupStatusConstant.daibeihuo.getValue());
 			distributionStockupEntity.setForkliftId(stockup.getForkliftId());
 			distributionStockupEntity.setForkliftName(stockup.getForkliftName());
-			distributionStockupEntity.setStockupUser(AuthUtil.getUserId().toString());
-			distributionStockupEntity.setStockupStatus(StockupStatusConstant.weibeihuo.getValue());
+		}
+		BladeUser user = AuthUtil.getUser();
+		distributionStockupEntity.setStockupUser(user.getUserName());
+		distributionStockupEntity.setStockupArea(stockup.getGoodsAreaName());
+		distributionStockupEntity.setLoaderName(stockup.getLoaderName());
+		distributionStockupEntity.setLoaderId(stockup.getLoaderId());
+		distributionStockupEntity.setStockupUserId(user.getUserId());
+		distributionStockupEntity.setTeamResponsibility(stockup.getLoadAndUnload());
+		distributionStockupEntity.setOutboundDate(stockup.getOutboundDate());
 		distributionStockupEntity.setTypeService(DistributionTypeConstant.shipie.getValue());
 		distributionStockupService.save(distributionStockupEntity);
-		}else {
-			//这里就是未填写备货信息
-			if (stockListTotal > 0 ){
-				return R.fail("配送库存品请填写备货信息!!!");
-			}
-		}
 		DistributionDeliveryListEntity distributionDeliveryListEntity = new DistributionDeliveryListEntity();
 		//设置车次号
 		String today = DateUtil.today();
 		String random = Func.random(7, RandomType.ALL);
 		distributionDeliveryListEntity.setTrainNumber(random + today);
+		distributionDeliveryListEntity.setFee(BigDecimal.ZERO);
+		distributionDeliveryListEntity.setPrice(BigDecimal.ZERO);
 		distributionDeliveryListService.save(distributionDeliveryListEntity);
 		Map<String, Object> map = new HashMap<>();
 //		//获取备货任务的编号
@@ -527,10 +534,11 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					Long stockupId = distributionStockupInfoEntity.getStockupId();
 					DistributionStockupEntity stockupEntity = distributionStockupService.getById(stockupId);
 					//2、预约单存在备货任务还未指派
-					if (Func.equals(stockupEntity.getAssignStatus(), StockAssignStatusConstant.weizhipai.getValue())) {
+					if (!Func.equals(stockupEntity.getAssignStatus(), StockAssignStatusConstant.yizhipai.getValue())) {
 						//备货任务只存在一个,对该备货任务进行删除
 						//查询备货任务下是否具有
 						Long id = distributionStockupInfoEntity.getStockupId();
+
 						Integer reservationNum = distributionStockupMapper.getReservationTotal(id);
 						if (reservationNum==1){
 							//只有一条，对该备货记录进行删除
@@ -567,13 +575,24 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionReservationStockarticleService.getBaseMapper().selectList(q);
 			List<DistributionReservationStocklistEntity> reservationStocklistEntityList = distributionReservationStocklistService.getBaseMapper().selectList(w);
 			//查询预约单下的包件信息
-			QueryWrapper<DistributionReservationPackageEntity> o = Condition.getQueryWrapper(map, DistributionReservationPackageEntity.class);
-			o.lambda().eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId());
-			List<DistributionReservationPackageEntity> reservationPackageEntityList = distributionReservationPackageService.getBaseMapper().selectList(o);
+//			QueryWrapper<DistributionReservationPackageEntity> o = Condition.getQueryWrapper(map, DistributionReservationPackageEntity.class);
+//			o.lambda().eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId());
+//			List<DistributionReservationPackageEntity> reservationPackageEntityList = distributionReservationPackageService.getBaseMapper().selectList(o);
 			if (!Func.isEmpty(reservationStockarticleEntityList)) {
 				reservationStockarticleEntityList.forEach(r -> {
 					//查询订单信息，完成对订单的信息修改
 					DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(r.getStockArticleId());
+					//这里查询出订单下所有包件信息的长度，和预约的包件进行比对，如果一致那么订单状态为已预约否则为部分预约
+					QueryWrapper<DistributionParcelListEntity> queryWrapper = new  QueryWrapper<>();
+					queryWrapper.lambda().eq(DistributionParcelListEntity::getStockArticleId,r.getStockArticleId());
+					List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.getBaseMapper().selectList(queryWrapper);
+					//查询出这个预约单下订单所备选取的包件数量
+					List<DistributionParcelListEntity> parcelListEntityList = distributionReservationStocklistMapper.selectReservationPackageNum(reservationEntity.getId(),r.getStockArticleId());
+					if (parcelListEntities.size()!=parcelListEntityList.size()){
+						stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
+					}else {
+						stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
+					}
 					//拼接订单编号
 					orderIds.append(stockArticleEntity.getId()).append(",");
 					//拼接订单自编号
@@ -586,8 +605,13 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						//修改订单的在库数量
 						stockArticleEntity.setHandQuantity(stockArticleEntity.getHandQuantity() - r.getReservationNum());
 						//对订单进行修改
-						distributionStockArticleService.updateById(stockArticleEntity);
 					}
+					distributionStockArticleService.updateById(stockArticleEntity);
+					//查询出选取的包件信息然后进行包件的备货信息修改
+					parcelListEntityList.forEach(p->{
+						p.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.daibeihuo.getValue());
+						distributionParcelListService.updateById(p);
+					});
 				});
 			}
 			if (!Func.isEmpty(reservationStocklistEntityList)) {
@@ -745,6 +769,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				//删除前需要对订单的可用数进行操作
 				DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(s1.getStockArticleId());
 				stockArticleEntity.setAvailableQuantity(s1.getReservationNum() + stockArticleEntity.getAvailableQuantity());
+				stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.daiyuyue.getValue());
 				distributionStockArticleService.updateById(stockArticleEntity);
 				//这里对原表进行物理删除
 				distributionReservationStockarticleMapper.deleteReservationStockarticle(distributionReservationDTO.getId());
@@ -767,9 +792,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			//对已有预约信息的订单包件数量进行清理
 			reservationPackageEntityList.forEach(p1 -> {
 				DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(p1.getParceListId());
+				parcelListEntity.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.daibeihuo.getValue());
+				parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
 				//todo 这里需要将包件状态设置成未预约；备货信息设置为未备货
 //				parcelListEntity.setOrderPackageReservationStatus();
-
 				//这里对原表进行物理删除
 				distributionReservationPackageMapper.deleteReservationPackage(distributionReservationDTO.getId());
 			});
@@ -785,6 +811,14 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			//这里判断修改内容是否存在订单信息，如果存在则进行中间表数据的重新插入
 			stockArticleList.forEach(s -> {
 				List<DistributionParcelListEntity> packageList = s.getPackageList();
+				QueryWrapper<DistributionParcelListEntity> parcelListEntityQueryWrapper = new QueryWrapper<>();
+				LambdaQueryWrapper<DistributionParcelListEntity> queryWrapper = parcelListEntityQueryWrapper.lambda().eq(DistributionParcelListEntity::getStockArticleId, s.getId());
+				List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(queryWrapper);
+				if (packageList.size()!=parcelListEntityList.size()){
+					s.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
+				}else {
+					s.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
+				}
 				AtomicInteger packageNum = new AtomicInteger();
 				if (Func.isEmpty(packageList)) {
 					Map<String, Object> map = new HashMap<>();
@@ -801,8 +835,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						distributionReservationPackageEntity.setStockArticleId(s.getId());
 						//维护订单下包件信息
 						distributionReservationPackageService.save(distributionReservationPackageEntity);
-						// todo 改变包件的预约信息为已预约
-//						p.setOrderPackageReservationStatus();
+						p.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
+						distributionParcelListService.updateById(p);
 					});
 					//设置订单可用数为0
 					s.setAvailableQuantity(0);
@@ -816,11 +850,11 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						distributionReservationPackageEntity.setStockArticleId(s.getId());
 						distributionReservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
 						distributionReservationPackageService.save(distributionReservationPackageEntity);
-						// todo 改变包件的预约信息为已预约
-//						p.setOrderPackageReservationStatus();
+						p.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
+						distributionParcelListService.updateById(p);
 					});
 					s.setAvailableQuantity(s.getAvailableQuantity() - s.getReservationNum());
-					// todo 这里进行选取的包件和订单的包件进行比对，如果选取的包件数量和订单本身的数量一致，那么订单的状态为已预约，如果选取的和订单下的包件长度少那么订单的状态为部分预约
+
 				}
 				DistributionReservationStockarticleEntity distributionReservationStockarticleEntity = new DistributionReservationStockarticleEntity();
 				//构建预约订单中间表信息
@@ -878,32 +912,35 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		DistributionStockupDTO stockup = allocationDTO.getStockup();
 		DistributionStockupEntity stockupEntity = Func.copy(stockup, DistributionStockupEntity.class);
 		if (!Func.isBlank(stockup.getForkliftName())){
+			stockupEntity.setAssignTime(new Date());
 			stockupEntity.setForkliftId(stockupEntity.getForkliftId());
 			stockupEntity.setForkliftName(stockupEntity.getForkliftName());
 			stockupEntity.setAssignStatus(StockAssignStatusConstant.yizhipai.getValue());
+			stockupEntity.setStockupStatus(StockupStatusConstant.daibeihuo.getValue());
 		}else {
+			stockupEntity.setStockupStatus(StockupStatusConstant.weibeihuo.getValue());
 			stockupEntity.setAssignStatus(StockAssignStatusConstant.weizhipai.getValue());
 		}
-		stockupEntity.setStockupStatus(StockupStatusConstant.weibeihuo.getValue());
 		BladeUser user = AuthUtil.getUser();
 		stockupEntity.setStockupUser(user.getUserName());
 		stockupEntity.setStockupUserId(user.getUserId());
-		stockupEntity.setStockupUser(user.getUserName());
 		stockupEntity.setLoaderId(stockup.getLoaderId());
+		stockupEntity.setStockupArea(stockup.getGoodsAreaName());
+		stockupEntity.setOutboundDate(stockup.getOutboundDate());
 		stockupEntity.setTeamResponsibility(stockup.getLoadAndUnload());
 		stockupEntity.setStockupDate(stockup.getStockupDate());
 		//设置类型为商配
 		stockupEntity.setTypeService(DistributionTypeConstant.shangpei.getValue());
-		stockupEntity.setAssignTime(new Date());
 		//2、添加备货任务
 		distributionStockupService.save(stockupEntity);
 		//4、维护配送表数据
 		DistributionDeliveryListEntity distributionDeliveryListEntity = new DistributionDeliveryListEntity();
 		String str = Func.random(7, RandomType.ALL) + DateUtil.today();
-
 		distributionDeliveryListEntity.setTrainNumber(str);
 		distributionDeliveryListEntity.setType(DistributionTypeConstant.shangpei.getValue());
 		distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.daipeisong.getValue());
+		distributionDeliveryListEntity.setPrice(BigDecimal.ZERO);
+		distributionDeliveryListEntity.setFee(BigDecimal.ZERO);
 		distributionDeliveryListService.save(distributionDeliveryListEntity);
 		//获取所有订单
 		List<DistributionStockArticleDTO> stockArticle = allocationDTO.getStockArticle();
@@ -983,6 +1020,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 							QueryWrapper<DistributionParcelListEntity> o = Condition.getQueryWrapper(map, DistributionParcelListEntity.class);
 //							o.lambda().eq(DistributionParcelListEntity::getStockArticleId, stockArticleEntity.getId());
 							List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(o);
+							stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
 							parcelListEntityList.forEach(p -> {
 								packageCount.getAndAdd(p.getQuantity());
 								DistributionReservationPackageEntity reservationPackageEntity = new DistributionReservationPackageEntity();
@@ -991,6 +1029,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 								reservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
 								reservationPackageEntity.setParceListId(p.getId());
 								distributionReservationPackageService.save(reservationPackageEntity);
+								p.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
+								distributionParcelListService.updateById(p);
 							});
 						} else {
 							//订单选择了指定包件进行配送
@@ -1002,7 +1042,16 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 								reservationPackageEntity.setStockArticleId(stockArticleEntity.getId());
 								reservationPackageEntity.setParceListId(p.getId());
 								distributionReservationPackageService.save(reservationPackageEntity);
+								p.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
+								distributionParcelListService.updateById(p);
 							});
+							//查询出这个预约单下订单所备选取的包件数量
+							List<DistributionParcelListEntity> parcelListEntityList = distributionReservationStocklistMapper.selectReservationPackageNum(reservationEntity.getId(),stockArticleEntity.getId());
+							if (packageList.size()!=parcelListEntityList.size()){
+								stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
+							}else {
+								stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
+							}
 						}
 						reservationStockarticleEntity.setReservationNum(packageCount.get());
 						reservationStockarticleEntity.setIsHaveData(ServiceConstant.ORDER_HAVE_DATA);
@@ -1043,7 +1092,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 //			tripartiteEntity.setReservationIds(reservationIds);
 			tripartiteEntity.setDeliveryId(distributionDeliveryListEntity.getId());
 			distributionDeliveryTripartiteService.save(tripartiteEntity);
-			distributionDeliveryListEntity.setKind(ServiceConstant.DELIVERLIST_KIND_SELF);
+			distributionDeliveryListEntity.setKind(ServiceConstant.DELIVERLIST_KIND_TRIPARTITE);
 			distributionDeliveryListEntity.setDriverName(tripartiteEntity.getDriverName());
 			distributionDeliveryListEntity.setVehicleName(tripartiteEntity.getVehicleNum());
 			distributionDeliveryListEntity.setDistributionCompany(tripartite.getDistributionCompany());
@@ -1082,6 +1131,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 //		distributionDeliveryListEntity.setLoadingTeamName(stockup.getLoaderName());
 //		distributionDeliveryListEntity.setLoadingTeamId(stockup.getLoaderId());
 //		distributionDeliveryListEntity.setLeadTime(stockup.getStockupDate());
+		String taskTime = allocationDTO.getTaskTime();
+		if(!Func.isEmpty(taskTime)){
+			distributionDeliveryListEntity.setTaskTime(taskTime);
+		}
 		distributionDeliveryListEntity.setOrderCode(orderSelfNumbering.deleteCharAt(orderSelfNumbering.length() - 1).toString());
 		distributionDeliveryListEntity.setOrderNumber(orderTotal.get());
 		distributionDeliveryListEntity.setDeliveryNumber(packageTotal.get());
@@ -1107,7 +1160,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		}
 		boolean result = false;
 		reservationEntity.setCancelReason(reservationDTO.getCancelReason());
-		reservationEntity.setReservationStatus(ServiceConstant.RESERVATION_STATE_CANCEL);
+		reservationEntity.setReservationStatus(ReservationStatusConstant.yiquexiao.getValue());
 		result = this.updateById(reservationEntity);
 		return result;
 	}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionDeliveryListWrapper.java

@@ -0,0 +1,34 @@
+package com.logpm.distribution.wrapper;
+
+import com.logpm.distribution.entity.DistributionDeliveryListEntity;
+import com.logpm.distribution.entity.DistributionReservationEntity;
+import com.logpm.distribution.vo.DistributionDeliveryListVO;
+import com.logpm.distribution.vo.DistributionReservationVO;
+import org.springblade.common.constant.DictBizConstant;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.system.cache.DictBizCache;
+
+import java.util.Objects;
+
+/**
+ * @program: LogisticsPlatform-Service
+ * @description: 包件包装类
+ * @author: cyz
+ * @create: 2023-08-02 14:35
+ **/
+public class DistributionDeliveryListWrapper extends BaseEntityWrapper<DistributionDeliveryListEntity, DistributionDeliveryListVO> {
+
+	public static DistributionDeliveryListWrapper build(){
+		return new DistributionDeliveryListWrapper();
+	}
+
+
+	@Override
+	public DistributionDeliveryListVO entityVO(DistributionDeliveryListEntity entity) {
+		DistributionDeliveryListVO deliveryListVO = Objects.requireNonNull(BeanUtil.copy(entity,DistributionDeliveryListVO.class));
+		deliveryListVO.setDeliveryStatusName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_DELIVERY_STATUS,entity.getDeliveryStatus()));
+		deliveryListVO.setKindName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_DELIVERY_KiIND,entity.getKind()));
+		return deliveryListVO;
+	}
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java

@@ -29,8 +29,8 @@ public class DistributionParcelListWrapper extends BaseEntityWrapper<Distributio
 		parcelListVO.setOrderPackageFreezeStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, entity.getOrderPackageFreezeStatus()));
 		parcelListVO.setOrderPackageGroundingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_GROUNDING_STATUS, entity.getOrderPackageGroundingStatus()));
 		parcelListVO.setOrderPackageStockupStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STOCKUP_STATUS, entity.getOrderPackageStockupStatus()));
-
-		parcelListVO.setOrderPackageReservationStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, entity.getOrderPackageReservationStatus()));
+		parcelListVO.setOrderPackageReservationStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_RESERVATION_STATUS, entity.getOrderPackageReservationStatus()));
+//		parcelListVO.setOrderPackageReservationStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, entity.getOrderPackageReservationStatus()));
 		return parcelListVO;
 	}
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionReservationWrapper.java

@@ -40,8 +40,10 @@ public class DistributionReservationWrapper extends BaseEntityWrapper<Distributi
 		}
 
 		reservationVO.setServeTypeName(builder.deleteCharAt(builder.length()-1).toString());
-//		reservationVO.setDeliveryTypeName(builder.append(DictBizCache.getValue(DictBizConstant.ADD_VALUE_SERVE_TYPE,serveType)).append(","););
+		reservationVO.setDeliveryWayName(DictBizCache.getValue(DictBizConstant.DELIVERY_WAY,entity.getDeliveryWay()));
+		reservationVO.setDeliveryTypeName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE,entity.getDeliveryType()));
+		reservationVO.setReservationStatusName(DictBizCache.getValue(DictBizConstant.RESERVATION_STATUS,entity.getReservationStatus()));
+		reservationVO.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS,entity.getStockupStatus()));
 		return reservationVO;
 	}
-
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java

@@ -53,7 +53,7 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper<Distribut
 		distributionStockupVO.setOrderStatusName(DictBizCache.getValue(DictBizConstant.DELIVERY_ORDER_STATUS, entity.getOrderStatus()));
 		distributionStockupVO.setGroundingStatusName(DictBizCache.getValue(DictBizConstant.BASIC_GROUNDING, entity.getGroundingStatus()));
 		distributionStockupVO.setFreezeStatusName(DictBizCache.getValue(DictBizConstant.FREEZE_STATUS,entity.getFreezeStatus()));
-		distributionStockupVO.setReservationStatusName(DictBizCache.getValue(DictBizConstant.RESERVATION_STATUS,entity.getReservationStatus()));
+		distributionStockupVO.setReservationStatusName(DictBizCache.getValue(DictBizConstant.ORDER_RESERVATION_STATUS,entity.getReservationStatus()));
 		distributionStockupVO.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS,entity.getStockupStatus()));
 		distributionStockupVO.setCreateUserName(userCliient.userInfoById(distributionStockupVO.getCreateUser()).getData().getName());