没有财务付款类型也要加上一天财务付款时间

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

@@ -171,7 +171,8 @@ public class AutoTurnoverJob extends PointJob {
             dcAveragePurchase = dcAveragePurchaseMapper.selectOneByExample(DcAveragePurchaseExample.newAndCreateCriteria().andBailunSkuEqualTo(bailunSku).andWarehouseCodeEqualTo(warehouseCode).andSupplierIdEqualTo(turnoverSku.getSuppliersId()).example());
             DcAverageWarehouseMapper dcAverageWarehouseMapper = SessionUtil.getSession().getMapper(DcAverageWarehouseMapper.class);
             dcAverageWarehouse = dcAverageWarehouseMapper.selectOneByExample(DcAverageWarehouseExample.newAndCreateCriteria().andBailunSkuEqualTo(bailunSku).andWarehouseCodeEqualTo(warehouseCode).example());
-            if (dcAveragePurchase != null && dcAveragePurchase.getPaymentType() != null && dcAveragePurchase.getPaymentType().equals(1)) {
+            //没有dcAveragePurchase这数据也要加一天
+            if (dcAveragePurchase == null || (dcAveragePurchase.getPaymentType() != null && dcAveragePurchase.getPaymentType().equals(1))) {
                 paymentBeforeDelivery = 1;
             }
         } catch (Exception e) {
@@ -590,6 +591,7 @@ public class AutoTurnoverJob extends PointJob {
         }
         //入库天数
         Integer turnoverInboundDelivery = Constant.INSPECTION_DELIVE;
+        //质检入库天数-配置值(实际还没用上)
         dcAutoTurnover.setInspectionConfigDelivery(turnoverInboundDelivery);
         //调拨头程
         Integer turnoverTransferHeadDelivery = dcAutoConfigDelivery.getTranferHead();
@@ -601,6 +603,7 @@ public class AutoTurnoverJob extends PointJob {
         Integer turnoverAbroadInboundDelivery = dcAutoConfigDelivery.getAbroadInbound();
         dcAutoTurnover.setAbroadInboundConfigDelivery(turnoverAbroadInboundDelivery);
 
+
         if (dcAverageWarehouse != null) {
             if (dcAverageWarehouse.getInboundDays() != null && dcAverageWarehouse.getInboundDays() > 0) {
                 turnoverInboundDelivery = dcAverageWarehouse.getInboundDays();
@@ -615,9 +618,11 @@ public class AutoTurnoverJob extends PointJob {
                 turnoverAbroadInboundDelivery = dcAverageWarehouse.getAbroadInboundDelivery().intValue();
             }
         }
+
         //周转期
         Integer turnoverDays = turnoverSupplierDelivery + turnoverInboundDelivery + turnoverTransferHeadDelivery + turnoverTransferBaleDelivery + turnoverAbroadInboundDelivery;
         dcAutoTurnover.setSupplierDelivery(turnoverSupplierDelivery);
+        //质检天数
         dcAutoTurnover.setInspectionDelivery(turnoverInboundDelivery);
         dcAutoTurnover.setTransferDelivery(turnoverTransferHeadDelivery);
         dcAutoTurnover.setTransferBaleDelivery(turnoverTransferBaleDelivery);