fba库存新增1 2月的数据字段

AutoTurnOver.DB/daily.cs

@@ -1275,6 +1275,11 @@ where bailun_sku in @skus", new { skus = skus.Split(',').ToList() });
             var etime7 = date.AddDays(-1).ToDayEnd();
             var btime30 = date.AddDays(-31).ToDayHome();
             var etime30 = date.AddDays(-1).ToDayEnd();
+
+            var btime_month_1 = (DateTime.Parse(date.ToString("yyyy-MM-01 00:00:00"))).ToDayHome();
+            var etime_month_1 = btime_month_1.LastDayOfMonth().ToDayEnd();
+            var btime_month_2 = (DateTime.Parse(date.ToString("yyyy-MM-02 00:00:00"))).ToDayHome();
+            var etime_month_2 = btime_month_2.LastDayOfMonth().ToDayEnd();
             int page = 0;
             int rows = 1000;
 
@@ -1327,6 +1332,40 @@ where id=@id
                         bailun_sku_quantity_ordered_30 = tempData.bailun_sku_quantity_ordered_30,
                         id = item.id
                     });
+
+                    var tempMonthData = _connection.QueryFirstOrDefault<dc_config_fba_extend_temp_dto>($@"
+select t1.bailun_sku,t1.warehouse_code,
+sum(case when t1.create_time>=@btime_month_1 and t1.create_time<=@etime_month_1 then t1.amount_sales * t1.order_to_usd_exchange_rate * t1.bailun_sku_quantity_ordered else 0 end) as 'amount_sales_usd_month_1',
+sum(case when t1.create_time>=@btime_month_1 and t1.create_time<=@etime_month_1 then t1.bailun_sku_quantity_ordered else 0  end) as 'bailun_sku_quantity_ordered_month_1',
+sum(case when t1.create_time>=@btime_month_2 and t1.create_time<=@etime_month_2 then t1.amount_sales * t1.order_to_usd_exchange_rate * t1.bailun_sku_quantity_ordered else 0 end) as 'amount_sales_usd_month_2',
+sum(case when t1.create_time>=@btime_month_2 and t1.create_time<=@etime_month_2 then t1.bailun_sku_quantity_ordered else 0  end) as 'bailun_sku_quantity_ordered_month_2'
+from dc_base_oms_sku as t1 where t1.create_time>=@btime_month_1 and t1.create_time<=@etime_month_2
+and t1.bailun_sku=@bailun_sku and t1.warehouse_code=@warehouse_code
+  and has_fba_s = 0
+    and has_delete = 0
+   and has_scalp = 0
+  and has_buyer_remark = 0
+ and has_platsku_remark = 0
+  and has_innersale = 0
+and bailun_order_status !='Canceled'
+ and platform_order_type != '手工单'
+", new { btime_month_1, etime_month_1, btime_month_2, etime_month_2,  item.bailun_sku, item.warehouse_code }) ?? new dc_config_fba_extend_temp_dto();
+                    _connection.Execute($@" update dc_config_fba_extend set 
+amount_sales_usd_month_1=@amount_sales_usd_month_1,
+bailun_sku_quantity_ordered_month_1=@bailun_sku_quantity_ordered_month_1,
+amount_sales_usd_month_2=@amount_sales_usd_month_2,
+bailun_sku_quantity_ordered_month_2=@bailun_sku_quantity_ordered_month_2,
+sales_reset_date = now()
+where id=@id
+", new
+                    {
+                        amount_sales_usd_month_1 = tempData.amount_sales_usd_month_1,
+                        bailun_sku_quantity_ordered_month_1 = tempData.bailun_sku_quantity_ordered_month_1,
+                        amount_sales_usd_month_2 = tempData.amount_sales_usd_month_2,
+                        bailun_sku_quantity_ordered_month_2 = tempData.bailun_sku_quantity_ordered_month_2,
+                        amount_sales_usd_30 = tempData.amount_sales_usd_30,
+                        id = item.id
+                    });
                 }
             }
 

AutoTurnOver.DB/db_config.cs

@@ -629,7 +629,7 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
                 }
                 else
                 {
-                    conn.Execute(" update  dc_auto_config_sku_warehouse set status=@monitor_status,time_type=@time_type,bl_operator=@bl_operator where id=@id", new { monitor_status, id = oldData.id, bl_operator = user.UserName, time_type= time_type });
+                    conn.Execute(" update  dc_auto_config_sku_warehouse set status=@monitor_status,time_type=@time_type,bl_operator=@bl_operator where id=@id", new { monitor_status, id = oldData.id, bl_operator = user.UserName, time_type = time_type });
                 }
 
                 conn.Insert(new dc_base_monitor_status_log
@@ -668,7 +668,8 @@ GROUP BY t1.bailun_sku,t3.hq_type
             // 如果是永久停止，则清理历史采购建议
             if (time_type == 2)
             {
-                _connection.Execute(" update dc_auto_purchase_advise_detailed set `status`=-1 where bailun_sku_warehouse_codes in @bailun_sku_warehouse_codes ",new { 
+                _connection.Execute(" update dc_auto_purchase_advise_detailed set `status`=-1 where bailun_sku_warehouse_codes in @bailun_sku_warehouse_codes ", new
+                {
                     bailun_sku_warehouse_codes = datas.Select(s => $"{s.bailun_sku}{s.warehouse_code}").ToList()
                 });
             }
@@ -845,6 +846,82 @@ GROUP BY t1.bailun_sku,t3.hq_type
 
 
         }
+
+
+        public static string UpdateStorageCapacity(string ids, int status, UserData user)
+        {
+            var conn = MyMySqlConnection._connection;
+            conn.Open();
+            if (status != 1 && status != 0)
+            {
+                throw new Exception("状态异常");
+            }
+            var datas = conn.Query<AutoTurnOver.Models.dc_auto_turnover>(" select * from dc_auto_turnover where id in @ids ", new { ids = ids.Split(',') }).AsList();
+            foreach (AutoTurnOver.Models.dc_auto_turnover turnover_item in datas)
+            {
+                conn.Insert(new dc_base_storage_capacity_config_log
+                {
+                    bailun_sku = turnover_item.bailun_sku,
+                    create_user = user.UserAccount,
+                    create_date = DateTime.Now,
+                    status = status,
+                    warehouse_code = turnover_item.warehouse_code
+                });
+
+                // 先检查当前状态
+                var oldData = conn.QueryFirstOrDefault<dc_base_storage_capacity_config>($" select * from dc_base_storage_capacity_config where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code ", new { bailun_sku = turnover_item.bailun_sku, warehouse_code = turnover_item.warehouse_code });
+                if (oldData == null)
+                {
+                    if (status == 0)
+                    {
+                        continue;
+                    }
+
+                }
+
+                if (oldData != null)
+                {
+                    if (status == 1)
+                    {
+                        continue;
+                    }
+
+                }
+
+                DateTime now = DateTime.Now;
+
+                if (oldData == null)
+                {
+                    var newData = new dc_base_storage_capacity_config
+                    {
+                        bailun_sku = turnover_item.bailun_sku,
+                        warehouse_code  = turnover_item.warehouse_code,
+                        status = status,
+                        bailun_sku_warehouse_code = $"{turnover_item.bailun_sku}{turnover_item.warehouse_code}"
+                    };
+                    conn.Insert<dc_base_storage_capacity_config>(newData);
+                }
+                else
+                {
+                    if (status == 0)
+                    {
+                        conn.Execute(" delete from  dc_base_storage_capacity_config  where id=@id", new { id = oldData.id });
+                    }
+                    else
+                    {
+
+                    }
+
+                }
+
+            }
+
+            return "";
+
+
+        }
+
+
         #region 备货天数设置
 
         /// <summary>

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -105,7 +105,8 @@ left join dc_return_goods_not_push as t12 on dat.bailun_sku = t12.bailun_sku and
 left join dc_mid_transit as t13 on dat.bailun_sku = t13.bailun_sku and dat.warehouse_code = t13.warehouse_code
 -- left join dc_auto_sales_forecast_config as t14 on dat.dc_auto_sales_forecast_config_id = t14.id 
 -- left join not_trans_view as t15 on dat.bailun_sku = t15.bailun_sku and dat.warehouse_code = t15.warehouse_code
-where 1=1 ";
+
+ ";
                 }
 
                 string sqlCount = @"select count(1)
@@ -131,6 +132,11 @@ from dc_auto_turnover as dat
                 if (m.monitor_status != null)
                 {
                     sqlCount += " left join dc_auto_config_sku_warehouse as t5 on dat.bailun_sku = t5.bailun_sku and dat.warehouse_code = t5.warehouse_code ";
+                }   
+                if (m.storage_capacity_status != null)
+                {
+                    sqlCount += " left join dc_base_storage_capacity_config as t16 on dat.bailun_sku = t16.bailun_sku and dat.warehouse_code = t16.warehouse_code ";
+                    sql += " left join dc_base_storage_capacity_config as t16 on dat.bailun_sku = t16.bailun_sku and dat.warehouse_code = t16.warehouse_code ";
                 }
                 if (m.returngoodspush_state != null)
                 {
@@ -149,6 +155,7 @@ from dc_auto_turnover as dat
                     sqlCount += " left join not_trans_view as t15 on dat.bailun_sku = t15.bailun_sku and dat.warehouse_code = t15.warehouse_code ";
                 }
                 sqlCount += " where 1=1 ";
+                sql += " where 1=1 ";
 
                 if (m.has_tort != null)
                 {
@@ -194,6 +201,16 @@ from dc_auto_turnover as dat
                     sql += " and ( t5.`status`=0 or t5.`status` is null ) ";
                     sqlCount += " and ( t5.`status`=0 or t5.`status` is null ) ";
                 }
+                if (m.storage_capacity_status == 1)
+                {
+                    sql += " and  t16.`status`=1   ";
+                    sqlCount += " and  t16.`status`=1  ";
+                }
+                if (m.storage_capacity_status == 0)
+                {
+                    sql += " and   t16.`status` is null  ";
+                    sqlCount += " and  t16.`status` is null  ";
+                }
 
                 if (m.returngoodspush_state == 1)
                 {
@@ -404,21 +421,32 @@ from dc_auto_turnover as dat
 
                 var obj = _connection.Query<Models.dc_auto_turnover_list_dto>(sql, parameters, commandTimeout: 0).AsList();
                 //Console.WriteLine(sql);
-                foreach (var item in obj)
-                {
-                    item.history_sevenday_sales = item.history_sevenday_sales.Round1();
-                    item.history_fourteenday_sales = item.history_fourteenday_sales.Round1();
-                    item.history_thirtyday_sales = item.history_thirtyday_sales.Round1();
-                    item.history_sevenday_sales_ebay = item.history_sevenday_sales_ebay.Round1();
-                    item.history_fourteenday_sales_ebay = item.history_fourteenday_sales_ebay.Round1();
-                    item.history_thirtyday_sales_ebay = item.history_thirtyday_sales_ebay.Round1();
-                    item.history_sevenday_sales_aliexpress = item.history_sevenday_sales_aliexpress.Round1();
-                    item.history_fourteenday_sales_aliexpress = item.history_fourteenday_sales_aliexpress.Round1();
-                    item.history_thirtyday_sales_aliexpress = item.history_thirtyday_sales_aliexpress.Round1();
-                    item.history_sevenday_sales_amazon = item.history_sevenday_sales_amazon.Round1();
-                    item.history_fourteenday_sales_amazon = item.history_fourteenday_sales_amazon.Round1();
-                    item.history_thirtyday_sales_amazon = item.history_thirtyday_sales_amazon.Round1();
+                if(obj!=null && obj.Count >= 1)
+                {
+                    var storage_capacity_configs = _connection.Query<dc_base_storage_capacity_config>(" select * from dc_base_storage_capacity_config where bailun_sku_warehouse_code in @bailun_sku_warehouse_codes ",new {
+                        bailun_sku_warehouse_codes = obj.Select(s=>$"{s.bailun_sku}{s.warehouse_code}").ToList()
+                    }).ToList();
+
+                    foreach (var item in obj)
+                    {
+                        item.history_sevenday_sales = item.history_sevenday_sales.Round1();
+                        item.history_fourteenday_sales = item.history_fourteenday_sales.Round1();
+                        item.history_thirtyday_sales = item.history_thirtyday_sales.Round1();
+                        item.history_sevenday_sales_ebay = item.history_sevenday_sales_ebay.Round1();
+                        item.history_fourteenday_sales_ebay = item.history_fourteenday_sales_ebay.Round1();
+                        item.history_thirtyday_sales_ebay = item.history_thirtyday_sales_ebay.Round1();
+                        item.history_sevenday_sales_aliexpress = item.history_sevenday_sales_aliexpress.Round1();
+                        item.history_fourteenday_sales_aliexpress = item.history_fourteenday_sales_aliexpress.Round1();
+                        item.history_thirtyday_sales_aliexpress = item.history_thirtyday_sales_aliexpress.Round1();
+                        item.history_sevenday_sales_amazon = item.history_sevenday_sales_amazon.Round1();
+                        item.history_fourteenday_sales_amazon = item.history_fourteenday_sales_amazon.Round1();
+                        item.history_thirtyday_sales_amazon = item.history_thirtyday_sales_amazon.Round1();
+
+                        var storage_capacity_config = storage_capacity_configs.FirstOrDefault(s=>s.bailun_sku_warehouse_code== $"{item.bailun_sku}{item.warehouse_code}")??new dc_base_storage_capacity_config { };
+                        item.storage_capacity_status = storage_capacity_config.status;
+                    }
                 }
+              
                 return obj;
             }
             catch (Exception ex)

AutoTurnOver.DB/dc_base_mother_sku_dao.cs

+using AutoTurnOver.Models;
+using Dapper;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace AutoTurnOver.DB
+{
+    /// <summary>
+    /// 子母sku配置
+    /// </summary>
+    public class dc_base_mother_sku_dao : connectionHelper
+    {
+        /// <summary>
+        /// 分页查询母sku
+        /// </summary>
+        /// <param name="search"></param>
+        /// <param name="total"></param>
+        /// <returns></returns>
+        public static List<dc_base_mother_sku_dto> Page(dc_base_mother_sku_search_dto search, int offset, int limit, ref int total)
+        {
+            var sql = " select t1.*,t2.warehouse_name from dc_base_mother_sku as t1 left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where 1=1 ";
+            var sqlCount = " select count(1) from dc_base_mother_sku as t1 left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where 1=1  ";
+            DynamicParameters parameters = new DynamicParameters();
+            if (search != null)
+            {
+                if (!string.IsNullOrWhiteSpace(search.sku))
+                {
+                    sql += " and t1.sku =@sku ";
+                    sqlCount += " and t1.sku =@sku ";
+                    parameters.Add("sku", search.sku);
+                }
+
+                if (!string.IsNullOrWhiteSpace(search.warehousecode))
+                {
+                    sql += " and t1.warehouse_code =@warehousecode ";
+                    sqlCount += " and t1.warehouse_code =@warehousecode ";
+                    parameters.Add("warehousecode", search.warehousecode);
+                }
+
+                if (!string.IsNullOrWhiteSpace(search.warehousetype))
+                {
+                    sql += " and t2.hq_type = @hq_type ";
+                    sqlCount += " and t2.hq_type = @hq_type ";
+                    parameters.Add("hq_type", search.warehousetype);
+                }
+                if (search.warehousearea > 0)
+                {
+                    sql += " and t2.area_id = @area_id ";
+                    sqlCount += " and t2.area_id = @area_id ";
+                    parameters.Add("area_id", search.warehousearea);
+                }
+
+                if (!string.IsNullOrWhiteSpace(search.bailun_sku))
+                {
+                    sql += " and EXISTS ( select * from dc_base_mother_sku_map as t_map where t1.sku_warehouse_code = t_map.mother_sku_warehouse_code and t_map.bailun_sku=@bailun_sku ) ";
+                    sqlCount += " and EXISTS ( select * from dc_base_mother_sku_map as t_map where t1.sku_warehouse_code = t_map.mother_sku_warehouse_code and t_map.bailun_sku=@bailun_sku ) ";
+                    parameters.Add("bailun_sku", search.bailun_sku);
+                }
+            }
+
+            total = _connection.QueryFirstOrDefault<int>(sqlCount, parameters);
+
+            sql += $" limit {offset},{limit} ";
+            var datas = _connection.Query<dc_base_mother_sku_dto>(sql, parameters).AsList();
+            if (datas != null && datas.Count >= 1)
+            {
+                var map_datas = _connection.Query<dc_base_mother_sku_map_dto>(" select t1.*,t2.warehouse_name from dc_base_mother_sku_map as t1 left join dc_base_warehouse as t2 on t1.warehouse_code  = t2.warehouse_code where t1.mother_sku_warehouse_code in @mother_sku_warehouse_codes ", new
+                {
+                    mother_sku_warehouse_codes = datas.Select(s => s.sku_warehouse_code).ToList()
+                }).ToList();
+                foreach (var item in datas)
+                {
+                    item.maps = map_datas.Where(s => s.mother_sku_warehouse_code == item.sku_warehouse_code).ToList();
+                }
+            }
+            return datas;
+        }
+
+        /// <summary>
+        /// 分页查询母sku
+        /// </summary>
+        /// <param name="search"></param>
+        /// <param name="total"></param>
+        /// <returns></returns>
+        public static List<dc_base_mother_sku_log_dto> LogPage(dc_base_mother_sku_log_search_dto search, int offset, int limit, ref int total)
+        {
+            var sql = " select t1.*,t2.warehouse_name from dc_base_mother_sku_log as t1 left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where 1=1 ";
+            var sqlCount = " select count(1) from dc_base_mother_sku_log as t1 left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where 1=1  ";
+            DynamicParameters parameters = new DynamicParameters();
+            if (search != null)
+            {
+                if (!string.IsNullOrWhiteSpace(search.sku))
+                {
+                    sql += " and t1.sku =@sku ";
+                    sqlCount += " and t1.sku =@sku ";
+                    parameters.Add("sku", search.sku);
+                }
+
+                if (!string.IsNullOrWhiteSpace(search.warehousecode))
+                {
+                    sql += " and t1.warehouse_code =@warehousecode ";
+                    sqlCount += " and t1.warehouse_code =@warehousecode ";
+                    parameters.Add("warehousecode", search.warehousecode);
+                }
+            }
+
+            total = _connection.QueryFirstOrDefault<int>(sqlCount, parameters);
+
+            sql += $" limit {offset},{limit} ";
+            var datas = _connection.Query<dc_base_mother_sku_log_dto>(sql, parameters).AsList();
+            return datas;
+        }
+
+
+        /// <summary>
+        /// 保存数据
+        /// </summary>
+        public static void Save(dc_base_mother_sku data, UserData user)
+        {
+            data.sku = ("M-" + data.sku);
+            data.sku_warehouse_code = $"{data.sku}{data.warehouse_code}";
+            if (data.id <= 0)
+            {
+                // 查询是否存在
+                var oldData = _connection.QueryFirstOrDefault(" select * from dc_base_mother_sku where sku=@sku ", new { sku = data.sku });
+                if (oldData != null)
+                {
+                    throw new Exception("该sku已存在，请勿重复添加");
+                }
+                _connection.Insert(data);
+
+                _connection.Insert(new dc_base_mother_sku_log
+                {
+                    action = "新增母sku资料",
+                    create_user = user.UserName,
+                    create_date = DateTime.Now,
+                    sku_warehouse_code = data.sku_warehouse_code,
+                    warehouse_code = data.warehouse_code,
+                    sku = data.sku
+                });
+            }
+            else
+            {
+                throw new Exception("不支持修改");
+                //_connection.Update(data);
+            }
+
+
+        }
+
+
+        /// <summary>
+        /// 修改状态
+        /// </summary>
+        /// <param name="data"></param>
+        /// <param name="user"></param>
+        public static void UpdateStatus(update_status_input_dto data, UserData user)
+        {
+            var oldData = _connection.QueryFirstOrDefault<dc_base_mother_sku>(" select * from dc_base_mother_sku where id=@id ", new { id = data.id });
+            if (oldData == null)
+            {
+                throw new Exception("数据不存在");
+            }
+            if (oldData.status == data.status)
+            {
+                throw new Exception("状态未发送变化，无需修改");
+            }
+            oldData.status = data.status;
+
+            _connection.Update(oldData);
+
+            _connection.Insert(new dc_base_mother_sku_log
+            {
+                action = (oldData.status == -1 ? "停用" : "启用"),
+                create_date = DateTime.Now,
+                create_user = user.UserName,
+                sku = oldData.sku,
+                sku_warehouse_code = oldData.sku_warehouse_code,
+                warehouse_code = oldData.warehouse_code
+            });
+
+        }
+
+
+        /// <summary>
+        /// 移除子sku
+        /// </summary>
+        /// <param name="input_data"></param>
+        public static void RemoveMap(remove_map_input_dto input_data, UserData user)
+        {
+            var conn = MyMySqlConnection._connection;
+            conn.Open();
+            using (var t = conn.BeginTransaction())
+            {
+                try
+                {
+
+                    foreach (var item in input_data.map_ids)
+                    {
+                        var map_data = conn.QueryFirstOrDefault<dc_base_mother_sku_map_dto>(" select t1.*,t2.warehouse_name from dc_base_mother_sku_map as t1 left join dc_base_warehouse as t2 on t1.warehouse_code  = t2.warehouse_code where t1.id=@id ", new { id = item });
+                        conn.Insert(new dc_base_mother_sku_log
+                        {
+                            action = $"移除子sku 【{map_data.bailun_sku}】  【{map_data.warehouse_code}】 【{map_data.warehouse_name}】 ",
+                            warehouse_code = map_data.mother_sku_warehouse_code,
+                            create_date = DateTime.Now,
+                            create_user = user.UserName,
+                            sku = map_data.mother_sku,
+                            sku_warehouse_code = map_data.mother_sku_warehouse_code
+                        });
+
+                        conn.Execute(" delete from dc_base_mother_sku_map where id=@id ", new { id = item });
+                    }
+
+                    t.Commit();
+                }
+                catch (Exception ex)
+                {
+                    t.Rollback();
+                }
+
+            }
+
+        }
+
+        /// <summary>
+        /// 批量设置母sku
+        /// </summary>
+        /// <param name="input_data"></param>
+        public static void BatchSet(batch_set_input_dto input_data, UserData user)
+        {
+            var conn = MyMySqlConnection._connection;
+            conn.Open();
+            using (var t = conn.BeginTransaction())
+            {
+                try
+                {
+                    var mother_data = conn.QueryFirstOrDefault<dc_base_mother_sku>(" select * from dc_base_mother_sku where id=@id ", new { id = input_data.mother_id });
+                    foreach (var item in input_data.ids)
+                    {
+                        var trunData = conn.QueryFirstOrDefault<AutoTurnOver.Models.dc_auto_turnover>(" select * from dc_auto_turnover where id=@id ",new { id=item});
+                        // 查询是否有旧记录
+                        var oldLog = conn.QueryFirstOrDefault<dc_base_mother_sku_map>(" select * from dc_base_mother_sku_map where bailun_sku_warehouse_code=@bailun_sku_warehouse_code ", new
+                        {
+                            bailun_sku_warehouse_code = $"{trunData.bailun_sku}{trunData.warehouse_code}"
+                        });
+                        if (oldLog != null)
+                        {
+
+                            // 先移除
+                            conn.Insert(new dc_base_mother_sku_log
+                            {
+                                action = $"移除子sku 【{oldLog.bailun_sku}】【{oldLog.warehouse_code}】，设置到新的sku 【{mother_data.sku}】",
+                                sku_warehouse_code = oldLog.mother_sku_warehouse_code,
+                                create_date = DateTime.Now,
+                                create_user = user.UserName,
+                                sku = oldLog.mother_sku,
+                                warehouse_code = oldLog.mother_warehouse_code
+                            });
+
+                            conn.Execute(" delete from dc_base_mother_sku_map where id=@id ", new { id = oldLog.id });
+                        }
+
+                        // 添加日志
+                        conn.Insert(new dc_base_mother_sku_log
+                        {
+                            action = $"新增子sku  【{trunData.bailun_sku}】【{trunData.warehouse_code}】",
+                            sku_warehouse_code = mother_data.sku_warehouse_code,
+                            create_date = DateTime.Now,
+                            create_user = user.UserName,
+                            sku = mother_data.sku,
+                            warehouse_code = mother_data.warehouse_code
+                        });
+                        conn.Insert(new dc_base_mother_sku_map
+                        {
+                            bailun_sku = trunData.bailun_sku,
+                            warehouse_code = trunData.warehouse_code,
+                            mother_sku = mother_data.sku,
+                            mother_sku_warehouse_code = mother_data.sku_warehouse_code,
+                            mother_warehouse_code = mother_data.warehouse_code,
+                            bailun_sku_warehouse_code = $"{trunData.bailun_sku}{trunData.warehouse_code}"
+                        });
+                    }
+
+                    t.Commit();
+                }
+                catch (Exception ex)
+                {
+                    t.Rollback();
+                    throw;
+                }
+
+            }
+        }
+
+        /// <summary>
+        /// 搜索母sku
+        /// </summary>
+        /// <returns></returns>
+        public  static List<dc_base_mother_sku_dto> SearchSku(string name)
+        {
+            return _connection.Query<dc_base_mother_sku_dto>(" select  t1.*,t2.warehouse_name from dc_base_mother_sku as t1 left join dc_base_warehouse as t2 on t1.warehouse_code=t2.warehouse_code where t1.sku like @name ", new { name= $"%{name}%"} ).ToList();
+        }
+
+    }
+}

AutoTurnOver.DB/dc_config_fba_extend.cs

@@ -42,5 +42,9 @@ namespace AutoTurnOver.DB
         public decimal bailun_sku_quantity_ordered_7 { get; set; }
         public decimal amount_sales_usd_30 { get; set; }
         public decimal bailun_sku_quantity_ordered_30 { get; set; }
+        public decimal amount_sales_usd_month_1 { get; set; }
+        public decimal bailun_sku_quantity_ordered_month_1 { get; set; }
+        public decimal amount_sales_usd_month_2 { get; set; }
+        public decimal bailun_sku_quantity_ordered_month_2 { get; set; }
     }
 }

AutoTurnOver.Models/dc_auto_turnover.cs

@@ -331,6 +331,9 @@ namespace AutoTurnOver.Models
         [Description("是否侵权")]
         public int? has_tort { get; set; }
 
+        [Description("是否监控库容")]
+        public int? storage_capacity_status { get; set; }
+
         /// <summary>
         /// 仓库编码
         /// </summary>
@@ -509,6 +512,11 @@ namespace AutoTurnOver.Models
         /// 备货数量
         /// </summary>
         public decimal? stock_up_sales { get; set; }
+
+        /// <summary>
+        /// 是否监控库容
+        /// </summary>
+        public int storage_capacity_status { get; set; }
         /// <summary>
         /// 首次出单时间
         /// </summary>

AutoTurnOver.Models/dc_base_mother_sku.cs

+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace AutoTurnOver.Models
+{
+    /// <summary>
+    /// 子母sku
+    /// </summary>
+    public class dc_base_mother_sku
+    {
+        public int id { get; set; }
+        public string sku { get; set; }
+        public string warehouse_code { get; set; }
+        public string sku_warehouse_code { get; set; }
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public int status { get; set; }
+    }
+    public class dc_base_mother_sku_map
+    {
+        public int id { get; set; }
+        public string mother_sku { get; set; }
+        public string mother_warehouse_code { get; set; }
+        public string mother_sku_warehouse_code { get; set; }
+        public string bailun_sku { get; set; }
+        public string warehouse_code { get; set; }
+        public string bailun_sku_warehouse_code { get; set; }
+    }
+    public class dc_base_mother_sku_log
+    {
+        public int id { get; set; }
+        public string sku { get; set; }
+        public string warehouse_code { get; set; }
+        public string sku_warehouse_code { get; set; }
+        public string action { get; set; }
+        public DateTime create_date { get; set; }
+        public string create_user { get; set; }
+    }
+
+    public class dc_base_mother_sku_dto: dc_base_mother_sku
+    {
+        public string warehouse_name { get; set; }
+        public List<dc_base_mother_sku_map_dto> maps { get; set; }
+    }  public class dc_base_mother_sku_map_dto : dc_base_mother_sku_map
+    {
+        public string warehouse_name { get; set; }
+    }
+    public class dc_base_mother_sku_log_dto : dc_base_mother_sku_log
+    {
+        public string warehouse_name { get; set; }
+    }
+    public class dc_base_mother_sku_search_dto
+    {
+        public string sku { get; set; }
+        public string bailun_sku { get; set; }
+        [Description("仓库类型")]
+        public string warehousetype { get; set; }
+
+        [Description("仓库国家")]
+        public int? warehousearea { get; set; }
+
+        [Description("仓库编码")]
+        public string warehousecode { get; set; }
+    }
+
+    public class dc_base_mother_sku_log_search_dto
+    {
+        public string sku { get; set; }
+      
+
+        [Description("仓库编码")]
+        public string warehousecode { get; set; }
+    }
+
+    public class update_status_input_dto
+    {
+        public int id { get; set; }
+        public int status { get; set; }
+    }
+
+    /// <summary>
+    /// 移除子sku
+    /// </summary>
+    public class remove_map_input_dto
+    {
+        public List<int> map_ids { get; set; }
+    }
+
+    public class batch_set_input_dto
+    {
+        public List<int> ids { get; set; }
+        public int mother_id { get; set; }
+    }
+}

AutoTurnOver.Models/dc_base_storage_capacity_config.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace AutoTurnOver.Models
+{
+
+    /// <summary>
+    /// 库容配置
+    /// </summary>
+   public class dc_base_storage_capacity_config
+    {
+        public int id { get; set; }
+        public string bailun_sku { get; set; }
+        public string warehouse_code { get; set; }
+        public string bailun_sku_warehouse_code { get; set; }
+
+        /// <summary>
+        /// 1 =要看库容
+        /// </summary>
+        public int status { get; set; }
+    }
+    public class dc_base_storage_capacity_config_log
+    {
+        public int id { get; set; }
+        public string bailun_sku { get; set; }
+        public string warehouse_code { get; set; }
+
+        /// <summary>
+        /// 1 =要看库容
+        /// </summary>
+        public int status { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string create_user { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime create_date { get; set; }
+    }
+}

AutoTurnOver.Services/ConfigServices.cs

@@ -430,6 +430,12 @@ namespace AutoTurnOver.Services
             return DB.db_config.BatchTortStatus(ids, monitor_status, user);
         }
         
+        
+        public string UpdateStorageCapacity(string ids, int status, UserData user)
+        {
+            return DB.db_config.UpdateStorageCapacity(ids, status, user);
+        }
+        
 
 
         #region fba共享仓发货仓配置

AutoTurnOver.Services/MotherSkuServices.cs

+using AutoTurnOver.Models;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using AutoTurnOver.DB;
+using System.Data;
+using System.IO;
+using AutoTurnOver.Utility;
+using System.Linq;
+using Dapper;
+
+namespace AutoTurnOver.Services
+{
+    /// <summary>
+    /// 子母sku
+    /// </summary>
+    public class MotherSkuServices
+    {
+        public List<dc_base_mother_sku_dto> Page(dc_base_mother_sku_search_dto search, int offset, int limit, ref int total)
+        {
+            return dc_base_mother_sku_dao.Page(search, offset, limit, ref total);
+        }
+        public List<dc_base_mother_sku_log_dto> LogPage(dc_base_mother_sku_log_search_dto search, int offset, int limit, ref int total)
+        {
+            return dc_base_mother_sku_dao.LogPage(search, offset, limit, ref total);
+        }
+        public void Save(dc_base_mother_sku data, UserData user)
+        {
+            dc_base_mother_sku_dao.Save(data, user);
+        }
+        public void UpdateStatus(update_status_input_dto data, UserData user)
+        {
+            dc_base_mother_sku_dao.UpdateStatus(data, user);
+        }
+        public void RemoveMap(remove_map_input_dto data, UserData user)
+        {
+            dc_base_mother_sku_dao.RemoveMap(data, user);
+        }
+
+        public void BatchSet(batch_set_input_dto input_data, UserData user)
+        {
+            dc_base_mother_sku_dao.BatchSet(input_data, user);
+        }
+
+        public List<dc_base_mother_sku_dto> SearchSku(string name)
+        {
+            return dc_base_mother_sku_dao.SearchSku(name);
+        }
+
+        public DataTable Import(Stream fileInfo, UserData user)
+        {
+            var conn = MyMySqlConnection._connection;
+            var data_set = EPPlusHelper.ReadExcel(fileInfo);
+            var table = data_set.Tables[0];
+            if (!table.Columns.Contains("导入结果")) table.Columns.Add("导入结果");
+            if (!table.Columns.Contains("导入异常")) table.Columns.Add("导入异常");
+
+            var warehouse_list = DB.common.ListWareHouse(null, null);
+
+            DateTime now = DateTime.Now;
+
+            int index = 1;
+            foreach (DataRow row in table.Rows)
+            {
+                index++;
+                try
+                {
+                    var mother_bailun_sku = row["母SKU"].ToString();
+                    var month_warehouse_code = row["母仓库编码"].ToString();
+                    var bailun_sku = row["子SKU"].ToString();
+                    var warehouse_code = row["子仓库编码"].ToString();
+
+                    if (string.IsNullOrWhiteSpace(mother_bailun_sku)) throw new Exception("母SKU必填");
+                    if (string.IsNullOrWhiteSpace(month_warehouse_code)) throw new Exception("母warehouse_code必填");
+                    if (string.IsNullOrWhiteSpace(bailun_sku)) throw new Exception("SKU必填");
+                    if (string.IsNullOrWhiteSpace(warehouse_code)) throw new Exception("warehouse_code必填");
+                    var m_warehouse_data = warehouse_list.SingleOrDefault(s => s.warehouse_code.Equals(month_warehouse_code, StringComparison.OrdinalIgnoreCase));
+                    if (m_warehouse_data == null) { throw new Exception("母仓库在系统中找不到"); }
+
+                    var warehouse_data = warehouse_list.SingleOrDefault(s => s.warehouse_code.Equals(warehouse_code, StringComparison.OrdinalIgnoreCase));
+                    if (warehouse_data == null) { throw new Exception("仓库在系统中找不到"); }
+                    var warehouse_name = warehouse_data.warehouse_name;
+
+                    var trun_data_id = (conn.QueryFirstOrDefault<int?>("select id from dc_auto_turnover where bailun_sku=@bailun_sku and warehouse_code=@warehouse_code", new
+                    {
+                        bailun_sku = bailun_sku,
+                        warehouse_code = warehouse_code
+                    }) ?? 0);
+                    if (trun_data_id <= 0)
+                    {
+                        throw new Exception("子sku不存在");
+                    }
+
+                    try
+                    {
+                        dc_base_mother_sku_dao.Save(new dc_base_mother_sku()
+                        {
+                            warehouse_code = month_warehouse_code,
+                            sku = mother_bailun_sku
+                        }, user);
+
+
+                    }
+                    catch (Exception)
+                    {
+
+                    }
+
+                    dc_base_mother_sku_dao.BatchSet(new batch_set_input_dto
+                    {
+                        mother_id = conn.QueryFirstOrDefault<int?>("select id from dc_base_mother_sku where sku_warehouse_code=@sku_warehouse_code", new
+                        {
+                            sku_warehouse_code = $"M-{mother_bailun_sku}{month_warehouse_code}"
+                        }) ?? 0,
+                        ids = new List<int> {
+                       trun_data_id
+                        }
+                    }, user);
+
+
+                    row["导入结果"] = "成功";
+                    row["导入异常"] = "";
+                }
+                catch (Exception ex)
+                {
+                    row["导入结果"] = "失败";
+                    row["导入异常"] = ex.Message;
+                }
+            }
+            return table;
+        }
+    }
+}

AutoTurnOver/Controllers/ConfigController.cs

@@ -1144,5 +1144,18 @@ namespace AutoTurnOver.Controllers
             }
 
         }
+
+
+
+        [HttpGet]
+        [BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【自动下单管理】->【自动周转列表】->【开启/停止库容配置】操作", 3)]
+        public JsonResult UpdateStorageCapacity(string ids, int status)
+        {
+            var user = AutoUtility.GetUser();
+            if (user == null) return null;
+            var result = new Services.ConfigServices().UpdateStorageCapacity(ids, status, user);
+            return new JsonResult(result);
+        }
+
     }
 }
\ No newline at end of file

AutoTurnOver/Controllers/MotherSkuController.cs

+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using AutoTurnOver.Common;
+using AutoTurnOver.Models;
+using AutoTurnOver.Utility;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace AutoTurnOver.Controllers
+{
+    /// <summary>
+    /// 子母sku
+    /// </summary>
+    [Route("api/[controller]/[action]")]
+    [ApiController]
+    public class MotherSkuController : Controller
+    {
+
+        [HttpGet]
+        [BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【配置】->【子母sku】->【搜索】页面", 0)]
+        public JsonResult Page([FromQuery]dc_base_mother_sku_search_dto search, [FromQuery]int limit, [FromQuery]int offset)
+        {
+
+            var total = 0;
+            var service = new Services.MotherSkuServices();
+            var list = service.Page(search, offset, limit, ref total);
+
+            return new JsonResult(new
+            {
+                rows = list,
+                total = total,
+            });
+        }
+
+
+        [HttpGet]
+        [BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【配置】->【子母sku 日志】->【搜索】页面", 0)]
+        public JsonResult LogPage([FromQuery]dc_base_mother_sku_log_search_dto search, [FromQuery]int limit, [FromQuery]int offset)
+        {
+
+            var total = 0;
+            var service = new Services.MotherSkuServices();
+            var list = service.LogPage(search, offset, limit, ref total);
+
+            return new JsonResult(new
+            {
+                rows = list,
+                total = total,
+            });
+        }
+
+        
+        [HttpGet]
+        [BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【配置】->【子母sku 日志】->【搜索】页面", 0)]
+        public JsonResult SearchSku([FromQuery]string name)
+        {
+
+            var service = new Services.MotherSkuServices();
+            var list = service.SearchSku(name);
+
+            return new JsonResult(list.Select(s=>new { id = s.id,text=$"【{s.sku}】【{s.warehouse_code}】【{s.warehouse_name}】"}));
+        }
+
+
+        [HttpPost]
+        [BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【配置】->【子母sku】->【新增规则】->【保存】操作", 1)]
+        public JsonResult Save([FromBody]dc_base_mother_sku m)
+        {
+            try
+            {
+                var user = AutoUtility.GetUser();
+                new Services.MotherSkuServices().Save(m, user);
+                return new JsonResult(new { success = true });
+            }
+            catch (Exception ex)
+            {
+                return new JsonResult(new { success = false, message = ex.Message });
+            }
+        
+        }
+        [HttpPost]
+        [BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【配置】->【子母sku】->【修改状态】->【保存】操作", 1)]
+        public JsonResult UpdateStatus([FromBody]update_status_input_dto m)
+        {
+            try
+            {
+                var user = AutoUtility.GetUser();
+                new Services.MotherSkuServices().UpdateStatus(m, user);
+                return new JsonResult(new { success = true });
+            }
+            catch (Exception ex)
+            {
+                return new JsonResult(new { success = false, message = ex.Message });
+            }
+           
+        }
+        [HttpPost]
+        [BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【配置】->【子母sku】->【移除子sku】->【保存】操作", 1)]
+        public JsonResult RemoveMap([FromBody]remove_map_input_dto m)
+        {
+            try
+            {
+                var user = AutoUtility.GetUser();
+                new Services.MotherSkuServices().RemoveMap(m, user);
+                return new JsonResult(new { success =true});
+            }
+            catch (Exception ex)
+            {
+                return new JsonResult(new { success = false,message = ex.Message });
+            }
+           
+        }
+        [HttpPost]
+        [BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【自动周转列表】->【设置母sku】->【保存】操作", 1)]
+        public JsonResult BatchSet([FromBody]batch_set_input_dto m)
+        {
+            try
+            {
+                var user = AutoUtility.GetUser();
+                new Services.MotherSkuServices().BatchSet(m, user);
+                return new JsonResult(new { success = true });
+            }
+            catch (Exception ex)
+            {
+                return new JsonResult(new { success = false, message = ex.Message });
+            }
+          
+        }
+
+        /// <summary>
+        /// 导入
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【子母sku设置】->【导入】操作", 1)]
+        public async Task<ActionResult<RequestResultDto>> Import(IFormFile file)
+        {
+            try
+            {
+                var user = AutoUtility.GetUser();
+                var dataTable = new Services.MotherSkuServices().Import(file.OpenReadStream(), user);
+
+                var fileName = AppContext.BaseDirectory + $@"Result\子母导入结果.csv";
+
+                CsvFileHelper.SaveCSV(dataTable, fileName);
+
+                var memory = new MemoryStream();
+                using (var stream = new FileStream(fileName, FileMode.Open))
+                {
+                    stream.CopyTo(memory);
+                }
+                memory.Position = 0;
+
+                var fileData = await QiNiuCloudHelper.UploadAsync(memory, $"{user.UserName}-{DateTime.Now.ToString("yyyyMMddHHmmss")}子母导入结果.csv");
+                return new RequestResultDto { success = true, data = fileData };
+            }
+            catch (Exception ex)
+            {
+                return new RequestResultDto { success = false, message = ex.Message, err_data = ex.StackTrace };
+            }
+
+        }
+    }
+}
\ No newline at end of file

ResetOutofstock/Program.cs

@@ -28,6 +28,7 @@ namespace ResetOutofstock
 
                 //dc_base_transfer_freight_dao.CalculationSingle("946549801", "GB4PXBL");
                 //dc_base_transfer_freight_dao.Init();
+               
             }
             catch (Exception ex)
             {

ResetOutofstock/ResetOutofstockBackgrounService.cs

@@ -18,7 +18,7 @@ namespace ResetOutofstock
             Task.Factory.StartNew(() =>
             {
                 Console.WriteLine($"init 开始  ，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
-                //dc_base_transfer_freight_dao.Init();
+                daily.ResetFbaExtendSales(DateTime.Now);
                 Console.WriteLine($"init 结束，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
             });