Skip to content

D
DataCenter_Core2.1_20190520
Commit ebf6e250 by guanzhenshan
Options

解决资产负债表应付账款-物流供应商付款额明细和汇总对不上的问题

parent c8d1c309
Showing with 23 additions and 4 deletions
Bailun.DC.Services/FinanceReportServices.cs
...@@ -1869,7 +1869,7 @@ namespace Bailun.DC.Services ...@@ -1869,7 +1869,7 @@ namespace Bailun.DC.Services
/// <returns></returns> /// <returns></returns>
public List<dc_base_finance_cashier> ListHeadLogisticPay(BtTableParameter parameter,DateTime start, DateTime end,ref int total) public List<dc_base_finance_cashier> ListHeadLogisticPay(BtTableParameter parameter,DateTime start, DateTime end,ref int total)
{ {
var sql = $"select code,detail_name,type_name,companymain_name_from,paymoney_rmb,cashier_paymoneyrmb,cashier_time from dc_base_finance_cashier where cashier_type=1 and cashier_status=1 and sourcecode in ('newCost','oldbuy') and type_name='销售费用/物流费' and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss")}'"; ; var sql = $"select code,detail_name,type_name,companymain_name_from,if(cashier_type=2,-paymoney_rmb,paymoney_rmb) paymoney_rmb,if(cashier_type=2,-cashier_paymoneyrmb,cashier_paymoneyrmb) cashier_paymoneyrmb,cashier_time from dc_base_finance_cashier where cashier_type in (1,2) and cashier_status=1 and sourcecode in ('newCost','oldbuy') and type_name='销售费用/物流费' and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss")}'"; ;
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString)) using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{ {
...@@ -1892,7 +1892,7 @@ namespace Bailun.DC.Services ...@@ -1892,7 +1892,7 @@ namespace Bailun.DC.Services
/// <returns></returns> /// <returns></returns>
public dc_base_finance_cashier ListHeadLogisticPayCount(DateTime start, DateTime end) public dc_base_finance_cashier ListHeadLogisticPayCount(DateTime start, DateTime end)
{ {
var sql = $"select sum(paymoney_rmb) paymoney_rmb,sum(cashier_paymoneyrmb) cashier_paymoneyrmb from dc_base_finance_cashier where cashier_type=1 and cashier_status=1 and sourcecode in ('newCost','oldbuy') and type_name='销售费用/物流费' and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss")}'"; ; var sql = $"select sum(if(cashier_type=2,-paymoney_rmb,paymoney_rmb)) paymoney_rmb,sum(if(cashier_type=2,-cashier_paymoneyrmb,cashier_paymoneyrmb)) cashier_paymoneyrmb from dc_base_finance_cashier where cashier_type in (1,2) and cashier_status=1 and sourcecode in ('newCost','oldbuy') and type_name='销售费用/物流费' and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss")}'"; ;
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString)) using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{ {
...@@ -1917,7 +1917,7 @@ namespace Bailun.DC.Services ...@@ -1917,7 +1917,7 @@ namespace Bailun.DC.Services
{ {
try try
{ {
var sql = $"select code,detail_name,type_name,companymain_name_from,paymoney_rmb,cashier_paymoneyrmb,cashier_time from dc_base_finance_cashier where cashier_type=1 and cashier_status=1 and sourcecode in ('newCost','oldbuy') and type_name='销售费用/物流费' and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss")}'"; ; var sql = $"select code,detail_name,type_name,companymain_name_from,if(cashier_type=2,-paymoney_rmb,paymoney_rmb) paymoney_rmb,if(cashier_type=2,-cashier_paymoneyrmb,cashier_paymoneyrmb) cashier_paymoneyrmb,cashier_time from dc_base_finance_cashier where cashier_type in (1,2) and cashier_status=1 and sourcecode in ('newCost','oldbuy') and type_name='销售费用/物流费' and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss")}'"; ;
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString)) using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{ {
......
Bailun.DC.Web/Pages/Index.cshtml
...@@ -24,11 +24,12 @@ ...@@ -24,11 +24,12 @@
<script src="css/hplus/js/jquery.min.js?v=2.1.4"></script> <script src="css/hplus/js/jquery.min.js?v=2.1.4"></script>
<script src="~/js/jquery.cookie.js" type="text/javascript"></script> <script src="~/js/jquery.cookie.js" type="text/javascript"></script>
<script src="~/js/common.js?20200220003" type="text/javascript"></script> <script src="~/js/common.js?20200220004" type="text/javascript"></script>
</head> </head>
<body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden"> <body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">
<script type="text/javascript"> <script type="text/javascript">
//login_localhost();
login(); login();
window.location = "@Url.Content("~/Home/Main")"; window.location = "@Url.Content("~/Home/Main")";
</script> </script>
......
Bailun.DC.Web/wwwroot/js/common.js
...@@ -330,6 +330,24 @@ function login() { ...@@ -330,6 +330,24 @@ function login() {
} }
} }
function login_localhost() {
var token = getUrlParam('token');
if (token != '') {
$.cookie('BailunToken', token, { expires: 1, domain: 'localhost' });
window.location = baseUrl;
}
else {
token = $.cookie('BailunToken');
if (token == '' || token == undefined || token == null) {
window.location = "http://sso.bailuntec.com/?returnUrl=" + baseUrl;
return false;
}
}
}
function logout() { function logout() {
$.removeCookie('BailunToken'); $.removeCookie('BailunToken');
window.location = "http://sso.bailuntec.com/?returnUrl=" + baseUrl; window.location = "http://sso.bailuntec.com/?returnUrl=" + baseUrl;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment