解决仓库信息同步没有保存帐号名称信息的问题

Bailun.DC.DailyLogisticSupplierTransaction/Services.cs

@@ -80,19 +80,27 @@ namespace Bailun.DC.DailyLogisticSupplierTransaction
 
                 
                 //发生额
-                var sql = $"select t1.company_name,sum(t1.merchant_shipment_cost_cny) as merchant_shipment_cost_cny from dc_base_logistics t1 where ((t1.reconciliation_type='跟踪号对账' and t1.diff_state_type!=0) or (t1.reconciliation_type='单独费用')) and t1.merchant_reconciliation_time='{day.ToString("yyyy-MM-dd")}' and t1.company_name!='广州嘉和货运代理有限公司' group by t1.company_name";
+                var sql = $"select t1.company_name,sum(t1.merchant_shipment_cost_cny) as merchant_shipment_cost_cny from dc_base_logistics t1 where ((t1.reconciliation_type='跟踪号对账' and t1.diff_state_type!=0) or (t1.reconciliation_type='单独费用')) and t1.merchant_reconciliation_time>='{day.ToString("yyyy-MM-dd")}' and t1.merchant_reconciliation_time<'{day.AddDays(1).ToString("yyyy-MM-dd")}' and t1.company_name!='广州嘉和货运代理有限公司' group by t1.company_name";
                 listHappen = cn.Query<Models.dc_base_logistics>(sql).AsList();
 
                 //付款额
                 sql = $@"select t1.receive_unit as company_name,sum(t1.amount_rmb) as merchant_shipment_cost_cny from dc_base_finance_logistics t1 
-where t1.no in (select DISTINCT t2.fee_code from dc_base_logistics t2 where t2.fee_code in (select t1.`no` from dc_base_finance_logistics t1 where t1.pay_time>='{day.ToString("yyyy-MM-dd")}' and t1.pay_time<'{day.AddDays(1).ToString("yyyy-MM-dd")}' and t1.amount_rmb>=0 and t1.receive_unit!='广州嘉和货运代理有限公司'))
-group by t1.receive_unit";
+                        join dc_base_finance_fee t2 on t1.no=t2.cost_no and t2.logistics_supplier_id is not null
+                        where 
+                         t1.pay_time>='{day.ToString("yyyy-MM-dd")}' 
+                         and t1.pay_time<'{day.AddDays(1).ToString("yyyy-MM-dd")}' 
+                         and t1.amount_rmb>=0 
+                         group by t1.receive_unit";
                 listPay = cn.Query<dc_base_logistics>(sql).AsList();
 
                 //收款额
                 sql = $@"select t1.receive_unit as company_name,sum(t1.amount_rmb) as merchant_shipment_cost_cny from dc_base_finance_logistics t1 
-where t1.no in (select DISTINCT t2.fee_code from dc_base_logistics t2 where t2.fee_code in (select t1.`no` from dc_base_finance_logistics t1 where t1.pay_time>='{day.ToString("yyyy-MM-dd")}' and t1.pay_time<'{day.AddDays(1).ToString("yyyy-MM-dd")}' and t1.amount_rmb<0 and t1.receive_unit!='广州嘉和货运代理有限公司'))
-group by t1.receive_unit";
+                        join dc_base_finance_fee t2 on t1.no=t2.cost_no and t2.logistics_supplier_id is not null
+                        where 
+                         t1.pay_time>='{day.ToString("yyyy-MM-dd")}' 
+                         and t1.pay_time<'{day.AddDays(1).ToString("yyyy-MM-dd")}' 
+                         and t1.amount_rmb<0 
+                         group by t1.receive_unit";
                 listRecevice = cn.Query<dc_base_logistics>(sql).AsList();
 
 
@@ -162,29 +170,31 @@ group by t1.receive_unit";
 
             //合并三通的数据
             var objSanTong = list.Where(a => arrSanTong.Contains(a.suppliername)).ToList();
-            var tempSanTong = new dc_daily_logistics_supplier_transaction {
-                amount_happen = objSanTong.Count>0?objSanTong.Sum(a=>a.amount_happen):0,
-                amount_pay = objSanTong.Count > 0 ? objSanTong.Sum(a=>a.amount_pay) : 0,
-                amount_receipt = objSanTong.Count > 0 ? objSanTong.Sum(a=>a.amount_receipt) : 0,
-                amount_other = objSanTong.Count > 0 ? objSanTong.Sum(a=>a.amount_other) : 0,
+            var tempSanTong = new dc_daily_logistics_supplier_transaction
+            {
+                amount_happen = objSanTong.Count > 0 ? objSanTong.Sum(a => a.amount_happen) : 0,
+                amount_pay = objSanTong.Count > 0 ? objSanTong.Sum(a => a.amount_pay) : 0,
+                amount_receipt = objSanTong.Count > 0 ? objSanTong.Sum(a => a.amount_receipt) : 0,
+                amount_other = objSanTong.Count > 0 ? objSanTong.Sum(a => a.amount_other) : 0,
                 suppliername = "三通",
                 supplierid = 0,
                 amount_end = 0,
                 amount_start = 0,
-                createtime =DateTime.Now,
+                createtime = DateTime.Now,
                 day = list.FirstOrDefault().day,
                 lastupdatetime = DateTime.Now,
-                lastupdateuserid=0,
+                lastupdateuserid = 0,
                 lastupdateusername = "admin"
             };
 
             //合并Midland国际的数据
             var objMidland = list.Where(a => arrMidland.Contains(a.suppliername)).ToList();
-            var tempMidland = new dc_daily_logistics_supplier_transaction {
-                amount_happen = arrMidland.Count>0? objMidland.Sum(a=>a.amount_happen):0,
-                amount_pay = arrMidland.Count>0? objMidland.Sum(a=>a.amount_pay):0,
-                amount_receipt = arrMidland.Count>0? objMidland.Sum(a=>a.amount_receipt):0,
-                amount_other = arrMidland.Count>0? objMidland.Sum(a=>a.amount_other):0,
+            var tempMidland = new dc_daily_logistics_supplier_transaction
+            {
+                amount_happen = arrMidland.Count > 0 ? objMidland.Sum(a => a.amount_happen) : 0,
+                amount_pay = arrMidland.Count > 0 ? objMidland.Sum(a => a.amount_pay) : 0,
+                amount_receipt = arrMidland.Count > 0 ? objMidland.Sum(a => a.amount_receipt) : 0,
+                amount_other = arrMidland.Count > 0 ? objMidland.Sum(a => a.amount_other) : 0,
                 suppliername = "Midlands Associates",
                 supplierid = 0,
                 amount_end = 0,
@@ -198,11 +208,12 @@ group by t1.receive_unit";
 
             //合并华宇的数据
             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,
+            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,

Bailun.DC.SyncWarehouseInfo/Services.cs

@@ -82,7 +82,7 @@ namespace Bailun.DC.SyncWarehouseInfo
                     var accountname = "";
                     if (item.accountId > 0)
                     {
-                        accountname = cn.QueryFirstOrDefault<string>("select account_name+'-'+site_en as acount from dc_base_company_account where account_id=" + item.accountId);
+                        accountname = cn.QueryFirstOrDefault<string>("select concat(account_name,'-',site_en) as account from dc_base_company_account where account_id=" + item.accountId);
                     }
 
                     var m = cn.QueryFirstOrDefault<dc_base_warehouse>("select * from dc_base_warehouse where warehouse_code='" + item.code+"'");

Bailun.DC.Web/Controllers/HomeController.cs

@@ -58,7 +58,7 @@ namespace Bailun.DC.Web.Controllers
         public ActionResult Main()
         {
 #if DEBUG
-            var cookie = "Bearer%20eyJhbGciOiJSUzI1NiIsImtpZCI6ImQ3ZjgyYjYyN2E1OWY4YWJkMWU2OTI5MTlkNzc1NmNkIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTQ2MDY1OTMsImV4cCI6MTU5NDY0MjU5MywiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTk0NjA2NTkzLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.pyRMxoO3G_NDtjFaaJbQj00bU8LS8egnmZZB3WdN1Hbl-wut_flVvFIFIUPyMqbbGnuI26RLU3Q-kldo8gfiKtdHKUaHkPTmlDprKLS9P0kqX2yGFn6QwHTvuSYgmB-MtZPhtYA4vNiyM9_wv_BZauPcuzMeh6W9NAQaQtZ9OLXJuq-htoj2J_SGeBV9mKWbGere7F-6rVwgBCL3WOW_DWbEwKJesZC02upHo2v50GO21k2YSFrJAlBZyanS2QQzaTG2gdQKjchrnJNqlWLxKRVoM3dRUbaMfay4lEWUCuec_kf2mumYcloXgu6BSv403rx3oSjhAG_pUx511BYrjA";
+            var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImQ3ZjgyYjYyN2E1OWY4YWJkMWU2OTI5MTlkNzc1NmNkIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTQ3OTQzMDIsImV4cCI6MTU5NDgzMDMwMiwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTk0Nzk0MzAyLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.OCXAt2m8ia04T5dwrrhtGTG7KSnf1NmagQbxxls-GZVOBDSYcX1SwTozVThAdeI38Mv5nw7u-U_JUF1VA_qGbMTUo8XNMj5aygEbHEYSOAPo329HCvmJwlXIVoxKuzkwvj4rthk-e9PGdRKdnK9_cXzJWSbi7SCo_cz9lERdRItot1MooM-YBlKTvLsH4ZZe-a-Bv9pn6EOxLmOmAztDC2x0Lpm5hdD2lM7t9v-4VaMX1ZlXxSbL0G3xmpILbXqZGAziNKGlwN8W-OCFZFEg5xnDJQ6SwCRY1k0dXgY7XKoAnTpYZCEalXyU_3Ni3CVVL_Mc_V7AYsrPgbIZafJdgA";
 #else
             //var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
             var cookie = HttpContext.Request.Cookies["BailunToken"];