# 更新

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

@@ -799,6 +799,15 @@ public class DcAutoTurnover {
     private Integer purchaseCreateOrderDays;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_turnover.transfer_order_days
+     *
+     * @mbg.generated
+     */
+    private Integer transferOrderDays;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_auto_turnover
      *
@@ -898,6 +907,7 @@ public class DcAutoTurnover {
         sb.append(", ordersAvg=").append(ordersAvg);
         sb.append(", advUid=").append(advUid);
         sb.append(", purchaseCreateOrderDays=").append(purchaseCreateOrderDays);
+        sb.append(", transferOrderDays=").append(transferOrderDays);
         sb.append("]");
         return sb.toString();
     }
@@ -1007,7 +1017,8 @@ public class DcAutoTurnover {
             && (this.getFirstOrderBailunOrderId() == null ? other.getFirstOrderBailunOrderId() == null : this.getFirstOrderBailunOrderId().equals(other.getFirstOrderBailunOrderId()))
             && (this.getOrdersAvg() == null ? other.getOrdersAvg() == null : this.getOrdersAvg().equals(other.getOrdersAvg()))
             && (this.getAdvUid() == null ? other.getAdvUid() == null : this.getAdvUid().equals(other.getAdvUid()))
-            && (this.getPurchaseCreateOrderDays() == null ? other.getPurchaseCreateOrderDays() == null : this.getPurchaseCreateOrderDays().equals(other.getPurchaseCreateOrderDays()));
+            && (this.getPurchaseCreateOrderDays() == null ? other.getPurchaseCreateOrderDays() == null : this.getPurchaseCreateOrderDays().equals(other.getPurchaseCreateOrderDays()))
+            && (this.getTransferOrderDays() == null ? other.getTransferOrderDays() == null : this.getTransferOrderDays().equals(other.getTransferOrderDays()));
     }
 
     /**
@@ -1108,6 +1119,7 @@ public class DcAutoTurnover {
         result = prime * result + ((getOrdersAvg() == null) ? 0 : getOrdersAvg().hashCode());
         result = prime * result + ((getAdvUid() == null) ? 0 : getAdvUid().hashCode());
         result = prime * result + ((getPurchaseCreateOrderDays() == null) ? 0 : getPurchaseCreateOrderDays().hashCode());
+        result = prime * result + ((getTransferOrderDays() == null) ? 0 : getTransferOrderDays().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -160,6 +160,7 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
             && (this.getOrdersAvg() == null ? other.getOrdersAvg() == null : this.getOrdersAvg().equals(other.getOrdersAvg()))
             && (this.getAdvUid() == null ? other.getAdvUid() == null : this.getAdvUid().equals(other.getAdvUid()))
             && (this.getPurchaseCreateOrderDays() == null ? other.getPurchaseCreateOrderDays() == null : this.getPurchaseCreateOrderDays().equals(other.getPurchaseCreateOrderDays()))
+            && (this.getTransferOrderDays() == null ? other.getTransferOrderDays() == null : this.getTransferOrderDays().equals(other.getTransferOrderDays()))
             && (this.getSalesDetails() == null ? other.getSalesDetails() == null : this.getSalesDetails().equals(other.getSalesDetails()))
             && (this.getShortSupplyDetails() == null ? other.getShortSupplyDetails() == null : this.getShortSupplyDetails().equals(other.getShortSupplyDetails()))
             && (this.getSalesDetailsFormula() == null ? other.getSalesDetailsFormula() == null : this.getSalesDetailsFormula().equals(other.getSalesDetailsFormula()));
@@ -263,6 +264,7 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
         result = prime * result + ((getOrdersAvg() == null) ? 0 : getOrdersAvg().hashCode());
         result = prime * result + ((getAdvUid() == null) ? 0 : getAdvUid().hashCode());
         result = prime * result + ((getPurchaseCreateOrderDays() == null) ? 0 : getPurchaseCreateOrderDays().hashCode());
+        result = prime * result + ((getTransferOrderDays() == null) ? 0 : getTransferOrderDays().hashCode());
         result = prime * result + ((getSalesDetails() == null) ? 0 : getSalesDetails().hashCode());
         result = prime * result + ((getShortSupplyDetails() == null) ? 0 : getShortSupplyDetails().hashCode());
         result = prime * result + ((getSalesDetailsFormula() == null) ? 0 : getSalesDetailsFormula().hashCode());

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

@@ -5890,6 +5890,66 @@ public class DcAutoTurnoverExample {
             addCriterion("purchase_create_order_days not between", value1, value2, "purchaseCreateOrderDays");
             return (Criteria) this;
         }
+
+        public Criteria andTransferOrderDaysIsNull() {
+            addCriterion("transfer_order_days is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferOrderDaysIsNotNull() {
+            addCriterion("transfer_order_days is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferOrderDaysEqualTo(Integer value) {
+            addCriterion("transfer_order_days =", value, "transferOrderDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferOrderDaysNotEqualTo(Integer value) {
+            addCriterion("transfer_order_days <>", value, "transferOrderDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferOrderDaysGreaterThan(Integer value) {
+            addCriterion("transfer_order_days >", value, "transferOrderDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferOrderDaysGreaterThanOrEqualTo(Integer value) {
+            addCriterion("transfer_order_days >=", value, "transferOrderDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferOrderDaysLessThan(Integer value) {
+            addCriterion("transfer_order_days <", value, "transferOrderDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferOrderDaysLessThanOrEqualTo(Integer value) {
+            addCriterion("transfer_order_days <=", value, "transferOrderDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferOrderDaysIn(List<Integer> values) {
+            addCriterion("transfer_order_days in", values, "transferOrderDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferOrderDaysNotIn(List<Integer> values) {
+            addCriterion("transfer_order_days not in", values, "transferOrderDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferOrderDaysBetween(Integer value1, Integer value2) {
+            addCriterion("transfer_order_days between", value1, value2, "transferOrderDays");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferOrderDaysNotBetween(Integer value1, Integer value2) {
+            addCriterion("transfer_order_days not between", value1, value2, "transferOrderDays");
+            return (Criteria) this;
+        }
     }
 
     /**

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

-table-name=dc_average_warehouse
+table-name=dc_auto_turnover

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

@@ -45,7 +45,7 @@ public class TurnoverDaysHandler {
      * 3. 拿到仓库名称 和 仓库类型(可选) turnoverWarehouse
      *
      * <p>
-     * 周转天数计算公式: 供应链长度 = 周转天数 = 供应商交期 + 入库时间(质检入库时间) + 调拨头程  + 调拨打包  + 海外仓入库 + 财务付款天数 + 采购平均下单天数 + 启航天数
+     * 周转天数计算公式: 供应链长度 = 周转天数 = 供应商交期 + 入库时间(质检入库时间) + 调拨头程  + 调拨打包  + 海外仓入库 + 财务付款天数 + 采购平均下单天数 + 启航天数 + 调拨下单天数
      *
      * <p>
      * 模版方法
@@ -68,12 +68,32 @@ public class TurnoverDaysHandler {
         this.handlePurchaseCreateOrderDays();
         //启航天数
         this.handleSailDays();
+        //调拨下单天数
+        this.handleTransferOrderDays();
         //汇总计算总周转天数
         this.sumTurnoverDays();
         //后置方法处理jit周转天数
         this.handleJit();
     }
 
+    private void handleTransferOrderDays() {
+        int transferOrderDays = 0;
+        //海运的数据
+        String shardingContext = AutoTurnoverJob.transferStrategy.get();
+        if (dcAverageWarehouse != null && Constant.OCEAN_HEAD.equals(shardingContext)) {
+            transferOrderDays = dcAverageWarehouse.getTransferOrderDaysOcean().intValue();
+        }
+        //空运的数据
+        else if (dcAverageWarehouse != null && Constant.AIR_HEAD.equals(shardingContext)) {
+            transferOrderDays = dcAverageWarehouse.getTransferOrderDaysEmpty().intValue();
+        }
+        //默认
+        else if (dcAverageWarehouse != null) {
+            transferOrderDays = dcAverageWarehouse.getTransferOrderDays().intValue();
+        }
+        dcAutoTurnover.setTransferOrderDays(transferOrderDays);
+    }
+
     private void handleSailDays() {
 
         int sailDays = 0;