调整仓库冗余sku维度的比例*100

Bailun.DC.Services/InventoryServices.cs

@@ -330,7 +330,7 @@ namespace Bailun.DC.Services
                 {
                     cn.Open();
                 }
-
+                
                 var tb = new System.Data.DataTable();
                 tb.Columns.Add("id", typeof(int));
                 tb.Columns.Add("bailun_sku");
@@ -372,7 +372,7 @@ namespace Bailun.DC.Services
                     var liststock = cn.Query<Models.Warehouse.mWarehouseRedundancy>($@"select t1.bailun_sku,t1.warehouse_code,t1.usable_stock,t2.sku_title_cn,t2.unit_price,t3.warehouse_name,t4.quantity,t5.quantity_out_stock,t6.oneday_total_sales,t6.threeday_total_sales,t6.sevenday_total_sales,t6.fourteenday_total_sales,t6.thirtyday_total_sales,t6.threeday_average_sales,t6.sevenday_average_sales,t6.fourteenday_average_sales,t6.thirtyday_average_sales,t7.quantity_purchase,t7.quantity_transfer from dc_base_stock t1
                                                                                                                                     join dc_base_sku t2 on t1.bailun_sku=t2.bailun_sku 
                                                                                                                                     join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
-                                                                                                                                    left join dc_auto_forecast_fluctuation t4 on t1.bailun_sku=t4.bailun_sku and t4.type=3 and t1.warehouse_code=t4.warehouse_code -- 仓库冗余
+                                                                                                                                    left join dc_auto_daily_redundance t4 on t4.record_time='{DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")}' and t1.bailun_sku=t4.bailun_sku and t1.warehouse_code=t4.warehouse_code -- 仓库冗余
                                                                                                                                     left join dc_mid_transit t5 on t1.bailun_sku=t5.bailun_sku and t1.warehouse_code=t5.warehouse_code
                                                                                                                                     left join dc_daily_sales t6 on t1.bailun_sku=t6.bailun_sku and t6.record_date='{DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")}' and t1.warehouse_code=t6.warehouse_code 
                                                                                                                                     left join dc_daily_transit t7 on t1.bailun_sku=t7.bailun_sku and t1.warehouse_code=t7.warehouse_code and t7.record_time='{DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")}'
@@ -397,13 +397,13 @@ namespace Bailun.DC.Services
 
                         row["daily_productsale_count"] = item.sevenday_average_sales ?? 0;
                         row["dailysale_amount"] = (item.sevenday_total_sales ?? 0) * item.unit_price;
-                        row["productsale_rate"] = stockcount > 0 ? (item.sevenday_average_sales ?? 0) / stockcount : 0;
-                        row["saleamount_rate"] = stockcount > 0 ? (item.sevenday_average_sales ?? 0) / stockcount : 0;
+                        row["productsale_rate"] = stockcount > 0 ? (item.sevenday_average_sales ?? 0) / (decimal)stockcount : 0;
+                        row["saleamount_rate"] = stockcount > 0 ? (item.sevenday_average_sales ?? 0) / (decimal)stockcount : 0;
 
                         row["redundancy_product_count"] = item.quantity ?? 0;
-                        row["redundancy_product_rate"] = stockcount > 0 ? (item.quantity ?? 0) / stockcount : 0;
+                        row["redundancy_product_rate"] = stockcount > 0 ? (decimal)(item.quantity ?? 0) / (decimal)stockcount : 0;
                         row["redundancy_amount"] = (item.quantity ?? 0) * item.unit_price;
-                        row["redundancy_amount_rate"] = stockcount > 0 ? (item.quantity ?? 0) / stockcount : 0;
+                        row["redundancy_amount_rate"] = stockcount > 0 ? (decimal)(item.quantity ?? 0) / (decimal)stockcount : 0;
 
                         row["yesterdaysale_amount"] = (item.oneday_total_sales ?? 0) * item.unit_price;
                         row["yesterdaysale_count"] = (item.oneday_total_sales ?? 0);
@@ -413,9 +413,9 @@ namespace Bailun.DC.Services
                         row["sale_14d_avg"] = (item.fourteenday_average_sales ?? 0) / 14;
                         row["sale_30d_avg"] = (item.thirtyday_average_sales ?? 0) / 30;
 
-                        row["day_turnover_rate"] = stockcount > 0 ? item.oneday_total_sales ?? 0 / stockcount : 0;
-                        row["week_turnover_rate"] = stockcount > 0 ? (item.sevenday_average_sales ?? 0) / stockcount * 7 : 0;
-                        row["month_turnover_rate"] = stockcount > 0 ? (item.thirtyday_average_sales ?? 0) / stockcount * 30 : 0;
+                        row["day_turnover_rate"] = stockcount > 0 ? item.oneday_total_sales ?? 0 / (decimal)stockcount : 0;
+                        row["week_turnover_rate"] = stockcount > 0 ? (item.sevenday_average_sales ?? 0) / (decimal)stockcount * 7 : 0;
+                        row["month_turnover_rate"] = stockcount > 0 ? (item.thirtyday_average_sales ?? 0) / (decimal)stockcount * 30 : 0;
                         row["stockout"] = item.quantity_out_stock ?? 0;
 
                         row["day"] = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
@@ -452,9 +452,16 @@ namespace Bailun.DC.Services
                     }
                 }
 
-                //生成仓库维度的冗余报告
-                cn.Execute("call Proc_SaveWarehouseRedundancy");
-
+                try
+                {
+                    //生成仓库维度的冗余报告
+                    cn.Execute("call Proc_SaveWarehouseRedundancy");
+                }
+                catch
+                {
+                    cn.Execute("call Proc_SaveWarehouseRedundancy");
+                }
+                
             }
 
             return "";

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

@@ -239,6 +239,20 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             if (t.HasValue)
             {
                 var obj = services.GetSkuRedundancyByType(warehousecode, day, t);
+
+                foreach (var item in obj)
+                {
+                    item.productsale_rate = item.productsale_rate * 100;
+                    item.saleamount_rate = item.saleamount_rate * 100;
+                    item.redundancy_product_rate = item.redundancy_product_rate * 100;
+                    item.redundancy_amount_rate = item.redundancy_amount_rate * 100;
+
+                    item.day_turnover_rate = item.day_turnover_rate * 100;
+                    item.week_turnover_rate = item.week_turnover_rate * 100;
+                    item.month_turnover_rate = item.month_turnover_rate * 100;
+
+                }
+
                 return Json(obj);
             }
             else

Bailun.DC.Web/Controllers/ApiController.cs

@@ -93,7 +93,6 @@ namespace Bailun.DC.Web.Controllers
         /// <param name="start">淘汰开始时间</param>
         /// <param name="end">淘汰结束时间</param>
         /// <returns></returns>
-        [HttpPost]
         public JsonResult ListWeekOutSku(int page, int pagesize, DateTime? start, DateTime? end)
         {
             var total = 0;
@@ -101,7 +100,7 @@ namespace Bailun.DC.Web.Controllers
 
             return Json(new {
                 success = true,
-                data = list,
+                skucodes = list,
                 total = total
             });