自动周转安全库存乘以倍数小于0.8就置0,0.8-1 之间就置1

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

@@ -1063,14 +1063,13 @@ public class AutoTurnoverJob extends PointJob {
                         dcAutoConfigSafeInventory = autoConfigSafeInventoryMapper.selectOneByExample(DcAutoConfigSafeInventoryExample.newAndCreateCriteria().andVariableCodeEqualTo("").andWarehouseCodeEqualTo(warehouseCode).andStatusEqualTo(1).andTypeEqualTo(3).example());
                         if (dcAutoConfigSafeInventory != null) {
                             weightingAvgSales = caculateWeightingAvgSales(dcAutoConfigSafeInventory.getWeightingCoefficientSeven(), dcAutoConfigSafeInventory.getWeightingCoefficientFourteen(), dcAutoConfigSafeInventory.getWeightingCoefficientThirty(), historyThirtySalesList);
-                            //进来这里就存一份没乘倍数的加权日均销量,小于0.8就置0   0.8-1 之间就置1
+                            //进来这里就存一份 乘倍数后的加权日均销量,小于0.8就置0   0.8-1 之间就置1
+                            weightingAvgSales = weightingAvgSales.multiply(dcAutoConfigSafeInventory.getParam()).setScale(3, RoundingMode.HALF_EVEN);
                             dcAutoTurnover.setDailyWeightedSales(weightingAvgSales);
-                            if (weightingAvgSales.compareTo(BigDecimal.ONE) == 1) {
-                                weightingAvgSales = weightingAvgSales.multiply(dcAutoConfigSafeInventory.getParam()).setScale(3, RoundingMode.HALF_EVEN);
-                            } else if (weightingAvgSales.compareTo(BigDecimal.valueOf(0.8)) >= 0){
-                                weightingAvgSales = BigDecimal.ONE;
-                            } else {
+                            if (weightingAvgSales.compareTo(BigDecimal.valueOf(0.8)) == -1 ){
                                 weightingAvgSales = BigDecimal.ZERO;
+                            } else if (weightingAvgSales.compareTo(BigDecimal.ONE) <= 0){
+                                weightingAvgSales = BigDecimal.ONE;
                             }
                         } else {
                             //啥配置都没有就给个默认取值

data-show/show-auto-turnover/src/test/java/AutoTurnoverTest.java

@@ -52,7 +52,7 @@ public class AutoTurnoverTest {
 //            dcBaseStock = mapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo("322572421").andWarehouseCodeEqualTo("QYBLZZ").example());
 //            dcBaseStock = mapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo("232232601").andWarehouseCodeEqualTo("CHUKFBA").example());
 //            dcBaseStock = mapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo("213789601").andWarehouseCodeEqualTo("GZBLWH").example());
-            dcBaseStock = mapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo("LM-EO-007").andWarehouseCodeEqualTo("MMDUSFBA").example());
+            dcBaseStock = mapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo("273502105").andWarehouseCodeEqualTo("GZBLWH").example());
         } catch (Exception e) {
             e.printStackTrace();
         } finally {