Merge branch 'dev' into pre-production

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

@@ -18,7 +18,7 @@ public class RedisKeyConstant {
 	 */
 	public static final String TASK_QUEST_CHILD_KEY ="cache:task-quest-child-key:";
 
-	public static final String BASIC_DATA_WAREHOUSE_KEY ="cache:basic-data-list:";
+	public static final String BASIC_DATA_WAREHOUSE_LIST_KEY ="cache:basic-data-warehouse-list:";
 
 
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java

@@ -172,7 +172,7 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient {
 
 
 
-		String key =RedisKeyConstant.BASIC_DATA_WAREHOUSE_KEY + deptId;
+		String key =RedisKeyConstant.BASIC_DATA_WAREHOUSE_LIST_KEY + deptId;
 		BasicdataWarehouseEntity o = bladeRedis.get(key);
 		log.info(">>> 获取的仓库的信息 o ={}",o);
 		if(ObjectUtils.isNull(o)){

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

@@ -4242,13 +4242,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				IPage<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackage(page, orderIds, distributionDeliveryInfoDTO);
 				parcelListVOIPage.setTotal(parcelListEntityList.getTotal());
 //				List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackageNew(distributionDeliveryInfoDTO);
-				log.info(">>>>>> parcelListEntityList {}", parcelListEntityList);
+//				log.info(">>>>>> parcelListEntityList {}", parcelListEntityList);
 				List<DistributionParcelListVO> parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList.getRecords());
 				for (DistributionParcelListVO distributionParcelListVO : parcelListVOList) {
-					log.info(">>>>>> distributionParcelListVO {}", distributionParcelListVO);
+//					log.info(">>>>>> distributionParcelListVO {}", distributionParcelListVO);
 					if (Func.isNotEmpty(loadingDataMap)) {
 						DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(distributionParcelListVO.getId());
-						log.info(">>>>>> loadscanEntity {}", loadscanEntity);
+//						log.info(">>>>>> loadscanEntity {}", loadscanEntity);
 
 						if (Func.isNotEmpty(loadscanEntity)) {
 							if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
@@ -4294,7 +4294,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							}
 						}
 					}
-					log.info(">>>>>> distributionParcelListVO2 {}", distributionParcelListVO);
+//					log.info(">>>>>> distributionParcelListVO2 {}", distributionParcelListVO);
 
 					distributionParcelListVOS.add(distributionParcelListVO);
 				}