# 更新

data-common/src/main/java/com/bailuntec/mapper/DcAutoSalesForecastStageConfigMapper.xml

@@ -25,21 +25,23 @@
                 and (t5.first_order_days_min = 0 or t5.first_order_days_min <= #{firstOrderDays})
                 and (t5.first_order_days_max = 0 or t5.first_order_days_max >= #{firstOrderDays})
             </if>
+            and (false
             <if test="avgOrderCount30!=null ">
-                and (t5.orders_avg_max = 0 or (t5.orders_avg_sampling_days = 30
+                or (t5.orders_avg_sampling_days = 0 or (t5.orders_avg_sampling_days = 30
                 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})))
             </if>
             <if test="avgOrderCount14!=null ">
-                and (t5.orders_avg_max = 0 or (t5.orders_avg_sampling_days = 14
+                or (t5.orders_avg_sampling_days = 0 or (t5.orders_avg_sampling_days = 14
                 and (t5.orders_avg_min = 0 or t5.orders_avg_min &lt;= #{avgOrderCount14})
                 and (t5.orders_avg_max = 0 or t5.orders_avg_max &gt;= #{avgOrderCount14})))
             </if>
             <if test="avgOrderCount7!=null ">
-                and (t5.orders_avg_max = 0 or (t5.orders_avg_sampling_days = 7
-                                             and (t5.orders_avg_min = 0 or t5.orders_avg_min &lt;= #{avgOrderCount7})
-                                             and (t5.orders_avg_max = 0 or t5.orders_avg_max &gt;= #{avgOrderCount7})))
+                or (t5.orders_avg_sampling_days = 0 or (t5.orders_avg_sampling_days = 7
+                and (t5.orders_avg_min = 0 or t5.orders_avg_min &lt;= #{avgOrderCount7})
+                and (t5.orders_avg_max = 0 or t5.orders_avg_max &gt;= #{avgOrderCount7})))
             </if>
+            )
                  LEFT JOIN dc_auto_sales_forecast_stage_config t7 on t7.config_id = t5.id
             and (IF(t5.screen_type = 1,
                     ((t8.first_inbound_date &lt;= t7.duration_upper_limit or t7.duration_upper_limit = 0)

data-show/show-auto-turnover/src/main/resources/job.properties

@@ -13,9 +13,9 @@ NAME_SPACE=data-center
 #JOB_NAME_WEEK=show-auto-turnover-week
 #JOB_NAME_WEEK=0 0 10 ? * MON
 
-JOB_NAME=show-auto-turnover57
-JOB_CRON=0 0 3 * * ?
-#JOB_CRON=0 36 17 * * ?
+JOB_NAME=show-auto-turnover58
+#JOB_CRON=0 0 3 * * ?
+JOB_CRON=0 30 10 * * ?
 
 SHARDING_TOTAL_COUNT=8
 JOB_NAME_NE_NORMAL=show-auto-turnover-ne-normal

data-show/show-auto-turnover/src/test/java/AutoTurnoverTest.java

@@ -258,8 +258,8 @@ public class AutoTurnoverTest {
     public void testXX2() {
         DcBaseStock dcBaseStock = SessionUtil.getSession().getMapper(DcBaseStockMapper.class)
                 .selectOneByExample(DcBaseStockExample.newAndCreateCriteria()
-                        .andBailunSkuEqualTo("944772116")
-                        .andWarehouseCodeEqualTo("GB4PXBL")
+                        .andBailunSkuEqualTo("946406301")
+                        .andWarehouseCodeEqualTo("GZBLWH")
                         .example());
         try {
             AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob();