Skip to content

D
DataCenter_Core2.1_20190520
Commit a4ee2c0b by guanzhenshan
Options

增加管理成本，调整其他销售额和其他成本

parent a56385d6
Showing with 79 additions and 20 deletions
Bailun.DC.Models/dc_month_sales_profit.cs
...@@ -163,6 +163,17 @@ namespace Bailun.DC.Models ...@@ -163,6 +163,17 @@ namespace Bailun.DC.Models
/// 管理成本-信荟蓝 /// 管理成本-信荟蓝
/// </summary> /// </summary>
public decimal managercost_xinhuilan { get; set; } public decimal managercost_xinhuilan { get; set; }
/// <summary>
/// 迪致美容
/// </summary>
public decimal managercost_dizhi { get; set; }
/// <summary>
/// 广州美甲生产仓
/// </summary>
public decimal managercost_meijiashengchan { get; set; }
/// <summary> /// <summary>
/// 管理成本合计 /// 管理成本合计
/// </summary> /// </summary>
......
Bailun.DC.MonthSaleProfit/Services.cs
...@@ -476,6 +476,9 @@ namespace Bailun.DC.MonthSaleProfit ...@@ -476,6 +476,9 @@ namespace Bailun.DC.MonthSaleProfit
managecost_bl_xg = 0, managecost_bl_xg = 0,
managecost_meijia = 0, managecost_meijia = 0,
managercost_yangshan = 0, managercost_yangshan = 0,
managercost_dizhi = 0,
managercost_meijiashengchan = 0,
managercost_xinhuilan = 0,
month = day.ToString("yyyy-MM"), month = day.ToString("yyyy-MM"),
dividend = 0, dividend = 0,
incoming_non_operating = 0, incoming_non_operating = 0,
...@@ -528,7 +531,7 @@ namespace Bailun.DC.MonthSaleProfit ...@@ -528,7 +531,7 @@ namespace Bailun.DC.MonthSaleProfit
m.amount_sales_meirongmj = objOrder.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.amount_sales) ?? 0+ objFBA.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.amount_sales) ?? 0; m.amount_sales_meirongmj = objOrder.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.amount_sales) ?? 0+ objFBA.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.amount_sales) ?? 0;
m.amount_sales = m.amount_sales_dianzi + m.amount_sales_fuzhuang + m.amount_sales_jiaju + m.amount_sales_jingyou + m.amount_sales_meirongmj; m.amount_sales = m.amount_sales_dianzi + m.amount_sales_fuzhuang + m.amount_sales_jiaju + m.amount_sales_jingyou + m.amount_sales_meirongmj;
m.amount_sales_other = objOrder.Sum(a => a.amount_sales??0) + objFBA.Sum(a=>a.amount_sales??0) - m.amount_sales; m.amount_sales_other = objOrder.Where(a => a.financecategoryname == "")?.Sum(a => a.amount_sales) ?? 0 + objFBA.Where(a => a.financecategoryname == "")?.Sum(a => a.amount_sales) ?? 0;
m.amount_sales += m.amount_sales_other; m.amount_sales += m.amount_sales_other;
//产品成本=家居用品类+服装类+电子产品类+精油类+美容美甲类+其他类型成本 //产品成本=家居用品类+服装类+电子产品类+精油类+美容美甲类+其他类型成本
...@@ -539,7 +542,7 @@ namespace Bailun.DC.MonthSaleProfit ...@@ -539,7 +542,7 @@ namespace Bailun.DC.MonthSaleProfit
m.cost_meirongmj = objOrder.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.cost_product) ?? 0+ objFBA.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.cost_product) ?? 0; m.cost_meirongmj = objOrder.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.cost_product) ?? 0+ objFBA.Where(a => a.financecategoryname == "美容美甲类")?.Sum(a => a.cost_product) ?? 0;
m.cost = m.cost_dianzi + m.cost_fuzhuang + m.cost_jiaju + m.cost_jingyou + m.cost_meirongmj; m.cost = m.cost_dianzi + m.cost_fuzhuang + m.cost_jiaju + m.cost_jingyou + m.cost_meirongmj;
m.cost_other = objOrder.Sum(a => a.cost_product??0) + objFBA.Sum(a => a.cost_product??0) - m.cost; m.cost_other = objOrder.Where(a => a.financecategoryname == "")?.Sum(a => a.cost_product) ?? 0 + objFBA.Where(a => a.financecategoryname == "")?.Sum(a => a.cost_product) ?? 0;
m.cost += m.cost_other; m.cost += m.cost_other;
...@@ -588,7 +591,7 @@ namespace Bailun.DC.MonthSaleProfit ...@@ -588,7 +591,7 @@ namespace Bailun.DC.MonthSaleProfit
join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
where t1.has_delete=0 and t1.shipping_status = 'TotalShipping' and t1.company_id=1 and t1.shipping_time>='{day.ToString("yyyy-MM-dd")}' and t1.shipping_time<'{day.AddMonths(1).ToString("yyyy-MM-dd")}' where t1.has_delete=0 and t1.shipping_status = 'TotalShipping' and t1.company_id=1 and t1.shipping_time>='{day.ToString("yyyy-MM-dd")}' and t1.shipping_time<'{day.AddMonths(1).ToString("yyyy-MM-dd")}'
group by t3.hq_type"; group by t3.hq_type";
var objLogistics = cn.Query<Models.mLogisticsFee>(sql,null,null,true,3*60).ToList(); var objLogistics = cn.Query<Models.mLogisticsFee>(sql,null,null,true,6*60).ToList();
//物流仓储费用 = 头程运输+直邮物流费（国内发货）+尾程物流费（国外发货）+海外仓仓储及其他费用 //物流仓储费用 = 头程运输+直邮物流费（国内发货）+尾程物流费（国外发货）+海外仓仓储及其他费用
...@@ -622,14 +625,17 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code ...@@ -622,14 +625,17 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
m.rate_profit_sales = m.amount_sales > 0 ? m.profit_sales / m.amount_sales : 0; m.rate_profit_sales = m.amount_sales > 0 ? m.profit_sales / m.amount_sales : 0;
//管理成本=香港百伦+广州百伦+美容美甲店+杨杉+信荟蓝+成品仓 //管理成本=香港百伦+广州百伦+美容美甲店+杨杉+信荟蓝+成品仓+广州美甲生产仓+迪致美容
m.managecost_bl_xg = list.Where(a => a.company_name.Contains("香港百伦"))?.Sum(a => a.amount_rmb)??0; m.managecost_bl_xg = list.Where(a => a.company_name.Contains("香港百伦"))?.Sum(a => a.amount_rmb)??0;
m.managecost_bl_gz = list.Where(a => a.company_name.Contains("广州百伦"))?.Sum(a => a.amount_rmb) ?? 0+listInterest?.Sum(a=>a.RepayInterestRMB)??0+listHandleFee?.Sum(a=>a.pay_money_rMB)??0; m.managecost_bl_gz = list.Where(a => a.company_name.Contains("广州百伦"))?.Sum(a => a.amount_rmb) ?? 0+listInterest?.Sum(a=>a.RepayInterestRMB)??0+listHandleFee?.Sum(a=>a.pay_money_rMB)??0;
m.managecost_meijia = list.Where(a => a.company_name.Contains("歌戈儿") || a.company_name.Contains("拉古娜") || a.company_name.Contains("迪致美容")||a.company_name.Contains("美甲生产仓"))?.Sum(a => a.amount_rmb) ?? 0; m.managecost_meijia = list.Where(a => a.company_name.Contains("歌戈儿"))?.Sum(a => a.amount_rmb) ?? 0;
m.managercost_chengpincang = list.Where(a => a.company_name.Contains("广州电子服装仓"))?.Sum(a => a.amount_rmb) ?? 0; m.managercost_chengpincang = list.Where(a => a.company_name.Contains("广州电子服装仓"))?.Sum(a => a.amount_rmb) ?? 0;
m.managercost_yangshan = list.Where(a => a.company_name.Contains("扬杉"))?.Sum(a => a.amount_rmb) ?? 0; m.managercost_yangshan = list.Where(a => a.company_name.Contains("扬杉"))?.Sum(a => a.amount_rmb) ?? 0;
m.managercost_xinhuilan = list.Where(a => a.company_name.Contains("信荟蓝"))?.Sum(a => a.amount_rmb) ?? 0; m.managercost_xinhuilan = list.Where(a => a.company_name.Contains("信荟蓝"))?.Sum(a => a.amount_rmb) ?? 0;
m.managercost_count = m.managecost_bl_gz + m.managecost_bl_xg + m.managecost_meijia + m.managercost_chengpincang + m.managercost_xinhuilan + m.managercost_yangshan; m.managercost_meijiashengchan = list.Where(a => a.company_name.Contains("美甲生产仓"))?.Sum(a => a.amount_rmb) ?? 0;
m.managercost_dizhi = list.Where(a => a.company_name.Contains("迪致美容"))?.Sum(a => a.amount_rmb) ?? 0;
m.managercost_count = m.managecost_bl_gz + m.managecost_bl_xg + m.managecost_meijia + m.managercost_chengpincang + m.managercost_xinhuilan + m.managercost_yangshan+m.managercost_meijiashengchan+m.managercost_dizhi;
//财务费用=手续费 //财务费用=手续费
...@@ -661,8 +667,8 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code ...@@ -661,8 +667,8 @@ join dc_base_warehouse t3 on t1.warehouse_code=t3.warehouse_code
} }
cn.Execute("delete from dc_month_sales_profit where month='" + m.month + "'"); cn.Execute("delete from dc_month_sales_profit where month='" + m.month + "'");
sql = $@"insert dc_month_sales_profit (month,amount_sales,amount_sales_jingyou,amount_sales_dianzi,amount_sales_jiaju,amount_sales_meirongmj,amount_sales_fuzhuang,amount_sales_other,cost,cost_jingyou,cost_dianzi,cost_jiaju,cost_meirongmj,cost_fuzhuang,cost_other,fee_platform_and_refund,fee_platform,fee_fba,fee_refund,amount_withdraw,fee_logistics_storage,fee_logistics_first,fee_logistics_direct,fee_logistics_tail,fee_storage,fee_paycash_sales,fee_sales_count,profit_sales,rate_profit_sales,managecost_bl_xg,managecost_bl_gz,managecost_meijia,managercost_yangshan,managercost_chengpincang,managercost_xinhuilan,managercost_count,fee_finance,profit,rate_profit,incoming_other,incoming_non_operating,pay_non_operating,actual_profit,dividend,profit_balance,rate_profit_actual,createtime,lastupdateuserid,lastupdateusername,lastupdatetime,isedit) values sql = $@"insert dc_month_sales_profit (month,amount_sales,amount_sales_jingyou,amount_sales_dianzi,amount_sales_jiaju,amount_sales_meirongmj,amount_sales_fuzhuang,amount_sales_other,cost,cost_jingyou,cost_dianzi,cost_jiaju,cost_meirongmj,cost_fuzhuang,cost_other,fee_platform_and_refund,fee_platform,fee_fba,fee_refund,amount_withdraw,fee_logistics_storage,fee_logistics_first,fee_logistics_direct,fee_logistics_tail,fee_storage,fee_paycash_sales,fee_sales_count,profit_sales,rate_profit_sales,managecost_bl_xg,managecost_bl_gz,managecost_meijia,managercost_yangshan,managercost_chengpincang,managercost_xinhuilan,managercost_count,fee_finance,profit,rate_profit,incoming_other,incoming_non_operating,pay_non_operating,actual_profit,dividend,profit_balance,rate_profit_actual,createtime,lastupdateuserid,lastupdateusername,lastupdatetime,isedit,managercost_dizhi,managercost_meijiashengchan) values
('{m.month}',{m.amount_sales},{m.amount_sales_jingyou},{m.amount_sales_dianzi},{m.amount_sales_jiaju},{m.amount_sales_meirongmj},{m.amount_sales_fuzhuang},{m.amount_sales_other},{m.cost},{m.cost_jingyou},{m.cost_dianzi},{m.cost_jiaju},{m.cost_meirongmj},{m.cost_fuzhuang},{m.cost_other},{m.fee_platform_and_refund},{m.fee_platform},{m.fee_fba},{m.fee_refund},{m.amount_withdraw},{m.fee_logistics_storage},{m.fee_logistics_first},{m.fee_logistics_direct},{m.fee_logistics_tail},{m.fee_storage},{m.fee_paycash_sales},{m.fee_sales_count},{m.profit_sales},{m.rate_profit_sales},{m.managecost_bl_xg},{m.managecost_bl_gz},{m.managecost_meijia},{m.managercost_yangshan},{m.managercost_chengpincang},{m.managercost_xinhuilan},{m.managercost_count},{m.fee_finance},{m.profit},{m.rate_profit},{m.incoming_other},{m.incoming_non_operating},{m.pay_non_operating},{m.actual_profit},{m.dividend},{m.profit_balance},{m.rate_profit_actual},'{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}',{m.lastupdateuserid},'{m.lastupdateusername}','{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}',0)"; ('{m.month}',{m.amount_sales},{m.amount_sales_jingyou},{m.amount_sales_dianzi},{m.amount_sales_jiaju},{m.amount_sales_meirongmj},{m.amount_sales_fuzhuang},{m.amount_sales_other},{m.cost},{m.cost_jingyou},{m.cost_dianzi},{m.cost_jiaju},{m.cost_meirongmj},{m.cost_fuzhuang},{m.cost_other},{m.fee_platform_and_refund},{m.fee_platform},{m.fee_fba},{m.fee_refund},{m.amount_withdraw},{m.fee_logistics_storage},{m.fee_logistics_first},{m.fee_logistics_direct},{m.fee_logistics_tail},{m.fee_storage},{m.fee_paycash_sales},{m.fee_sales_count},{m.profit_sales},{m.rate_profit_sales},{m.managecost_bl_xg},{m.managecost_bl_gz},{m.managecost_meijia},{m.managercost_yangshan},{m.managercost_chengpincang},{m.managercost_xinhuilan},{m.managercost_count},{m.fee_finance},{m.profit},{m.rate_profit},{m.incoming_other},{m.incoming_non_operating},{m.pay_non_operating},{m.actual_profit},{m.dividend},{m.profit_balance},{m.rate_profit_actual},'{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}',{m.lastupdateuserid},'{m.lastupdateusername}','{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}',0,{m.managercost_dizhi},{m.managercost_meijiashengchan})";
cn.Execute(sql); cn.Execute(sql);
} }
......
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
...@@ -26,6 +26,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -26,6 +26,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
_hostingEnvironment = hostingEnvironment; _hostingEnvironment = hostingEnvironment;
} }
#region 资产负债表
public IActionResult Index() public IActionResult Index()
{ {
return View(); return View();
...@@ -159,7 +161,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -159,7 +161,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
m.not_fba_transfer_amount = m.not_fba_transfer_amount ?? 0; m.not_fba_transfer_amount = m.not_fba_transfer_amount ?? 0;
m.semi_inventory_amount = m.semi_inventory_amount ?? 0; m.semi_inventory_amount = m.semi_inventory_amount ?? 0;
m.semi_transfer_amount = m.semi_transfer_amount ?? 0; m.semi_transfer_amount = m.semi_transfer_amount ?? 0;
m.semi_prod_inventory_amount = m.semi_prod_inventory_amount ?? 0; m.semi_prod_inventory_amount = m.semi_prod_inventory_amount ?? 0;
m.fba_transfer_allot_amount = m.fba_transfer_allot_amount ?? 0; m.fba_transfer_allot_amount = m.fba_transfer_allot_amount ?? 0;
...@@ -496,7 +498,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -496,7 +498,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var list = new Services.FinanceReportServices().ListBalanceSheetTask(day); var list = new Services.FinanceReportServices().ListBalanceSheetTask(day);
return Json(new { return Json(new
{
success = true, success = true,
msg = "", msg = "",
list = list list = list
...@@ -515,7 +518,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -515,7 +518,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
if (m == null) if (m == null)
{ {
m = new dc_daily_lg_waitpay() { m = new dc_daily_lg_waitpay()
{
day = date, day = date,
}; };
} }
...@@ -540,7 +544,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -540,7 +544,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var result = new Services.FinanceReportServices().UpdateLogisticsWaitPay(id, type, amount, (user != null ? user.GetUid() : 0), (user != null ? user.GetUserName() : "")); var result = new Services.FinanceReportServices().UpdateLogisticsWaitPay(id, type, amount, (user != null ? user.GetUid() : 0), (user != null ? user.GetUserName() : ""));
return Json(new { return Json(new
{
success = string.IsNullOrEmpty(result), success = string.IsNullOrEmpty(result),
msg = result msg = result
}); });
...@@ -561,16 +566,51 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -561,16 +566,51 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
while (day.AddDays(1) < DateTime.Now) while (day.AddDays(1) < DateTime.Now)
{ {
result+=_service.UpdateLogisticPayed(day); result += _service.UpdateLogisticPayed(day);
day = day.AddDays(1); day = day.AddDays(1);
} }
return Json(new { return Json(new
{
success = string.IsNullOrEmpty(result), success = string.IsNullOrEmpty(result),
msg = result msg = result
}); });
} }
#endregion
#region 新资产负债表 at 20201207 -- 需求from唐衍芬
/// <summary>
/// 资产负债表（新）
/// </summary>
/// <returns></returns>
public ActionResult BalanceSheetNew()
{
return View();
}
/// <summary>
/// 资产负债表
/// </summary>
/// <param name="type">统计时间类型，1：日，2：周，3：月</param>
/// <param name="day">日期</param>
/// <returns></returns>
public JsonResult BalanceSheetNewJson(int type,DateTime day)
{
return Json("");
}
#endregion
/// <summary> /// <summary>
/// 管理成本报表页面 /// 管理成本报表页面
/// </summary> /// </summary>
...@@ -8349,12 +8389,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -8349,12 +8389,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
listHead.Add(new Tuple<string, string, int>("销售毛利率", "rate_profit_sales", 0)); listHead.Add(new Tuple<string, string, int>("销售毛利率", "rate_profit_sales", 0));
listHead.Add(new Tuple<string, string, int>("管理成本合计", "managercost_count", 1)); listHead.Add(new Tuple<string, string, int>("管理成本合计", "managercost_count", 1));
listHead.Add(new Tuple<string, string, int>("香港百伦", "managecost_bl_xg", 0)); listHead.Add(new Tuple<string, string, int>("香港百伦科技有限公司", "managecost_bl_xg", 0));
listHead.Add(new Tuple<string, string, int>("广州百伦", "managecost_bl_gz", 0)); listHead.Add(new Tuple<string, string, int>("广州百伦供应链科技有限公司", "managecost_bl_gz", 0));
listHead.Add(new Tuple<string, string, int>("美容美甲店", "managecost_meijia", 0)); listHead.Add(new Tuple<string, string, int>("广州歌戈儿生活科技有限公司", "managecost_meijia", 0));
listHead.Add(new Tuple<string, string, int>("杨杉", "managercost_yangshan", 0)); listHead.Add(new Tuple<string, string, int>("深圳前海扬杉创新科技有限公司", "managercost_yangshan", 0));
listHead.Add(new Tuple<string, string, int>("信荟蓝", "managercost_xinhuilan", 0)); listHead.Add(new Tuple<string, string, int>("广州信荟蓝科技有限公司", "managercost_xinhuilan", 0));
listHead.Add(new Tuple<string, string, int>("成品仓", "managercost_chengpincang", 0)); listHead.Add(new Tuple<string, string, int>("广州电子服装仓", "managercost_chengpincang", 0));
listHead.Add(new Tuple<string, string, int>("广州迪致美容科技有限公司", "managercost_dizhi", 0));
listHead.Add(new Tuple<string, string, int>("广州美甲生产仓", "managercost_meijiashengchan", 0));
listHead.Add(new Tuple<string, string, int>("财务费用", "fee_finance", 1)); listHead.Add(new Tuple<string, string, int>("财务费用", "fee_finance", 1));
......
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