修改利润算法

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -1319,6 +1319,9 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
                         val = modalData.freight_price
                     });
 
+                    //实际周转金额
+                    modalData.turnover_amount = modalData.turnover* modalData.unit_price;
+
 
                     modalData.quantity_final_advise_ocean = (int)Math.Round(result_ocean.quantity_safe_inventory + (result_ocean.daily_weighted_sales * result_ocean.turnover_days));
                     datas.FirstOrDefault(s => s.name == "海运周转数（推荐海运）").days.Add(new transfer_profit_dto.day_dto
@@ -1357,6 +1360,47 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
                         date = this_time,
                         val = modalData.freight_price_air
                     });
+
+                    modalData.freight_price_ocean_difference_amount = modalData.freight_price - modalData.freight_price_ocean;
+                    datas.FirstOrDefault(s => s.name == "实际-海运运费差值").days.Add(new transfer_profit_dto.day_dto
+                    {
+                        date = this_time,
+                        val = modalData.freight_price_ocean_difference_amount
+                    });
+
+                    modalData.quantity_final_ocean_difference_amount = modalData.turnover_amount - modalData.quantity_final_advise_ocean_amount;
+                    datas.FirstOrDefault(s => s.name == "实际-海运周转采购金额差值").days.Add(new transfer_profit_dto.day_dto
+                    {
+                        date = this_time,
+                        val = modalData.quantity_final_ocean_difference_amount
+                    });
+
+                    datas.FirstOrDefault(s => s.name == "差值(海运)-实际周转采购金额占比").days.Add(new transfer_profit_dto.day_dto
+                    {
+                        date = this_time,
+                        val = (modalData.turnover_amount ?? 0) <= 0 ? 0M : (Math.Round((modalData.quantity_final_ocean_difference_amount ?? 0) / modalData.turnover_amount.Value, 3))
+                    });
+
+
+                    modalData.freight_price_air_difference_amount = modalData.freight_price - modalData.freight_price_air;
+                    datas.FirstOrDefault(s => s.name == "实际-空运运费差值").days.Add(new transfer_profit_dto.day_dto
+                    {
+                        date = this_time,
+                        val = modalData.freight_price_air_difference_amount
+                    });
+
+                    modalData.quantity_final_air_difference_amount = modalData.turnover_amount - modalData.quantity_final_advise_air_amount;
+                    datas.FirstOrDefault(s => s.name == "实际-空运周转采购金额差值").days.Add(new transfer_profit_dto.day_dto
+                    {
+                        date = this_time,
+                        val = modalData.quantity_final_air_difference_amount
+                    });
+
+                    datas.FirstOrDefault(s => s.name == "差值(空运)-实际周转采购金额占比").days.Add(new transfer_profit_dto.day_dto
+                    {
+                        date = this_time,
+                        val = (modalData.turnover_amount ?? 0) <= 0 ? 0M : (Math.Round((modalData.quantity_final_air_difference_amount ?? 0) / modalData.turnover_amount.Value, 3))
+                    });
                 }
                 else // 过去
                 {
@@ -1592,6 +1636,11 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
         internal decimal? quantity_final_advise_amount;
 
         /// <summary>
+        /// 实际周转金额
+        /// </summary>
+        internal decimal? turnover_amount;
+
+        /// <summary>
         /// 实际周转数
         /// </summary>
         internal decimal? purchase_quantity;
@@ -1630,7 +1679,7 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
         /// </summary>
         internal decimal? quantity_final_advise_air;
         /// <summary>
-        /// 实际-海运周转金额差值
+        /// 实际-海运周转运费差值
         /// </summary>
         internal decimal? freight_price_ocean_difference_amount;