增加采购价

Bailun.DC.Models/Stock/mSkuStock.cs

@@ -28,5 +28,10 @@ namespace Bailun.DC.Models.Stock
         /// 占用库存
         /// </summary>
         public int occupy_stock { get; set; }
+
+        /// <summary>
+        /// 采购价
+        /// </summary>
+        public decimal? unit_price { get; set; }
     }
 }

Bailun.DC.Services/InventoryServices.cs

@@ -1261,7 +1261,7 @@ namespace Bailun.DC.Services
         /// <returns></returns>
         public List<mSkuStock> ListStock(List<string> skus)
         {
-            var sql = $"select bailun_sku,sum(usable_stock) usable_stock,sum(occupy_stock) occupy_stock from dc_base_stock where bailun_sku in ('{string.Join("','",skus)}')";
+            var sql = $"select t1.bailun_sku,sum(t1.usable_stock) usable_stock,sum(t1.occupy_stock) occupy_stock,t2.unit_price from dc_base_stock t1 left join dc_base_sku t2 on t1.bailun_sku=t2.bailun_sku where t1.bailun_sku in ('{string.Join("','",skus)}')";
 
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString_read))
             {

Bailun.DC.Web/Controllers/ApiController.cs

@@ -1025,11 +1025,12 @@ namespace Bailun.DC.Web.Controllers
                     var obj = m.skus.Select(a => new
                     {
                         bailun_sku = a,
-                        salecount = objSkuOrder.Where(o => o.bailun_sku == a)?.Sum(b => b.bailun_sku_quantity_ordered) ?? 0,
-                        saleamount = objSkuOrder.Where(o => o.bailun_sku == a)?.Sum(b => b.amount_sales) ?? 0,
-                        profit = objSkuOrder.Where(o => o.bailun_sku == a)?.Sum(b => b.profit_total) ?? 0,
+                        salecount = objSkuOrder.Where(o => o.bailun_sku == a)?.Sum(b => b.bailun_sku_quantity_ordered) ?? 0,  //销量
+                        saleamount = objSkuOrder.Where(o => o.bailun_sku == a)?.Sum(b => b.amount_sales) ?? 0,                //销售额
+                        profit = objSkuOrder.Where(o => o.bailun_sku == a)?.Sum(b => b.profit_total) ?? 0,                    //利润
 
-                        stock = objSkuStock.Where(s => s.bailun_sku == a)?.Sum(b => b.occupy_stock + b.usable_stock) ?? 0,
+                        stock = objSkuStock.Where(s => s.bailun_sku == a)?.Sum(b => b.occupy_stock + b.usable_stock) ?? 0,    //库存
+                        unit_price = objSkuStock.Where(s=>s.bailun_sku==a).FirstOrDefault()?.unit_price??0,                   //最新采购价
                         platform = ""
                     });
 
@@ -1050,6 +1051,7 @@ namespace Bailun.DC.Web.Controllers
                         profit = objSkuOrder.Where(o => o.bailun_sku == a && o.platform_type == m.platform)?.Sum(b => b.profit_total) ?? 0,
 
                         stock = objSkuStock.Where(s => s.bailun_sku == a)?.Sum(b => b.occupy_stock + b.usable_stock) ?? 0,
+                        unit_price = objSkuStock.Where(s => s.bailun_sku == a).FirstOrDefault()?.unit_price ?? 0,
                         platform = m.platform
                     });