配送详情包件字段调整

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

@@ -231,6 +231,9 @@
                             ldsa.consignee_address,
                             ldsa.consignee_mobile,
                             ldsa.order_status,
+                            ldsa.customer_name,
+                            ldsa.customer_telephone,
+                            ldsa.customer_address,
                      ldsa.description_goods descriptionGoods,
                      (
 

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

@@ -2055,7 +2055,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		Func.copy(distributionReservationDTO, reservationEntity);
 		reservationEntity.setWarehouseId(myCurrentWarehouse.getId());
 		//新建预约单为待确认状态
-		reservationEntity.setReservationStatus(ReservationStatusConstant.daiqueren.getValue());
+		reservationEntity.setReservationStatus(ReservationStatusConstant.yiqueren.getValue());
 		//新建预约单订单处于未备货状态
 		reservationEntity.setStockupStatus(ReservationStockupStatusConstant.weibeihuo.getValue());
 		this.save(reservationEntity);
@@ -2275,7 +2275,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			String s = String.join(",", serviceNumber);
 			reservationEntity.setServiceNumber(s);
 		}
-		reservationEntity.setReservationStatus(distributionReservationDTO.getReservationStatus());
+//		reservationEntity.setReservationStatus(distributionReservationDTO.getReservationStatus());
 		reservationEntity.setOrderSource(ReservationOrderSourceConstant.zijian.getValue());
 		if (Func.isNotEmpty(distributionReservationDTO.getServeType())){
 			reservationEntity.setServeType(distributionReservationDTO.getServeType());