feat(all): 配送明细报表

1 修改配送明细报表查询导出逻辑

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

@@ -478,35 +478,43 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 		if (more == 1) {
 			// 单仓，最多导出1个月的数据
 			if (StrUtil.isNotEmpty(query.getTrainNumber()) || StrUtil.isNotEmpty(query.getOrderPackageCode()) || StrUtil.isNotEmpty(query.getReservationCode()) || StrUtil.isNotEmpty(query.getStockArticleId())) {
-			}else{
+			} else {
 				if (ObjectUtil.isNotEmpty(query.getStartTaskTime()) || ObjectUtil.isNotEmpty(query.getEndTaskTime())) {
 					boolean withinOneMonth = DateUtil.between(query.getStartTaskTime(), query.getEndTaskTime(), DateUnit.DAY) <= 30;
 					if (!withinOneMonth) {
 						throw new ServiceException("配送日期必选且时间不超过一个月");
 					}
+				} else {
+					throw new ServiceException("导出时配送日期必填");
 				}
 				if (ObjectUtil.isNotEmpty(query.getStartSjsigningTime()) || ObjectUtil.isNotEmpty(query.getEndSjsigningTime())) {
 					boolean withinOneMonth = DateUtil.between(query.getStartSjsigningTime(), query.getEndSjsigningTime(), DateUnit.DAY) <= 30;
 					if (!withinOneMonth) {
 						throw new ServiceException("签收日期必选且时间不超过一个月");
 					}
+				} else {
+					throw new ServiceException("导出时签收日期必填");
 				}
 			}
 		} else {
 			// 多仓，最多导出1个星期的数据
 			if (StrUtil.isNotEmpty(query.getTrainNumber()) || StrUtil.isNotEmpty(query.getOrderPackageCode()) || StrUtil.isNotEmpty(query.getReservationCode()) || StrUtil.isNotEmpty(query.getStockArticleId())) {
-			}else{
+			} else {
 				if (ObjectUtil.isNotEmpty(query.getStartTaskTime()) || ObjectUtil.isNotEmpty(query.getEndTaskTime())) {
 					boolean withinOneMonth = DateUtil.between(query.getStartTaskTime(), query.getEndTaskTime(), DateUnit.DAY) <= 7;
 					if (!withinOneMonth) {
 						throw new ServiceException("配送日期必选且时间不超过7天");
 					}
+				} else {
+					throw new ServiceException("导出时配送日期必填");
 				}
 				if (ObjectUtil.isNotEmpty(query.getStartSjsigningTime()) || ObjectUtil.isNotEmpty(query.getEndSjsigningTime())) {
 					boolean withinOneMonth = DateUtil.between(query.getStartSjsigningTime(), query.getEndSjsigningTime(), DateUnit.DAY) <= 7;
 					if (!withinOneMonth) {
 						throw new ServiceException("签收日期必选且时间不超过7天 ");
 					}
+				} else {
+					throw new ServiceException("导出时签收日期必填");
 				}
 			}
 		}