Commit d8bbd0d5 by huluobin

# update

parent 3b0bf493
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
and (find_in_set(t2.product_type,t5.category) or length(trim(t5.category)) = 0) and (find_in_set(t2.product_type,t5.category) or length(trim(t5.category)) = 0)
and (t6.area_id = t5.warehouse_area_id or length(trim(t5.warehouse_area_id)) = 0) and (t6.area_id = t5.warehouse_area_id or length(trim(t5.warehouse_area_id)) = 0)
and t5.is_delete = 0 and t5.is_delete = 0
<if test="firstOrderDays!=null and firstOrderDays!=0"> <if test="firstOrderDays!=null ">
and (t5.first_order_days_min = 0 or t5.first_order_days_min &lt;= #{firstOrderDays}) and (t5.first_order_days_min = 0 or t5.first_order_days_min &lt;= #{firstOrderDays})
and (t5.first_order_days_max = 0 or t5.first_order_days_max &gt;= #{firstOrderDays}) and (t5.first_order_days_max = 0 or t5.first_order_days_max &gt;= #{firstOrderDays})
</if> </if>
<if test="avgOrderCount30!=null and avgOrderCount30!=0"> <if test="avgOrderCount30!=null ">
and (t5.orders_avg_min = 0 or t5.orders_avg_min &lt;= #{avgOrderCount30}) and (t5.orders_avg_min = 0 or t5.orders_avg_min &lt;= #{avgOrderCount30})
and (t5.orders_avg_max = 0 or t5.orders_avg_max &gt;= #{avgOrderCount30}) and (t5.orders_avg_max = 0 or t5.orders_avg_max &gt;= #{avgOrderCount30})
</if> </if>
......
...@@ -262,8 +262,8 @@ public class AutoTurnoverTest { ...@@ -262,8 +262,8 @@ public class AutoTurnoverTest {
public void testXX2() { public void testXX2() {
DcBaseStock dcBaseStock = SessionUtil.getSession().getMapper(DcBaseStockMapper.class) DcBaseStock dcBaseStock = SessionUtil.getSession().getMapper(DcBaseStockMapper.class)
.selectOneByExample(DcBaseStockExample.newAndCreateCriteria() .selectOneByExample(DcBaseStockExample.newAndCreateCriteria()
.andBailunSkuEqualTo("948276501") .andBailunSkuEqualTo("951467301")
.andWarehouseCodeEqualTo("GB4PXBL") .andWarehouseCodeEqualTo("GZBLWH")
.example()); .example());
try { try {
AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob(); AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob();
......
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