Merge remote-tracking branch 'origin/dev' into dev

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

@@ -1817,6 +1817,8 @@
         ldr.cancel_reason,
         ldr.is_urgent,
         ldr.collection_fee,
+        ldr.receiving_unit,
+        ldr.mall_name,
         ldr.signing_status
         FROM
         logpm_distribution_signfor AS lds

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

@@ -2925,6 +2925,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
 				reservationEntity.setWarehouseId(myCurrentWarehouse.getId());
 				reservationEntity.setReservationCode(reservationMa());
+				reservationEntity.setReceivingUnit(k);
+				reservationEntity.setMallName(k);
 				BladeUser user = AuthUtil.getUser();
 				reservationEntity.setCreateUser(user.getUserId());
 				reservationEntity.setDeliveryWay(reservation.getDeliveryWay());

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

@@ -2321,8 +2321,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			clientTotal.getAndIncrement();
 			DistributionReservationDTO reservation = allocationDTO.getReservation();
 			DistributionReservationEntity reservationEntity = Func.copy(reservation, DistributionReservationEntity.class);
-			reservationEntity.setWaybillNo(k);
 			reservationEntity.setReservationCode(reservationMa());
+			reservationEntity.setReceivingUnit(k);
+			reservationEntity.setMallName(k);
 			reservationEntity.setWarehouseId(myCurrentWarehouse.getId());
 			reservationEntity.setReservationStatus(ReservationStatusConstant.daipeisong.getValue());
 			//这里采用订单上的收货信息