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

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

@@ -1730,6 +1730,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							loadscanEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
 							loadscanEntity.setPackageNub(parcelListEntity.getQuantity());
 							loadscanEntity.setLoadedNub(parcelListEntity.getQuantity());
+							loadscanEntity.setWarehouseId(myCurrentWarehouse.getId());
+							loadscanEntity.setWarehouseName(myCurrentWarehouse.getName());
 							loadscanEntity.setScanTime(now);
 							if (StringUtils.isNotBlank(finalDistributionDeliverySelfEntity.getDriverPhone())) {
 								loadscanEntity.setDriverPhone(finalDistributionDeliverySelfEntity.getDriverPhone());