fix

AutoTurnOver.DB/dc_auto_stock_monitor_dao.cs

@@ -73,5 +73,119 @@ where 1=1 ";
             }
             return _connection.Page<dc_auto_stock_monitor_dto>(sql, search, parameters);
         }
+        
+        /// <summary>
+        /// listing 状态监控
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        public static Page<listing_status_view_dto> GetListingStatusPage(listing_status_view_search_dto search)
+        {
+            string sql = @" select
+tw.hq_type,
+tw.area_name,
+tw.warehouse_name,
+tw.warehouse_code,
+t1.bailun_sku as 'base_bailun_sku',
+t1.sku_title_cn,
+t1.product_code,
+t1.buyer_name,
+t1.brand,
+t1.weight,
+t1.unit_price,
+t1.height,
+(case when t8.id is null then '未侵权' else  '侵权' end) as 'has_tort',
+( case when t5.bailun_sku is not null then '监控中' else '停止监控' end ) as 'monitor_status',
+t9.history_sevenday_sales,
+tdb.usable_stock,
+(tdb.usable_stock * t1.unit_price) as 'usable_stock_amount',
+ifnull(t10.quantity_purchase,0) as 'quantity_purchase',
+ifnull(t10.quantity_transfer,0) as 'quantity_transfer',
+t1.source,
+t11.*
+from dc_base_stock as tdb
+left join dc_base_warehouse as tw on tdb.warehouse_code = tw.warehouse_code
+inner join dc_base_sku as t1 on tdb.bailun_sku = t1.bailun_sku 
+left join dc_auto_monitor_sku as t5 on t1.bailun_sku = t5.bailun_sku 
+left join dc_base_tort as t8  on t1.bailun_sku = t8.bailun_sku
+left join dc_auto_turnover as t9 on tdb.bailun_sku = t9.bailun_sku and tdb.warehouse_code = t9.warehouse_code
+left join dc_mid_transit as t10 on tdb.bailun_sku = t10.bailun_sku and tdb.warehouse_code = t10.warehouse_code
+left join dc_base_listing_status_sum_view as t11 on tdb.bailun_sku = t11.bailun_sku
+where tdb.usable_stock>0 ";
+            DynamicParameters parameters = new DynamicParameters();
+            if (search != null)
+            {
+                if(search.start_date!=null && search.end_date != null)
+                {
+                    sql += "  and EXISTS (select * from dc_base_stock_record as t_re where tv.bailun_sku = t_re.bailun_sku and t_re.stock_time>=@start_date and t_re.stock_time<=@end_date and has_transfer=1 ) ";
+                    parameters.Add("start_date", search.start_date.Value.ToString("yyyy-MM-dd 00:00:00"));
+                    parameters.Add("end_date", search.start_date.Value.ToString("yyyy-MM-dd 23:59:59"));
+                }
+                else if (search.start_date != null)
+                {
+                    sql += "  and EXISTS (select * from dc_base_stock_record as t_re where tdb.bailun_sku = t_re.bailun_sku and tdb.warehouse_code = t_re.warehouse_code and  t_re.stock_time>=@start_date ) ";
+                    parameters.Add("start_date", search.start_date.Value.ToString("yyyy-MM-dd 00:00:00"));
+                }else if (search.end_date != null)
+                {
+                    sql += "  and EXISTS (select * from dc_base_stock_record as t_re where tdb.bailun_sku = t_re.bailun_sku and tdb.warehouse_code = t_re.warehouse_code and t_re.stock_time<=@end_date ) ";
+                    parameters.Add("end_date", search.start_date.Value.ToString("yyyy-MM-dd 23:59:59"));
+                }
+                if(!string.IsNullOrWhiteSpace(search.brand))
+                {
+                    sql += " and t1.brand=@brand ";
+                    parameters.Add("brand",search.brand);
+                }
+                if (!string.IsNullOrEmpty(search.warehouse_code))
+                {
+                    sql += " and dat.warehouse_code='" + search.warehouse_code + "'";
+                }
+                else
+                {
+                    if (!string.IsNullOrWhiteSpace(search.warehousetype))
+                    {
+                        sql += " and dat.hq_type=" + $"'{search.warehousetype}'";
+                    }
+                    if (search.warehousearea > 0)
+                    {
+                        sql += " and t3.area_id=" + search.warehousearea;
+                    }
+                }
+                if (search.has_tort == 1)
+                {
+                    sql += " and t8.id is not null ";
+                }
+                else if(search.has_tort == 0)
+                {
+                    sql += " and t8.id is null ";
+                }
+                if (search.source>0)
+                {
+                    sql += " and t1.source =@source ";
+                    parameters.Add("source", search.source);
+                }
+            }
+            return _connection.Page<listing_status_view_dto>(sql, search, parameters);
+        }
+
+        /// <summary>
+        /// 查询要显示的字段
+        /// </summary>
+        /// <param name="warehouse_code"></param>
+        /// <returns></returns>
+        public static List<string> GetShowField(string warehouse_code)
+        {
+            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 == "国内仓")
+            {
+
+            }
+            else
+            {
+                if (wData.area_name == "英国")
+                {
+                    return new List<string> { "ebay_uk_abroad" , "amazon_uk_abroad"  ,"aliexpress_uk_abroad" };
+                }
+            }
+        }
     }
 }

AutoTurnOver.DB/report.cs

@@ -1611,7 +1611,7 @@ 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_us_china`,`wish_us_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`) (
+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 
 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',
@@ -1619,8 +1619,8 @@ count(case when t1.platform='ebay' and t1.localtion!='国内' and t1.web_site='u
 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='us' and t1.`status`=1 then 1 else null  end) as 'wish_us_china',
-count(case when t1.platform='wish' and t1.localtion!='国内' and t1.web_site='us' and t1.`status`=1 then 1 else null  end) as 'wish_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='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',

AutoTurnOver.Models/listing_status_view_dto.cs

+using AutoTurnOver.Models.Base;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace AutoTurnOver.Models
+{
+    /// <summary>
+    /// 产品刊登情况监控
+    /// </summary>
+    public class listing_status_view_dto
+    {
+        public string hq_type { get; set; }
+        public string area_name { get; set; }
+        public string warehouse_code { get; set; }
+        public string warehouse_name { get; set; }
+        public string base_bailun_sku { get; set; }
+        public string sku_title_cn { get; set; }
+        public string product_code { get; set; }
+        public string buyer_name { get; set; }
+        public string brand { get; set; }
+        public decimal? weight { get; set; }
+        public decimal? unit_price { get; set; }
+        public decimal? height { get; set; }
+        public string has_tort { get; set; }
+        public string monitor_status { get; set; }
+        /// <summary>
+        /// 7日日均
+        /// </summary>
+        public decimal? history_sevenday_sales { get; set; }
+        public decimal usable_stock { get; set; }
+        public decimal? usable_stock_amount { get; set; }
+        public decimal? quantity_purchase { get; set; }
+        public decimal? quantity_transfer { get; set; }
+        public decimal? source { get; set; }
+        public decimal? ebay_uk_china { get; set; }
+        public decimal? ebay_uk_abroad { get; set; }
+        public decimal? ebay_us_china { get; set; }
+        public decimal? ebay_us_abroad { get; set; }
+        public decimal? wish_us_china { get; set; }
+        public decimal? wish_us_abroad { get; set; }
+        public decimal? amazon_uk_china { get; set; }
+        public decimal? amazon_uk_abroad { get; set; }
+        public decimal? amazon_us_china { get; set; }
+        public decimal? amazon_us_abroad { get; set; }
+        public decimal? aliexpress_uk_china { get; set; }
+        public decimal? aliexpress_uk_abroad { get; set; }
+        public decimal? aliexpress_us_china { get; set; }
+        public decimal? aliexpress_us_abroad { get; set; }
+        public decimal? walmart_us_china { get; set; }
+        public decimal? walmart_us_abroad { get; set; }
+        public decimal? sears_us_china { get; set; }
+        public decimal? sears_us_abroad { get; set; }
+    }
+
+    public class listing_status_view_search_dto: page_search_dto
+    {
+        public DateTime? end_date { get; set; }
+        public DateTime? start_date { get; set; }
+        public int? has_tort { get; set; }
+        /// <summary>
+        /// 仓库编码
+        /// </summary>
+        public string warehouse_code { get; set; }
+        public string warehousetype { get; set; }
+
+        public int? warehousearea { get; set; }
+        public string platform { get; set; }
+
+        /// <summary>
+        /// 1 = 可上架
+        /// 2 = 无在线
+        /// </summary>
+        public int? listing_status { get; set; }
+        /// <summary>
+        /// 商品来源
+        /// </summary>
+        public int? source { get; set; }
+        
+        /// <summary>
+        /// 产品类型
+        /// </summary>
+        public int? product_type { get; set; }
+        /// <summary>
+        /// 品牌
+        /// </summary>
+        public string brand { get; set; }
+    }
+}