Merge branch 'dev' into pre-production

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();