Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dc-java
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huluobin
dc-java
Commits
f7ca8051
Commit
f7ca8051
authored
Aug 05, 2019
by
yinyong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
自动周转新增tagid
parent
917da768
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
312 additions
and
13 deletions
+312
-13
DcAutoTurnover.java
...main/java/com/bailuntec/domain/entity/DcAutoTurnover.java
+38
-1
DcAutoTurnoverExample.java
...a/com/bailuntec/domain/example/DcAutoTurnoverExample.java
+180
-0
DcAutoTurnoverMapper.xml
...c/main/java/com/bailuntec/mapper/DcAutoTurnoverMapper.xml
+91
-11
AutoTurnoverJob.java
...over/src/main/java/com/bailuntec/job/AutoTurnoverJob.java
+3
-1
No files found.
data-common/src/main/java/com/bailuntec/domain/entity/DcAutoTurnover.java
View file @
f7ca8051
...
@@ -584,6 +584,33 @@ public class DcAutoTurnover {
...
@@ -584,6 +584,33 @@ public class DcAutoTurnover {
private
BigDecimal
dailyWeightedSales
;
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 was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover
* This method corresponds to the database table dc_auto_turnover
*
*
...
@@ -659,6 +686,9 @@ public class DcAutoTurnover {
...
@@ -659,6 +686,9 @@ public class DcAutoTurnover {
sb
.
append
(
", historyFourteendaySalesEbay="
).
append
(
historyFourteendaySalesEbay
);
sb
.
append
(
", historyFourteendaySalesEbay="
).
append
(
historyFourteendaySalesEbay
);
sb
.
append
(
", historyThirtydaySalesEbay="
).
append
(
historyThirtydaySalesEbay
);
sb
.
append
(
", historyThirtydaySalesEbay="
).
append
(
historyThirtydaySalesEbay
);
sb
.
append
(
", dailyWeightedSales="
).
append
(
dailyWeightedSales
);
sb
.
append
(
", dailyWeightedSales="
).
append
(
dailyWeightedSales
);
sb
.
append
(
", originalQuantityInitAdvise="
).
append
(
originalQuantityInitAdvise
);
sb
.
append
(
", isModifyQuantityInitAdvise="
).
append
(
isModifyQuantityInitAdvise
);
sb
.
append
(
", tagId="
).
append
(
tagId
);
sb
.
append
(
"]"
);
sb
.
append
(
"]"
);
return
sb
.
toString
();
return
sb
.
toString
();
}
}
...
@@ -744,7 +774,10 @@ public class DcAutoTurnover {
...
@@ -744,7 +774,10 @@ public class DcAutoTurnover {
&&
(
this
.
getHistorySevendaySalesEbay
()
==
null
?
other
.
getHistorySevendaySalesEbay
()
==
null
:
this
.
getHistorySevendaySalesEbay
().
equals
(
other
.
getHistorySevendaySalesEbay
()))
&&
(
this
.
getHistorySevendaySalesEbay
()
==
null
?
other
.
getHistorySevendaySalesEbay
()
==
null
:
this
.
getHistorySevendaySalesEbay
().
equals
(
other
.
getHistorySevendaySalesEbay
()))
&&
(
this
.
getHistoryFourteendaySalesEbay
()
==
null
?
other
.
getHistoryFourteendaySalesEbay
()
==
null
:
this
.
getHistoryFourteendaySalesEbay
().
equals
(
other
.
getHistoryFourteendaySalesEbay
()))
&&
(
this
.
getHistoryFourteendaySalesEbay
()
==
null
?
other
.
getHistoryFourteendaySalesEbay
()
==
null
:
this
.
getHistoryFourteendaySalesEbay
().
equals
(
other
.
getHistoryFourteendaySalesEbay
()))
&&
(
this
.
getHistoryThirtydaySalesEbay
()
==
null
?
other
.
getHistoryThirtydaySalesEbay
()
==
null
:
this
.
getHistoryThirtydaySalesEbay
().
equals
(
other
.
getHistoryThirtydaySalesEbay
()))
&&
(
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 {
...
@@ -821,6 +854,9 @@ public class DcAutoTurnover {
result
=
prime
*
result
+
((
getHistoryFourteendaySalesEbay
()
==
null
)
?
0
:
getHistoryFourteendaySalesEbay
().
hashCode
());
result
=
prime
*
result
+
((
getHistoryFourteendaySalesEbay
()
==
null
)
?
0
:
getHistoryFourteendaySalesEbay
().
hashCode
());
result
=
prime
*
result
+
((
getHistoryThirtydaySalesEbay
()
==
null
)
?
0
:
getHistoryThirtydaySalesEbay
().
hashCode
());
result
=
prime
*
result
+
((
getHistoryThirtydaySalesEbay
()
==
null
)
?
0
:
getHistoryThirtydaySalesEbay
().
hashCode
());
result
=
prime
*
result
+
((
getDailyWeightedSales
()
==
null
)
?
0
:
getDailyWeightedSales
().
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
;
return
result
;
}
}
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcAutoTurnoverExample.java
View file @
f7ca8051
...
@@ -4380,6 +4380,186 @@ public class DcAutoTurnoverExample {
...
@@ -4380,6 +4380,186 @@ public class DcAutoTurnoverExample {
addCriterion
(
"daily_weighted_sales not between"
,
value1
,
value2
,
"dailyWeightedSales"
);
addCriterion
(
"daily_weighted_sales not between"
,
value1
,
value2
,
"dailyWeightedSales"
);
return
(
Criteria
)
this
;
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
View file @
f7ca8051
...
@@ -70,6 +70,9 @@
...
@@ -70,6 +70,9 @@
<result
column=
"history_fourteenday_sales_ebay"
jdbcType=
"DECIMAL"
property=
"historyFourteendaySalesEbay"
/>
<result
column=
"history_fourteenday_sales_ebay"
jdbcType=
"DECIMAL"
property=
"historyFourteendaySalesEbay"
/>
<result
column=
"history_thirtyday_sales_ebay"
jdbcType=
"DECIMAL"
property=
"historyThirtydaySalesEbay"
/>
<result
column=
"history_thirtyday_sales_ebay"
jdbcType=
"DECIMAL"
property=
"historyThirtydaySalesEbay"
/>
<result
column=
"daily_weighted_sales"
jdbcType=
"DECIMAL"
property=
"dailyWeightedSales"
/>
<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>
</resultMap>
<sql
id=
"Example_Where_Clause"
>
<sql
id=
"Example_Where_Clause"
>
<!--
<!--
...
@@ -155,7 +158,8 @@
...
@@ -155,7 +158,8 @@
history_thirtyday_sales, sales_explain_details, forecast_turnoverday_sales, stock_up_sales,
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,
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,
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>
</sql>
<select
id=
"selectByExample"
parameterType=
"com.bailuntec.domain.example.DcAutoTurnoverExample"
resultMap=
"BaseResultMap"
>
<select
id=
"selectByExample"
parameterType=
"com.bailuntec.domain.example.DcAutoTurnoverExample"
resultMap=
"BaseResultMap"
>
<!--
<!--
...
@@ -240,8 +244,9 @@
...
@@ -240,8 +244,9 @@
payment_before_delivery, product_code, product_inner_code,
payment_before_delivery, product_code, product_inner_code,
bailun_category_id, buyer_name, suppliers_name,
bailun_category_id, buyer_name, suppliers_name,
history_sevenday_sales_ebay, history_fourteenday_sales_ebay,
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},
values (#{id,jdbcType=INTEGER}, #{purchaseAdviceId,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR},
#{warehouseCode,jdbcType=VARCHAR}, #{quantityInitAdvise,jdbcType=DECIMAL}, #{quantityMinimumOrder,jdbcType=INTEGER},
#{warehouseCode,jdbcType=VARCHAR}, #{quantityInitAdvise,jdbcType=DECIMAL}, #{quantityMinimumOrder,jdbcType=INTEGER},
#{quantityFinalAdvise,jdbcType=DECIMAL}, #{warehouseName,jdbcType=VARCHAR}, #{quantityPromotion,jdbcType=INTEGER},
#{quantityFinalAdvise,jdbcType=DECIMAL}, #{warehouseName,jdbcType=VARCHAR}, #{quantityPromotion,jdbcType=INTEGER},
...
@@ -266,8 +271,9 @@
...
@@ -266,8 +271,9 @@
#{paymentBeforeDelivery,jdbcType=INTEGER}, #{productCode,jdbcType=VARCHAR}, #{productInnerCode,jdbcType=VARCHAR},
#{paymentBeforeDelivery,jdbcType=INTEGER}, #{productCode,jdbcType=VARCHAR}, #{productInnerCode,jdbcType=VARCHAR},
#{bailunCategoryId,jdbcType=INTEGER}, #{buyerName,jdbcType=VARCHAR}, #{suppliersName,jdbcType=VARCHAR},
#{bailunCategoryId,jdbcType=INTEGER}, #{buyerName,jdbcType=VARCHAR}, #{suppliersName,jdbcType=VARCHAR},
#{historySevendaySalesEbay,jdbcType=DECIMAL}, #{historyFourteendaySalesEbay,jdbcType=DECIMAL},
#{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>
<insert
id=
"insertSelective"
parameterType=
"com.bailuntec.domain.entity.DcAutoTurnover"
>
<insert
id=
"insertSelective"
parameterType=
"com.bailuntec.domain.entity.DcAutoTurnover"
>
<!--
<!--
...
@@ -468,6 +474,15 @@
...
@@ -468,6 +474,15 @@
<if
test=
"dailyWeightedSales != null"
>
<if
test=
"dailyWeightedSales != null"
>
daily_weighted_sales,
daily_weighted_sales,
</if>
</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>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"id != null"
>
<if
test=
"id != null"
>
...
@@ -662,6 +677,15 @@
...
@@ -662,6 +677,15 @@
<if
test=
"dailyWeightedSales != null"
>
<if
test=
"dailyWeightedSales != null"
>
#{dailyWeightedSales,jdbcType=DECIMAL},
#{dailyWeightedSales,jdbcType=DECIMAL},
</if>
</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>
</trim>
</insert>
</insert>
<select
id=
"countByExample"
parameterType=
"com.bailuntec.domain.example.DcAutoTurnoverExample"
resultType=
"java.lang.Long"
>
<select
id=
"countByExample"
parameterType=
"com.bailuntec.domain.example.DcAutoTurnoverExample"
resultType=
"java.lang.Long"
>
...
@@ -873,6 +897,15 @@
...
@@ -873,6 +897,15 @@
<if
test=
"record.dailyWeightedSales != null"
>
<if
test=
"record.dailyWeightedSales != null"
>
daily_weighted_sales = #{record.dailyWeightedSales,jdbcType=DECIMAL},
daily_weighted_sales = #{record.dailyWeightedSales,jdbcType=DECIMAL},
</if>
</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>
</set>
<if
test=
"_parameter != null"
>
<if
test=
"_parameter != null"
>
<include
refid=
"Update_By_Example_Where_Clause"
/>
<include
refid=
"Update_By_Example_Where_Clause"
/>
...
@@ -947,7 +980,10 @@
...
@@ -947,7 +980,10 @@
history_sevenday_sales_ebay = #{record.historySevendaySalesEbay,jdbcType=DECIMAL},
history_sevenday_sales_ebay = #{record.historySevendaySalesEbay,jdbcType=DECIMAL},
history_fourteenday_sales_ebay = #{record.historyFourteendaySalesEbay,jdbcType=DECIMAL},
history_fourteenday_sales_ebay = #{record.historyFourteendaySalesEbay,jdbcType=DECIMAL},
history_thirtyday_sales_ebay = #{record.historyThirtydaySalesEbay,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"
>
<if
test=
"_parameter != null"
>
<include
refid=
"Update_By_Example_Where_Clause"
/>
<include
refid=
"Update_By_Example_Where_Clause"
/>
</if>
</if>
...
@@ -1148,6 +1184,15 @@
...
@@ -1148,6 +1184,15 @@
<if
test=
"dailyWeightedSales != null"
>
<if
test=
"dailyWeightedSales != null"
>
daily_weighted_sales = #{dailyWeightedSales,jdbcType=DECIMAL},
daily_weighted_sales = #{dailyWeightedSales,jdbcType=DECIMAL},
</if>
</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>
</set>
where id = #{id,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
</update>
...
@@ -1219,7 +1264,10 @@
...
@@ -1219,7 +1264,10 @@
history_sevenday_sales_ebay = #{historySevendaySalesEbay,jdbcType=DECIMAL},
history_sevenday_sales_ebay = #{historySevendaySalesEbay,jdbcType=DECIMAL},
history_fourteenday_sales_ebay = #{historyFourteendaySalesEbay,jdbcType=DECIMAL},
history_fourteenday_sales_ebay = #{historyFourteendaySalesEbay,jdbcType=DECIMAL},
history_thirtyday_sales_ebay = #{historyThirtydaySalesEbay,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}
where id = #{id,jdbcType=INTEGER}
</update>
</update>
<insert
id=
"upsertSelective"
parameterType=
"com.bailuntec.domain.entity.DcAutoTurnover"
>
<insert
id=
"upsertSelective"
parameterType=
"com.bailuntec.domain.entity.DcAutoTurnover"
>
...
@@ -1422,6 +1470,15 @@
...
@@ -1422,6 +1470,15 @@
<if
test=
"dailyWeightedSales != null"
>
<if
test=
"dailyWeightedSales != null"
>
daily_weighted_sales,
daily_weighted_sales,
</if>
</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>
values
values
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
...
@@ -1617,6 +1674,15 @@
...
@@ -1617,6 +1674,15 @@
<if
test=
"dailyWeightedSales != null"
>
<if
test=
"dailyWeightedSales != null"
>
#{dailyWeightedSales,jdbcType=DECIMAL},
#{dailyWeightedSales,jdbcType=DECIMAL},
</if>
</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>
</trim>
on duplicate key update
on duplicate key update
<trim
suffixOverrides=
","
>
<trim
suffixOverrides=
","
>
...
@@ -1812,6 +1878,15 @@
...
@@ -1812,6 +1878,15 @@
<if
test=
"dailyWeightedSales != null"
>
<if
test=
"dailyWeightedSales != null"
>
daily_weighted_sales = #{dailyWeightedSales,jdbcType=DECIMAL},
daily_weighted_sales = #{dailyWeightedSales,jdbcType=DECIMAL},
</if>
</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>
</trim>
</insert>
</insert>
<insert
id=
"upsert"
parameterType=
"com.bailuntec.domain.entity.DcAutoTurnover"
>
<insert
id=
"upsert"
parameterType=
"com.bailuntec.domain.entity.DcAutoTurnover"
>
...
@@ -1835,7 +1910,8 @@
...
@@ -1835,7 +1910,8 @@
forecast_turnoverday_sales, stock_up_sales, quantity_begin_advise, stock_up_days,
forecast_turnoverday_sales, stock_up_sales, quantity_begin_advise, stock_up_days,
payment_before_delivery, product_code, product_inner_code, bailun_category_id,
payment_before_delivery, product_code, product_inner_code, bailun_category_id,
buyer_name, suppliers_name, history_sevenday_sales_ebay, history_fourteenday_sales_ebay,
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
values
(#{id,jdbcType=INTEGER}, #{purchaseAdviceId,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR},
(#{id,jdbcType=INTEGER}, #{purchaseAdviceId,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR},
#{warehouseCode,jdbcType=VARCHAR}, #{quantityInitAdvise,jdbcType=DECIMAL}, #{quantityMinimumOrder,jdbcType=INTEGER},
#{warehouseCode,jdbcType=VARCHAR}, #{quantityInitAdvise,jdbcType=DECIMAL}, #{quantityMinimumOrder,jdbcType=INTEGER},
...
@@ -1861,8 +1937,9 @@
...
@@ -1861,8 +1937,9 @@
#{paymentBeforeDelivery,jdbcType=INTEGER}, #{productCode,jdbcType=VARCHAR}, #{productInnerCode,jdbcType=VARCHAR},
#{paymentBeforeDelivery,jdbcType=INTEGER}, #{productCode,jdbcType=VARCHAR}, #{productInnerCode,jdbcType=VARCHAR},
#{bailunCategoryId,jdbcType=INTEGER}, #{buyerName,jdbcType=VARCHAR}, #{suppliersName,jdbcType=VARCHAR},
#{bailunCategoryId,jdbcType=INTEGER}, #{buyerName,jdbcType=VARCHAR}, #{suppliersName,jdbcType=VARCHAR},
#{historySevendaySalesEbay,jdbcType=DECIMAL}, #{historyFourteendaySalesEbay,jdbcType=DECIMAL},
#{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
on duplicate key update
id = #{id,jdbcType=INTEGER},
id = #{id,jdbcType=INTEGER},
purchase_advice_id = #{purchaseAdviceId,jdbcType=VARCHAR},
purchase_advice_id = #{purchaseAdviceId,jdbcType=VARCHAR},
...
@@ -1927,7 +2004,10 @@
...
@@ -1927,7 +2004,10 @@
history_sevenday_sales_ebay = #{historySevendaySalesEbay,jdbcType=DECIMAL},
history_sevenday_sales_ebay = #{historySevendaySalesEbay,jdbcType=DECIMAL},
history_fourteenday_sales_ebay = #{historyFourteendaySalesEbay,jdbcType=DECIMAL},
history_fourteenday_sales_ebay = #{historyFourteendaySalesEbay,jdbcType=DECIMAL},
history_thirtyday_sales_ebay = #{historyThirtydaySalesEbay,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>
</insert>
<select
id=
"selectOneByExample"
parameterType=
"com.bailuntec.domain.example.DcAutoTurnoverExample"
resultMap=
"BaseResultMap"
>
<select
id=
"selectOneByExample"
parameterType=
"com.bailuntec.domain.example.DcAutoTurnoverExample"
resultMap=
"BaseResultMap"
>
<!--
<!--
...
...
data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java
View file @
f7ca8051
...
@@ -1179,9 +1179,11 @@ public class AutoTurnoverJob extends PointJob {
...
@@ -1179,9 +1179,11 @@ public class AutoTurnoverJob extends PointJob {
dcAutoJitTagLog
.
setTagId
(
dcAutoJitTag
.
getId
());
dcAutoJitTagLog
.
setTagId
(
dcAutoJitTag
.
getId
());
dcAutoJitTagLog
.
setTagJson
(
JSONObject
.
toJSONString
(
dcAutoJitTag
));
dcAutoJitTagLog
.
setTagJson
(
JSONObject
.
toJSONString
(
dcAutoJitTag
));
dcAutoJitTagLogMapper
.
upsertSelective
(
dcAutoJitTagLog
);
dcAutoJitTagLogMapper
.
upsertSelective
(
dcAutoJitTagLog
);
dcAutoTurnover
.
setTagId
(
dcAutoJitTag
.
getId
());
break
;
break
;
}
}
dcAutoTurnover
.
setDailyWeightedSales
(
weightingAvgSales
.
multiply
(
saveDays
));
dcAutoTurnover
.
setDailyWeightedSales
(
weightingAvgSales
);
weightingAvgSales
=
weightingAvgSales
.
multiply
(
saveDays
);
return
weightingAvgSales
;
return
weightingAvgSales
;
}
else
{
}
else
{
/*
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment