# stash 周转

data-common/src/main/java/com/bailuntec/domain/dto/DateTurnover.java

@@ -22,6 +22,8 @@ public class DateTurnover {
     private BigDecimal forecastSales;
     //预测销量公式
     private String forecastSalesFormula;
+    //预测销量解释
+    private String forecastSalesExplain;
     //日期
     private LocalDate date;
     //周系数
@@ -36,6 +38,22 @@ public class DateTurnover {
     private BigDecimal showSales;
     //入库释义
     private String inboundRelation;
+    //预计入库数量
+    private BigDecimal forecastInbound;
+    //预测缺货数量
+    private BigDecimal forecastShortSupply;
+    //mop 采购建议
+    private BigDecimal moqPurchaseAdvised;
+    //预测采购建议
+    private BigDecimal forecastPurchaseAdvised;
+    //预计库存
+    private BigDecimal forecastInventory;
+    //p_表示采购单Id, t_表示调拨单Id, 用_连接调拨在途数量
+    private String forecastInboundRelation;
+    //预测采购入库
+    private BigDecimal forecastPurchaseInbound;
+    //预测调拨入库
+    private BigDecimal forecastTransferInbound;
 
     public void calcShowSales() {
         this.showSales = sales;

data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java

@@ -661,12 +661,8 @@ public class AutoTurnoverJob extends PointJob {
                 dcAutoForecastFluctuationActual.setEndTime(recordTime);
                 forecastFluctuationList.add(dcAutoForecastFluctuationActual);
             }
-        }
 
-        /*
-         * 自动下单管理的冗余-缺货等异常提醒
-         */
-        if (hasMonitorFluctuation) {
+            //自动下单管理的冗余-缺货等异常提醒
             unusualFluctuation(
                     turnoverDays,
                     recordTime,
@@ -1655,7 +1651,12 @@ public class AutoTurnoverJob extends PointJob {
                         }
                         //按照规则递减或递增 j = 63
                         for (int i = 0; i <= shortSupplyDays; i++) {
-                            BigDecimal result = forecastSaleGTZero.multiply(Constant.FBA_OUT_STOCK_DECREASE.pow(shortSupplyDays)).multiply(Constant.FBA_OUT_STOCK_INCREMENT.pow(i)).setScale(3, RoundingMode.HALF_EVEN);
+                            BigDecimal result = forecastSaleGTZero
+                                    .multiply(Constant.FBA_OUT_STOCK_DECREASE
+                                            .pow(shortSupplyDays))
+                                    .multiply(Constant.FBA_OUT_STOCK_INCREMENT
+                                            .pow(i))
+                                    .setScale(3, RoundingMode.HALF_EVEN);
                             //索引越界
                             if (j + i < forecastSalesList.size()) {
                                 forecastSalesList.set(j + i - 1, result);