解决逻辑仓库动销率无法查看趋势图的问题

Bailun.DC.Services/WareHouseServices.cs

@@ -1150,11 +1150,15 @@ namespace Bailun.DC.Services
         public List<string> GetMidLogicWarehouseStatisticCount(string columnname, DateTime start, DateTime end)
         {
             var sql = "select CONCAT(name,',',DATE_FORMAT(day,'%Y-%m-%d')) as name from ("; 
-            sql += "select sum(" + columnname + ") as name,day from dc_daily_logic_wh_statistic where ";
+            
 
             if(columnname.Trim()== "pin_rate_stock")
             {
-                sql = "select sum(thirtyday_total_sales)/sum(usable_stock) as name,day from dc_daily_logic_wh_statistic where ";
+                sql += "select sum(thirtyday_total_sales)*100/sum(usable_stock) as name,day from dc_daily_logic_wh_statistic where ";
+            }
+            else
+            {
+                sql += "select sum(" + columnname + ") as name,day from dc_daily_logic_wh_statistic where ";
             }
 
             sql += $" day>='{start.ToString("yyyy-MM-dd")}' and day<='{end.ToString("yyyy-MM-dd")}' group by day";

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

@@ -1684,7 +1684,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     var arr = item.Split(',');
                     if (arr.Length > 1)
                     {
-                        listval.Add(arr[0]);
+                        if (key.Trim() == "pin_rate_stock")
+                        {
+                            listval.Add(decimal.Parse(arr[0]).ToString("N2"));
+                        }
+                        else
+                        {
+                            listval.Add(arr[0]);
+                        }
                         listdate.Add(DateTime.Parse(arr[1]).ToString("yyyy-MM-dd"));
                     }
                 }