fix

AutoTurnOver.DB/dc_auto_stock_monitor_dao.cs

@@ -177,15 +177,23 @@ where tdb.usable_stock>0 ";
             var wData = _connection.QuerySingleOrDefault<dc_base_warehouse>(" select * from dc_base_warehouse where warehouse_code=@warehouse_code ",new { warehouse_code  = warehouse_code });
             if (wData.hq_type == "国内仓")
             {
-
+                return new List<string>() { "ebay_uk_china", "ebay_us_china", "wish_uk_china", "amazon_uk_china", "amazon_us_china", "aliexpress_uk_china", "aliexpress_us_china", "walmart_us_china", "sears_us_china" };
             }
             else
             {
                 if (wData.area_name == "英国")
                 {
                     return new List<string> { "ebay_uk_abroad" , "amazon_uk_abroad"  ,"aliexpress_uk_abroad" };
+                }else if (wData.area_name == "美国")
+                {
+                    return new List<string> { "ebay_us_abroad", "amazon_us_abroad", "aliexpress_us_abroad" , "walmart_us_abroad", "sears_us_abroad" };
+                }
+                else
+                {
+                    return new List<string> { };
                 }
             }
+
         }
     }
 }

AutoTurnOver.DB/report.cs

@@ -1611,32 +1611,60 @@ start transaction;
 -- 清空视图表的数据
 Truncate table dc_base_listing_status_sum_view_temp;
 
-INSERT into dc_base_listing_status_sum_view_temp(`bailun_sku`,`ebay_uk_china`,`ebay_uk_abroad`,`ebay_us_china`,`ebay_us_abroad`,`wish_uk_china`,`wish_uk_abroad`,`amazon_uk_china`,`amazon_uk_abroad`,`amazon_us_china`,`amazon_us_abroad`,`aliexpress_uk_china`,`aliexpress_uk_abroad`,`aliexpress_us_china`,`aliexpress_us_abroad`,`walmart_us_china`,`walmart_us_abroad`,`sears_us_china`,`sears_us_abroad`) (
-	select 
+INSERT into dc_base_listing_status_sum_view_temp(`bailun_sku`,`ebay_uk_china`,`ebay_uk_abroad`,`ebay_us_china`,`ebay_us_abroad`,`wish_china`,`wish_abroad`,`amazon_uk_china`,`amazon_uk_abroad`,`amazon_us_china`,`amazon_us_abroad`,`aliexpress_china`,`aliexpress_abroad`,`walmart_china`,`walmart_abroad`,`sears_china`,`sears_abroad`,`ebay_au_china`,`ebay_au_abroad`,`ebay_de_china`,`ebay_de_abroad`,`ebay_es_china`,`ebay_es_abroad`,`ebay_fr_china`,`ebay_fr_abroad`,`ebay_it_china`,`ebay_it_abroad`,`amazon_au_china`,`amazon_au_abroad`,`amazon_de_china`,`amazon_de_abroad`,`amazon_es_china`,`amazon_es_abroad`,`amazon_fr_china`,`amazon_fr_abroad`,`amazon_it_china`,`amazon_it_abroad`,`amazon_jp_china`,`amazon_jp_abroad`,`amazon_na_china`,`amazon_na_abroad`,`amazon_ca_china`,`amazon_ca_abroad`) (
+select 
 t1.bailun_sku,
 count(case when t1.platform='ebay' and t1.localtion='国内' and t1.web_site='uk' and t1.`status`=1 then 1 else null end ) as 'ebay_uk_china',
 count(case when t1.platform='ebay' and t1.localtion!='国内' and t1.web_site='uk' and t1.`status`=1 then 1 else null  end) as 'ebay_uk_abroad',
 count(case when t1.platform='ebay' and t1.localtion='国内' and t1.web_site='us' and t1.`status`=1 then 1 else null  end) as 'ebay_us_china',
 count(case when t1.platform='ebay' and t1.localtion!='国内' and t1.web_site='us' and t1.`status`=1 then 1 else null  end) as 'ebay_us_abroad',
 
-count(case when t1.platform='wish' and t1.localtion='国内' and t1.web_site='uk' and t1.`status`=1 then 1 else null  end) as 'wish_uk_china',
-count(case when t1.platform='wish' and t1.localtion!='国内' and t1.web_site='uk' and t1.`status`=1 then 1 else null  end) as 'wish_uk_abroad',
+count(case when t1.platform='wish' and t1.localtion='国内' and t1.`status`=1 then 1 else null  end) as 'wish_china',
+count(case when t1.platform='wish' and t1.localtion!='国内' and t1.`status`=1 then 1 else null  end) as 'wish_abroad',
 
 count(case when t1.platform='amazon' and t1.localtion='国内' and t1.web_site='uk' and t1.`status`=1 then 1 else null  end) as 'amazon_uk_china',
 count(case when t1.platform='amazon' and t1.localtion!='国内' and t1.web_site='uk' and t1.`status`=1 then 1 else null  end) as 'amazon_uk_abroad',
 count(case when t1.platform='amazon' and t1.localtion='国内' and t1.web_site='us' and t1.`status`=1 then 1 else null  end) as 'amazon_us_china',
 count(case when t1.platform='amazon' and t1.localtion!='国内' and t1.web_site='us' and t1.`status`=1 then 1 else null  end) as 'amazon_us_abroad',
 
-count(case when t1.platform='aliexpress' and t1.localtion='国内' and t1.web_site='uk' and t1.`status`=1 then 1 else null  end) as 'aliexpress_uk_china',
-count(case when t1.platform='aliexpress' and t1.localtion!='国内' and t1.web_site='uk' and t1.`status`=1 then 1 else null  end) as 'aliexpress_uk_abroad',
-count(case when t1.platform='aliexpress' and t1.localtion='国内' and t1.web_site='us' and t1.`status`=1 then 1 else null  end) as 'aliexpress_us_china',
-count(case when t1.platform='aliexpress' and t1.localtion!='国内' and t1.web_site='us' and t1.`status`=1 then 1 else null  end) as 'aliexpress_us_abroad',
+count(case when t1.platform='aliexpress' and t1.localtion='国内'  and t1.`status`=1 then 1 else null  end) as 'aliexpress_china',
+count(case when t1.platform='aliexpress' and t1.localtion!='国内' and t1.`status`=1 then 1 else null  end) as 'aliexpress_abroad',
+
+count(case when t1.platform='walmart' and t1.localtion='国内' and t1.`status`=1 then 1 else null  end) as 'walmart_china',
+count(case when t1.platform='walmart' and t1.localtion!='国内'  and t1.`status`=1 then 1 else null  end) as 'walmart_abroad',
+
+count(case when t1.platform='sears' and t1.localtion='国内'  and t1.`status`=1 then 1 else null  end) as 'sears_china',
+count(case when t1.platform='sears' and t1.localtion!='国内'  and t1.`status`=1 then 1 else null  end) as 'sears_abroad',
+
+count(case when t1.platform='ebay' and t1.localtion='国内' and t1.web_site='au' and t1.`status`=1 then 1 else null end ) as 'ebay_au_china',
+count(case when t1.platform='ebay' and t1.localtion!='国内' and t1.web_site='au' and t1.`status`=1 then 1 else null  end) as 'ebay_au_abroad',
+count(case when t1.platform='ebay' and t1.localtion='国内' and t1.web_site='de' and t1.`status`=1 then 1 else null  end) as 'ebay_de_china',
+count(case when t1.platform='ebay' and t1.localtion!='国内' and t1.web_site='de' and t1.`status`=1 then 1 else null  end) as 'ebay_de_abroad',
+count(case when t1.platform='ebay' and t1.localtion='国内' and t1.web_site='es' and t1.`status`=1 then 1 else null end ) as 'ebay_es_china',
+count(case when t1.platform='ebay' and t1.localtion!='国内' and t1.web_site='es' and t1.`status`=1 then 1 else null  end) as 'ebay_es_abroad',
+count(case when t1.platform='ebay' and t1.localtion='国内' and t1.web_site='fr' and t1.`status`=1 then 1 else null  end) as 'ebay_fr_china',
+count(case when t1.platform='ebay' and t1.localtion!='国内' and t1.web_site='fr' and t1.`status`=1 then 1 else null  end) as 'ebay_fr_abroad',
+count(case when t1.platform='ebay' and t1.localtion='国内' and t1.web_site='it' and t1.`status`=1 then 1 else null  end) as 'ebay_it_china',
+count(case when t1.platform='ebay' and t1.localtion!='国内' and t1.web_site='it' and t1.`status`=1 then 1 else null  end) as 'ebay_it_abroad',
+
+count(case when t1.platform='amazon' and t1.localtion='国内' and t1.web_site='au' and t1.`status`=1 then 1 else null end ) as 'amazon_au_china',
+count(case when t1.platform='amazon' and t1.localtion!='国内' and t1.web_site='au' and t1.`status`=1 then 1 else null  end) as 'amazon_au_abroad',
+count(case when t1.platform='amazon' and t1.localtion='国内' and t1.web_site='de' and t1.`status`=1 then 1 else null  end) as 'amazon_de_china',
+count(case when t1.platform='amazon' and t1.localtion!='国内' and t1.web_site='de' and t1.`status`=1 then 1 else null  end) as 'amazon_de_abroad',
+count(case when t1.platform='amazon' and t1.localtion='国内' and t1.web_site='es' and t1.`status`=1 then 1 else null end ) as 'amazon_es_china',
+count(case when t1.platform='amazon' and t1.localtion!='国内' and t1.web_site='es' and t1.`status`=1 then 1 else null  end) as 'amazon_es_abroad',
+count(case when t1.platform='amazon' and t1.localtion='国内' and t1.web_site='fr' and t1.`status`=1 then 1 else null  end) as 'amazon_fr_china',
+count(case when t1.platform='amazon' and t1.localtion!='国内' and t1.web_site='fr' and t1.`status`=1 then 1 else null  end) as 'amazon_fr_abroad',
+count(case when t1.platform='amazon' and t1.localtion='国内' and t1.web_site='it' and t1.`status`=1 then 1 else null  end) as 'amazon_it_china',
+count(case when t1.platform='amazon' and t1.localtion!='国内' and t1.web_site='it' and t1.`status`=1 then 1 else null  end) as 'amazon_it_abroad',
+count(case when t1.platform='amazon' and t1.localtion='国内' and t1.web_site='jp' and t1.`status`=1 then 1 else null  end) as 'amazon_jp_china',
+count(case when t1.platform='amazon' and t1.localtion!='国内' and t1.web_site='jp' and t1.`status`=1 then 1 else null  end) as 'amazon_jp_abroad',
+count(case when t1.platform='amazon' and t1.localtion='国内' and t1.web_site='na' and t1.`status`=1 then 1 else null  end) as 'amazon_na_china',
+count(case when t1.platform='amazon' and t1.localtion!='国内' and t1.web_site='na' and t1.`status`=1 then 1 else null  end) as 'amazon_na_abroad',
+count(case when t1.platform='amazon' and t1.localtion='国内' and t1.web_site='ca' and t1.`status`=1 then 1 else null  end) as 'amazon_ca_china',
+count(case when t1.platform='amazon' and t1.localtion!='国内' and t1.web_site='ca' and t1.`status`=1 then 1 else null  end) as 'amazon_ca_abroad'
 
-count(case when t1.platform='walmart' and t1.localtion='国内' and t1.web_site='us' and t1.`status`=1 then 1 else null  end) as 'walmart_us_china',
-count(case when t1.platform='walmart' and t1.localtion!='国内' and t1.web_site='us' and t1.`status`=1 then 1 else null  end) as 'walmart_us_abroad',
 
-count(case when t1.platform='sears' and t1.localtion='国内' and t1.web_site='us' and t1.`status`=1 then 1 else null  end) as 'sears_us_china',
-count(case when t1.platform='sears' and t1.localtion!='国内' and t1.web_site='us' and t1.`status`=1 then 1 else null  end) as 'sears_us_abroad'
 from dc_base_listing_status as t1
 GROUP BY t1.bailun_sku
 );

AutoTurnOver.Models/listing_status_view_dto.cs

@@ -11,6 +11,22 @@ namespace AutoTurnOver.Models
     public class listing_status_view_dto
     {
         public string hq_type { get; set; }
+        public string source_str
+        {
+            get
+            {
+                switch (source)
+                {
+                    case 1: return "精准开发";
+                    case 2: return "线下（其他）";
+                    case 3: return "线下美容";
+                    case 6: return "普货供应商推荐";
+                    case 7: return "服装产品中心";
+                    case 11: return "无库供应商推荐";
+                    default: return (source ?? 0).ToString();
+                }
+            }
+        }
         public string area_name { get; set; }
         public string warehouse_code { get; set; }
         public string warehouse_name { get; set; }
@@ -51,6 +67,33 @@ namespace AutoTurnOver.Models
         public decimal? walmart_us_abroad { get; set; }
         public decimal? sears_us_china { get; set; }
         public decimal? sears_us_abroad { get; set; }
+
+        public decimal? ebay_au_china { get; set; }
+        public decimal? ebay_au_abroad { get; set; }
+        public decimal? ebay_de_china { get; set; }
+        public decimal? ebay_de_abroad { get; set; }
+        public decimal? ebay_es_china { get; set; }
+        public decimal? ebay_es_abroad { get; set; }
+        public decimal? ebay_fr_china { get; set; }
+        public decimal? ebay_fr_abroad { get; set; }
+        public decimal? ebay_it_china { get; set; }
+        public decimal? ebay_it_abroad { get; set; }
+        public decimal? amazon_au_china { get; set; }
+        public decimal? amazon_au_abroad { get; set; }
+        public decimal? amazon_de_china { get; set; }
+        public decimal? amazon_de_abroad { get; set; }
+        public decimal? amazon_es_china { get; set; }
+        public decimal? amazon_es_abroad { get; set; }
+        public decimal? amazon_fr_china { get; set; }
+        public decimal? amazon_fr_abroad { get; set; }
+        public decimal? amazon_it_china { get; set; }
+        public decimal? amazon_it_abroad { get; set; }
+        public decimal? amazon_jp_china { get; set; }
+        public decimal? amazon_jp_abroad { get; set; }
+        public decimal? amazon_na_china { get; set; }
+        public decimal? amazon_na_abroad { get; set; }
+        public decimal? amazon_ca_china { get; set; }
+        public decimal? amazon_ca_abroad { get; set; }
     }
 
     public class listing_status_view_search_dto: page_search_dto

AutoTurnOver.Services/StockMonitorService.cs

@@ -16,6 +16,16 @@ namespace AutoTurnOver.Services
         {
             return dc_auto_stock_monitor_dao.GetPage(search);
         }
+        
+        public Page<listing_status_view_dto> GetListingStatusPage(listing_status_view_search_dto search)
+        {
+            return dc_auto_stock_monitor_dao.GetListingStatusPage(search);
+        }
+
+        public List<string> GetShowField(string warehouse_code)
+        {
+            return dc_auto_stock_monitor_dao.GetShowField(warehouse_code);
+        }
 
         private static int export_count = 0;
         public MemoryStream Export(UserData user, dc_auto_stock_monitor_search_dto search)

AutoTurnOver/Controllers/DailyController.cs

@@ -224,6 +224,48 @@ namespace AutoTurnOver.Controllers
 
         }
 
+        public JsonResult GetListingStatusPage(int offset, int limit, string order, string sort,
+            DateTime? end_date, DateTime? start_date,string brand,int? has_tort,int? listing_status,int? warehousearea,int? source,string warehousetype,string warehouse_code)
+        {
+            try
+            {
+                var services = new StockMonitorService();
+                var page_data = services.GetListingStatusPage(new listing_status_view_search_dto {warehouse_code = warehouse_code, warehousetype = warehousetype, source = source, warehousearea  = warehousearea, listing_status = listing_status,  brand = brand, has_tort = has_tort, page = offset + 1, rows = limit, sidx = sort, sord = order, start_date = start_date, end_date = end_date });
+
+                return new JsonResult(new
+                {
+                    rows = page_data.Items,
+                    total = page_data.TotalItems
+                });
+            }
+            catch (Exception ex)
+            {
+                return new JsonResult(new
+                {
+                    message = ex.Message,
+                    stack_trace = ex.StackTrace
+                });
+            }
+        }
+
+        public JsonResult GetShowField(string warehouse_code)
+        {
+            try
+            {
+                var services = new StockMonitorService();
+                var datas = services.GetShowField(warehouse_code);
+
+                return new JsonResult(datas);
+            }
+            catch (Exception ex)
+            {
+                return new JsonResult(new
+                {
+                    message = ex.Message,
+                    stack_trace = ex.StackTrace
+                });
+            }
+        }
 
         /// <summary>
         /// 导出实时库存