增加二级供应商发生额的计算

Bailun.DC.HappenAmount/Services.cs

@@ -98,6 +98,8 @@ namespace Bailun.DC.HappenAmount
 
                 var listFeeType = new List<string> { "推广费", "税费", "平台费用", "服务费", "其他" };
 
+
+
                 if (list.Count > 0)
                 {
                     m.ac_amount_pay += list.Sum(a => a.amountRmb);
@@ -173,11 +175,12 @@ namespace Bailun.DC.HappenAmount
                 #region 二级供应商
 
                 //付款额  取财务系统—出纳单列表当期费用系统中广州百伦，香港百伦对广州哈倪蔓生物科技有限公司、 广州拉古娜生物科技有限公司、 HONGKONG KULE INTERNATIONAL TRADING LIMITED、LEIKESAER INFORMATION SERVICE LIMITED、 广州市花都区花城滋柔贸易商行的应付账款付款金额
-                sqlpay = $@"select sum(cashier_paymoneyrmb) from dc_base_finance_cashier where cashier_type=1 and cashier_status=1 and cashier_time>='2019-08-17' and cashier_time<'2019-08-19' and companymain_value_from in (1,2) and tradeb_bjectname in ('广州哈倪蔓生物科技有限公司','广州拉古娜生物科技有限公司','HONGKONG KULE INTERNATIONAL TRADING LIMITED','LEIKESAER INFORMATION SERVICE LIMITED','广州市花都区花城滋柔贸易商行')";
+                sqlpay = $@"select sum(cashier_paymoneyrmb) from dc_base_finance_cashier where cashier_type=1 and cashier_status=1 and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and companymain_value_from in (1,2) and tradeb_bjectname in ('广州哈倪蔓生物科技有限公司','广州拉古娜生物科技有限公司','HONGKONG KULE INTERNATIONAL TRADING LIMITED','LEIKESAER INFORMATION SERVICE LIMITED','广州市花都区花城滋柔贸易商行')";
                 m.ss_amount_pay += cn.QueryFirstOrDefault<decimal?>(sqlpay, null, null, 2 * 60)??0;
 
                 //发生额
-
+                sqlhappen = $@"select sum(quantity_purchase*unit_price) from dc_semi_purchase_info where create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and status>-1";
+                m.ss_amount_happen += cn.QueryFirstOrDefault<decimal?>(sqlhappen, null, null, 2 * 60)??0;
 
                 //销售额
                 m.ss_amount_sales += m.tos_amount_sales;