# 更新

data-common/src/main/java/com/bailuntec/domain/entity/DcAutoTurnoverWithBLOBs.java

@@ -116,6 +116,7 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
             && (this.getTransferBaleDeliverySource() == null ? other.getTransferBaleDeliverySource() == null : this.getTransferBaleDeliverySource().equals(other.getTransferBaleDeliverySource()))
             && (this.getAbroadInboundDelivery() == null ? other.getAbroadInboundDelivery() == null : this.getAbroadInboundDelivery().equals(other.getAbroadInboundDelivery()))
             && (this.getAbroadInboundDeliverySource() == null ? other.getAbroadInboundDeliverySource() == null : this.getAbroadInboundDeliverySource().equals(other.getAbroadInboundDeliverySource()))
+            && (this.getTransferSailDays() == null ? other.getTransferSailDays() == null : this.getTransferSailDays().equals(other.getTransferSailDays()))
             && (this.getSupplementarySales() == null ? other.getSupplementarySales() == null : this.getSupplementarySales().equals(other.getSupplementarySales()))
             && (this.getTurnoverSales() == null ? other.getTurnoverSales() == null : this.getTurnoverSales().equals(other.getTurnoverSales()))
             && (this.getTurnoverInbound() == null ? other.getTurnoverInbound() == null : this.getTurnoverInbound().equals(other.getTurnoverInbound()))
@@ -218,6 +219,7 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
         result = prime * result + ((getTransferBaleDeliverySource() == null) ? 0 : getTransferBaleDeliverySource().hashCode());
         result = prime * result + ((getAbroadInboundDelivery() == null) ? 0 : getAbroadInboundDelivery().hashCode());
         result = prime * result + ((getAbroadInboundDeliverySource() == null) ? 0 : getAbroadInboundDeliverySource().hashCode());
+        result = prime * result + ((getTransferSailDays() == null) ? 0 : getTransferSailDays().hashCode());
         result = prime * result + ((getSupplementarySales() == null) ? 0 : getSupplementarySales().hashCode());
         result = prime * result + ((getTurnoverSales() == null) ? 0 : getTurnoverSales().hashCode());
         result = prime * result + ((getTurnoverInbound() == null) ? 0 : getTurnoverInbound().hashCode());

data-common/src/main/java/com/bailuntec/domain/entity/DcAverageWarehouse.java

@@ -81,6 +81,15 @@ public class DcAverageWarehouse {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_average_warehouse.transfer_sail_days
+     *
+     * @mbg.generated
+     */
+    private BigDecimal transferSailDays;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_average_warehouse.abroad_inbound_delivery
      *
      * @mbg.generated
@@ -180,6 +189,15 @@ public class DcAverageWarehouse {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_average_warehouse.transfer_sail_days_ocean
+     *
+     * @mbg.generated
+     */
+    private BigDecimal transferSailDaysOcean;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_average_warehouse.transfer_bale_delivery_empty
      *
      * @mbg.generated
@@ -205,6 +223,15 @@ public class DcAverageWarehouse {
     private BigDecimal transferDeliveryEmpty;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_average_warehouse.transfer_sail_days_empty
+     *
+     * @mbg.generated
+     */
+    private BigDecimal transferSailDaysEmpty;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_average_warehouse
      *
@@ -224,6 +251,7 @@ public class DcAverageWarehouse {
         sb.append(", transferType1Days=").append(transferType1Days);
         sb.append(", transferType2Days=").append(transferType2Days);
         sb.append(", transferBaleDelivery=").append(transferBaleDelivery);
+        sb.append(", transferSailDays=").append(transferSailDays);
         sb.append(", abroadInboundDelivery=").append(abroadInboundDelivery);
         sb.append(", transferDelivery=").append(transferDelivery);
         sb.append(", productCount=").append(productCount);
@@ -235,9 +263,11 @@ public class DcAverageWarehouse {
         sb.append(", transferBaleDeliveryOcean=").append(transferBaleDeliveryOcean);
         sb.append(", abroadInboundDeliveryOcean=").append(abroadInboundDeliveryOcean);
         sb.append(", transferDeliveryOcean=").append(transferDeliveryOcean);
+        sb.append(", transferSailDaysOcean=").append(transferSailDaysOcean);
         sb.append(", transferBaleDeliveryEmpty=").append(transferBaleDeliveryEmpty);
         sb.append(", abroadInboundDeliveryEmpty=").append(abroadInboundDeliveryEmpty);
         sb.append(", transferDeliveryEmpty=").append(transferDeliveryEmpty);
+        sb.append(", transferSailDaysEmpty=").append(transferSailDaysEmpty);
         sb.append("]");
         return sb.toString();
     }
@@ -268,6 +298,7 @@ public class DcAverageWarehouse {
             && (this.getTransferType1Days() == null ? other.getTransferType1Days() == null : this.getTransferType1Days().equals(other.getTransferType1Days()))
             && (this.getTransferType2Days() == null ? other.getTransferType2Days() == null : this.getTransferType2Days().equals(other.getTransferType2Days()))
             && (this.getTransferBaleDelivery() == null ? other.getTransferBaleDelivery() == null : this.getTransferBaleDelivery().equals(other.getTransferBaleDelivery()))
+            && (this.getTransferSailDays() == null ? other.getTransferSailDays() == null : this.getTransferSailDays().equals(other.getTransferSailDays()))
             && (this.getAbroadInboundDelivery() == null ? other.getAbroadInboundDelivery() == null : this.getAbroadInboundDelivery().equals(other.getAbroadInboundDelivery()))
             && (this.getTransferDelivery() == null ? other.getTransferDelivery() == null : this.getTransferDelivery().equals(other.getTransferDelivery()))
             && (this.getProductCount() == null ? other.getProductCount() == null : this.getProductCount().equals(other.getProductCount()))
@@ -279,9 +310,11 @@ public class DcAverageWarehouse {
             && (this.getTransferBaleDeliveryOcean() == null ? other.getTransferBaleDeliveryOcean() == null : this.getTransferBaleDeliveryOcean().equals(other.getTransferBaleDeliveryOcean()))
             && (this.getAbroadInboundDeliveryOcean() == null ? other.getAbroadInboundDeliveryOcean() == null : this.getAbroadInboundDeliveryOcean().equals(other.getAbroadInboundDeliveryOcean()))
             && (this.getTransferDeliveryOcean() == null ? other.getTransferDeliveryOcean() == null : this.getTransferDeliveryOcean().equals(other.getTransferDeliveryOcean()))
+            && (this.getTransferSailDaysOcean() == null ? other.getTransferSailDaysOcean() == null : this.getTransferSailDaysOcean().equals(other.getTransferSailDaysOcean()))
             && (this.getTransferBaleDeliveryEmpty() == null ? other.getTransferBaleDeliveryEmpty() == null : this.getTransferBaleDeliveryEmpty().equals(other.getTransferBaleDeliveryEmpty()))
             && (this.getAbroadInboundDeliveryEmpty() == null ? other.getAbroadInboundDeliveryEmpty() == null : this.getAbroadInboundDeliveryEmpty().equals(other.getAbroadInboundDeliveryEmpty()))
-            && (this.getTransferDeliveryEmpty() == null ? other.getTransferDeliveryEmpty() == null : this.getTransferDeliveryEmpty().equals(other.getTransferDeliveryEmpty()));
+            && (this.getTransferDeliveryEmpty() == null ? other.getTransferDeliveryEmpty() == null : this.getTransferDeliveryEmpty().equals(other.getTransferDeliveryEmpty()))
+            && (this.getTransferSailDaysEmpty() == null ? other.getTransferSailDaysEmpty() == null : this.getTransferSailDaysEmpty().equals(other.getTransferSailDaysEmpty()));
     }
 
     /**
@@ -302,6 +335,7 @@ public class DcAverageWarehouse {
         result = prime * result + ((getTransferType1Days() == null) ? 0 : getTransferType1Days().hashCode());
         result = prime * result + ((getTransferType2Days() == null) ? 0 : getTransferType2Days().hashCode());
         result = prime * result + ((getTransferBaleDelivery() == null) ? 0 : getTransferBaleDelivery().hashCode());
+        result = prime * result + ((getTransferSailDays() == null) ? 0 : getTransferSailDays().hashCode());
         result = prime * result + ((getAbroadInboundDelivery() == null) ? 0 : getAbroadInboundDelivery().hashCode());
         result = prime * result + ((getTransferDelivery() == null) ? 0 : getTransferDelivery().hashCode());
         result = prime * result + ((getProductCount() == null) ? 0 : getProductCount().hashCode());
@@ -313,9 +347,11 @@ public class DcAverageWarehouse {
         result = prime * result + ((getTransferBaleDeliveryOcean() == null) ? 0 : getTransferBaleDeliveryOcean().hashCode());
         result = prime * result + ((getAbroadInboundDeliveryOcean() == null) ? 0 : getAbroadInboundDeliveryOcean().hashCode());
         result = prime * result + ((getTransferDeliveryOcean() == null) ? 0 : getTransferDeliveryOcean().hashCode());
+        result = prime * result + ((getTransferSailDaysOcean() == null) ? 0 : getTransferSailDaysOcean().hashCode());
         result = prime * result + ((getTransferBaleDeliveryEmpty() == null) ? 0 : getTransferBaleDeliveryEmpty().hashCode());
         result = prime * result + ((getAbroadInboundDeliveryEmpty() == null) ? 0 : getAbroadInboundDeliveryEmpty().hashCode());
         result = prime * result + ((getTransferDeliveryEmpty() == null) ? 0 : getTransferDeliveryEmpty().hashCode());
+        result = prime * result + ((getTransferSailDaysEmpty() == null) ? 0 : getTransferSailDaysEmpty().hashCode());
         return result;
     }
 }
\ No newline at end of file

data-common/src/main/java/com/bailuntec/domain/example/DcAutoTurnoverExample.java

@@ -3141,6 +3141,66 @@ public class DcAutoTurnoverExample {
             return (Criteria) this;
         }
 
+        public Criteria andTransferSailDaysIsNull() {
+            addCriterion("transfer_sail_days is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysIsNotNull() {
+            addCriterion("transfer_sail_days is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysEqualTo(Integer value) {
+            addCriterion("transfer_sail_days =", value, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysNotEqualTo(Integer value) {
+            addCriterion("transfer_sail_days <>", value, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysGreaterThan(Integer value) {
+            addCriterion("transfer_sail_days >", value, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysGreaterThanOrEqualTo(Integer value) {
+            addCriterion("transfer_sail_days >=", value, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysLessThan(Integer value) {
+            addCriterion("transfer_sail_days <", value, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysLessThanOrEqualTo(Integer value) {
+            addCriterion("transfer_sail_days <=", value, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysIn(List<Integer> values) {
+            addCriterion("transfer_sail_days in", values, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysNotIn(List<Integer> values) {
+            addCriterion("transfer_sail_days not in", values, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysBetween(Integer value1, Integer value2) {
+            addCriterion("transfer_sail_days between", value1, value2, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysNotBetween(Integer value1, Integer value2) {
+            addCriterion("transfer_sail_days not between", value1, value2, "transferSailDays");
+            return (Criteria) this;
+        }
+
         public Criteria andSupplementarySalesIsNull() {
             addCriterion("supplementary_sales is null");
             return (Criteria) this;

data-common/src/main/java/com/bailuntec/domain/example/DcAverageWarehouseExample.java

@@ -871,6 +871,66 @@ public class DcAverageWarehouseExample {
             return (Criteria) this;
         }
 
+        public Criteria andTransferSailDaysIsNull() {
+            addCriterion("transfer_sail_days is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysIsNotNull() {
+            addCriterion("transfer_sail_days is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysEqualTo(BigDecimal value) {
+            addCriterion("transfer_sail_days =", value, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysNotEqualTo(BigDecimal value) {
+            addCriterion("transfer_sail_days <>", value, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysGreaterThan(BigDecimal value) {
+            addCriterion("transfer_sail_days >", value, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("transfer_sail_days >=", value, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysLessThan(BigDecimal value) {
+            addCriterion("transfer_sail_days <", value, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("transfer_sail_days <=", value, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysIn(List<BigDecimal> values) {
+            addCriterion("transfer_sail_days in", values, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysNotIn(List<BigDecimal> values) {
+            addCriterion("transfer_sail_days not in", values, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("transfer_sail_days between", value1, value2, "transferSailDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("transfer_sail_days not between", value1, value2, "transferSailDays");
+            return (Criteria) this;
+        }
+
         public Criteria andAbroadInboundDeliveryIsNull() {
             addCriterion("abroad_inbound_delivery is null");
             return (Criteria) this;
@@ -1531,6 +1591,66 @@ public class DcAverageWarehouseExample {
             return (Criteria) this;
         }
 
+        public Criteria andTransferSailDaysOceanIsNull() {
+            addCriterion("transfer_sail_days_ocean is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysOceanIsNotNull() {
+            addCriterion("transfer_sail_days_ocean is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysOceanEqualTo(BigDecimal value) {
+            addCriterion("transfer_sail_days_ocean =", value, "transferSailDaysOcean");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysOceanNotEqualTo(BigDecimal value) {
+            addCriterion("transfer_sail_days_ocean <>", value, "transferSailDaysOcean");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysOceanGreaterThan(BigDecimal value) {
+            addCriterion("transfer_sail_days_ocean >", value, "transferSailDaysOcean");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysOceanGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("transfer_sail_days_ocean >=", value, "transferSailDaysOcean");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysOceanLessThan(BigDecimal value) {
+            addCriterion("transfer_sail_days_ocean <", value, "transferSailDaysOcean");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysOceanLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("transfer_sail_days_ocean <=", value, "transferSailDaysOcean");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysOceanIn(List<BigDecimal> values) {
+            addCriterion("transfer_sail_days_ocean in", values, "transferSailDaysOcean");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysOceanNotIn(List<BigDecimal> values) {
+            addCriterion("transfer_sail_days_ocean not in", values, "transferSailDaysOcean");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysOceanBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("transfer_sail_days_ocean between", value1, value2, "transferSailDaysOcean");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysOceanNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("transfer_sail_days_ocean not between", value1, value2, "transferSailDaysOcean");
+            return (Criteria) this;
+        }
+
         public Criteria andTransferBaleDeliveryEmptyIsNull() {
             addCriterion("transfer_bale_delivery_empty is null");
             return (Criteria) this;
@@ -1710,6 +1830,66 @@ public class DcAverageWarehouseExample {
             addCriterion("transfer_delivery_empty not between", value1, value2, "transferDeliveryEmpty");
             return (Criteria) this;
         }
+
+        public Criteria andTransferSailDaysEmptyIsNull() {
+            addCriterion("transfer_sail_days_empty is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysEmptyIsNotNull() {
+            addCriterion("transfer_sail_days_empty is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysEmptyEqualTo(BigDecimal value) {
+            addCriterion("transfer_sail_days_empty =", value, "transferSailDaysEmpty");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysEmptyNotEqualTo(BigDecimal value) {
+            addCriterion("transfer_sail_days_empty <>", value, "transferSailDaysEmpty");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysEmptyGreaterThan(BigDecimal value) {
+            addCriterion("transfer_sail_days_empty >", value, "transferSailDaysEmpty");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysEmptyGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("transfer_sail_days_empty >=", value, "transferSailDaysEmpty");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysEmptyLessThan(BigDecimal value) {
+            addCriterion("transfer_sail_days_empty <", value, "transferSailDaysEmpty");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysEmptyLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("transfer_sail_days_empty <=", value, "transferSailDaysEmpty");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysEmptyIn(List<BigDecimal> values) {
+            addCriterion("transfer_sail_days_empty in", values, "transferSailDaysEmpty");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysEmptyNotIn(List<BigDecimal> values) {
+            addCriterion("transfer_sail_days_empty not in", values, "transferSailDaysEmpty");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysEmptyBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("transfer_sail_days_empty between", value1, value2, "transferSailDaysEmpty");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferSailDaysEmptyNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("transfer_sail_days_empty not between", value1, value2, "transferSailDaysEmpty");
+            return (Criteria) this;
+        }
     }
 
     /**

data-common/src/main/java/com/bailuntec/mapper/DcAutoTurnoverMapper.java

@@ -2,10 +2,8 @@ package com.bailuntec.mapper;
 
 import com.bailuntec.domain.entity.DcAutoTurnover;
 import com.bailuntec.domain.entity.DcAutoTurnoverWithBLOBs;
-
-import java.util.List;
-
 import com.bailuntec.domain.example.DcAutoTurnoverExample;
+import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface DcAutoTurnoverMapper {

data-common/src/main/resources/init.properties

-table-name=dc_auto_turnover_air
+table-name=dc_average_warehouse

data-show/show-auto-turnover/src/main/java/com/bailuntec/domain/constant/Constant.java

@@ -60,4 +60,8 @@ public interface Constant {
     String OCEAN_HEAD = "海运头程";
     String AIR_HEAD = "空运头程";
 
+
+    String SOURCE_AIMS = "aims配置";
+    String SOURCE_LMS = "lms配置";
+    String SOURCE_AIR = "空运切换";
 }

data-show/show-auto-turnover/src/main/java/com/bailuntec/service/impl/TurnoverDaysHandler.java

@@ -143,30 +143,30 @@ public class TurnoverDaysHandler {
         //调拨头程天数 - 实际值
         Integer transferDelivery = dcAutoConfigDelivery.getTranferHead();
         // //调拨头程天数 - 来源
-        String transferDeliverySource = DcAutoTurnover.SOURCE_AIMS;
+        String transferDeliverySource = Constant.SOURCE_AIMS;
 
         //来源切换lms
         if (dcAverageWarehouse != null && dcAverageWarehouse.getTransferDelivery().compareTo(BigDecimal.ZERO) > 0) {
-            transferDeliverySource = DcAutoTurnover.SOURCE_LMS;
+            transferDeliverySource = Constant.SOURCE_LMS;
             transferDelivery = dcAverageWarehouse.getTransferDelivery().intValue();
         }
         //来源切换空运
         if (ReplaceLogisticJob.logisticsTaskThreadLocal.get() != null) {
             DcAutoReplaceLogisticsTask dcAutoReplaceLogisticsTask = ReplaceLogisticJob.logisticsTaskThreadLocal.get();
             transferDelivery = dcAutoReplaceLogisticsTask.getTransferDelivery().intValue();
-            transferDeliverySource = DcAutoTurnover.SOURCE_AIR;
+            transferDeliverySource = Constant.SOURCE_AIR;
 
         }
         //海运的数据
         String shardingContext = AutoTurnoverJob.transferStrategy.get();
         if (dcAverageWarehouse != null && Constant.OCEAN_HEAD.equals(shardingContext)) {
-            transferDeliverySource = DcAutoTurnover.SOURCE_LMS;
+            transferDeliverySource = Constant.SOURCE_LMS;
             transferDelivery = dcAverageWarehouse.getTransferDeliveryOcean().intValue();
         }
 
         //空运的数据
         if (dcAverageWarehouse != null && Constant.AIR_HEAD.equals(shardingContext)) {
-            transferDeliverySource = DcAutoTurnover.SOURCE_LMS;
+            transferDeliverySource = Constant.SOURCE_LMS;
             transferDelivery = dcAverageWarehouse.getTransferDeliveryEmpty().intValue();
         }
 
@@ -186,31 +186,31 @@ public class TurnoverDaysHandler {
         //调拨打包天数 - 实际值
         Integer transferBaleDelivery = dcAutoConfigDelivery.getTranferBale();
         //调拨打包天数 - 来源
-        String transferBaleDeliverySource = DcAutoTurnover.SOURCE_AIMS;
+        String transferBaleDeliverySource = Constant.SOURCE_AIMS;
 
         //来源切换lms
         if (dcAverageWarehouse != null && dcAverageWarehouse.getTransferBaleDelivery().compareTo(BigDecimal.ZERO) > 0) {
-            transferBaleDeliverySource = DcAutoTurnover.SOURCE_LMS;
+            transferBaleDeliverySource = Constant.SOURCE_LMS;
             transferBaleDelivery = dcAverageWarehouse.getTransferBaleDelivery().intValue();
         }
 
         //来源切换空运
         if (ReplaceLogisticJob.logisticsTaskThreadLocal.get() != null) {
             DcAutoReplaceLogisticsTask dcAutoReplaceLogisticsTask = ReplaceLogisticJob.logisticsTaskThreadLocal.get();
-            transferBaleDeliverySource = DcAutoTurnover.SOURCE_AIR;
+            transferBaleDeliverySource = Constant.SOURCE_AIR;
             transferBaleDelivery = dcAutoReplaceLogisticsTask.getTransferBaleDelivery().intValue();
         }
 
         //海运的数据
         String shardingContext = AutoTurnoverJob.transferStrategy.get();
         if (dcAverageWarehouse != null && Constant.OCEAN_HEAD.equals(shardingContext)) {
-            transferBaleDeliverySource = DcAutoTurnover.SOURCE_LMS;
+            transferBaleDeliverySource = Constant.SOURCE_LMS;
             transferBaleDelivery = dcAverageWarehouse.getTransferBaleDeliveryOcean().intValue();
         }
 
         //空运的数据
         if (dcAverageWarehouse != null && Constant.AIR_HEAD.equals(shardingContext)) {
-            transferBaleDeliverySource = DcAutoTurnover.SOURCE_LMS;
+            transferBaleDeliverySource = Constant.SOURCE_LMS;
             transferBaleDelivery = dcAverageWarehouse.getTransferBaleDeliveryOcean().intValue();
         }
 
@@ -228,31 +228,31 @@ public class TurnoverDaysHandler {
         //海外仓入库天数 - 实际值
         Integer abroadInboundDelivery = dcAutoConfigDelivery.getAbroadInbound();
         //海外仓入库天数 - 来源
-        String abroadInboundDeliverySource = DcAutoTurnover.SOURCE_AIMS;
+        String abroadInboundDeliverySource = Constant.SOURCE_AIMS;
 
         //来源切换lms
         if (dcAverageWarehouse != null && dcAverageWarehouse.getAbroadInboundDelivery().compareTo(BigDecimal.ZERO) > 0) {
             abroadInboundDelivery = dcAverageWarehouse.getTransferBaleDelivery().intValue();
-            abroadInboundDeliverySource = DcAutoTurnover.SOURCE_LMS;
+            abroadInboundDeliverySource = Constant.SOURCE_LMS;
         }
 
         //来源切换空运
         if (ReplaceLogisticJob.logisticsTaskThreadLocal.get() != null) {
             DcAutoReplaceLogisticsTask dcAutoReplaceLogisticsTask = ReplaceLogisticJob.logisticsTaskThreadLocal.get();
             abroadInboundDelivery = dcAutoReplaceLogisticsTask.getAbroadInboundDelivery().intValue();
-            abroadInboundDeliverySource = DcAutoTurnover.SOURCE_AIR;
+            abroadInboundDeliverySource = Constant.SOURCE_AIR;
         }
 
         //海运的数据
         String shardingContext = AutoTurnoverJob.transferStrategy.get();
         if (dcAverageWarehouse != null && Constant.OCEAN_HEAD.equals(shardingContext)) {
-            abroadInboundDeliverySource = DcAutoTurnover.SOURCE_LMS;
+            abroadInboundDeliverySource = Constant.SOURCE_LMS;
             abroadInboundDelivery = dcAverageWarehouse.getAbroadInboundDeliveryOcean().intValue();
         }
 
         //空运的数据
         if (dcAverageWarehouse != null && Constant.AIR_HEAD.equals(shardingContext)) {
-            abroadInboundDeliverySource = DcAutoTurnover.SOURCE_LMS;
+            abroadInboundDeliverySource = Constant.SOURCE_LMS;
             abroadInboundDelivery = dcAverageWarehouse.getAbroadInboundDeliveryEmpty().intValue();
         }
 

data-show/show-auto-turnover/src/main/resources/job.properties

@@ -13,9 +13,9 @@ NAME_SPACE=data-center
 #JOB_NAME_WEEK=show-auto-turnover-week
 #JOB_NAME_WEEK=0 0 10 ? * MON
 
-JOB_NAME=show-auto-turnover61
-#JOB_CRON=0 0 3 * * ?
-JOB_CRON=0 30 14 * * ?
+JOB_NAME=show-auto-turnover62
+JOB_CRON=0 0 3 * * ?
+#JOB_CRON=0 30 14 * * ?
 
 SHARDING_TOTAL_COUNT=8
 JOB_NAME_NE_NORMAL=show-auto-turnover-ne-normal