每日销进比采购数据导出增加百伦简易分类

Bailun.DC.Models/dc_base_purchase.cs

@@ -33,7 +33,7 @@ namespace Bailun.DC.Models
 
         public DateTime? estimated_arrival_time { get; set; }
 
-        public int supplier_id { get; set;}
+        public int supplier_id { get; set; }
 
         public string supplier_name { get; set; }
 
@@ -56,7 +56,7 @@ namespace Bailun.DC.Models
         public int has_delete { get; set; }
 
         public int company_id { get; set; }
-        
 
+        public string category_simple_name { get; set; }
     }
 }

Bailun.DC.Services/PurchaseServices.cs

@@ -161,7 +161,8 @@ namespace Bailun.DC.Services
         /// <returns></returns>
         public List<dc_base_purchase> ListPurchase(DateTime start, DateTime end)
         {
-            var sql = $@"select t1.* from dc_base_purchase t1 
+            var sql = $@"select t1.*,category_simple_name from dc_base_purchase t1 
+                        join dc_base_sku t2 on t1.bailun_sku=t2.bailun_sku
                         where t1.has_delete=0 and t1.status!=-1 and t1.create_time>='{start.ToString("yyyy-MM-dd")}' and t1.create_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}'";
 
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))

Bailun.DC.SkuDailyPurchaseAndSales/Program.cs

@@ -9,7 +9,7 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
     {
         //static async Task Main(string[] args)
         //{
-        //    Console.WriteLine("进入保存每日采购数和售出数");
+        //    Console.WriteLine("每日销进差异汇总");
         //    var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
         //    {
         //        services.AddHostedService<Services>();

Bailun.DC.Web/Areas/Reports/Controllers/PurchaseController.cs

@@ -116,24 +116,28 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             if (t == 0)
             {
+                colNames.Add("百伦简易分类");
+
                 var obj = _service.ListPurchase(start, end);
 
                 foreach (var item in obj)
                 {
                     listVal.Add(
                         item.purchase_id + "|" + item.bailun_sku + "|" + item.count + "|" + item.price + "|" + (item.count * item.price) + "|" +
-                        item.create_time.ToString("yyyy-MM-dd HH:mm:ss") + "|" + item.status
+                        item.create_time.ToString("yyyy-MM-dd HH:mm:ss") + "|" + item.status+"|"+item.category_simple_name
                         );
                 }
             }
             else if (t == 1)
             {
+                colNames.Add("仓库");
+
                 var obj = _service.ListSemiPurchase(start, end);
                 foreach (var item in obj)
                 {
                     listVal.Add(
                         item.purchase_id + "|" + item.bailun_sku + "|" + item.quantity_purchase + "|" + item.unit_price + "|" + (item.quantity_purchase * item.unit_price) + "|" +
-                        item.create_time.ToString("yyyy-MM-dd HH:mm:ss") + "|" + item.status
+                        item.create_time.ToString("yyyy-MM-dd HH:mm:ss") + "|" + item.status+"|"+item.warehouse_from_name
                         );
                 }
             }