Skip to content

D
DataCenter_Core2.1_20190520
Commit 18cbbf2a by guanzhenshan
Options

调整管理成本，改为付现流水，可筛选管理成本报表

parent aa6f7c90
Showing with 138 additions and 17 deletions
Bailun.DC.Models/dc_base_finance_fee.cs
......@@ -333,5 +333,16 @@ namespace Bailun.DC.Models
public string customer_num { get; set; }
public string accounting_subject_name { get; set; }
/// <summary>
/// 是否管理成本
/// </summary>
public int? is_manage_cost { get; set; }
/// <summary>
/// 部门名称
/// </summary>
public string department_name { get; set; }
}
}
Bailun.DC.Services/FinanceReportServices.cs
......@@ -768,6 +768,100 @@ namespace Bailun.DC.Services
}
/// <summary>
/// 付现管理列表
/// </summary>
/// <param name="start">付款开始时间</param>
/// <param name="end">付款结束时间</param>
/// <param name="ismanager">是否管理成本</param>
/// <returns></returns>
public List<Models.dc_base_finance_fee> ListFinanceFee(DateTime start, DateTime end, string feesupertype, string feesubtype, string departmentname, int? paycompanyid,int? ismanager)
{
var sqlparam = new DynamicParameters();
var list = new List<Models.dc_base_finance_fee>();
var sql = $"select * from dc_base_finance_fee where cost_status=4 and is_lend!=2 and pay_time>='{start.ToString("yyyy-MM-dd")}' and pay_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}'";
if (!string.IsNullOrEmpty(feesupertype))
{
sql += " and fee_super_type=@type";
sqlparam.Add("type", feesupertype);
}
if (!string.IsNullOrEmpty(feesubtype))
{
sql += " and fee_sub_type=@subtype";
sqlparam.Add("subtype", feesubtype);
}
if (!string.IsNullOrEmpty(departmentname))
{
if (departmentname == "四千里主体")
{
//72, 67, 58, 54, 78
sql += " and company_value in (72, 67, 58, 54, 78)";
}
else
{
sql += " and department_name=@department_name";
sqlparam.Add("department_name", departmentname);
}
}
if (paycompanyid.HasValue && paycompanyid.Value > 0)
{
if (paycompanyid.Value == 53)
{
sql += " and company_value in (53,59,60,61,66)";
}
else if (paycompanyid.Value == 54) //四千里
{
sql += " and company_value in (72, 67, 58, 54, 78)";
}
else
{
sql += " and company_value=" + paycompanyid.Value;
}
}
if(ismanager.HasValue)
{
sql += " and is_manage_cost="+ismanager.Value;
}
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
if (cn.State == ConnectionState.Closed)
{
cn.Open();
}
list = cn.Query<dc_base_finance_fee>(sql, sqlparam, null, true, 2 * 60).ToList();
foreach (var item in list)
{
if (item.cost_form == 2)
{
item.amount = -(item.amount);
item.amount_rmb = -(item.amount_rmb);
}
//借支单待还余额
if(item.cost_form==3 && item.lend_balance.HasValue && item.lend_balance.Value>0)
{
item.amount += item.lend_balance.Value;
item.amount_rmb = item.lend_balance.Value * (item.to_rmb_rate ?? 1);
}
}
return list.ToList();
}
}
/// <summary>
/// 获取管理成本的利息支出
/// </summary>
/// <param name="start"></param>
......@@ -5095,6 +5189,8 @@ group by currency";
return "找不到该月份的利润数据。";
}
#region 赋值
if (m.cost_sale_.HasValue)
{
obj.cost_sale = (obj.cost_sale - obj.cost_sale_) + m.cost_sale_.Value;
......@@ -5246,6 +5342,8 @@ group by currency";
obj.lastupdatetime = DateTime.Now;
#endregion
var result = cn.Update<dc_month_sale_profit>(obj);
return result > 0 ? "" : "更新失败，请重试";
......
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
......@@ -1315,11 +1315,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// </summary>
/// <param name="t"></param>
/// <param name="PayName"></param>
/// <param name="ismanager">是否管理成本</param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[HttpPost]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【管理成本报表】->【查询】页面", 0)]
public JsonResult AdministrativeCostJson(int t, DateTime start,DateTime end,int? paycompanyid)
public JsonResult AdministrativeCostJson(int t, DateTime start,DateTime end,int? paycompanyid,int? ismanager)
{
var url = ConfigHelper.GetByName("FeeUrl")+"?o=0";
var cwurl = ConfigHelper.GetByName("cwUrl") + "?";
......@@ -1338,7 +1339,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var listInterest = new Services.FinanceReportServices().ListInterestExpense(cwurl);
//Edit by Allan at 20191217 for 更改数据源
var list = new Services.FinanceReportServices().ListFinanceManageCost(start,end,"","","",paycompanyid); //new Services.FinanceReportServices().ListOtherCost(url);
//var list = new Services.FinanceReportServices().ListFinanceManageCost(start,end,"","","",paycompanyid); //new Services.FinanceReportServices().ListOtherCost(url);
var list = new Services.FinanceReportServices().ListFinanceFee(start,end,"","","",paycompanyid,ismanager);
//手续费 Add by Allan at 20200514
var listHandleFee = new Services.FinanceReportServices().ListFinanceHandleFee(start, end, paycompanyid);
......@@ -1380,7 +1383,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
{
if (item.company_name == listCol[i])
{
var obj = listValue.Where(a => a.Item1 == item.fee_super_type).FirstOrDefault();
var obj = listValue.Where(a => a.Item1 == item.type_no).FirstOrDefault();
if (obj == null)
{
......@@ -1390,12 +1393,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
listItems.Add(0.00M);
}
listItems[i] = item.amount_rmb;
listValue.Add(new Tuple<string, List<decimal>>(item.fee_super_type, listItems));
listItems[i] = item.amount_rmb??0;
listValue.Add(new Tuple<string, List<decimal>>(item.type_no, listItems));
}
else
{
obj.Item2[i] += item.amount_rmb;
obj.Item2[i] += item.amount_rmb??0;
}
}
}
......@@ -1403,7 +1406,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
{
if (item.department_name == listCol[i])
{
var obj = listValue.Where(a => a.Item1 == item.fee_super_type).FirstOrDefault();
var obj = listValue.Where(a => a.Item1 == item.type_no).FirstOrDefault();
if (obj == null)
{
......@@ -1413,12 +1416,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
listItems.Add(0.00M);
}
listItems[i] = item.amount_rmb;
listValue.Add(new Tuple<string, List<decimal>>(item.fee_super_type, listItems));
listItems[i] = item.amount_rmb??0;
listValue.Add(new Tuple<string, List<decimal>>(item.type_no, listItems));
}
else
{
obj.Item2[i] += item.amount_rmb;
obj.Item2[i] += item.amount_rmb??0;
}
}
}
......@@ -1833,7 +1836,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
msg = list.Count>0?"":"成本接口返回了空记录。",
col = listCol,
list = listValue,
amount = Math.Round(list.Sum(a=>a.amount_rmb)+ listInterest.Sum(a=>a.RepayInterestRMB)+ listHandleFee.Sum(a => a.pay_money_rMB), 2),
amount = Math.Round(list.Sum(a=>a.amount_rmb??0)+ listInterest.Sum(a=>a.RepayInterestRMB)+ listHandleFee.Sum(a => a.pay_money_rMB), 2),
isexport = Services.UserAuthorityServices.checkUserExportAuthority("ExportListInterestExpense", HttpContextHelper.Current.User.GetUserName()),
});
}
......@@ -2182,7 +2185,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="type"></param>
/// <param name="issub"></param>
/// <returns></returns>
public ActionResult ExportListAdministrativeCost(DateTime start, DateTime end, int? paycompanyid, string headname, string categoryname, int type, int issub)
public ActionResult ExportListAdministrativeCost(DateTime start, DateTime end, int? paycompanyid, string headname, string categoryname, int type, int issub,int? ismanager)
{
//var url = ConfigHelper.GetByName("FeeUrl") + "?o=0";
......@@ -2253,7 +2256,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
//var obj = new Services.FinanceReportServices().ListOtherCost(url);
var obj = new Services.FinanceReportServices().ListFinanceManageCost(start, end, (issub == 0 ? categoryname : ""), (issub != 0 ? categoryname : ""), (type == 1 ? headname : ""), paycompanyid);
var obj = new Services.FinanceReportServices().ListFinanceFee(start, end, (issub == 0 ? categoryname : ""), (issub != 0 ? categoryname : ""), (type == 1 ? headname : ""), paycompanyid, ismanager);
var colNames = new List<string> {"费用单号","一级部门","付款主体名称","费用类别", "会计科目",
......@@ -2262,8 +2265,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var list = new List<string>();
foreach (var item in obj)
{
list.Add(item.no + "|" + item.department_name + "|" + item.company_name + "|" + item.fee_super_type + "|" + item.accounting_subject_name + "|" +
item.amount + "|" + item.currency + "|" + item.amount_rmb + "|" + item.receive_unit + "|" + item.reason + "|" + item.pay_time.Value.ToString("yyyy-MM-dd HH:mm:ss")
list.Add(item.cost_no + "|" + item.department_name + "|" + item.company_name + "|" + item.type_name + "|" + item.accounting_subject_name + "|" +
item.amount + "|" + item.dic + "|" + item.amount_rmb + "|" + item.bank_company + "|" + item.cost_reason + "|" + item.pay_time.Value.ToString("yyyy-MM-dd HH:mm:ss"+"|"+item.mor_remark)
);
}
......@@ -2289,7 +2292,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="end"></param>
/// <param name="paycompanyid"></param>
/// <returns></returns>
public IActionResult ExportAdministrativeCost(DateTime start, DateTime end, int? paycompanyid)
public IActionResult ExportAdministrativeCost(DateTime start, DateTime end, int? paycompanyid,int? ismanager)
{
//var url = ConfigHelper.GetByName("FeeUrl") + "?o=0";
......
Bailun.DC.Web/Areas/Reports/Views/Finance/AdministrativeCost.cshtml
......@@ -35,6 +35,14 @@
</div>
<div class="form-group">
<label>&nbsp;</label>
<select id="ismanager" class="form-control">
<option value="">全部</option>
<option value="1">销管财</option>
<option value="0">非销管财</option>
</select>
</div>
<div class="form-group">
<label>&nbsp;</label>
<button type="button" class="btn btn-primary" onclick="list();"><i class="fa fa-search"></i>&nbsp;查询</button>
<button id="btnexport" style="display:none;" type="button" class="btn btn-success" onclick="exportxls();">导出</button>
</div>
......@@ -217,6 +225,7 @@
}
function getChildren(trindex, typename) {
return false;
if (typename == '利息支出') {
layer.msg('利息支出没有子分类哦');
return false;
......@@ -372,7 +381,7 @@
return false;
}
var url = '@Url.Content("~/Reports/Finance/ExportAdministrativeCost?")' + 'start=' + start + '&end=' + end + '&paycompanyid=' + paycompanyid;
var url = '@Url.Content("~/Reports/Finance/ExportAdministrativeCost?")' + 'start=' + start + '&end=' + end + '&paycompanyid=' + paycompanyid + '&ismanager=' + $('#ismanager').val();
window.open(url, '_blank');
}
......
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