From db71fec6ee0b4a9febe3fcd506446f1e86799f10 Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 12 Jan 2024 17:08:20 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BA=A7=E5=93=81BOM=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/impl/SAPPortServiceImpl.java | 2 +- .../main/java/com/aucma/api/task/SAPTask.java | 15 +++++++++--- .../com/aucma/common/utils/DateUtils.java | 23 +++++++++++++++++++ 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/aucma-api/src/main/java/com/aucma/api/service/impl/SAPPortServiceImpl.java b/aucma-api/src/main/java/com/aucma/api/service/impl/SAPPortServiceImpl.java index 88c29e5..e6a2b95 100644 --- a/aucma-api/src/main/java/com/aucma/api/service/impl/SAPPortServiceImpl.java +++ b/aucma-api/src/main/java/com/aucma/api/service/impl/SAPPortServiceImpl.java @@ -204,7 +204,7 @@ public class SAPPortServiceImpl implements ISAPPortService { //转物料实体类 保存数据 orderBomInfosVos = storageService.insertSAPOrderBomInfo(resultVo); //保存接口日志 - PortLogUtils.savePortLog(werks.getItem().get(0).get("WERKS"), "获取产品bom数据" + intervalDate, "getSapBaseBomInfo", requestParam, result, null); + //PortLogUtils.savePortLog(werks.getItem().get(0).get("WERKS"), "获取产品bom数据" + intervalDate, "getSapBaseBomInfo", requestParam, result, null); } catch (Exception e) { //保存接口日志 PortLogUtils.savePortLog(werks.getItem().get(0).get("WERKS"), "获取产品bom数据" + intervalDate, "getSapBaseBomInfo", requestParam, result, e.toString()); diff --git a/aucma-api/src/main/java/com/aucma/api/task/SAPTask.java b/aucma-api/src/main/java/com/aucma/api/task/SAPTask.java index ffc6404..dbabb94 100644 --- a/aucma-api/src/main/java/com/aucma/api/task/SAPTask.java +++ b/aucma-api/src/main/java/com/aucma/api/task/SAPTask.java @@ -81,10 +81,19 @@ public class SAPTask { public void SAPBaseBomInfoDataTask(String factoryCode, Long startDays, Long endDays) { SAPPortDto sapPortDto = this.SAPRequestDataAssembly(factoryCode, startDays, endDays); SAPBOMPortDto sapbomPortDto = new SAPBOMPortDto(); - sapbomPortDto.setStartDate(sapPortDto.getStartDate()); - sapbomPortDto.setEndDate(sapPortDto.getEndDate()); sapbomPortDto.setFactoryCodes(sapPortDto.getFactoryCodes()); - portService.getSapOrderBomInfo(sapbomPortDto); + String startDate = sapPortDto.getStartDate(); + String endDate = sapPortDto.getEndDate(); + List dateList = DateUtils.getDifferenceDateList(startDate, endDate); + for (String date : dateList) { + sapbomPortDto.setStartDate(date); + sapbomPortDto.setEndDate(date); + try { + portService.getSapOrderBomInfo(sapbomPortDto); + } catch (Exception e) { + e.printStackTrace(); + } + } } diff --git a/aucma-common/src/main/java/com/aucma/common/utils/DateUtils.java b/aucma-common/src/main/java/com/aucma/common/utils/DateUtils.java index 54c6557..138402a 100644 --- a/aucma-common/src/main/java/com/aucma/common/utils/DateUtils.java +++ b/aucma-common/src/main/java/com/aucma/common/utils/DateUtils.java @@ -9,7 +9,10 @@ import java.time.LocalTime; import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.Date; +import java.util.List; + import org.apache.commons.lang3.time.DateFormatUtils; /** @@ -214,4 +217,24 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils return targetDate.format(formatter); } + /** + * 计算日期差,输出日期List + * @param startDateStr + * @param endDateStr + * @return + */ + public static List getDifferenceDateList(String startDateStr, String endDateStr) { + List dateList = new ArrayList<>(); + + LocalDate startDate = LocalDate.parse(startDateStr); + LocalDate endDate = LocalDate.parse(endDateStr); + + while (!startDate.isAfter(endDate)) { + dateList.add(startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + startDate = startDate.plusDays(1); + } + + return dateList; + } + }