采购建议数如果大于1的时候就向上取整。如果小于1就四舍五入

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

@@ -1209,7 +1209,13 @@ public class AutoTurnoverJob extends PointJob {
                         .add(totalSales)//累计销量
                         .subtract(BigDecimal.valueOf(totalInbound.doubleValue()))//累计到货
                         .subtract(outStock > 0 ? BigDecimal.ZERO : BigDecimal.valueOf(realInventory.longValue())) //真实库存, 如果缺货就不减,不缺就减去
-                        .add(forecastSalesList.get(j)).setScale(0, RoundingMode.HALF_EVEN);//预计销量
+                        .add(forecastSalesList.get(j));//预计销量
+                //采购建议数如果大于1的时候就向上取整。如果小于1就四舍五入
+                if (totalAdvised.compareTo(BigDecimal.ONE) == 1) {
+                    totalAdvised = totalAdvised.setScale(0, RoundingMode.HALF_UP);
+                } else {
+                    totalAdvised = totalAdvised.setScale(0, RoundingMode.HALF_EVEN);
+                }
                 forecastPurchaseAdvisedList.add(totalAdvised);
                 if (totalAdvised.compareTo(moqDecimal) == 1) {
                     moqPurchaseAdvisedList.add(totalAdvised);
@@ -1339,7 +1345,13 @@ public class AutoTurnoverJob extends PointJob {
                         .add(totalSales)//累计销量
                         .subtract(BigDecimal.valueOf(totalInbound.doubleValue()))//累计到货
                         .subtract(outStock > 0 ? BigDecimal.ZERO : BigDecimal.valueOf(realInventory.longValue())) //真实库存,如果缺货就不减
-                        .add(forecastSalesList.get(j)).setScale(0, RoundingMode.HALF_EVEN);//预计销量
+                        .add(forecastSalesList.get(j));//预计销量
+                //采购建议数如果大于1的时候就向上取整。如果小于1就四舍五入
+                if (totalAdvised.compareTo(BigDecimal.ONE) == 1) {
+                    totalAdvised = totalAdvised.setScale(0, RoundingMode.HALF_UP);
+                } else {
+                    totalAdvised = totalAdvised.setScale(0, RoundingMode.HALF_EVEN);
+                }
                 forecastPurchaseAdvisedList.add(totalAdvised);
                 if (totalAdvised.compareTo(moqDecimal) == 1) {
                     moqPurchaseAdvisedList.add(totalAdvised);
@@ -1354,8 +1366,6 @@ public class AutoTurnoverJob extends PointJob {
              * 如果forecastShortSupplyList.get(j) > 0, 就是预测断货
              */
             if (j <= turnoverDays && hasMonitorFluctuation) {
-                BigDecimal forecastShortSupplyDayJ = j == 0 ? forecastShortSupplyList.get(j) : forecastShortSupplyList.get(j).subtract(forecastShortSupplyList.get(j - 1));
-                //                if (forecastShortSupplyDayJ.doubleValue() > 0) {
                 if (forecastInventory.compareTo(totalSafeInventory.add(forecastSalesList.get(j))) == -1) {
                     //预测断货, 需要检查前一天有没有预测冗余
                     if (forecastFluctuationDays > 0) {