自动周转海外仓FBA仓入库天数设定逻辑修改为按仓库编码、仓库类型+SKU配置

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

@@ -114,6 +114,15 @@ public class DcAutoConfigDelivery {
      */
     private Integer abroadInbound;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_config_delivery.bailun_sku
+     *
+     * @mbg.generated
+     */
+    private String bailunSku;
+
     public DcAutoConfigDelivery() {
     }
 
@@ -129,8 +138,6 @@ public class DcAutoConfigDelivery {
      *
      * @mbg.generated
      */
-
-
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -149,6 +156,7 @@ public class DcAutoConfigDelivery {
         sb.append(", tranferBale=").append(tranferBale);
         sb.append(", tranferHead=").append(tranferHead);
         sb.append(", abroadInbound=").append(abroadInbound);
+        sb.append(", bailunSku=").append(bailunSku);
         sb.append("]");
         return sb.toString();
     }
@@ -182,7 +190,8 @@ public class DcAutoConfigDelivery {
             && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
             && (this.getTranferBale() == null ? other.getTranferBale() == null : this.getTranferBale().equals(other.getTranferBale()))
             && (this.getTranferHead() == null ? other.getTranferHead() == null : this.getTranferHead().equals(other.getTranferHead()))
-            && (this.getAbroadInbound() == null ? other.getAbroadInbound() == null : this.getAbroadInbound().equals(other.getAbroadInbound()));
+            && (this.getAbroadInbound() == null ? other.getAbroadInbound() == null : this.getAbroadInbound().equals(other.getAbroadInbound()))
+            && (this.getBailunSku() == null ? other.getBailunSku() == null : this.getBailunSku().equals(other.getBailunSku()));
     }
 
     /**
@@ -207,8 +216,7 @@ public class DcAutoConfigDelivery {
         result = prime * result + ((getTranferBale() == null) ? 0 : getTranferBale().hashCode());
         result = prime * result + ((getTranferHead() == null) ? 0 : getTranferHead().hashCode());
         result = prime * result + ((getAbroadInbound() == null) ? 0 : getAbroadInbound().hashCode());
+        result = prime * result + ((getBailunSku() == null) ? 0 : getBailunSku().hashCode());
         return result;
     }
-
-
 }
\ No newline at end of file

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

@@ -218,6 +218,36 @@ public class DcAutoConfigDeliveryExample {
      * @mbg.generated
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
+    public DcAutoConfigDeliveryExample when(boolean condition, IExampleWhen then) {
+        if (condition) {
+            then.example(this);
+        }
+        return this;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_auto_config_delivery
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public DcAutoConfigDeliveryExample when(boolean condition, IExampleWhen then, IExampleWhen otherwise) {
+        if (condition) {
+            then.example(this);
+        } else {
+            otherwise.example(this);
+        }
+        return this;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dc_auto_config_delivery
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
     public void setOffset(Integer offset) {
         this.offset = offset;
     }
@@ -1099,6 +1129,76 @@ public class DcAutoConfigDeliveryExample {
             addCriterion("abroad_inbound not between", value1, value2, "abroadInbound");
             return (Criteria) this;
         }
+
+        public Criteria andBailunSkuIsNull() {
+            addCriterion("bailun_sku is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBailunSkuIsNotNull() {
+            addCriterion("bailun_sku is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBailunSkuEqualTo(String value) {
+            addCriterion("bailun_sku =", value, "bailunSku");
+            return (Criteria) this;
+        }
+
+        public Criteria andBailunSkuNotEqualTo(String value) {
+            addCriterion("bailun_sku <>", value, "bailunSku");
+            return (Criteria) this;
+        }
+
+        public Criteria andBailunSkuGreaterThan(String value) {
+            addCriterion("bailun_sku >", value, "bailunSku");
+            return (Criteria) this;
+        }
+
+        public Criteria andBailunSkuGreaterThanOrEqualTo(String value) {
+            addCriterion("bailun_sku >=", value, "bailunSku");
+            return (Criteria) this;
+        }
+
+        public Criteria andBailunSkuLessThan(String value) {
+            addCriterion("bailun_sku <", value, "bailunSku");
+            return (Criteria) this;
+        }
+
+        public Criteria andBailunSkuLessThanOrEqualTo(String value) {
+            addCriterion("bailun_sku <=", value, "bailunSku");
+            return (Criteria) this;
+        }
+
+        public Criteria andBailunSkuLike(String value) {
+            addCriterion("bailun_sku like", value, "bailunSku");
+            return (Criteria) this;
+        }
+
+        public Criteria andBailunSkuNotLike(String value) {
+            addCriterion("bailun_sku not like", value, "bailunSku");
+            return (Criteria) this;
+        }
+
+        public Criteria andBailunSkuIn(List<String> values) {
+            addCriterion("bailun_sku in", values, "bailunSku");
+            return (Criteria) this;
+        }
+
+        public Criteria andBailunSkuNotIn(List<String> values) {
+            addCriterion("bailun_sku not in", values, "bailunSku");
+            return (Criteria) this;
+        }
+
+        public Criteria andBailunSkuBetween(String value1, String value2) {
+            addCriterion("bailun_sku between", value1, value2, "bailunSku");
+            return (Criteria) this;
+        }
+
+        public Criteria andBailunSkuNotBetween(String value1, String value2) {
+            addCriterion("bailun_sku not between", value1, value2, "bailunSku");
+            return (Criteria) this;
+        }
     }
 
     /**
@@ -1147,6 +1247,7 @@ public class DcAutoConfigDeliveryExample {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
+        @Deprecated
         public Criteria andIf(boolean ifAdd, ICriteriaAdd add) {
             if (ifAdd) {
                 add.add(this);
@@ -1155,12 +1256,43 @@ public class DcAutoConfigDeliveryExample {
         }
 
         /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dc_auto_config_delivery
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria when(boolean condition, ICriteriaWhen then) {
+            if (condition) {
+                then.criteria(this);
+            }
+            return this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dc_auto_config_delivery
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria when(boolean condition, ICriteriaWhen then, ICriteriaWhen otherwise) {
+            if (condition) {
+                then.criteria(this);
+            } else {
+                otherwise.criteria(this);
+            }
+            return this;
+        }
+
+        /**
          * This interface was generated by MyBatis Generator.
          * This interface corresponds to the database table dc_auto_config_delivery
          *
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
+        @Deprecated
         public interface ICriteriaAdd {
             /**
              * This method was generated by MyBatis Generator.
@@ -1264,4 +1396,40 @@ public class DcAutoConfigDeliveryExample {
             this(condition, value, secondValue, null);
         }
     }
+
+    /**
+     * This interface was generated by MyBatis Generator.
+     * This interface corresponds to the database table dc_auto_config_delivery
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public interface ICriteriaWhen {
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dc_auto_config_delivery
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        void criteria(Criteria criteria);
+    }
+
+    /**
+     * This interface was generated by MyBatis Generator.
+     * This interface corresponds to the database table dc_auto_config_delivery
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public interface IExampleWhen {
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table dc_auto_config_delivery
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        void example(DcAutoConfigDeliveryExample example);
+    }
 }
\ No newline at end of file

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

@@ -1520,12 +1520,12 @@ public class AutoTurnoverJob extends PointJob {
         if (dcBaseWarehouse != null && !dcBaseWarehouse.getHqType().equals(CommonConstant.DOMESTIC_WAREHOUSE)) {
             try {
                 DcAutoConfigDeliveryMapper dcAutoConfigDeliveryMapper = SessionUtil.getSession().getMapper(DcAutoConfigDeliveryMapper.class);
-                dcAutoConfigDelivery = dcAutoConfigDeliveryMapper.selectOneByExample(DcAutoConfigDeliveryExample.newAndCreateCriteria().andVariableCodeEqualTo(bailunSku).andStatusEqualTo(1).andTypeEqualTo(1).example());
+                dcAutoConfigDelivery = dcAutoConfigDeliveryMapper.selectOneByExample(DcAutoConfigDeliveryExample.newAndCreateCriteria().andVariableCodeEqualTo(warehouseCode).andBailunSkuEqualTo(bailunSku).andStatusEqualTo(1).andTypeEqualTo(1).example());
                 if (dcAutoConfigDelivery == null && bailunFirstLevelCatagoryId != null) {
-                    dcAutoConfigDelivery = dcAutoConfigDeliveryMapper.selectOneByExample(DcAutoConfigDeliveryExample.newAndCreateCriteria().andVariableCodeEqualTo(bailunFirstLevelCatagoryId.toString()).andStatusEqualTo(1).andTypeEqualTo(2).example());
+                    dcAutoConfigDelivery = dcAutoConfigDeliveryMapper.selectOneByExample(DcAutoConfigDeliveryExample.newAndCreateCriteria().andVariableCodeEqualTo(dcBaseWarehouse.getHqType()).andBailunSkuEqualTo(bailunSku).andStatusEqualTo(1).andTypeEqualTo(2).example());
                 }
                 if (dcAutoConfigDelivery == null) {
-                    dcAutoConfigDelivery = dcAutoConfigDeliveryMapper.selectOneByExample(DcAutoConfigDeliveryExample.newAndCreateCriteria().andVariableCodeEqualTo(warehouseCode).andStatusEqualTo(1).andTypeEqualTo(3).example());
+                    dcAutoConfigDelivery = dcAutoConfigDeliveryMapper.selectOneByExample(DcAutoConfigDeliveryExample.newAndCreateCriteria().andVariableCodeEqualTo(dcBaseWarehouse.getHqType()).andStatusEqualTo(1).andTypeEqualTo(3).example());
                 }
             } catch (Exception e) {
                 e.printStackTrace();

data-show/show-auto-turnover/src/main/java/com/bailuntec/mapper/DcAutoConfigDeliveryMapper.xml

@@ -18,6 +18,7 @@
     <result column="tranfer_bale" jdbcType="INTEGER" property="tranferBale" />
     <result column="tranfer_head" jdbcType="INTEGER" property="tranferHead" />
     <result column="abroad_inbound" jdbcType="INTEGER" property="abroadInbound" />
+    <result column="bailun_sku" jdbcType="VARCHAR" property="bailunSku" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -91,7 +92,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, gmt_create, gmt_modified, variable_code, variable_name, type, bl_operator, remark, 
-    status, tranfer_bale, tranfer_head, abroad_inbound
+    status, tranfer_bale, tranfer_head, abroad_inbound, bailun_sku
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcAutoConfigDeliveryExample" resultMap="BaseResultMap">
     <!--
@@ -155,13 +156,13 @@
     insert into dc_auto_config_delivery (id, gmt_create, gmt_modified, 
       variable_code, variable_name, type, 
       bl_operator, remark, status, 
-      tranfer_bale, tranfer_head, abroad_inbound
-      )
-    values (#{id,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP},
+      tranfer_bale, tranfer_head, abroad_inbound, 
+      bailun_sku)
+    values (#{id,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, 
       #{variableCode,jdbcType=VARCHAR}, #{variableName,jdbcType=VARCHAR}, #{type,jdbcType=TINYINT}, 
       #{blOperator,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, 
-      #{tranferBale,jdbcType=INTEGER}, #{tranferHead,jdbcType=INTEGER}, #{abroadInbound,jdbcType=INTEGER}
-      )
+      #{tranferBale,jdbcType=INTEGER}, #{tranferHead,jdbcType=INTEGER}, #{abroadInbound,jdbcType=INTEGER}, 
+      #{bailunSku,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcAutoConfigDelivery">
     <!--
@@ -206,6 +207,9 @@
       <if test="abroadInbound != null">
         abroad_inbound,
       </if>
+      <if test="bailunSku != null">
+        bailun_sku,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -244,6 +248,9 @@
       <if test="abroadInbound != null">
         #{abroadInbound,jdbcType=INTEGER},
       </if>
+      <if test="bailunSku != null">
+        #{bailunSku,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bailuntec.domain.example.DcAutoConfigDeliveryExample" resultType="java.lang.Long">
@@ -299,6 +306,9 @@
       <if test="record.abroadInbound != null">
         abroad_inbound = #{record.abroadInbound,jdbcType=INTEGER},
       </if>
+      <if test="record.bailunSku != null">
+        bailun_sku = #{record.bailunSku,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -321,7 +331,8 @@
       status = #{record.status,jdbcType=TINYINT},
       tranfer_bale = #{record.tranferBale,jdbcType=INTEGER},
       tranfer_head = #{record.tranferHead,jdbcType=INTEGER},
-      abroad_inbound = #{record.abroadInbound,jdbcType=INTEGER}
+      abroad_inbound = #{record.abroadInbound,jdbcType=INTEGER},
+      bailun_sku = #{record.bailunSku,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -366,6 +377,9 @@
       <if test="abroadInbound != null">
         abroad_inbound = #{abroadInbound,jdbcType=INTEGER},
       </if>
+      <if test="bailunSku != null">
+        bailun_sku = #{bailunSku,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -385,7 +399,8 @@
       status = #{status,jdbcType=TINYINT},
       tranfer_bale = #{tranferBale,jdbcType=INTEGER},
       tranfer_head = #{tranferHead,jdbcType=INTEGER},
-      abroad_inbound = #{abroadInbound,jdbcType=INTEGER}
+      abroad_inbound = #{abroadInbound,jdbcType=INTEGER},
+      bailun_sku = #{bailunSku,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcAutoConfigDelivery">
@@ -432,6 +447,9 @@
       <if test="abroadInbound != null">
         abroad_inbound,
       </if>
+      <if test="bailunSku != null">
+        bailun_sku,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -471,6 +489,9 @@
       <if test="abroadInbound != null">
         #{abroadInbound,jdbcType=INTEGER},
       </if>
+      <if test="bailunSku != null">
+        #{bailunSku,jdbcType=VARCHAR},
+      </if>
     </trim>
     on duplicate key update 
     <trim suffixOverrides=",">
@@ -510,6 +531,9 @@
       <if test="abroadInbound != null">
         abroad_inbound = #{abroadInbound,jdbcType=INTEGER},
       </if>
+      <if test="bailunSku != null">
+        bailun_sku = #{bailunSku,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcAutoConfigDelivery">
@@ -520,17 +544,17 @@
     -->
     insert into dc_auto_config_delivery
     (id, gmt_create, gmt_modified, variable_code, variable_name, type, bl_operator, remark, 
-      status, tranfer_bale, tranfer_head, abroad_inbound)
+      status, tranfer_bale, tranfer_head, abroad_inbound, bailun_sku)
     values
-    (#{id,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP},
+    (#{id,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, 
       #{variableCode,jdbcType=VARCHAR}, #{variableName,jdbcType=VARCHAR}, #{type,jdbcType=TINYINT}, 
       #{blOperator,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, 
-      #{tranferBale,jdbcType=INTEGER}, #{tranferHead,jdbcType=INTEGER}, #{abroadInbound,jdbcType=INTEGER}
-      )
+      #{tranferBale,jdbcType=INTEGER}, #{tranferHead,jdbcType=INTEGER}, #{abroadInbound,jdbcType=INTEGER}, 
+      #{bailunSku,jdbcType=VARCHAR})
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
-    gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
-    gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
+    gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, 
+    gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}, 
     variable_code = #{variableCode,jdbcType=VARCHAR}, 
     variable_name = #{variableName,jdbcType=VARCHAR}, 
     type = #{type,jdbcType=TINYINT}, 
@@ -539,7 +563,8 @@
     status = #{status,jdbcType=TINYINT}, 
     tranfer_bale = #{tranferBale,jdbcType=INTEGER}, 
     tranfer_head = #{tranferHead,jdbcType=INTEGER}, 
-    abroad_inbound = #{abroadInbound,jdbcType=INTEGER}
+    abroad_inbound = #{abroadInbound,jdbcType=INTEGER}, 
+    bailun_sku = #{bailunSku,jdbcType=VARCHAR}
   </insert>
   <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcAutoConfigDeliveryExample" resultMap="BaseResultMap">
     <!--