新增实际冗余 预计冗余 判断

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

@@ -21,7 +21,6 @@ import com.bailuntec.utils.OkHttpUtil;
 import com.bailuntec.utils.PropertiesUtil;
 import com.bailuntec.utils.SessionUtil;
 import com.dangdang.ddframe.job.api.ShardingContext;
-import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -572,11 +571,24 @@ public class AutoTurnoverJob extends PointJob {
         if (hasMonitorFluctuation) {
             //            if (realInventory > forecastSalesList.get(0).add(totalSafeInventory).doubleValue()) {
             DcAutoForecastFluctuation dcAutoForecastFluctuationActual = null;
-            if (forecastPurchaseAdvisedList.get(0).compareTo(BigDecimal.ZERO) < 0) {
+            BigDecimal forecastPurchaseAdvise = forecastPurchaseAdvisedList.get(0);
+
+            if (forecastPurchaseAdvise.compareTo(BigDecimal.ZERO) < 0) {
+
+                //实际冗余
+                if (forecastPurchaseAdvise.add(totalInbound).compareTo(BigDecimal.ZERO) < 0) {
                     dcAutoForecastFluctuationActual = new DcAutoForecastFluctuation();
                     //实际冗余
                     dcAutoForecastFluctuationActual.setType(3);
-                dcAutoForecastFluctuationActual.setQuantity(Math.abs(forecastPurchaseAdvisedList.get(0).intValue()));
+                    dcAutoForecastFluctuationActual.setQuantity(Math.abs(forecastPurchaseAdvise.add(totalInbound).intValue());
+                }
+                //预计冗余
+                else {
+                    dcAutoForecastFluctuationActual = new DcAutoForecastFluctuation();
+                    //实际冗余
+                    dcAutoForecastFluctuationActual.setType(4);
+                    dcAutoForecastFluctuationActual.setQuantity(Math.abs(forecastPurchaseAdvise.intValue());
+                }
             }
 
             if (outStock > 0) {