新增库存入库数查询

AutoTurnOver.DB/daily.cs

@@ -249,6 +249,7 @@ UNION ALL
         public static List<dc_base_stock_dto> RealtimeList(int? monitor_status,int? searchType, string key_words, string warehouse_code,string supplier_name, int offset, int limit, ref int total, string warehousetype, int? warehousearea, bool isSum = false, string order = null, string sort = null,int? has_tort = null, List<bailun_category_new_dto> categoryModels = null,string buyer_name = null,
            DateTime? start_date = null, DateTime? end_date = null, DateTime? f_start_date = null, DateTime? f_end_date = null,int? product_type = null)
         {
+            DynamicParameters parameters = new DynamicParameters();
             var sql = "";
             if (isSum)
             {
@@ -328,7 +329,8 @@ t3.`status` as 'sku_status',
 t3.length as 'pack_length',
 t3.width as 'pack_width',
 t3.height as 'pack_height',
-LEAST(ifnull(t6.quantity_safe_inventory,0),t1.usable_stock) as 'real_quantity_safe_inventory'
+LEAST(ifnull(t6.quantity_safe_inventory,0),t1.usable_stock) as 'real_quantity_safe_inventory',
+t_storage.storage_quantity
 from 
 dc_base_stock as t1
 left join dc_base_sku as t3 on t1.bailun_sku = t3.bailun_sku
@@ -338,9 +340,24 @@ left join dc_base_tort as t5  on t1.bailun_sku = t5.bailun_sku
 left join dc_auto_turnover as t6 on t1.bailun_sku = t6.bailun_sku and t1.warehouse_code = t6.warehouse_code
 left join dc_auto_config_sku_warehouse as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code
 left join dc_auto_sales as t8 on t1.bailun_sku=t8.bailun_sku and t1.warehouse_code = t8.warehouse_code
-where 1=1
+
 ";
+
+                var storage_quantity_sql = @" left join (
+select bailun_sku_warehouse_code,sum(quantity_stock) as 'storage_quantity' from dc_base_stock_record where 1=1 ";
+
+                if(start_date != null && end_date != null)
+                {
+                    storage_quantity_sql += " and stock_time>=@start_date and  stock_time<=@end_date ";
+                }
+
+                storage_quantity_sql += @"  GROUP BY bailun_sku_warehouse_code
+) as t_storage on t1.bailun_sku_warehouse_code = t_storage.bailun_sku_warehouse_code ";
+                sql += storage_quantity_sql;
+                sql += " where 1=1 ";
             }
+            
+
             var countSql = @" 
  select
 count(1)
@@ -364,7 +381,7 @@ left join dc_base_warehouse as dbw on t1.warehouse_code = dbw.warehouse_code
             countSql += "where 1=1 ";
 
 
-            DynamicParameters parameters = new DynamicParameters();
+           
             parameters.Add("time", DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
 
             if (f_start_date != null)

AutoTurnOver.DB/report.cs

@@ -1619,7 +1619,10 @@ truncate table dc_base_full_stock_temp;  ", commandTimeout: 0);
 
                 _connection.Execute(@" -- 刷新 库存表的索引字段
 update dc_base_stock set bailun_sku_warehouse_code=concat(bailun_sku,warehouse_code);
-update dc_base_stock_record set bailun_sku_warehouse_code=concat(bailun_sku,warehouse_code);  ", commandTimeout: 0);
+update dc_base_stock_record set bailun_sku_warehouse_code=concat(bailun_sku,warehouse_code);  
+update dc_base_stock as t1,
(select bailun_sku_warehouse_code,min(stock_time) as 'min_time' from dc_base_stock_record GROUP BY bailun_sku_warehouse_code) as t2
+set t1.first_inbound_date = t2.min_time
+where t1.bailun_sku_warehouse_code = t2.bailun_sku_warehouse_code;", commandTimeout: 0);
             }
             catch (Exception ex)
             {

AutoTurnOver.Models/dc_base_stock.cs

@@ -166,6 +166,10 @@ namespace AutoTurnOver.Models
     public class dc_base_stock_dto : dc_base_stock
     {
         /// <summary>
+        /// 入库数
+        /// </summary>
+        public decimal storage_quantity { get; set; }
+        /// <summary>
         /// 安全库存
         /// </summary>
         public decimal real_quantity_safe_inventory { get; set; }

AutoTurnOver.Services/DailyServices.cs

@@ -161,7 +161,7 @@ namespace AutoTurnOver.Services
                     DataTable table = new DataTable();
                     string[] cols = new string[] { "百伦简易分类","Sku", "采购名称", "中文名","内部编码", "仓库编码", "仓库名称", "货主编码","实时采购在途","实时调拨在途","在途金额"
                 ,"订货数量","运输在途","中转仓库存","冻结库存","供应商库存","预售库存","不良品库存","在途库存","收货待检"
-                 ,"待上架","可配库存","可配库存金额","销售可用库存(聚合)","销售可用库存(私有)","销售可用库存(共享)","在仓库存(共享)","在仓库存(私有)","在仓库存(聚合)","仓库占用(共享)"
+                 ,"待上架","可配库存","入库数量","可配库存金额","销售可用库存(聚合)","销售可用库存(私有)","销售可用库存(共享)","在仓库存(共享)","在仓库存(私有)","在仓库存(聚合)","仓库占用(共享)"
                   ,"仓库占用(私有)","仓库占用(聚合)","活动占用","单占用(私有)","订单占用(共享)","订单占用(聚合)","环球更新时间","供应商","采购员","重量","单价","已发货库存","实时缺货","是否侵权",
                   "过去7日日均销量", "过去14日日均销量", "过去30日日均销量", "过去7日Eaby日均销量", "过去14日Eaby日均销量", "过去30日Eaby日均销量", "过去7日速卖通日均销量", "过去14日速卖通日均销量", "过去30日速卖通日均销量",
                         "监控状态","开发时间","昨日销量","停售状态","amazon最近7天日均销量","amazon最近14天日均销量","amazon最近30天日均销量","moq","品牌","标签","类型","产品尺寸","包装尺寸","安全库存"
@@ -176,6 +176,7 @@ namespace AutoTurnOver.Services
                         DataRow row = table.NewRow();
                         row["百伦简易分类"] = itemData.category_simple_name;
                         row["Sku"] = itemData.bailun_sku;
+                        row["入库数量"] = itemData.storage_quantity;
                         row["采购名称"] = itemData.buyer_name;
                         row["中文名"] = itemData.base_sku_name;
                         //row["英文名称"] = itemData.sku_title_en;