1

Bailun.DC.Services/WareHouseServices.cs

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

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

@@ -1669,7 +1669,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             }
             else
             {
-                new Services.WareHouseServices().GetMidLogicWarehouseStatistic(warehouse_code, key, start, end);
+                obj = new Services.WareHouseServices().GetMidLogicWarehouseStatistic(warehouse_code, key, start, end);
             }