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

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -933,7 +933,11 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 		AftersalesWorkOrderEntity workOrderEntity = JSONObject.parseObject(JSONObject.toJSONString(aftersalesWorkOrder), AftersalesWorkOrderEntity.class);
 		IPage<AftersalesWorkOrderEntity> iPage = baseMapper.pageListOwn(page, workOrderEntity);
-
+		if (iPage.getRecords().isEmpty()) {
+			log.error(">>>>>>>>>>>>>>>>>>查询工单列表为空");
+			IPage<AftersalesWorkOrderVO> data = AftersalesWorkOrderWrapper.build().pageVO(iPage);
+			return data;
+		}
 		//  获取售后工单的ID 集合
 		List<Long> workOrderIds = iPage.getRecords().stream().map(AftersalesWorkOrderEntity::getId).collect(Collectors.toList());
 
@@ -942,6 +946,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		LambdaQueryWrapper<AftersalesCompletionRecipientEntity> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.in(AftersalesCompletionRecipientEntity::getWorkOrderId,workOrderIds);
 		List<AftersalesCompletionRecipientEntity> list = completionRecipientService.list(queryWrapper);
+
 		// 收款方分组
 		Map<Long, List<AftersalesCompletionRecipientEntity>> collect = list.stream().collect(Collectors.groupingBy(AftersalesCompletionRecipientEntity::getWorkOrderId));
 

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

@@ -677,7 +677,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 		}
 		String num = finaClientCode.replaceAll("HT", "");
 		int anInt = Integer.parseInt(num) + 1;
-		return "HT" + anInt;
+		return "HT00" + anInt;
 	}
 
 

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

@@ -630,9 +630,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			log.info("复核签收装车数和签收数不一致,装车数:{},签收数:{}", loadingNum,signNum);
 			return R.fail("存在装车还未签收数据!!!");
 		}
-		DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListService.getById(distributionSignfor.getTrainNumber());
+		DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListService.getById(distributionSignfor.getDeliveryId());
 		if (Func.isEmpty(deliveryListEntity)) {
-			log.error("文员复核查询配送计划失败,deliveryId:{}", distributionSignfor.getTrainNumber());
+			log.error("文员复核查询配送计划失败,deliveryId:{}", distributionSignfor.getDeliveryId());
 			return R.fail("操作失败,请核对计划信息!!!");
 		}
 		BladeUser user = AuthUtil.getUser();