canrd-outside / order-erp · Commits

Commit 17ee2dd534b79d8bc2c99bcc7d2ea00dc2606bc5

Authored by chenhang4442024
1 parent b416f3e5
build: skipped

feat:解决旧版erp系统最晚包材到货时间和最晚订舱时间无法选择时间的问题

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
  View file @17ee2dd
@@ -337,7 +337,7 @@ public class OrderOverTimeEventJob { @@ -337,7 +337,7 @@ public class OrderOverTimeEventJob {
337 private Boolean filterBarcodeArrivalEvent(OrderEventJobVO eventJobVO) { 337 private Boolean filterBarcodeArrivalEvent(OrderEventJobVO eventJobVO) {
338 String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime(); 338 String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime();
339 String lastArrivalTime = eventJobVO.getTrackStageInfo().getLatestArrivalTime(); 339 String lastArrivalTime = eventJobVO.getTrackStageInfo().getLatestArrivalTime();
340 - if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(lastArrivalTime)) { 340 + if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(lastArrivalTime) && !(lastArrivalTime.contains("ok"))) {
341 LocalDate orderHodTimelocalDate = DateUtils.parseDate(orderHodTime); 341 LocalDate orderHodTimelocalDate = DateUtils.parseDate(orderHodTime);
342 LocalDate lastArrivalTimelocalDate = DateUtils.parseDate(lastArrivalTime); 342 LocalDate lastArrivalTimelocalDate = DateUtils.parseDate(lastArrivalTime);
343 if (ChronoUnit.DAYS.between(lastArrivalTimelocalDate, orderHodTimelocalDate) == Constant.SEVEN) { 343 if (ChronoUnit.DAYS.between(lastArrivalTimelocalDate, orderHodTimelocalDate) == Constant.SEVEN) {
@@ -350,7 +350,7 @@ public class OrderOverTimeEventJob { @@ -350,7 +350,7 @@ public class OrderOverTimeEventJob {
350 private Boolean filterLatestDCEvent(OrderEventJobVO eventJobVO) { 350 private Boolean filterLatestDCEvent(OrderEventJobVO eventJobVO) {
351 String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime(); 351 String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime();
352 String latestBkTime = eventJobVO.getTrackStageInfo().getLatestBkTime(); 352 String latestBkTime = eventJobVO.getTrackStageInfo().getLatestBkTime();
353 - if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(latestBkTime)) { 353 + if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(latestBkTime) && !(latestBkTime.contains("ok"))) {
354 LocalDate latestBkTimelocalDate = DateUtils.parseDate(latestBkTime); 354 LocalDate latestBkTimelocalDate = DateUtils.parseDate(latestBkTime);
355 LocalDate orderHodTimelocalDate = DateUtils.parseDate(orderHodTime); 355 LocalDate orderHodTimelocalDate = DateUtils.parseDate(orderHodTime);
356 if (ChronoUnit.DAYS.between(latestBkTimelocalDate, orderHodTimelocalDate) == Constant.ENABLE_TEN) { 356 if (ChronoUnit.DAYS.between(latestBkTimelocalDate, orderHodTimelocalDate) == Constant.ENABLE_TEN) {