Skip to content

D
dc-java
Commit 9c1b90ee by yinyong
Options

周转新增hq_type

parent 243b40c4
Showing with 121 additions and 9 deletions
data-common/src/main/java/com/bailuntec/domain/entity/DcAutoTurnover.java
......@@ -638,6 +638,15 @@ public class DcAutoTurnover {
private Integer tagId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.hq_type
*
* @mbg.generated
*/
private String hqType;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover
*
......@@ -719,6 +728,7 @@ public class DcAutoTurnover {
sb.append(", originalQuantityInitAdvise=").append(originalQuantityInitAdvise);
sb.append(", isModifyQuantityInitAdvise=").append(isModifyQuantityInitAdvise);
sb.append(", tagId=").append(tagId);
sb.append(", hqType=").append(hqType);
sb.append("]");
return sb.toString();
}
......@@ -810,7 +820,8 @@ public class DcAutoTurnover {
&& (this.getDailyWeightedSales() == null ? other.getDailyWeightedSales() == null : this.getDailyWeightedSales().equals(other.getDailyWeightedSales()))
&& (this.getOriginalQuantityInitAdvise() == null ? other.getOriginalQuantityInitAdvise() == null : this.getOriginalQuantityInitAdvise().equals(other.getOriginalQuantityInitAdvise()))
&& (this.getIsModifyQuantityInitAdvise() == null ? other.getIsModifyQuantityInitAdvise() == null : this.getIsModifyQuantityInitAdvise().equals(other.getIsModifyQuantityInitAdvise()))
&& (this.getTagId() == null ? other.getTagId() == null : this.getTagId().equals(other.getTagId()));
&& (this.getTagId() == null ? other.getTagId() == null : this.getTagId().equals(other.getTagId()))
&& (this.getHqType() == null ? other.getHqType() == null : this.getHqType().equals(other.getHqType()));
}
/**
......@@ -893,6 +904,7 @@ public class DcAutoTurnover {
result = prime * result + ((getOriginalQuantityInitAdvise() == null) ? 0 : getOriginalQuantityInitAdvise().hashCode());
result = prime * result + ((getIsModifyQuantityInitAdvise() == null) ? 0 : getIsModifyQuantityInitAdvise().hashCode());
result = prime * result + ((getTagId() == null) ? 0 : getTagId().hashCode());
result = prime * result + ((getHqType() == null) ? 0 : getHqType().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcAutoTurnoverExample.java
......@@ -4740,6 +4740,76 @@ public class DcAutoTurnoverExample {
addCriterion("tag_id not between", value1, value2, "tagId");
return (Criteria) this;
}
public Criteria andHqTypeIsNull() {
addCriterion("hq_type is null");
return (Criteria) this;
}
public Criteria andHqTypeIsNotNull() {
addCriterion("hq_type is not null");
return (Criteria) this;
}
public Criteria andHqTypeEqualTo(String value) {
addCriterion("hq_type =", value, "hqType");
return (Criteria) this;
}
public Criteria andHqTypeNotEqualTo(String value) {
addCriterion("hq_type <>", value, "hqType");
return (Criteria) this;
}
public Criteria andHqTypeGreaterThan(String value) {
addCriterion("hq_type >", value, "hqType");
return (Criteria) this;
}
public Criteria andHqTypeGreaterThanOrEqualTo(String value) {
addCriterion("hq_type >=", value, "hqType");
return (Criteria) this;
}
public Criteria andHqTypeLessThan(String value) {
addCriterion("hq_type <", value, "hqType");
return (Criteria) this;
}
public Criteria andHqTypeLessThanOrEqualTo(String value) {
addCriterion("hq_type <=", value, "hqType");
return (Criteria) this;
}
public Criteria andHqTypeLike(String value) {
addCriterion("hq_type like", value, "hqType");
return (Criteria) this;
}
public Criteria andHqTypeNotLike(String value) {
addCriterion("hq_type not like", value, "hqType");
return (Criteria) this;
}
public Criteria andHqTypeIn(List<String> values) {
addCriterion("hq_type in", values, "hqType");
return (Criteria) this;
}
public Criteria andHqTypeNotIn(List<String> values) {
addCriterion("hq_type not in", values, "hqType");
return (Criteria) this;
}
public Criteria andHqTypeBetween(String value1, String value2) {
addCriterion("hq_type between", value1, value2, "hqType");
return (Criteria) this;
}
public Criteria andHqTypeNotBetween(String value1, String value2) {
addCriterion("hq_type not between", value1, value2, "hqType");
return (Criteria) this;
}
}
/**
......
data-common/src/main/java/com/bailuntec/mapper/DcAutoTurnoverMapper.xml
......@@ -76,6 +76,7 @@
<result column="original_quantity_init_advise" jdbcType="INTEGER" property="originalQuantityInitAdvise" />
<result column="is_modify_quantity_init_advise" jdbcType="INTEGER" property="isModifyQuantityInitAdvise" />
<result column="tag_id" jdbcType="INTEGER" property="tagId" />
<result column="hq_type" jdbcType="VARCHAR" property="hqType" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -163,7 +164,7 @@
bailun_category_id, buyer_name, suppliers_name, history_sevenday_sales_ebay, history_fourteenday_sales_ebay,
history_thirtyday_sales_ebay, history_sevenday_sales_aliexpress, history_fourteenday_sales_aliexpress,
history_thirtyday_sales_aliexpress, daily_weighted_sales, original_quantity_init_advise,
is_modify_quantity_init_advise, tag_id
is_modify_quantity_init_advise, tag_id, hq_type
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcAutoTurnoverExample" resultMap="BaseResultMap">
<!--
......@@ -251,7 +252,8 @@
history_thirtyday_sales_ebay, history_sevenday_sales_aliexpress,
history_fourteenday_sales_aliexpress, history_thirtyday_sales_aliexpress,
daily_weighted_sales, original_quantity_init_advise,
is_modify_quantity_init_advise, tag_id)
is_modify_quantity_init_advise, tag_id, hq_type
)
values (#{id,jdbcType=INTEGER}, #{purchaseAdviceId,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR},
#{warehouseCode,jdbcType=VARCHAR}, #{quantityInitAdvise,jdbcType=DECIMAL}, #{quantityMinimumOrder,jdbcType=INTEGER},
#{quantityFinalAdvise,jdbcType=DECIMAL}, #{warehouseName,jdbcType=VARCHAR}, #{quantityPromotion,jdbcType=INTEGER},
......@@ -279,7 +281,8 @@
#{historyThirtydaySalesEbay,jdbcType=DECIMAL}, #{historySevendaySalesAliexpress,jdbcType=DECIMAL},
#{historyFourteendaySalesAliexpress,jdbcType=DECIMAL}, #{historyThirtydaySalesAliexpress,jdbcType=DECIMAL},
#{dailyWeightedSales,jdbcType=DECIMAL}, #{originalQuantityInitAdvise,jdbcType=INTEGER},
#{isModifyQuantityInitAdvise,jdbcType=INTEGER}, #{tagId,jdbcType=INTEGER})
#{isModifyQuantityInitAdvise,jdbcType=INTEGER}, #{tagId,jdbcType=INTEGER}, #{hqType,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcAutoTurnover">
<!--
......@@ -498,6 +501,9 @@
<if test="tagId != null">
tag_id,
</if>
<if test="hqType != null">
hq_type,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -710,6 +716,9 @@
<if test="tagId != null">
#{tagId,jdbcType=INTEGER},
</if>
<if test="hqType != null">
#{hqType,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcAutoTurnoverExample" resultType="java.lang.Long">
......@@ -939,6 +948,9 @@
<if test="record.tagId != null">
tag_id = #{record.tagId,jdbcType=INTEGER},
</if>
<if test="record.hqType != null">
hq_type = #{record.hqType,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -1019,7 +1031,8 @@
daily_weighted_sales = #{record.dailyWeightedSales,jdbcType=DECIMAL},
original_quantity_init_advise = #{record.originalQuantityInitAdvise,jdbcType=INTEGER},
is_modify_quantity_init_advise = #{record.isModifyQuantityInitAdvise,jdbcType=INTEGER},
tag_id = #{record.tagId,jdbcType=INTEGER}
tag_id = #{record.tagId,jdbcType=INTEGER},
hq_type = #{record.hqType,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -1238,6 +1251,9 @@
<if test="tagId != null">
tag_id = #{tagId,jdbcType=INTEGER},
</if>
<if test="hqType != null">
hq_type = #{hqType,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -1315,7 +1331,8 @@
daily_weighted_sales = #{dailyWeightedSales,jdbcType=DECIMAL},
original_quantity_init_advise = #{originalQuantityInitAdvise,jdbcType=INTEGER},
is_modify_quantity_init_advise = #{isModifyQuantityInitAdvise,jdbcType=INTEGER},
tag_id = #{tagId,jdbcType=INTEGER}
tag_id = #{tagId,jdbcType=INTEGER},
hq_type = #{hqType,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcAutoTurnover">
......@@ -1536,6 +1553,9 @@
<if test="tagId != null">
tag_id,
</if>
<if test="hqType != null">
hq_type,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -1749,6 +1769,9 @@
<if test="tagId != null">
#{tagId,jdbcType=INTEGER},
</if>
<if test="hqType != null">
#{hqType,jdbcType=VARCHAR},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -1962,6 +1985,9 @@
<if test="tagId != null">
tag_id = #{tagId,jdbcType=INTEGER},
</if>
<if test="hqType != null">
hq_type = #{hqType,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcAutoTurnover">
......@@ -1987,7 +2013,7 @@
buyer_name, suppliers_name, history_sevenday_sales_ebay, history_fourteenday_sales_ebay,
history_thirtyday_sales_ebay, history_sevenday_sales_aliexpress, history_fourteenday_sales_aliexpress,
history_thirtyday_sales_aliexpress, daily_weighted_sales, original_quantity_init_advise,
is_modify_quantity_init_advise, tag_id)
is_modify_quantity_init_advise, tag_id, hq_type)
values
(#{id,jdbcType=INTEGER}, #{purchaseAdviceId,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR},
#{warehouseCode,jdbcType=VARCHAR}, #{quantityInitAdvise,jdbcType=DECIMAL}, #{quantityMinimumOrder,jdbcType=INTEGER},
......@@ -2016,7 +2042,8 @@
#{historyThirtydaySalesEbay,jdbcType=DECIMAL}, #{historySevendaySalesAliexpress,jdbcType=DECIMAL},
#{historyFourteendaySalesAliexpress,jdbcType=DECIMAL}, #{historyThirtydaySalesAliexpress,jdbcType=DECIMAL},
#{dailyWeightedSales,jdbcType=DECIMAL}, #{originalQuantityInitAdvise,jdbcType=INTEGER},
#{isModifyQuantityInitAdvise,jdbcType=INTEGER}, #{tagId,jdbcType=INTEGER})
#{isModifyQuantityInitAdvise,jdbcType=INTEGER}, #{tagId,jdbcType=INTEGER}, #{hqType,jdbcType=VARCHAR}
)
on duplicate key update
id = #{id,jdbcType=INTEGER},
purchase_advice_id = #{purchaseAdviceId,jdbcType=VARCHAR},
......@@ -2087,7 +2114,8 @@
daily_weighted_sales = #{dailyWeightedSales,jdbcType=DECIMAL},
original_quantity_init_advise = #{originalQuantityInitAdvise,jdbcType=INTEGER},
is_modify_quantity_init_advise = #{isModifyQuantityInitAdvise,jdbcType=INTEGER},
tag_id = #{tagId,jdbcType=INTEGER}
tag_id = #{tagId,jdbcType=INTEGER},
hq_type = #{hqType,jdbcType=VARCHAR}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcAutoTurnoverExample" resultMap="BaseResultMap">
<!--
......
data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java
......@@ -530,6 +530,7 @@ public class AutoTurnoverJob extends PointJob {
dcAutoTurnover.setStatus(forecastShortSupplyList.get(2 * turnoverDays.intValue()).intValue() > 0 ? 1 : 0);
dcAutoTurnover.setTurnoverDays(turnoverDays);
dcAutoTurnover.setQuantitySafeInventory(totalSafeInventory);
dcAutoTurnover.setHqType(dcBaseWarehouse.getHqType());
dcBaseStock.setSkuTitleCn(turnoverSku.getSkuTitleCn());
dcBaseStock.setProductInnerCode(turnoverSku.getProductInnerCode());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment