fix

AutoTurnOver.DB/report.cs

@@ -3714,6 +3714,71 @@ where t1.bailun_sku = t2.bailun_sku and t1.bailun_sku = t3.bailun_sku and t1.wee
 
             return r_datas;
         }
+        
+        public static List<report_stock_week_view_dto> ReportPurchaseWeekView2(report_stock_week_view_search_dto search)
+        {
+            var btime = DateTime.Now.AddDays(-(7 * 4)).GetWeekFirstDayMon().ToDayHome();
+            var etime = btime.AddDays(7 * 24).GetWeekLastDaySun().ToDayEnd();
+            if (search.btime != null)
+            {
+                btime = search.btime.Value;
+            }
+            if (search.etime != null)
+            {
+                etime = search.etime.Value;
+            }
+            var datas = _connection.Query<dc_report_tag_stock_week>(" select * from dc_report_tag_stock_week where `date`>=@btime and `date` <=@etime ", new { btime, etime });
+
+            List<report_stock_week_view_dto> r_datas = new List<report_stock_week_view_dto>();
+
+            var datas_web_site_group = datas.GroupBy(s => s.tag).ToList();
+
+            foreach (var websiteGroupItem in datas_web_site_group)
+            {
+                r_datas.Add(new report_stock_week_view_dto { web_site = websiteGroupItem.Key, tag = "可用库存数", weeks = new List<report_stock_week_view_dto.week>() { } });
+                r_datas.Add(new report_stock_week_view_dto { web_site = websiteGroupItem.Key, tag = "可用库存金额", weeks = new List<report_stock_week_view_dto.week>() { } });
+                r_datas.Add(new report_stock_week_view_dto { web_site = websiteGroupItem.Key, tag = "周总消耗成本", weeks = new List<report_stock_week_view_dto.week>() { } });
+                r_datas.Add(new report_stock_week_view_dto { web_site = websiteGroupItem.Key, tag = "周库存周转率（销售产品成本/库存金额比率）", weeks = new List<report_stock_week_view_dto.week>() { } });
+                
+
+                var this_date = btime.GetWeekFirstDayMon().ToDayHome();
+                while (this_date <= etime)
+                {
+                    var b_thie_date = this_date.ToDayHome();
+                    var e_thie_date = b_thie_date.GetWeekLastDaySun().ToDayEnd();
+
+                    var this_datas = websiteGroupItem.Where(s => s.date >= b_thie_date && s.date <= e_thie_date).ToList();
+
+                    r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "可用库存数").weeks.Add(new report_stock_week_view_dto.week
+                    {
+                        tag = $"{b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
+                        val = this_datas.FirstOrDefault(s=>s.field== "可用库存数").val
+                    }); 
+                    r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "可用库存金额").weeks.Add(new report_stock_week_view_dto.week
+                    {
+                        tag = $"{b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
+                        val = this_datas.FirstOrDefault(s=>s.field== "可用库存金额").val
+                    }); 
+                    r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "周总消耗成本").weeks.Add(new report_stock_week_view_dto.week
+                    {
+                        tag = $"{b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
+                        val = this_datas.FirstOrDefault(s=>s.field== "周总消耗成本").val
+                    }); 
+                    r_datas.SingleOrDefault(s => s.web_site == websiteGroupItem.Key && s.tag == "周库存周转率（销售产品成本/库存金额比率）").weeks.Add(new report_stock_week_view_dto.week
+                    {
+                        tag = $"{b_thie_date.ToString("MM-dd")} ~ {e_thie_date.ToString("MM-dd")}",
+                        val = this_datas.FirstOrDefault(s=>s.field== "周库存周转率（销售产品成本/库存金额比率）").val
+                    }); 
+
+                 
+                    this_date = this_date.AddDays(7);
+                }
+            }
+
+
+
+            return r_datas;
+        }
 
 
         public static List<string> ReportStockWeekViewGetWeekList(report_stock_week_view_search_dto search)

AutoTurnOver.Services/ReportServices.cs

@@ -995,6 +995,28 @@ namespace AutoTurnOver.Services
             return datas;
 
         }
+        
+        public List<dynamic> ReportPurchaseWeekView2(report_stock_week_view_search_dto search_data)
+        {
+            var order_list = report.ReportPurchaseWeekView2(search_data);
+            List<dynamic> datas = new List<dynamic>();
+            foreach (var item in order_list)
+            {
+                dynamic o = new ExpandoObject();
+                o.web_site = item.web_site;
+                o.tag = item.tag;
+                foreach (var dat_item in item.weeks)
+                {
+                    var dic = (IDictionary<string, object>)o;
+                    dic["val_" + (dat_item.tag)] = Math.Round(dat_item.val, 2);
+                }
+
+                datas.Add(o);
+            }
+
+            return datas;
+
+        }
 
         public List<dynamic> ReportFinanceView(report_stock_week_view_search_dto search_data)
         {
@@ -1022,6 +1044,7 @@ namespace AutoTurnOver.Services
         {
             return report.ReportStockWeekViewGetWeekList(search);
         }
+        
         public List<string> GetMonthList(report_stock_week_view_search_dto search)
         {
             return dc_report_finance_dao.GetMonthList(search);
@@ -1152,5 +1175,7 @@ namespace AutoTurnOver.Services
 
             return fileName;
         }
+
+
     }
 }

AutoTurnOver/Controllers/ReportsController.cs

@@ -894,6 +894,23 @@ namespace AutoTurnOver.Controllers
                 total = 0,
             });
         }
+        
+        [BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【报表】->【第三方海外仓采购汇总】->【搜索】页面", 0)]
+        public JsonResult ReportPurchaseWeekView2(DateTime? btime, DateTime? etime)
+        {
+            report_stock_week_view_search_dto search_data = new report_stock_week_view_search_dto
+            {
+                etime = etime,
+                btime = btime
+            };
+
+            var list = new ReportServices().ReportPurchaseWeekView2(search_data);
+            return new JsonResult(new
+            {
+                rows = list,
+                total = 0,
+            });
+        }
 
         [BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【报表】->【财务报表】->【搜索】页面", 0)]
         public JsonResult ReportFinanceView(DateTime? btime, DateTime? etime)
@@ -965,6 +982,59 @@ namespace AutoTurnOver.Controllers
             return File(memory, "text/csv", "第三方海外仓采购统计表.csv");
         }
 
+        [BrowseLog("Bailun_aims", "访问【百伦自动周转系统】->【报表】->【第三方海外仓采购汇总】->【导出】", 0)]
+        public FileResult ExportTableReportPurchaseWeekView2(DateTime? btime, DateTime? etime)
+        {
+            report_stock_week_view_search_dto search_data = new report_stock_week_view_search_dto
+            {
+                etime = etime,
+                btime = btime
+            };
+
+            var list = new ReportServices().ReportPurchaseWeekView2(search_data);
+            var time_list = new ReportServices().ReportStockWeekViewGetWeekList(search_data);
+
+
+            DataTable table = new DataTable();
+            string[] cols = new string[] { "站点", "标签" };
+            foreach (var item in cols)
+            {
+                table.Columns.Add(item);
+            }
+            foreach (var item in time_list)
+            {
+                table.Columns.Add($"{item}");
+            }
+
+
+            foreach (var itemDataD in list)
+            {
+                DataRow row = table.NewRow();
+                var itemData = (IDictionary<string, object>)itemDataD;
+                row["站点"] = itemData["web_site"];
+                row["标签"] = itemData["tag"];
+
+                foreach (var item in time_list)
+                {
+                    row[$"{item}"] = itemData["val_" + $"{item}"];
+                }
+
+                table.Rows.Add(row);
+            }
+
+            var fileName = AppContext.BaseDirectory + @"Result\RealtimeStock\第三方海外仓采购统计表.csv";
+
+            DataTableHelper.SaveCSV(table, fileName);
+
+            var memory = new MemoryStream();
+            using (var stream = new FileStream(fileName, FileMode.Open))
+            {
+                stream.CopyTo(memory);
+            }
+            memory.Position = 0;
+            return File(memory, "text/csv", "第三方海外仓采购统计表.csv");
+        }
+
         public JsonResult GetMonthList(DateTime? btime, DateTime? etime)
         {
             report_stock_week_view_search_dto search_data = new report_stock_week_view_search_dto