# 更新

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

@@ -257,6 +257,8 @@ public interface DcBaseStockMapper {
      */
     List<DcBaseStock> selectOcean(@Param("shardingContext") ShardingContext shardingContext, @Param("pageStart") int pageStart, @Param("pageOffset") int pageOffset);
 
+    List<DcBaseStock> selectTest();
+
     /**
      * 需要应用空运头程计算的stock count
      *

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

@@ -1491,6 +1491,15 @@
         limit #{pageStart}, #{pageOffset}
     </select>
 
+    <select id="selectTest" resultType="com.bailuntec.domain.entity.DcBaseStock">
+        select t1.*
+        from dc_base_stock t1
+                 left join dc_base_warehouse t2 on t1.warehouse_code = t2.warehouse_code
+                 left join dc_auto_config_sku_warehouse t3 on t1.bailun_sku = t3.bailun_sku and t1.warehouse_code = t3.warehouse_code
+        where t2.hq_type != '国内仓'
+          and (t3.`status` = 0 or t3.`status` is null)
+    </select>
+
     <select id="countAir" resultType="java.lang.Long">
         select count(t1.id)
         from dc_base_stock t1
@@ -1511,6 +1520,8 @@
           and t1.id % #{shardingContext.shardingTotalCount} = #{shardingContext.shardingItem}
     </select>
 
+
+
     <select id="selectNew" resultType="com.bailuntec.domain.entity.DcBaseStock">
         SELECT t1.*
         from dc_base_stock t1

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/dto/SemiStockLogDTO.java

@@ -32,4 +32,13 @@ public class SemiStockLogDTO {
     private BigDecimal redundancyStock;
     @JSONField(name = "warehouse_type")
     private Integer warehouseType;
+
+    @JSONField(name = "type_id")
+    private Integer typeId;
+    @JSONField(name = "type_name")
+    private String typeName;
+    @JSONField(name = "product_category_id")
+    private Integer productCategoryId;
+    @JSONField(name =  "product_category_id_name")
+    private String productCategoryName;
 }

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/mapper/DcSemiDailyStockMapper.java

@@ -11,8 +11,8 @@ import java.util.Date;
 
 @Repository
 public interface DcSemiDailyStockMapper {
-    @Insert("insert into dc_semi_daily_stock(day,inventory_amount,sku_code,sku_name,stock_quantity,price,warehouse_id,warehouse_name,redundancy_stock) " +
-            "select #{lastDay},l.final_stock * ifnull(ol.price,0),l.sku_code,l.sku_name,l.final_stock,ifnull(ol.price,0),l.warehouse_id,l.warehouse_name," +
+    @Insert("insert into dc_semi_daily_stock(day,inventory_amount,sku_code,sku_name,stock_quantity,price,warehouse_id,warehouse_name,redundancy_stock,type_id,type_name,product_category_id,product_category_name) " +
+            "select #{lastDay},l.final_stock * ifnull(ol.price,0),l.sku_code,l.sku_name,l.final_stock,ifnull(ol.price,0),l.warehouse_id,l.warehouse_name,l.type_id,t.type_name,l.product_category_id,l.product_category_name," +
             "case when l.redundancy_stock is null then 0 when l.redundancy_stock < 0 then 0 else l.redundancy_stock end " +
             "from dc_semi_stock_log l left join dc_semi_supplier_offer_log ol on l.sku_code = ol.sku_code")
     void insertSemiDailyStock(@Param("lastDay") Date lastDay);

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/mapper/DcSemiStockLogMapper.java

@@ -11,14 +11,15 @@ import java.util.List;
 public interface DcSemiStockLogMapper {
     @Insert("<script>" +
             "insert into dc_semi_stock_log(log_id,sku_code,sku_name,log_type_id,log_type,log_quantity,final_stock,warehouse_id,warehouse_name,create_time," +
-            "redundancy_stock,warehouse_type) values" +
+            "redundancy_stock,warehouse_type,type_id,type_name,product_category_id,product_category_name) values" +
             "<foreach collection='list' item='item' index='index' separator=','>" +
             "(#{item.logId},#{item.skuCode},#{item.skuName},#{item.logTypeId},#{item.logType},#{item.logQuantity},#{item.finalStock},#{item.warehouseId},#{item.warehouseName}," +
             "#{item.createTime},#{item.redundancyStock},#{item.warehouseType})" +
             "</foreach>" +
             " on duplicate key update log_id=values(log_id),sku_name=values(sku_name),log_type_id=values(log_type_id),log_type=values(log_type),log_quantity=values(log_quantity)," +
             "final_stock=values(final_stock),warehouse_id=values(warehouse_id),warehouse_name=values(warehouse_name),create_time=values(create_time)," +
-            "redundancy_stock=values(redundancy_stock),warehouse_type=values(warehouse_type)" +
+            "redundancy_stock=values(redundancy_stock),warehouse_type=values(warehouse_type),type_id=#{typeId},type_name=#{typeName}" +
+            ",product_category_id=#{productCategoryId},product_category_name=#{productCategoryName}" +
             "</script>")
     void insertOrUpdateSemiStockLog(List<SemiStockLogDTO> semiStockLogDTOList);
 }

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-turnover81
-#JOB_CRON=0 0 3 * * ?
-JOB_CRON=0 0 11 * * ?
+JOB_NAME=show-auto-turnover84
+JOB_CRON=0 0 3 * * ?
+#JOB_CRON=0 0 11 * * ?
 
 SHARDING_TOTAL_COUNT=8
 JOB_NAME_NE_NORMAL=show-auto-turnover-ne-normal

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

@@ -278,14 +278,14 @@ public class AutoTurnoverTest {
     public void testQueue() {
         DcBaseStockMapper dcBaseStockMapper = SessionUtil.getSession().getMapper(DcBaseStockMapper.class);
         DcBaseQueueMapper dcBaseQueueMapper = SessionUtil.getSession().getMapper(DcBaseQueueMapper.class);
-        DcReportProfitAnalysisMapper dcReportProfitAnalysisMapper = SessionUtil.getSession().getMapper(DcReportProfitAnalysisMapper.class);
-        List<DcReportProfitAnalysis> dcReportProfitAnalysisList = dcReportProfitAnalysisMapper.selectByExample(DcReportProfitAnalysisExample.newAndCreateCriteria().example());
 
-        dcReportProfitAnalysisList.forEach(dcReportProfitAnalysis -> {
+        List<DcBaseStock> dcBaseStockList = dcBaseStockMapper.selectTest();
+
+        dcBaseStockList.forEach(dcBaseStock -> {
             DcBaseQueue dcBaseQueue = new DcBaseQueue();
             QueueConsumerJob.BaseQueueMessage message = new QueueConsumerJob.BaseQueueMessage();
-            message.setBailunSku(dcReportProfitAnalysis.getBailunSku());
-            message.setWarehouseCode(dcReportProfitAnalysis.getWarehouseCode());
+            message.setBailunSku(dcBaseStock.getBailunSku());
+            message.setWarehouseCode(dcBaseStock.getWarehouseCode());
 
             dcBaseQueue.setMessage(JSON.toJSONString(message));
             dcBaseQueue.setType("10");