调整物流供应商往来报表

Bailun.DC.DailyLogisticSupplierTransaction/Services.cs

@@ -58,6 +58,7 @@ namespace Bailun.DC.DailyLogisticSupplierTransaction
 
         List<string> arrSanTong = new List<string> { "SPRING", "华得士国际货运代理有限公司", "DHL eCommerce (HK) Ltd", "Globavend", "华得士国际货运代理有限公司(中法)", "DHL  ECOMMERCE", "中国邮政集团公司广州市分公司", "华得士国际货运代理有限公司(西班牙)", "华得士国际货运代理有限公司(意大利)", "VALUE ADD SERVICE LIMITED（D）", "金羊城国际物流代理有限公司（T）", "深圳大森林国际货运代理有限公司（T）", "深圳市乐递供应链有限公司（T）", "深圳昊泽货运代理有限公司（T）", "深圳市天纵供应商管理有限公司（T）", "中外运－敦豪广东分公司（T）", "优比速包裹运送（广东）有限公司（T）", "天地国际运输代理（中国）有限公司广州分公司（T）", "HK TWELVE INTERNATIONAL CO., LIMITED（T）", "香港宇通供应链科技有限公司" };
         List<string> arrXingXing = new List<string> { "WMS-物流账单出纳页面-备注（直发）", "WMS-物流账单出纳页面-备注（调拨）" };
+        List<string> arrHuaYu = new List<string> { "橙联平台充值", "江苏天地华宇物联科技有限公司" };
 
         public void Init(DateTime day)
         {
@@ -194,12 +195,33 @@ group by t1.receive_unit";
                 lastupdateusername = "admin"
             };
 
-            //去除三通和猩猩的子公司数据
-            list = list.Where(a => !arrSanTong.Contains(a.suppliername) && !arrXingXing.Contains(a.suppliername)).ToList();
+            //合并华宇的数据
+            var objHuaYu = list.Where(a => arrHuaYu.Contains(a.suppliername)).ToList();
+            var tempHuaYu = new dc_daily_logistics_supplier_transaction {
+                amount_happen = objHuaYu.Count>0?objHuaYu.Sum(a=>a.amount_happen):0,
+                amount_pay = objHuaYu.Count>0?objHuaYu.Sum(a=>a.amount_pay):0,
+                amount_receipt = objHuaYu.Count>0?objHuaYu.Sum(a=>a.amount_receipt):0,
+                amount_other = objHuaYu.Count>0?objHuaYu.Sum(a=>a.amount_other):0,
 
-            //增加三通、猩猩国籍数据到列表
+                suppliername = "江苏天地华宇物联科技有限公司",
+                supplierid = 0,
+                amount_end = 0,
+                amount_start = 0,
+                createtime = DateTime.Now,
+                day = list.FirstOrDefault().day,
+                lastupdatetime = DateTime.Now,
+                lastupdateuserid = 0,
+                lastupdateusername = "admin"
+
+            };
+
+            //去除三通、华宇和猩猩的子公司数据
+            list = list.Where(a => !arrSanTong.Contains(a.suppliername) && !arrXingXing.Contains(a.suppliername) && !arrHuaYu.Contains(a.suppliername)).ToList();
+
+            //增加三通、华宇、猩猩国籍数据到列表
             list.Add(tempSanTong);
             list.Add(tempXingXing);
+            list.Add(tempHuaYu);
 
 
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))