# 更新

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

@@ -790,6 +790,24 @@ public class DcAutoTurnoverAir {
     private Integer purchaseCreateOrderDays;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_turnover_air.transfer_sail_days
+     *
+     * @mbg.generated
+     */
+    private Integer transferSailDays;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_turnover_air.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_air
      *
@@ -888,6 +906,8 @@ public class DcAutoTurnoverAir {
         sb.append(", ordersAvg=").append(ordersAvg);
         sb.append(", advUid=").append(advUid);
         sb.append(", purchaseCreateOrderDays=").append(purchaseCreateOrderDays);
+        sb.append(", transferSailDays=").append(transferSailDays);
+        sb.append(", transferOrderDays=").append(transferOrderDays);
         sb.append("]");
         return sb.toString();
     }
@@ -996,7 +1016,9 @@ public class DcAutoTurnoverAir {
             && (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.getTransferSailDays() == null ? other.getTransferSailDays() == null : this.getTransferSailDays().equals(other.getTransferSailDays()))
+            && (this.getTransferOrderDays() == null ? other.getTransferOrderDays() == null : this.getTransferOrderDays().equals(other.getTransferOrderDays()));
     }
 
     /**
@@ -1096,6 +1118,8 @@ public class DcAutoTurnoverAir {
         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 + ((getTransferSailDays() == null) ? 0 : getTransferSailDays().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/DcAutoTurnoverAirWithBLOBs.java

@@ -159,6 +159,8 @@ public class DcAutoTurnoverAirWithBLOBs extends DcAutoTurnoverAir {
             && (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.getTransferSailDays() == null ? other.getTransferSailDays() == null : this.getTransferSailDays().equals(other.getTransferSailDays()))
+            && (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()));
@@ -261,6 +263,8 @@ public class DcAutoTurnoverAirWithBLOBs extends DcAutoTurnoverAir {
         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 + ((getTransferSailDays() == null) ? 0 : getTransferSailDays().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/entity/DcAutoTurnoverOcean.java

@@ -790,6 +790,24 @@ public class DcAutoTurnoverOcean {
     private Integer purchaseCreateOrderDays;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_turnover_ocean.transfer_sail_days
+     *
+     * @mbg.generated
+     */
+    private Integer transferSailDays;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_turnover_ocean.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_ocean
      *
@@ -888,6 +906,8 @@ public class DcAutoTurnoverOcean {
         sb.append(", ordersAvg=").append(ordersAvg);
         sb.append(", advUid=").append(advUid);
         sb.append(", purchaseCreateOrderDays=").append(purchaseCreateOrderDays);
+        sb.append(", transferSailDays=").append(transferSailDays);
+        sb.append(", transferOrderDays=").append(transferOrderDays);
         sb.append("]");
         return sb.toString();
     }
@@ -996,7 +1016,9 @@ public class DcAutoTurnoverOcean {
             && (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.getTransferSailDays() == null ? other.getTransferSailDays() == null : this.getTransferSailDays().equals(other.getTransferSailDays()))
+            && (this.getTransferOrderDays() == null ? other.getTransferOrderDays() == null : this.getTransferOrderDays().equals(other.getTransferOrderDays()));
     }
 
     /**
@@ -1096,6 +1118,8 @@ public class DcAutoTurnoverOcean {
         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 + ((getTransferSailDays() == null) ? 0 : getTransferSailDays().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/DcAutoTurnoverOceanWithBLOBs.java

@@ -159,6 +159,8 @@ public class DcAutoTurnoverOceanWithBLOBs extends DcAutoTurnoverOcean {
             && (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.getTransferSailDays() == null ? other.getTransferSailDays() == null : this.getTransferSailDays().equals(other.getTransferSailDays()))
+            && (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()));
@@ -261,6 +263,8 @@ public class DcAutoTurnoverOceanWithBLOBs extends DcAutoTurnoverOcean {
         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 + ((getTransferSailDays() == null) ? 0 : getTransferSailDays().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/DcAutoTurnoverAirExample.java

@@ -5830,6 +5830,126 @@ public class DcAutoTurnoverAirExample {
             addCriterion("purchase_create_order_days not between", value1, value2, "purchaseCreateOrderDays");
             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 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/java/com/bailuntec/domain/example/DcAutoTurnoverOceanExample.java

@@ -5830,6 +5830,126 @@ public class DcAutoTurnoverOceanExample {
             addCriterion("purchase_create_order_days not between", value1, value2, "purchaseCreateOrderDays");
             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 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_auto_turnover
+table-name=dc_auto_turnover_air

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

@@ -208,6 +208,7 @@ public class AutoTurnoverJob extends PointJob {
 
         if (!"国内仓".equals(dcBaseWarehouse.getHqType())) {
 
+            
             transferStrategy.set(Constant.OCEAN_HEAD);
             this.autoTurnoverFromStock(queryTime, dcBaseStock);
             transferStrategy.remove();