# 更新

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

@@ -1473,7 +1473,7 @@
         select t1.*
         from dc_base_stock t1
                  left join dc_base_warehouse t2 on t1.warehouse_code = t2.warehouse_code
-        where t2.hq_type = '海外仓'
+        where t2.hq_type != '国内仓'
           and t1.id % #{shardingContext.shardingTotalCount} = #{shardingContext.shardingItem}
         limit #{pageStart}, #{pageOffset}
     </select>
@@ -1482,7 +1482,7 @@
         select t1.*
         from dc_base_stock t1
                  left join dc_base_warehouse t2 on t1.warehouse_code = t2.warehouse_code
-        where t2.hq_type = '海外仓'
+        where t2.hq_type != '国内仓'
           and t1.id % #{shardingContext.shardingTotalCount} = #{shardingContext.shardingItem}
         limit #{pageStart}, #{pageOffset}
     </select>
@@ -1491,7 +1491,7 @@
         select count(t1.id)
         from dc_base_stock t1
                  left join dc_base_warehouse t2 on t1.warehouse_code = t2.warehouse_code
-        where t2.hq_type = '海外仓'
+        where t2.hq_type != '国内仓'
           and t1.id % #{shardingContext.shardingTotalCount} = #{shardingContext.shardingItem}
     </select>
 
@@ -1499,7 +1499,7 @@
         select count(t1.id)
         from dc_base_stock t1
                  left join dc_base_warehouse t2 on t1.warehouse_code = t2.warehouse_code
-        where t2.hq_type = '海外仓'
+        where t2.hq_type != '国内仓'
           and t1.id % #{shardingContext.shardingTotalCount} = #{shardingContext.shardingItem}
     </select>
 

data-show/show-auto-turnover/src/main/java/com/bailuntec/job/QueueConsumerJob.java

@@ -3,6 +3,7 @@ package com.bailuntec.job;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.bailuntec.domain.constant.CommonConstant;
+import com.bailuntec.domain.constant.Constant;
 import com.bailuntec.domain.entity.DcBaseQueue;
 import com.bailuntec.domain.entity.DcBaseStock;
 import com.bailuntec.domain.example.DcBaseStockExample;
@@ -11,6 +12,7 @@ import com.bailuntec.mapper.DcBaseStockMapper;
 import com.bailuntec.utils.SessionUtil;
 import com.dangdang.ddframe.job.api.ShardingContext;
 import com.dangdang.ddframe.job.api.simple.SimpleJob;
+import com.dangdang.ddframe.job.executor.ShardingContexts;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.session.SqlSession;
@@ -18,6 +20,7 @@ import org.apache.ibatis.session.SqlSession;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -60,6 +63,11 @@ public class QueueConsumerJob implements SimpleJob {
                         .example());
                 try {
                     autoTurnoverJob.autoTurnoverFromStock(DateTimeFormatter.ofPattern(CommonConstant.DATE_FORMAT).format(LocalDate.now()), dcBaseStock);
+                    AutoTurnoverJob.shardingContextThreadLocal.set(new ShardingContext(new ShardingContexts("x", null, 1, Constant.OCEAN_HEAD, new HashMap<>(16)), 0));
+                    autoTurnoverJob.autoTurnoverFromStock(DateTimeFormatter.ofPattern(CommonConstant.DATE_FORMAT).format(LocalDate.now()), dcBaseStock);
+                    AutoTurnoverJob.shardingContextThreadLocal.set(new ShardingContext(new ShardingContexts("x", null, 1, Constant.AIR_HEAD, new HashMap<>(16)), 0));
+                    autoTurnoverJob.autoTurnoverFromStock(DateTimeFormatter.ofPattern(CommonConstant.DATE_FORMAT).format(LocalDate.now()), dcBaseStock);
+
                     dcBaseQueueMapper.deleteByPrimaryKey(dcBaseQueue.getId());
                 } catch (Exception e) {
                     try {

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

@@ -4,6 +4,7 @@ import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.fastjson.JSON;
 import com.bailuntec.domain.constant.CommonConstant;
+import com.bailuntec.domain.constant.Constant;
 import com.bailuntec.domain.entity.DcBaseStock;
 import com.bailuntec.domain.entity.JobPointLog;
 import com.bailuntec.domain.entity.SalesDayConfig;
@@ -261,14 +262,14 @@ public class AutoTurnoverTest {
     public void testXX2() {
         DcBaseStock dcBaseStock = SessionUtil.getSession().getMapper(DcBaseStockMapper.class)
                 .selectOneByExample(DcBaseStockExample.newAndCreateCriteria()
-                        .andBailunSkuEqualTo("3395609119")
-                        .andWarehouseCodeEqualTo("GZBLWH")
+                        .andBailunSkuEqualTo("228427301")
+                        .andWarehouseCodeEqualTo("BLFBW01")
                         .example());
         try {
             AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob();
             long time = System.currentTimeMillis();
             log.info(Long.toString(time));
-            AutoTurnoverJob.shardingContextThreadLocal.set(new ShardingContext(new ShardingContexts("x", null, 8, "NORMAL", new HashMap<>()), 0));
+            AutoTurnoverJob.shardingContextThreadLocal.set(new ShardingContext(new ShardingContexts("x", null, 8, Constant.AIR_HEAD, new HashMap<>()), 0));
             autoTurnoverJob.autoTurnoverFromStock(DateTimeFormatter.ofPattern(CommonConstant.DATE_FORMAT).format(LocalDate.now()), dcBaseStock);
             log.info(String.valueOf((System.currentTimeMillis() - time)));