fix

AutoTurnOver.Models/Report/transfer_profit_modal_dto.cs

@@ -20,6 +20,14 @@ namespace AutoTurnOver.Models.Report
         /// 实际周转数
         /// </summary>
         public int? turnover;
+        /// <summary>
+        /// 调拨+采购在途
+        /// </summary>
+        public int? dc_mid_transit_data;
+        /// <summary>
+        /// 实际在库
+        /// </summary>
+        public int? dc_stock_data;
 
         /// <summary>
         /// 实际建议周转金额
@@ -46,6 +54,11 @@ namespace AutoTurnOver.Models.Report
         public decimal? freight_unit_price;
 
         /// <summary>
+        /// 30天实际销量
+        /// </summary>
+        public decimal? sales30;
+
+        /// <summary>
         /// 实际周转运费
         /// </summary>
         public decimal? freight_price;
@@ -58,6 +71,10 @@ namespace AutoTurnOver.Models.Report
         /// 海运周转数（推荐海运）
         /// </summary>
         public int? quantity_final_advise_ocean;
+        /// <summary>
+        /// 海运供应链长度销量
+        /// </summary>
+        public dynamic turnover_sales_ocean;
 
 
         /// <summary>
@@ -65,6 +82,31 @@ namespace AutoTurnOver.Models.Report
         /// </summary>
         public decimal? freight_price_ocean;
         /// <summary>
+        /// 海运推荐物流
+        /// </summary>
+        public string cean_line_name;
+        /// <summary>
+        /// 空运推荐物流
+        /// </summary>
+        public string air_line_name;
+        /// <summary>
+        /// 海运推荐物流单价
+        /// </summary>
+        public decimal? cean_line_freight_unit_price;
+        /// <summary>
+        /// 空运推荐物流单价
+        /// </summary>
+        public decimal? air_line_freight_unit_price;
+        /// <summary>
+        /// 产品重量
+        /// </summary>
+        public decimal? weight;
+        /// <summary>
+        /// 30天海运周转运费 海运-实际差值
+        /// </summary>
+        public decimal? freight_price_ocean_30_difference;
+        public decimal? freight_price_air_30_difference;
+        /// <summary>
         /// 30天海运周转运费
         /// </summary>
         public decimal? freight_price_ocean_30;
@@ -84,9 +126,17 @@ namespace AutoTurnOver.Models.Report
         /// </summary>
         public decimal? quantity_final_advise_air;
         /// <summary>
+        /// 空运供应链销量
+        /// </summary>
+        public decimal turnover_sales_air { get; set; }
+        /// <summary>
         /// 实际-海运周转运费差值
         /// </summary>
         public decimal? freight_price_ocean_difference_amount;
+        /// <summary>
+        ///  实际-海运周转运费差值 占比
+        /// </summary>
+        public decimal? freight_price_ocean_difference_amount_radio;
 
         /// <summary>
         /// 空运周转金额
@@ -121,10 +171,15 @@ namespace AutoTurnOver.Models.Report
         /// </summary>
         public decimal? quantity_final_air_difference_amount;
 
+
         /// <summary>
         /// 海运-空运运费差值
         /// </summary>
         public decimal? freight_price_ocean_air_difference;
+        /// <summary>
+        /// 海运-空运运费差值 占比
+        /// </summary>
+        public decimal? freight_price_ocean_air_difference_radio;
 
         /// <summary>
         /// 海运-空运周转采购金额差值
@@ -135,15 +190,46 @@ namespace AutoTurnOver.Models.Report
         /// 实际-空运运费差值
         /// </summary>
         public decimal? freight_price_air_difference_amount;
+        /// <summary>
+        /// 实际-空运运费差值 占比
+        /// </summary>
+        public decimal? freight_price_air_difference_amount_radio;
+        public int? purchase_create_order_days_air;
+        public int payment_before_delivery_air;
+        public int supplier_delivery_air;
+        public int inspection_delivery_days_air;
+        public int transfer_delivery_air;
+        public decimal abroad_inbound_delivery_air;
+        public decimal transfer_bale_delivery_air;
+        public int? purchase_create_order_days_ocean;
+        public int payment_before_delivery_ocean;
+        public int supplier_delivery_ocean;
+        public int inspection_delivery_days_ocean;
+        public int transfer_delivery_ocean;
+        public decimal abroad_inbound_delivery_ocean;
+        public decimal transfer_bale_delivery_ocean;
+        public decimal turnover_sales;
+        public int turnover_days_air;
+        public decimal? freight_price_air_ocean_30_difference;
 
         /// <summary>
         /// 实际建议周转运费
         /// </summary>
-        public decimal? quantity_final_advise_freight;
+        //public decimal? quantity_final_advise_freight;
 
         /// <summary>
         /// 采购单价
         /// </summary>
         public decimal? unit_price { get; set; }
+
+        /// <summary>
+        /// 安全库存数量
+        /// </summary>
+        public decimal? quantity_safe_inventory { get; set; }
+
+        /// <summary>
+        /// 空运周转天数
+        /// </summary>
+        public decimal? turnover_days_ocean { get; set; }
     }
 }

AutoTurnOver.Models/dc_auto_turnover.cs

@@ -211,6 +211,7 @@ namespace AutoTurnOver.Models
         /// 本次采购到货到货前
         /// </summary>
         public decimal turnover_sales { get; set; }
+  
 
         /// <summary>
         /// 周转期内总入库

AutoTurnOver.Models/transfer_profit_dto.cs

-using System;
+using AutoTurnOver.Models.Report;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
 namespace AutoTurnOver.Models
 {
+    public class transfer_profit_result_dto
+    {
+        public List<transfer_profit_dto> datas { get; set; }
+        /// <summary>
+        /// 今日数据
+        /// </summary>
+        public transfer_profit_modal_dto today_data { get; set; }
+    }
     public class transfer_profit_dto
     {
         public string name { get; set; }
+        public string field_name { get; set; }
         public string remarks { get; set; }
         public List<day_dto> days { get; set; }
        

AutoTurnOver.Services/SkuAutoTurnServices.cs

@@ -681,7 +681,7 @@ namespace AutoTurnOver.Services
             public string warehouse_code { get; set; }
         }
 
-        public  List<transfer_profit_dto> TransferProfitList(string bailun_sku, string warehouse_code) {
+        public transfer_profit_result_dto TransferProfitList(string bailun_sku, string warehouse_code) {
             return DB.dc_auto_turnover.TransferProfitList(bailun_sku, warehouse_code);
         }
 

AutoTurnOver/Controllers/SkuAutoTurnController.cs

@@ -69,7 +69,7 @@ namespace AutoTurnOver.Controllers
 
                 return new JsonResult(new
                 {
-                    rows = list
+                    data = list
                 });
             }
             catch (Exception ex)