调整月销售利润报表生成服务

Bailun.DC.MonthSaleProfit/Program.cs

@@ -22,8 +22,10 @@ namespace Bailun.DC.MonthSaleProfit
         //{
         //    var _services = new Services();
 
-        //    var start = DateTime.Parse("2020-11-01");
-        //    _services.InitNew(start);
+        //    var start = DateTime.Parse("2020-12-01");
+        //    //_services.Init(start);
+        //    //_services.InitNew(start);
+        //    //_services.InitNew4K(start);
         //    //_services.InitNew4K(start);
         //}
     }

Bailun.DC.MonthSaleProfit/Services.cs

@@ -755,10 +755,10 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
             //付款
             var objPay = listFinance.Where(a => a.cost_form == 1 || (a.cost_form == 3 && a.is_lend == 2));
 
-            m.incoming_operating_dsp = objIncoming.Where(a => a.project_type.ToUpper() == "DSP")?.Sum(a => a.amount_rmb) ?? 0;
-            m.incoming_operating_saas = objIncoming.Where(a => a.project_type.ToUpper() == "SAAS")?.Sum(a => a.amount_rmb) ?? 0;
-            m.incoming_operating_test = objIncoming.Where(a => a.project_type.ToUpper() == "测评")?.Sum(a => a.amount_rmb) ?? 0;
-            m.incoming_operating_other = objIncoming.Where(a=>a.project_type=="其他"||string.IsNullOrEmpty(a.project_type))?.Sum(a => a.amount_rmb) ?? 0;
+            m.incoming_operating_dsp = objIncoming.Where(a => a.project_type!=null && a.project_type.ToUpper() == "DSP")?.Sum(a => a.amount_rmb) ?? 0;
+            m.incoming_operating_saas = objIncoming.Where(a => a.project_type != null && a.project_type.ToUpper() == "SAAS")?.Sum(a => a.amount_rmb) ?? 0;
+            m.incoming_operating_test = objIncoming.Where(a => a.project_type != null && a.project_type.ToUpper() == "测评")?.Sum(a => a.amount_rmb) ?? 0;
+            m.incoming_operating_other = objIncoming.Where(a => a.project_type != null && a.project_type=="其他"||string.IsNullOrEmpty(a.project_type))?.Sum(a => a.amount_rmb) ?? 0;
 
 
             //营业收入=SAAS套餐收入+测评收入+DSP服务收入+MH代理收入+代运营收入+粉丝系统服务收入+其他收入
@@ -828,7 +828,7 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
                 if(objRate==null)
                 {
                     var result_Exchange = Common.HttpHelper.NetHelper.Request(_url_exchange+item.Currency);
-                    if(!string.IsNullOrEmpty(result_Exchange))
+                    if(!string.IsNullOrEmpty(result_Exchange) && result_Exchange!="null")
                     {
                         var jsonExchange = Newtonsoft.Json.JsonConvert.DeserializeObject<Models.response_Exchange>(result_Exchange);
                         objRate = new Tuple<string, decimal>(item.Currency, jsonExchange.rate);