新增利润计算版块

AutoTurnOver.DB/dc_auto_turnover.cs

@@ -1285,7 +1285,7 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
                         date = this_time,
                         val = modalData.quantity_final_advise
                     });
-                    modalData.quantity_final_advise_amount = Math.Round( modalData.quantity_final_advise * modalData.unit_price??0,2);
+                    modalData.quantity_final_advise_amount = Math.Round( (modalData.quantity_final_advise??0) * (modalData.unit_price??0),2);
                     datas.FirstOrDefault(s => s.name == "实际建议周转金额").days.Add(new transfer_profit_dto.day_dto
                     {
                         date = this_time,
@@ -1319,13 +1319,13 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
                         date = this_time,
                         val = modalData.quantity_final_advise_ocean
                     });
-                    modalData.quantity_final_advise_ocean_amount = Math.Round( modalData.quantity_final_advise_ocean * modalData.unit_price??0,2);
+                    modalData.quantity_final_advise_ocean_amount = Math.Round( (modalData.quantity_final_advise_ocean??0) * (modalData.unit_price??0),2);
                     datas.FirstOrDefault(s => s.name == "海运周转金额").days.Add(new transfer_profit_dto.day_dto
                     {
                         date = this_time,
                         val = modalData.quantity_final_advise_ocean_amount
                     });
-                    modalData.freight_price_ocean = Math.Round( modalData.quantity_final_advise_ocean??0 * modalData.freight_unit_price_ocean,2);
+                    modalData.freight_price_ocean = Math.Round( (modalData.quantity_final_advise_ocean??0) * modalData.freight_unit_price_ocean,2);
                     datas.FirstOrDefault(s => s.name == "海运周转运费").days.Add(new transfer_profit_dto.day_dto
                     {
                         date = this_time,
@@ -1344,7 +1344,7 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
                         date = this_time,
                         val = modalData.quantity_final_advise_air_amount
                     });
-                    modalData.freight_price_air = Math.Round( modalData.quantity_final_advise_air * modalData.freight_unit_price_air??0,2);
+                    modalData.freight_price_air = Math.Round( (modalData.quantity_final_advise_air??0) * modalData.freight_unit_price_air,2);
                     datas.FirstOrDefault(s => s.name == "空运周转运费").days.Add(new transfer_profit_dto.day_dto
                     {
                         date = this_time,
@@ -1555,7 +1555,7 @@ from dc_auto_turnover_air where gmt_modified>=@btime and gmt_modified<=@etime
                 datas.FirstOrDefault(s => s.name == "差值(海运-空运)-实际周转采购金额占比").days.Add(new transfer_profit_dto.day_dto
                 {
                     date = this_time,
-                    val = (modalData.quantity_final_advise_amount??0) <= 0 ? 0M : (Math.Round(modalData.quantity_final__ocean_air_difference_amount??0 / modalData.quantity_final_advise_amount.Value, 3))
+                    val = (modalData.quantity_final_advise_amount??0) <= 0 ? 0M : (Math.Round((modalData.quantity_final__ocean_air_difference_amount??0) / modalData.quantity_final_advise_amount.Value, 3))
                 });