Skip to content

D
dc-java
Commit f7ca8051 by yinyong
Options

自动周转新增tagid

parent 917da768
Showing with 312 additions and 13 deletions
data-common/src/main/java/com/bailuntec/domain/entity/DcAutoTurnover.java
......@@ -584,6 +584,33 @@ public class DcAutoTurnover {
private BigDecimal dailyWeightedSales;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.original_quantity_init_advise
*
* @mbg.generated
*/
private Integer originalQuantityInitAdvise;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.is_modify_quantity_init_advise
*
* @mbg.generated
*/
private Integer isModifyQuantityInitAdvise;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.tag_id
*
* @mbg.generated
*/
private Integer tagId;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover
*
......@@ -659,6 +686,9 @@ public class DcAutoTurnover {
sb.append(", historyFourteendaySalesEbay=").append(historyFourteendaySalesEbay);
sb.append(", historyThirtydaySalesEbay=").append(historyThirtydaySalesEbay);
sb.append(", dailyWeightedSales=").append(dailyWeightedSales);
sb.append(", originalQuantityInitAdvise=").append(originalQuantityInitAdvise);
sb.append(", isModifyQuantityInitAdvise=").append(isModifyQuantityInitAdvise);
sb.append(", tagId=").append(tagId);
sb.append("]");
return sb.toString();
}
......@@ -744,7 +774,10 @@ public class DcAutoTurnover {
&& (this.getHistorySevendaySalesEbay() == null ? other.getHistorySevendaySalesEbay() == null : this.getHistorySevendaySalesEbay().equals(other.getHistorySevendaySalesEbay()))
&& (this.getHistoryFourteendaySalesEbay() == null ? other.getHistoryFourteendaySalesEbay() == null : this.getHistoryFourteendaySalesEbay().equals(other.getHistoryFourteendaySalesEbay()))
&& (this.getHistoryThirtydaySalesEbay() == null ? other.getHistoryThirtydaySalesEbay() == null : this.getHistoryThirtydaySalesEbay().equals(other.getHistoryThirtydaySalesEbay()))
&& (this.getDailyWeightedSales() == null ? other.getDailyWeightedSales() == null : this.getDailyWeightedSales().equals(other.getDailyWeightedSales()));
&& (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()));
}
/**
......@@ -821,6 +854,9 @@ public class DcAutoTurnover {
result = prime * result + ((getHistoryFourteendaySalesEbay() == null) ? 0 : getHistoryFourteendaySalesEbay().hashCode());
result = prime * result + ((getHistoryThirtydaySalesEbay() == null) ? 0 : getHistoryThirtydaySalesEbay().hashCode());
result = prime * result + ((getDailyWeightedSales() == null) ? 0 : getDailyWeightedSales().hashCode());
result = prime * result + ((getOriginalQuantityInitAdvise() == null) ? 0 : getOriginalQuantityInitAdvise().hashCode());
result = prime * result + ((getIsModifyQuantityInitAdvise() == null) ? 0 : getIsModifyQuantityInitAdvise().hashCode());
result = prime * result + ((getTagId() == null) ? 0 : getTagId().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcAutoTurnoverExample.java
......@@ -4380,6 +4380,186 @@ public class DcAutoTurnoverExample {
addCriterion("daily_weighted_sales not between", value1, value2, "dailyWeightedSales");
return (Criteria) this;
}
public Criteria andOriginalQuantityInitAdviseIsNull() {
addCriterion("original_quantity_init_advise is null");
return (Criteria) this;
}
public Criteria andOriginalQuantityInitAdviseIsNotNull() {
addCriterion("original_quantity_init_advise is not null");
return (Criteria) this;
}
public Criteria andOriginalQuantityInitAdviseEqualTo(Integer value) {
addCriterion("original_quantity_init_advise =", value, "originalQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andOriginalQuantityInitAdviseNotEqualTo(Integer value) {
addCriterion("original_quantity_init_advise <>", value, "originalQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andOriginalQuantityInitAdviseGreaterThan(Integer value) {
addCriterion("original_quantity_init_advise >", value, "originalQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andOriginalQuantityInitAdviseGreaterThanOrEqualTo(Integer value) {
addCriterion("original_quantity_init_advise >=", value, "originalQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andOriginalQuantityInitAdviseLessThan(Integer value) {
addCriterion("original_quantity_init_advise <", value, "originalQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andOriginalQuantityInitAdviseLessThanOrEqualTo(Integer value) {
addCriterion("original_quantity_init_advise <=", value, "originalQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andOriginalQuantityInitAdviseIn(List<Integer> values) {
addCriterion("original_quantity_init_advise in", values, "originalQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andOriginalQuantityInitAdviseNotIn(List<Integer> values) {
addCriterion("original_quantity_init_advise not in", values, "originalQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andOriginalQuantityInitAdviseBetween(Integer value1, Integer value2) {
addCriterion("original_quantity_init_advise between", value1, value2, "originalQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andOriginalQuantityInitAdviseNotBetween(Integer value1, Integer value2) {
addCriterion("original_quantity_init_advise not between", value1, value2, "originalQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andIsModifyQuantityInitAdviseIsNull() {
addCriterion("is_modify_quantity_init_advise is null");
return (Criteria) this;
}
public Criteria andIsModifyQuantityInitAdviseIsNotNull() {
addCriterion("is_modify_quantity_init_advise is not null");
return (Criteria) this;
}
public Criteria andIsModifyQuantityInitAdviseEqualTo(Integer value) {
addCriterion("is_modify_quantity_init_advise =", value, "isModifyQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andIsModifyQuantityInitAdviseNotEqualTo(Integer value) {
addCriterion("is_modify_quantity_init_advise <>", value, "isModifyQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andIsModifyQuantityInitAdviseGreaterThan(Integer value) {
addCriterion("is_modify_quantity_init_advise >", value, "isModifyQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andIsModifyQuantityInitAdviseGreaterThanOrEqualTo(Integer value) {
addCriterion("is_modify_quantity_init_advise >=", value, "isModifyQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andIsModifyQuantityInitAdviseLessThan(Integer value) {
addCriterion("is_modify_quantity_init_advise <", value, "isModifyQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andIsModifyQuantityInitAdviseLessThanOrEqualTo(Integer value) {
addCriterion("is_modify_quantity_init_advise <=", value, "isModifyQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andIsModifyQuantityInitAdviseIn(List<Integer> values) {
addCriterion("is_modify_quantity_init_advise in", values, "isModifyQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andIsModifyQuantityInitAdviseNotIn(List<Integer> values) {
addCriterion("is_modify_quantity_init_advise not in", values, "isModifyQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andIsModifyQuantityInitAdviseBetween(Integer value1, Integer value2) {
addCriterion("is_modify_quantity_init_advise between", value1, value2, "isModifyQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andIsModifyQuantityInitAdviseNotBetween(Integer value1, Integer value2) {
addCriterion("is_modify_quantity_init_advise not between", value1, value2, "isModifyQuantityInitAdvise");
return (Criteria) this;
}
public Criteria andTagIdIsNull() {
addCriterion("tag_id is null");
return (Criteria) this;
}
public Criteria andTagIdIsNotNull() {
addCriterion("tag_id is not null");
return (Criteria) this;
}
public Criteria andTagIdEqualTo(Integer value) {
addCriterion("tag_id =", value, "tagId");
return (Criteria) this;
}
public Criteria andTagIdNotEqualTo(Integer value) {
addCriterion("tag_id <>", value, "tagId");
return (Criteria) this;
}
public Criteria andTagIdGreaterThan(Integer value) {
addCriterion("tag_id >", value, "tagId");
return (Criteria) this;
}
public Criteria andTagIdGreaterThanOrEqualTo(Integer value) {
addCriterion("tag_id >=", value, "tagId");
return (Criteria) this;
}
public Criteria andTagIdLessThan(Integer value) {
addCriterion("tag_id <", value, "tagId");
return (Criteria) this;
}
public Criteria andTagIdLessThanOrEqualTo(Integer value) {
addCriterion("tag_id <=", value, "tagId");
return (Criteria) this;
}
public Criteria andTagIdIn(List<Integer> values) {
addCriterion("tag_id in", values, "tagId");
return (Criteria) this;
}
public Criteria andTagIdNotIn(List<Integer> values) {
addCriterion("tag_id not in", values, "tagId");
return (Criteria) this;
}
public Criteria andTagIdBetween(Integer value1, Integer value2) {
addCriterion("tag_id between", value1, value2, "tagId");
return (Criteria) this;
}
public Criteria andTagIdNotBetween(Integer value1, Integer value2) {
addCriterion("tag_id not between", value1, value2, "tagId");
return (Criteria) this;
}
}
/**
......
data-common/src/main/java/com/bailuntec/mapper/DcAutoTurnoverMapper.xml
......@@ -70,6 +70,9 @@
<result column="history_fourteenday_sales_ebay" jdbcType="DECIMAL" property="historyFourteendaySalesEbay" />
<result column="history_thirtyday_sales_ebay" jdbcType="DECIMAL" property="historyThirtydaySalesEbay" />
<result column="daily_weighted_sales" jdbcType="DECIMAL" property="dailyWeightedSales" />
<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" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -155,7 +158,8 @@
history_thirtyday_sales, sales_explain_details, forecast_turnoverday_sales, stock_up_sales,
quantity_begin_advise, stock_up_days, payment_before_delivery, product_code, product_inner_code,
bailun_category_id, buyer_name, suppliers_name, history_sevenday_sales_ebay, history_fourteenday_sales_ebay,
history_thirtyday_sales_ebay, daily_weighted_sales
history_thirtyday_sales_ebay, daily_weighted_sales, original_quantity_init_advise,
is_modify_quantity_init_advise, tag_id
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcAutoTurnoverExample" resultMap="BaseResultMap">
<!--
......@@ -240,8 +244,9 @@
payment_before_delivery, product_code, product_inner_code,
bailun_category_id, buyer_name, suppliers_name,
history_sevenday_sales_ebay, history_fourteenday_sales_ebay,
history_thirtyday_sales_ebay, daily_weighted_sales
)
history_thirtyday_sales_ebay, daily_weighted_sales,
original_quantity_init_advise, is_modify_quantity_init_advise,
tag_id)
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},
......@@ -266,8 +271,9 @@
#{paymentBeforeDelivery,jdbcType=INTEGER}, #{productCode,jdbcType=VARCHAR}, #{productInnerCode,jdbcType=VARCHAR},
#{bailunCategoryId,jdbcType=INTEGER}, #{buyerName,jdbcType=VARCHAR}, #{suppliersName,jdbcType=VARCHAR},
#{historySevendaySalesEbay,jdbcType=DECIMAL}, #{historyFourteendaySalesEbay,jdbcType=DECIMAL},
#{historyThirtydaySalesEbay,jdbcType=DECIMAL}, #{dailyWeightedSales,jdbcType=DECIMAL}
)
#{historyThirtydaySalesEbay,jdbcType=DECIMAL}, #{dailyWeightedSales,jdbcType=DECIMAL},
#{originalQuantityInitAdvise,jdbcType=INTEGER}, #{isModifyQuantityInitAdvise,jdbcType=INTEGER},
#{tagId,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcAutoTurnover">
<!--
......@@ -468,6 +474,15 @@
<if test="dailyWeightedSales != null">
daily_weighted_sales,
</if>
<if test="originalQuantityInitAdvise != null">
original_quantity_init_advise,
</if>
<if test="isModifyQuantityInitAdvise != null">
is_modify_quantity_init_advise,
</if>
<if test="tagId != null">
tag_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -662,6 +677,15 @@
<if test="dailyWeightedSales != null">
#{dailyWeightedSales,jdbcType=DECIMAL},
</if>
<if test="originalQuantityInitAdvise != null">
#{originalQuantityInitAdvise,jdbcType=INTEGER},
</if>
<if test="isModifyQuantityInitAdvise != null">
#{isModifyQuantityInitAdvise,jdbcType=INTEGER},
</if>
<if test="tagId != null">
#{tagId,jdbcType=INTEGER},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcAutoTurnoverExample" resultType="java.lang.Long">
......@@ -873,6 +897,15 @@
<if test="record.dailyWeightedSales != null">
daily_weighted_sales = #{record.dailyWeightedSales,jdbcType=DECIMAL},
</if>
<if test="record.originalQuantityInitAdvise != null">
original_quantity_init_advise = #{record.originalQuantityInitAdvise,jdbcType=INTEGER},
</if>
<if test="record.isModifyQuantityInitAdvise != null">
is_modify_quantity_init_advise = #{record.isModifyQuantityInitAdvise,jdbcType=INTEGER},
</if>
<if test="record.tagId != null">
tag_id = #{record.tagId,jdbcType=INTEGER},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -947,7 +980,10 @@
history_sevenday_sales_ebay = #{record.historySevendaySalesEbay,jdbcType=DECIMAL},
history_fourteenday_sales_ebay = #{record.historyFourteendaySalesEbay,jdbcType=DECIMAL},
history_thirtyday_sales_ebay = #{record.historyThirtydaySalesEbay,jdbcType=DECIMAL},
daily_weighted_sales = #{record.dailyWeightedSales,jdbcType=DECIMAL}
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}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -1148,6 +1184,15 @@
<if test="dailyWeightedSales != null">
daily_weighted_sales = #{dailyWeightedSales,jdbcType=DECIMAL},
</if>
<if test="originalQuantityInitAdvise != null">
original_quantity_init_advise = #{originalQuantityInitAdvise,jdbcType=INTEGER},
</if>
<if test="isModifyQuantityInitAdvise != null">
is_modify_quantity_init_advise = #{isModifyQuantityInitAdvise,jdbcType=INTEGER},
</if>
<if test="tagId != null">
tag_id = #{tagId,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -1219,7 +1264,10 @@
history_sevenday_sales_ebay = #{historySevendaySalesEbay,jdbcType=DECIMAL},
history_fourteenday_sales_ebay = #{historyFourteendaySalesEbay,jdbcType=DECIMAL},
history_thirtyday_sales_ebay = #{historyThirtydaySalesEbay,jdbcType=DECIMAL},
daily_weighted_sales = #{dailyWeightedSales,jdbcType=DECIMAL}
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}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcAutoTurnover">
......@@ -1422,6 +1470,15 @@
<if test="dailyWeightedSales != null">
daily_weighted_sales,
</if>
<if test="originalQuantityInitAdvise != null">
original_quantity_init_advise,
</if>
<if test="isModifyQuantityInitAdvise != null">
is_modify_quantity_init_advise,
</if>
<if test="tagId != null">
tag_id,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -1617,6 +1674,15 @@
<if test="dailyWeightedSales != null">
#{dailyWeightedSales,jdbcType=DECIMAL},
</if>
<if test="originalQuantityInitAdvise != null">
#{originalQuantityInitAdvise,jdbcType=INTEGER},
</if>
<if test="isModifyQuantityInitAdvise != null">
#{isModifyQuantityInitAdvise,jdbcType=INTEGER},
</if>
<if test="tagId != null">
#{tagId,jdbcType=INTEGER},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -1812,6 +1878,15 @@
<if test="dailyWeightedSales != null">
daily_weighted_sales = #{dailyWeightedSales,jdbcType=DECIMAL},
</if>
<if test="originalQuantityInitAdvise != null">
original_quantity_init_advise = #{originalQuantityInitAdvise,jdbcType=INTEGER},
</if>
<if test="isModifyQuantityInitAdvise != null">
is_modify_quantity_init_advise = #{isModifyQuantityInitAdvise,jdbcType=INTEGER},
</if>
<if test="tagId != null">
tag_id = #{tagId,jdbcType=INTEGER},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcAutoTurnover">
......@@ -1835,7 +1910,8 @@
forecast_turnoverday_sales, stock_up_sales, quantity_begin_advise, stock_up_days,
payment_before_delivery, product_code, product_inner_code, bailun_category_id,
buyer_name, suppliers_name, history_sevenday_sales_ebay, history_fourteenday_sales_ebay,
history_thirtyday_sales_ebay, daily_weighted_sales)
history_thirtyday_sales_ebay, daily_weighted_sales, original_quantity_init_advise,
is_modify_quantity_init_advise, tag_id)
values
(#{id,jdbcType=INTEGER}, #{purchaseAdviceId,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR},
#{warehouseCode,jdbcType=VARCHAR}, #{quantityInitAdvise,jdbcType=DECIMAL}, #{quantityMinimumOrder,jdbcType=INTEGER},
......@@ -1861,8 +1937,9 @@
#{paymentBeforeDelivery,jdbcType=INTEGER}, #{productCode,jdbcType=VARCHAR}, #{productInnerCode,jdbcType=VARCHAR},
#{bailunCategoryId,jdbcType=INTEGER}, #{buyerName,jdbcType=VARCHAR}, #{suppliersName,jdbcType=VARCHAR},
#{historySevendaySalesEbay,jdbcType=DECIMAL}, #{historyFourteendaySalesEbay,jdbcType=DECIMAL},
#{historyThirtydaySalesEbay,jdbcType=DECIMAL}, #{dailyWeightedSales,jdbcType=DECIMAL}
)
#{historyThirtydaySalesEbay,jdbcType=DECIMAL}, #{dailyWeightedSales,jdbcType=DECIMAL},
#{originalQuantityInitAdvise,jdbcType=INTEGER}, #{isModifyQuantityInitAdvise,jdbcType=INTEGER},
#{tagId,jdbcType=INTEGER})
on duplicate key update
id = #{id,jdbcType=INTEGER},
purchase_advice_id = #{purchaseAdviceId,jdbcType=VARCHAR},
......@@ -1927,7 +2004,10 @@
history_sevenday_sales_ebay = #{historySevendaySalesEbay,jdbcType=DECIMAL},
history_fourteenday_sales_ebay = #{historyFourteendaySalesEbay,jdbcType=DECIMAL},
history_thirtyday_sales_ebay = #{historyThirtydaySalesEbay,jdbcType=DECIMAL},
daily_weighted_sales = #{dailyWeightedSales,jdbcType=DECIMAL}
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}
</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
......@@ -1179,9 +1179,11 @@ public class AutoTurnoverJob extends PointJob {
dcAutoJitTagLog.setTagId(dcAutoJitTag.getId());
dcAutoJitTagLog.setTagJson(JSONObject.toJSONString(dcAutoJitTag));
dcAutoJitTagLogMapper.upsertSelective(dcAutoJitTagLog);
dcAutoTurnover.setTagId(dcAutoJitTag.getId());
break;
}
dcAutoTurnover.setDailyWeightedSales(weightingAvgSales.multiply(saveDays));
dcAutoTurnover.setDailyWeightedSales(weightingAvgSales);
weightingAvgSales = weightingAvgSales.multiply(saveDays);
return weightingAvgSales;
}else{
/*
......
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