Merge branch 'dev' into pre-production

blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java

@@ -78,14 +78,14 @@ public class JobRegistryMonitorHelper {
 						}
 					} catch (Exception e) {
 						if (!toStop) {
-							logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:{}", e);
+							logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:", e);
 						}
 					}
 					try {
 						TimeUnit.SECONDS.sleep(RegistryConfig.BEAT_TIMEOUT);
 					} catch (InterruptedException e) {
 						if (!toStop) {
-							logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:{}", e);
+							logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:", e);
 						}
 					}
 				}

blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java

@@ -143,7 +143,7 @@ public class JobScheduleHelper {
 
                     } catch (Exception e) {
                         if (!scheduleThreadToStop) {
-                            logger.error(">>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}", e);
+                            logger.error(">>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:", e);
                         }
                     } finally {
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java

@@ -121,8 +121,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 			.map(BasicdataWarehouseEntity::getId)
 			.collect(Collectors.toList());
 		basicdataGoodsShelf.put("warehouseList", collect);
-		IPage<BasicdataGoodsShelfVO> basicdataGoodsShelfVOIPage = basicdataGoodsShelfMapper.getGoodsShelfList(page, basicdataGoodsShelf);
+        return basicdataGoodsShelfMapper.getGoodsShelfList(page, basicdataGoodsShelf);
-		return basicdataGoodsShelfVOIPage;
 	}
 
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java

@@ -165,7 +165,7 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 	@Transactional
 	public void importDriverArtery(List<BasicdataVehicleImportExcel> data) {
 		String method = "#############BasicdataVehicleServiceImpl.importDriverArtery";
-		log.info("车辆模板导入信息>>>>",data);
+		log.info("车辆模板导入信息>>>>{}",data);
 		try {
 			List<BasicdataDrivermiddleEntity>drivermiddleEntities = new ArrayList<>();
 			//对导入数据进行处理

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

@@ -1439,13 +1439,15 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					break;
 				case "欧派":
 					//推送到欧派
-					try {
+//					try {
-						//	ouPaiFactoryClinet.newSystemHandleStatusDataSignforOne("7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName );//*签收人*//
+//						//	ouPaiFactoryClinet.newSystemHandleStatusDataSignforOne("7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName );//*签收人*//
-						//	log.info(">>>>>>>>>>>>>>>>>>>>>>>> 签收推送 欧派:{} {} {} {}", "7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName );
+//						//	log.info(">>>>>>>>>>>>>>>>>>>>>>>> 签收推送 欧派:{} {} {} {}", "7",distributionParcelListEntity.getOrderPackageCode(), signingTime, userName );
-					} catch (Exception e) {
+//					} catch (Exception e) {
-						throw new RuntimeException(e);
+//						throw new RuntimeException(e);
-					}
+//					}
 					break;
+				default:
+					log.info("开单其它品牌stockArticleEntity.getBrand() ={}",stockArticleEntity.getBrand());
 				//其他.....
 			}
 		}

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

@@ -4587,8 +4587,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				List<String> collect = list.stream().filter(l -> !l.getScanStatus().equals(LoadingStatusConstant.quxiao.getValue())).map(DistributionLoadscaninvnEntity::getScanUser).collect(Collectors.toList());
 				int loadingNum = list.stream().mapToInt(DistributionLoadscaninvnEntity::getLoadedNub).sum();
 				rs.setLoadedinNumber(loadingNum);
-				HashSet<String> strings = new HashSet<>();
+                HashSet<String> strings = new HashSet<>(collect);
-				strings.addAll(collect);
 				rs.setScanUser(String.join(",", strings));
 
 				if (loadingNum > 0 && loadingNum == rs.getReservationNum()) {
@@ -5084,7 +5083,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			}
 			TrayTypeDataVO trayTypeDataVO = warehouseTrayTypeClient.selectListByTrayCode(c.getTrayCode());
 			if (Func.isNotEmpty(trayTypeDataVO)) {
-				String trayName = trayTypeDataVO.getTrayName();
+				String trayName = trayTypeDataVO.getTrayCode();
 				c.setTrayName(trayName);
 				List<WarehouseTrayGoodsEntity> goodsLsit = trayTypeDataVO.getGoodsLsit();
 				if (Func.isNotEmpty(goodsLsit)) {
@@ -5653,12 +5652,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	public R getZeroPackageInfo(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
 		List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = baseMapper.selectReservationStockByDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
 		if (Func.isEmpty(reservationStockarticleEntityList)) {
-			log.error("#############配送任务查询订单错误,deliveryId:{}", distrilbutionloadingscanDTO.getDeliveryId());
+			log.info("#############配送任务查询订单错误,deliveryId:{}", distrilbutionloadingscanDTO.getDeliveryId());
 			return null;
 		}
 		List<Long> orderIds = reservationStockarticleEntityList.stream().filter(rs -> Func.isNotEmpty(rs.getIsZero()) && rs.getIsZero().equals(IsOrNoConstant.yes.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList());
 		if (Func.isEmpty(orderIds)) {
-			log.error("####################配送任务下无零担信息:{}");
+			log.info("####################配送任务下无零担信息:{}",orderIds);
 			return Resp.scanFail("查询错误", "该任务无零担订单");
 		}
 		List<DistributionParcelNumberVO> parcelNumberVOS = new ArrayList<>();

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

@@ -1664,10 +1664,10 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 							.eq(DistributionReservationPackageEntity::getStockArticleId, stockArticleEntity.getId())
 							.ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue())
 						);
-						if (Func.isNotEmpty(packageEntityList)) {
+//						if (Func.isNotEmpty(packageEntityList)) {
-							long count = packageEntityList.stream().count();
+////							long count = packageEntityList.size();
-
+//
-						}
+//						}
 						//查询签收数量
 					}
 				}

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

@@ -474,8 +474,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	}
 
 	private String deakwithPallet(List<String> packagePallet, List<String> stockListPallet) {
-		Set<String> set = new HashSet<>();
+        Set<String> set = new HashSet<>(packagePallet);
-		set.addAll(packagePallet);
 
 		for (String pallet : stockListPallet) {
 			if (StringUtil.isBlank(pallet)) {
@@ -500,8 +499,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 	private String dealwithAllocation(List<String> packageAllocation, List<String> stockListAllocation) {
 
-		Set<String> set = new HashSet<>();
+        Set<String> set = new HashSet<>(packageAllocation);
-		set.addAll(packageAllocation);
 
 		for (String allocation : stockListAllocation) {
 			if (StringUtil.isBlank(allocation)) {

blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/ZbFactoryAccountsInterceptor.java

@@ -39,7 +39,7 @@ public class ZbFactoryAccountsInterceptor implements HandlerInterceptor {
 
 		String body = myRequestWrapper.getBody();
 		JSONObject bodyJson = JSONObject.parseObject(body);
-		log.info("bodyJson {}",bodyJson,toString());
+		log.info("bodyJson ={}",bodyJson.toString());
 
 		Map<String, String> params = new HashMap<>();
 		params.put("app_key",appKey);

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -581,7 +581,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		FactoryOrderEntity factoryOrder = factoryOrderService.selectEntityByOrderPackageCode(unitNo);
 
 		if (Objects.isNull(factoryOrder)) {
-			log.info("》》》》》》》》》》》》 未查询到该单据推送订单信息", orderStatusDTO.getUnitNo());
+			log.info("》》》》》》》》》》》》 未查询到该单据推送订单信息 {}", orderStatusDTO.getUnitNo());
 			return Resp.fail(400, "未查询到该单据推送订单信息");
 		}
 		// 如何判断这个包间是非干仓配的数据

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

@@ -772,7 +772,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 					//查询当前包件盘点状态
 
 					QuestDetailEntity questDetail = new QuestDetailEntity();
-					questDetail.setId(Long.valueOf(i));
+					questDetail.setId(i);
 					questDetail.setQuestStatus(1);
 					questDetail.setUpdateUser(user.getUserId());
 					questDetail.setUpdateTime(new Date());
@@ -1362,9 +1362,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		if (ObjectUtils.isNotNull(taskSearchDTO.getQuestDetailIds())) {
 			//修改盘点状态
 			List<QuestDetailEntity> questDetailEntities = new ArrayList<>();
-			taskSearchDTO.getQuestDetailIds().stream().forEach(i -> {
+			taskSearchDTO.getQuestDetailIds().forEach(i -> {
 				QuestDetailEntity questDetail = new QuestDetailEntity();
-				questDetail.setId(Long.valueOf(i));
+				questDetail.setId(i);
 				questDetail.setQuestStatus(0);
 				questDetailEntities.add(questDetail);
 				baseMapper.deleteQuestChild(taskSearchDTO.getQuestNum() + "_child", i);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -2893,7 +2893,11 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		TrayTypeDataVO trayTypeDataVO = new TrayTypeDataVO();
 		trayTypeDataVO.setTrayTypeId(trayTypeId);
 		trayTypeDataVO.setType(type);
-		trayTypeDataVO.setTrayCode(trayTypeEntity.getTrayCode());
+		if(Func.isNotBlank(basicdataTrayEntity.getPalletName())){
+			trayTypeDataVO.setTrayCode(basicdataTrayEntity.getPalletName());
+		}else {
+			trayTypeDataVO.setTrayCode(basicdataTrayEntity.getPalletCode());
+		}
 		trayTypeDataVO.setTrayNum(trayTypeEntity.getTotalNum());
 		trayTypeDataVO.setName(trayTypeEntity.getFilterValue());
 		trayTypeDataVO.setOrderTotalNum(trayTypeEntity.getOrderTotalNum());