Commit 47faf69b by huluobin

# 更新

parent d1237a77
...@@ -33,6 +33,7 @@ import java.time.LocalDateTime; ...@@ -33,6 +33,7 @@ import java.time.LocalDateTime;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.Period; import java.time.Period;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.*; import java.util.*;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
...@@ -1175,7 +1176,8 @@ public class AutoTurnoverJob extends PointJob { ...@@ -1175,7 +1176,8 @@ public class AutoTurnoverJob extends PointJob {
else { else {
finalEstimatedArrivalTime = dcBasePurchase.getEstimatedArrivalTime().plusDays(dcAutoTurnover.getInspectionDelivery()); finalEstimatedArrivalTime = dcBasePurchase.getEstimatedArrivalTime().plusDays(dcAutoTurnover.getInspectionDelivery());
} }
int interval = between(recordTime, finalEstimatedArrivalTime.toLocalDate()).getDays(); // int interval = between(, finalEstimatedArrivalTime.toLocalDate()).getDays();
int interval = (int) recordTime.until(finalEstimatedArrivalTime, ChronoUnit.DAYS);
int index = Math.max(interval, 0); int index = Math.max(interval, 0);
forecastInboundRelationList.set(index, forecastInboundRelationList.get(index).equals(Constant.NAN_STRING) ? Constant.PURCHASE_SIGN + dcBasePurchase.getPurchaseId() + "_" + dcBasePurchase.getCount() : forecastInboundRelationList.get(index) + "*" + Constant.PURCHASE_SIGN + dcBasePurchase.getPurchaseId() + "_" + dcBasePurchase.getCount()); forecastInboundRelationList.set(index, forecastInboundRelationList.get(index).equals(Constant.NAN_STRING) ? Constant.PURCHASE_SIGN + dcBasePurchase.getPurchaseId() + "_" + dcBasePurchase.getCount() : forecastInboundRelationList.get(index) + "*" + Constant.PURCHASE_SIGN + dcBasePurchase.getPurchaseId() + "_" + dcBasePurchase.getCount());
forecastPurchaseInboundList.set(index, forecastPurchaseInboundList.get(index) + dcBasePurchase.getCount()); forecastPurchaseInboundList.set(index, forecastPurchaseInboundList.get(index) + dcBasePurchase.getCount());
...@@ -1208,7 +1210,7 @@ public class AutoTurnoverJob extends PointJob { ...@@ -1208,7 +1210,7 @@ public class AutoTurnoverJob extends PointJob {
} else { } else {
finalEstimatedArrivalTime = dcBaseTransferVerify.getCreateTime().plusDays(dcAutoConfigDelivery.getAbroadInbound()).plusDays(dcAutoConfigDelivery.getTranferBale()).plusDays(dcAutoConfigDelivery.getTranferHead()); finalEstimatedArrivalTime = dcBaseTransferVerify.getCreateTime().plusDays(dcAutoConfigDelivery.getAbroadInbound()).plusDays(dcAutoConfigDelivery.getTranferBale()).plusDays(dcAutoConfigDelivery.getTranferHead());
} }
int interval = between(recordTime, finalEstimatedArrivalTime.toLocalDate()).getDays(); int interval = (int) recordTime.until(finalEstimatedArrivalTime, ChronoUnit.DAYS);
int index = Math.max(interval, 0); int index = Math.max(interval, 0);
//todo fba的调拨在途,切换读我做的一个新表(表结构构建中) //todo fba的调拨在途,切换读我做的一个新表(表结构构建中)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment