up

AutoTurnOver.DB/dc_auto_week_negative_profit_details_dao.cs

@@ -28,7 +28,7 @@ namespace AutoTurnOver.DB
             {
                 sql.Append($" AND t1.create_date_time < '{m.end_date}' ");
             }
-            if (!string.IsNullOrWhiteSpace(m.platform))
+            if (!string.IsNullOrWhiteSpace(m.platform)&&m.platform!="null")
             {
                 sql.Append($" AND t1.platform = '{m.platform}' ");
             }
@@ -36,7 +36,7 @@ namespace AutoTurnOver.DB
             {
                 sql.Append($" AND t1.simple_category = '{m.simple_category}' ");
             }
-            if (!string.IsNullOrWhiteSpace(m.buyer_name))
+            if (!string.IsNullOrWhiteSpace(m.buyer_name) && m.buyer_name != "null")
             {
                 sql.Append($" AND t1.buyer_name = '{m.buyer_name}' ");
             }
@@ -80,7 +80,7 @@ namespace AutoTurnOver.DB
         {
             StringBuilder sql = new StringBuilder();
             sql.Append($@"
-                         SELECT t1.bailun_sku,t3.declare_title_cn,SUM(t1.amount_sales_usd_7)AS amount_sales_usd_7,
+                         SELECT t1.bailun_sku,t1.warehouse_code,t5.warehouse_name,t3.bailun_category_name AS 'simple_category',t3.declare_title_cn,SUM(t1.amount_sales_usd_7)AS amount_sales_usd_7,
                          SUM(t1.bailun_sku_quantity_ordered_7)AS bailun_sku_quantity_ordered_7,
                          SUM(t1.bailun_sku_quantity_ordered_7*t3.unit_price)AS weekly_cost_of_sales,
                          CASE WHEN t2.weekly_refunds_num>0 THEN t2.weekly_refunds_num ELSE 0 END AS weekly_refunds_num,
@@ -92,7 +92,8 @@ namespace AutoTurnOver.DB
                          LEFT JOIN (
                              SELECT bailun_sku,SUM(bailun_sku_quantity_refund)AS weekly_refunds_num,
                              SUM(bailun_sku_quantity_refund*bailun_sku_unit_price)AS weekly_refund_amount
-                             FROM dc_base_crm_refund WHERE refund_time>='{startTime.ToString("yyyy-MM-dd HH:mm:ss")}' AND refund_time<'{endtime.ToString("yyyy-MM-dd HH:mm:ss")}' GROUP BY bailun_sku
+                             FROM dc_base_crm_refund WHERE refund_time>='{startTime.ToString("yyyy-MM-dd HH:mm:ss")}' 
+                           AND refund_time<'{endtime.ToString("yyyy-MM-dd HH:mm:ss")}' GROUP BY bailun_sku
                          )AS t2 ON t2.bailun_sku = t1.bailun_sku
                          INNER JOIN dc_base_sku AS t3 ON t3.bailun_sku = t1.bailun_sku
                          LEFT JOIN(SELECT bailun_sku,
@@ -101,8 +102,10 @@ namespace AutoTurnOver.DB
                                                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 != '手工单'  GROUP BY bailun_sku)AS t4 ON t4.bailun_sku = t1.bailun_sku
-                         WHERE t1.sales_reset_date>='{startTime.ToString("yyyy-MM-dd HH:mm:ss")}' AND t1.sales_reset_date<'{endtime.ToString("yyyy-MM-dd HH:mm:ss")}' AND t1.bailun_sku_quantity_ordered_7>0
-                         GROUP BY t1.bailun_sku ORDER BY t1.bailun_sku ASC
+                         LEFT JOIN dc_base_warehouse AS t5 ON t5.warehouse_code = t1.warehouse_code
+                         WHERE t1.sales_reset_date>='{startTime.ToString("yyyy-MM-dd HH:mm:ss")}' 
+                         AND t1.sales_reset_date<'{endtime.ToString("yyyy-MM-dd HH:mm:ss")}' AND t1.bailun_sku_quantity_ordered_7>0
+                         GROUP BY t1.bailun_sku,t1.warehouse_code ORDER BY t1.bailun_sku ASC
                        ");
             try
             {

AutoTurnOver.DB/dc_auto_week_redundancy_details_dao.cs

@@ -43,7 +43,7 @@ namespace AutoTurnOver.DB
             {
                 sql.Append($" AND t1.create_date_time < '{m.end_date}' ");
             }
-            if (!string.IsNullOrWhiteSpace(m.platform))
+            if (!string.IsNullOrWhiteSpace(m.platform) && m.platform != "null")
             {
                 sql.Append($" AND t1.platform = '{m.platform}' ");
             }
@@ -51,7 +51,7 @@ namespace AutoTurnOver.DB
             {
                 sql.Append($" AND t1.simple_category = '{m.simple_category}' ");
             }
-            if (!string.IsNullOrWhiteSpace(m.buyer_name))
+            if (!string.IsNullOrWhiteSpace(m.buyer_name) && m.buyer_name != "null")
             {
                 sql.Append($" AND t1.buyer_name = '{m.buyer_name}' ");
             }

AutoTurnOver.DB/dc_auto_week_shortage_dao.cs

@@ -46,7 +46,7 @@ namespace AutoTurnOver.DB
             {
                 sql.Append($" AND t1.stockout_time < '{m.end_date}' ");
             }
-            if (!string.IsNullOrWhiteSpace(m.platform))
+            if (!string.IsNullOrWhiteSpace(m.platform)&& m.platform!="null")
             {
                 sql.Append($" AND t1.platform = '{m.platform}' ");
             }
@@ -54,7 +54,7 @@ namespace AutoTurnOver.DB
             {
                 sql.Append($" AND t1.simple_category = '{m.simple_category}' ");
             }
-            if (!string.IsNullOrWhiteSpace(m.buyer_name))
+            if (!string.IsNullOrWhiteSpace(m.buyer_name) && m.buyer_name != "null")
             {
                 sql.Append($" AND t1.buyer_name = '{m.buyer_name}' ");
             }
@@ -120,7 +120,7 @@ namespace AutoTurnOver.DB
         {
             StringBuilder sql = new StringBuilder();
             sql.Append($@"
-                      SELECT t1.*,t3.first_inbound_date,t4.bailun_sku_quantity_ordered,t5.history_sevenday_sales_ebay,t6.bailun_inner_sku,
+                      SELECT t1.*,t3.first_inbound_date,t4.platform_type AS 'platform',t4.bailun_sku_quantity_ordered,t5.history_sevenday_sales_ebay,t6.bailun_inner_sku,t6.bailun_category_name AS 'simple_category',t6.buyer_name,
                       (( case when t5.average_overdue> 0 then t5.average_overdue else 1 end ) * t5.quantity_safe_inventory ) as 'quantity_safe'
                       FROM(
                       SELECT bailun_sku,warehouse_code,MAX(gmt_out_stock_modified) AS gmt_out_stock_modified FROM dc_mid_transit
@@ -128,11 +128,11 @@ namespace AutoTurnOver.DB
                       ) AS t1
                       LEFT JOIN dc_base_stock AS t3 ON t3.bailun_sku = t1.bailun_sku AND t3.warehouse_code = t1.warehouse_code 
                       LEFT JOIN(
-                      SELECT bailun_sku,warehouse_code,SUM(bailun_sku_quantity_ordered)bailun_sku_quantity_ordered FROM 
+                      SELECT bailun_sku,warehouse_code,platform_type,SUM(bailun_sku_quantity_ordered)bailun_sku_quantity_ordered FROM 
                       dc_base_oms_sku_30 WHERE gmt_create>=  '{startTime.ToString("yyyy-MM-dd HH:mm:ss")}' AND gmt_create< '{endtime.ToString("yyyy-MM-dd HH:mm:ss")}'
                       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 != '手工单' GROUP BY bailun_sku,warehouse_code
+                      and platform_order_type != '手工单' GROUP BY bailun_sku,warehouse_code,platform_type
                       )AS t4 ON t4.bailun_sku = t1.bailun_sku AND t4.warehouse_code = t1.warehouse_code
                       LEFT JOIN dc_auto_turnover AS t5 ON t5.bailun_sku = t1.bailun_sku AND t5.warehouse_code = t1.warehouse_code
                       LEFT JOIN dc_base_sku AS t6 ON t6.bailun_sku = t1.bailun_sku ");

AutoTurnOver.Models/ApiDto/WeeklyStatistics/gmt_out_stock_page_output_dto.cs

@@ -51,5 +51,20 @@ namespace AutoTurnOver.Models.ApiDto.WeeklyStatistics
         /// 安全库存
         /// </summary>
         public decimal? quantity_safe { get; set; }
+
+        /// <summary>
+        /// 分类
+        /// </summary>
+        public string simple_category { get; set; }
+
+        /// <summary>
+        /// 采购员
+        /// </summary>
+        public string buyer_name { get; set; }
+
+        /// <summary>
+        /// 平台
+        /// </summary>
+        public string platform { get; set; }
     }
 }

AutoTurnOver.Models/ApiDto/WeeklyStatistics/query_week_negative_profit_dto.cs

@@ -52,5 +52,20 @@
         /// 利润率
         /// </summary>
         public decimal profit_rate { get; set; }
+
+        /// <summary>
+        /// 分类
+        /// </summary>
+        public string simple_category { get; set; }
+
+        /// <summary>
+        /// 仓库编码
+        /// </summary>
+        public string warehouse_code { get; set; }
+
+        /// <summary>
+        /// 仓库名称
+        /// </summary>
+        public string warehouse_name { get; set; }
     }
 }

AutoTurnOver.Models/dc_auto_week_negative_profit_details.cs

@@ -90,5 +90,14 @@ namespace AutoTurnOver.Models
         /// 简易分类
         /// </summary>
         public string simple_category { get; set; }
+        /// <summary>
+        /// 仓库编码
+        /// </summary>
+        public string warehouse_code { get; set; }
+
+        /// <summary>
+        /// 仓库名称
+        /// </summary>
+        public string warehouse_name { get; set; }
     }
 }

AutoTurnOver.Services/WeeklyStatisticsServices.cs

@@ -80,7 +80,10 @@ namespace AutoTurnOver.Services
                         refund_rate = item.weekly_refund_amount>0? Math.Round(item.weekly_refund_amount / item.amount_sales_usd_7,2):0,
                         create_date_time = DateTime.Now,
                         start_date = DateHelper.GetWeekFirstDayMon(DateTime.Now.AddDays(-1)),
-                        end_date = DateHelper.GetWeekLastDaySun(DateTime.Now.AddDays(-1))
+                        end_date = DateHelper.GetWeekLastDaySun(DateTime.Now.AddDays(-1)),
+                        simple_category = item.simple_category,
+                        warehouse_code = item.warehouse_code,
+                        warehouse_name = item.warehouse_name
                     };
                     dc_auto_week_negative_profit_details_dao.Insert(model);
                     Console.WriteLine($"写入负利润数据：{i}---{item.bailun_sku}");
@@ -160,6 +163,9 @@ namespace AutoTurnOver.Services
                         ana_seven_days_average = pdsModel.AnaMarketVagueSevenThSales ?? 0,
                         seven_days_average = item.history_sevenday_sales_ebay??0,
                         safety_stock = item.quantity_safe??0,
+                        simple_category = item.simple_category,
+                        buyer_name = item.buyer_name,
+                        platform = item.platform,
                         start_date = DateHelper.GetWeekFirstDayMon(DateTime.Now.AddDays(-1)),
                         end_date = DateHelper.GetWeekLastDaySun(DateTime.Now.AddDays(-1))
                     };