PDA装车签收页面时间限制修复

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

@@ -259,6 +259,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.MonthDay;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
@@ -2488,8 +2490,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			YearMonth parse1 = YearMonth.parse(distributionDeliveryList.getTaskTime_end(), DateTimeFormatter.ISO_DATE);
 			long until = parse.until(parse1, ChronoUnit.MONTHS);
 			if (until != 0) {
-				log.error(method + "列表搜索时间范围大于一个月");
-				return Resp.fail("最大区间为一个月,请缩小搜索范围");
+				LocalDate day1 = LocalDate.parse(distributionDeliveryList.getTaskTime_start());
+				LocalDate day2 = LocalDate.parse(distributionDeliveryList.getTaskTime_end());
+				long between = ChronoUnit.DAYS.between(day1, day2);
+				if (between > 30){
+					log.error(method + "列表搜索时间范围大于三十天");
+					return Resp.fail("最大区间为三十天,请缩小搜索范围");
+				}
+
 			}
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 			distributionDeliveryList.setWarehouseId(myCurrentWarehouse.getId());

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

@@ -125,6 +125,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
@@ -8396,8 +8397,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		YearMonth parse1 = YearMonth.parse(distributionDeliveryList.getTaskTime_end(), DateTimeFormatter.ISO_DATE);
 		long until = parse.until(parse1, ChronoUnit.MONTHS);
 		if (until != 0) {
-			log.error(method + "列表搜索时间范围大于一个月");
-			return Resp.fail("最大区间为一个月,请缩小搜索范围");
+			LocalDate day1 = LocalDate.parse(distributionDeliveryList.getTaskTime_start());
+			LocalDate day2 = LocalDate.parse(distributionDeliveryList.getTaskTime_end());
+			long between = ChronoUnit.DAYS.between(day1, day2);
+			if (between > 30){
+				log.error(method + "列表搜索时间范围大于三十天");
+				return Resp.fail("最大区间为三十天,请缩小搜索范围");
+			}
 		}
 
 		distributionDeliveryList.setWarehouseId(myCurrentWarehouse.getId());