自动周转修改有建议才备货.

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

@@ -319,7 +319,7 @@ public class AutoTurnoverJob extends PointJob {
         Integer inventoryAvailableDays = 0;
         BigDecimal totalSales = BigDecimal.ZERO;//周转期总销量
         BigDecimal totalInbound = BigDecimal.ZERO;//周转期总预计入库
-        BigDecimal moqDecimal = BigDecimal.valueOf(moq.doubleValue());
+        BigDecimal moqDecimal = BigDecimal.valueOf(moq.longValue());
         List<Integer> historySalesList = JSON.parseObject(dcAutoSales.getHistorySalesDetails(), new TypeReference<List<Integer>>() {
         });
 
@@ -426,7 +426,8 @@ public class AutoTurnoverJob extends PointJob {
             if (i < turnoverDays) {
                 avgForecastTurnoverDaySales = avgForecastTurnoverDaySales.add(forecastSalesList.get(i));
             }
-            if (i < stockUpDays) {
+            //如果初始采购建议 <= 0, 那就也不用备货.
+            if (i < stockUpDays && forecastPurchaseAdvisedList.get(0).compareTo(BigDecimal.ZERO) == 1) {
                 stockUpSales = stockUpSales.add(forecastSalesList.get(i + turnoverDays + 1));
             }
         }
@@ -455,7 +456,12 @@ public class AutoTurnoverJob extends PointJob {
         dcAutoTurnover.setSkuTitle(turnoverSku.getSkuTitle());
         dcAutoTurnover.setPromotions(promotionsBuilder.toString());
         dcAutoTurnover.setQuantityInitAdvise(forecastPurchaseAdvisedList.get(0).add(stockUpSales));
+        //如果初始建议数 + 备货数 > moq建议数, 那么moq建议数 + 备货数, 否则, 还是取moq建议数
+        BigDecimal subtract = dcAutoTurnover.getQuantityInitAdvise().subtract(moqPurchaseAdvisedList.get(0));
         dcAutoTurnover.setQuantityFinalAdvise(moqPurchaseAdvisedList.get(0));
+        if (subtract.compareTo(BigDecimal.ZERO) == 1) {
+            dcAutoTurnover.setQuantityFinalAdvise(moqPurchaseAdvisedList.get(0).add(subtract));
+        }
         dcAutoTurnover.setQuantityMinimumOrder(turnoverSku.getMoq());
         dcAutoTurnover.setQuantityInventory(realInventory);
         dcAutoTurnover.setQuantityPurchase(purchase);