新增在库+在途总金额

AutoTurnOver.DB/daily.cs

@@ -365,8 +365,9 @@ sum(t4.quantity_transfer_temporary_storage) as 'quantity_transfer_temporary_stor
 sum(t4.quantity_transfer_temporary_storage * t3.unit_price) as 'quantity_transfer_temporary_storage_amount',
 
 sum(t1.usable_stock + t4.quantity_transfer  + t4.quantity_purchase ) as 'sum_actual_stock',
-sum(t1.usable_stock + t4.quantity_transfer_order  ) as 'sum_actual_transfer_stock',
-sum(t1.usable_stock + t4.quantity_transfer_order  ) *  t3.unit_price as 'sum_actual_transfer_amount',
+sum((t1.usable_stock + t4.quantity_transfer  + t4.quantity_purchase) *  t3.unit_price  )  as 'sum_actual_stock_amount',
+sum(t1.usable_stock + ifnull(t4.quantity_transfer_order,0)  ) as 'sum_actual_transfer_stock',
+sum((t1.usable_stock + ifnull(t4.quantity_transfer_order,0) ) *  t3.unit_price  )  as 'sum_actual_transfer_amount',
 
 sum(t4.quantity_purchase * t3.unit_price) as 'realtime_amount_purchase',
 sum(t4.quantity_transfer * t3.unit_price) as 'realtime_amount_transfer',
@@ -446,6 +447,9 @@ t1.usable_stock + t1.occupy_stock as 'sum_usable_stock',
 (t1.usable_stock + t1.occupy_stock) * t3.unit_price as 'sum_usable_stock_amount',
 
 (t1.usable_stock + t4.quantity_transfer  + t4.quantity_purchase ) as 'sum_actual_stock',
+(t1.usable_stock + t4.quantity_transfer  + t4.quantity_purchase ) * t3.unit_price as 'sum_actual_stock_amount',
+(t1.usable_stock + t4.quantity_transfer_order  ) as 'sum_actual_transfer_stock',
+(t1.usable_stock + t4.quantity_transfer_order   ) * t3.unit_price as 'sum_actual_transfer_amount',
 
 ( (t6.turnover_sales+t6.quantity_safe_inventory) ) as 'turnover_days_quantity',
 t6.turnover_days  as 'turnover_days',

AutoTurnOver.Models/dc_base_stock.cs

@@ -302,10 +302,16 @@ namespace AutoTurnOver.Models
         /// 可用+调拨单在途
         /// </summary>
         public decimal? sum_actual_transfer_stock { get; set; }
+        private decimal? _sum_actual_transfer_amount;
         /// <summary>
         /// 可用+调拨单在途 金额
         /// </summary>
-        public decimal? sum_actual_transfer_amount { get; set; }
+        public decimal? sum_actual_transfer_amount { get { return Math.Round(_sum_actual_transfer_amount ?? 0, 1); } set { _sum_actual_transfer_amount = value; } }
+        private decimal? _sum_actual_stock_amount;
+        /// <summary>
+        /// 在库+在途金额
+        /// </summary>
+        public decimal? sum_actual_stock_amount { get { return Math.Round(_sum_actual_stock_amount ?? 0, 1); } set { _sum_actual_stock_amount = value; } }
         /// <summary>
         /// 供应链长度
         /// </summary>

AutoTurnOver.Services/DailyServices.cs

@@ -288,7 +288,7 @@ namespace AutoTurnOver.Services
                         "采购陆运在途","采购海运在途","采购空运在途","采购铁路在途","调拨陆运在途","调拨海运在途","调拨空运在途","调拨铁路在途",
                         "调拨最快到货时间","调拨最快到货单号","调拨最快到货数量","调拨最快到货跟踪号","调拨最快到货运输方式","调拨最快到到货物流","周转表更新时间",
                         "供应链长度天数","供应链预测销量","供应链预测缺货","供应链预测冗余","walmart最近7天日均销量","walmart最近14天日均销量","walmart最近30天日均销量","库存更新时间",
-                        "在库+调拨单在途数量","在库+调拨单在途金额"
+                        "在库+调拨单在途数量","在库+调拨单在途金额","在库+在途金额"
             };
                     foreach (var item in cols)
                     {
@@ -300,6 +300,7 @@ namespace AutoTurnOver.Services
                         DataRow row = table.NewRow();
                         row["在库+调拨单在途数量"] = itemData.sum_actual_transfer_stock;
                         row["在库+调拨单在途金额"] = itemData.sum_actual_transfer_amount;
+                        row["在库+在途金额"] = itemData.sum_actual_stock_amount;
 
                         row["walmart最近7天日均销量"] = itemData.history_sevenday_sales_walmart;
                         row["walmart最近14天日均销量"] = itemData.history_fourteenday_sales_walmart;