自动周转若平均交期为负, 则不采用.

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

@@ -81,7 +81,7 @@ public class AutoTurnoverJob extends PointJob {
                                 DcAutoException dcAutoException = new DcAutoException(dcBaseStock.getBailunSku(),dcBaseStock.getWarehouseCode(),e.toString());
                                 dcAutoExceptionMapper.insertSelective(dcAutoException);
                             } catch (Exception ex) {
-                                log.error("保存错误SKU失败,sku="+ dcBaseStock.getBailunSku() + ",仓库=" + dcBaseStock.getWarehouseCode()); ;
+                                log.error("保存错误SKU失败,sku="+ dcBaseStock.getBailunSku() + ",仓库=" + dcBaseStock.getWarehouseCode());
                             } finally {
                                 SessionUtil.closeSession();
                             }
@@ -260,9 +260,7 @@ public class AutoTurnoverJob extends PointJob {
 
         Integer purchase = 0;//采购在途
         Integer transfer = 0;//调拨在途
-        //通过SKU拿到MOQ和缺货数
-        Integer outStock = 0 ;
-//        Integer outStock = getOutStock(bailunSku, warehouseCode);
+        Integer outStock = 0 ;//缺货数
         DcMidTransit dcMidTransit = null;
         try {
             DcMidTransitMapper midTransitMapper = SessionUtil.getSession().getMapper(DcMidTransitMapper.class);
@@ -300,14 +298,13 @@ public class AutoTurnoverJob extends PointJob {
         BigDecimal safeInventory = calculateSafeInventory(bailunSku, warehouseCode, bailunFirstLevelCatagoryId, dcAutoSales, JSON.toJSONString(forecastSalesList));
         //平均逾期 = 平均交期(dc_average_purchase) - 供应商交期(根据仓库判断, 非国内就取调拨交期) , 小于0的取0
         BigDecimal overdue = BigDecimal.ZERO;
-        if (dcAveragePurchase != null) {
+        if (dcAveragePurchase != null && dcAveragePurchase.getDeliveryDays() >= 0) {
             overdue = BigDecimal.valueOf((dcAveragePurchase.getDeliveryDays().longValue() - dcAutoTurnover.getSupplierDelivery().longValue()));
             overdue = overdue.compareTo(BigDecimal.ZERO) == 1 ? overdue : BigDecimal.ZERO;
         }
         //安全库存 * 平均逾期
         BigDecimal totalSafeInventory = safeInventory.multiply((overdue.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ONE : overdue));
 
-
         Integer moq = turnoverSku.getMoq();
         /*
          * 预测库存 = 前一日库存 - 前一日销量(没有考虑实际缺货)
@@ -589,7 +586,7 @@ public class AutoTurnoverJob extends PointJob {
          * 先取dc_average_purchase,如果平均交期没有
          * 再去SKUMS取, 取SKUMS数据的时候如果是国内仓，就还取dc_base_sku原来那个字段，否则就要取dc_base_sku原新字段（调拨交期)
          */
-        Integer turnoverSupplierDelivery = dcAveragePurchase != null? dcAveragePurchase.getDeliveryDays() : -1;
+        Integer turnoverSupplierDelivery = dcAveragePurchase != null && dcAveragePurchase.getDeliveryDays() >= 0? dcAveragePurchase.getDeliveryDays() : -1;
         if (turnoverSupplierDelivery == null || turnoverSupplierDelivery.equals(-1)) {
             turnoverSupplierDelivery = turnoverSku.getSupplierDelivery();
             //如果是国内仓，就还取原来那个字段，否则就要取新字段（调拨交期)