调整现金流报表的库存统计方式

Bailun.DC.DailyPayAndIncoming/Program.cs

@@ -22,7 +22,7 @@ namespace Bailun.DC.DailyPayAndIncoming
         //{
         //    var _services = new Services();
 
-        //    var start = DateTime.Parse("2019-09-01");
+        //    var start = DateTime.Parse("2019-10-01");
         //    while (start < DateTime.Now)
         //    {
 

Bailun.DC.DailyPayAndIncoming/Services.cs

@@ -70,6 +70,8 @@ namespace Bailun.DC.DailyPayAndIncoming
 
             decimal costTotal = 0;
             costTotal = listInterest.Count > 0 ? listInterest.Sum(a => a.RepayInterestRMB):0;
+            
+            //管理成本 只取付款主体为广州百伦供应链科技有限公司、香港百伦科技有限公司、广州电子服装仓、阳山仓、深圳仓的数据
             list = list.Where(a => a.companyValue == 1 || a.companyValue == 2 || a.companyValue == 5 || a.companyValue == 8 || a.companyValue == 7).ToList();
             if (list.Count > 0)
             {
@@ -161,7 +163,11 @@ namespace Bailun.DC.DailyPayAndIncoming
                 var objArrival = cn.QueryFirstOrDefault<decimal?>(sql, null, null, 2 * 60);
 
                 //库存   每日晚上12点10分跑每日库存服务
-                sql = $"select sum((usable_stock+occupy_stock)*unit_price) amount from dc_daily_stock where record_time='{start.ToString("yyyy-MM-dd")}'";
+                sql = $@"select sum(ds.unit_price * (ds.usable_stock + ds.occupy_stock) * r.exchange_rate)
+                        from dc_daily_stock ds left join dc_base_sku s on ds.bailun_sku = s.bailun_sku
+                        left join dc_base_warehouse w on ds.warehouse_code = w.warehouse_code
+                        left join dc_exchange_rate r on s.currency = r.init_curreny
+                        where ds.record_time = '{start.ToString("yyyy-MM-dd")}' and r.final_curreny = 'CNY' and r.record_time = '{start.ToString("yyyy-MM-dd")}'";
                 var objStock = cn.QueryFirstOrDefault<decimal?>(sql, null, null, 2 * 60);