Skip to content

D
DataCenter_Core2.1_20190520
Commit 5696bbf3 by guanzhenshan
Options

平台利润统计订单明细增加按发货时间进行搜索，非FBA销售统计增加按仓库类型进行筛选

parent 6a3d2d9b
Showing with 270 additions and 29 deletions
Bailun.DC.Common/Bailun.DC.Common.csproj
......@@ -44,6 +44,7 @@
<Compile Include="CommonHelper.cs" />
<Compile Include="GlobalConfig.cs" />
<Compile Include="HttpHelper.cs" />
<Compile Include="LogHelper.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
Bailun.DC.Common/LogHelper.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Bailun.DC.Common
{
public class LogHelper
{
//在网站根目录下创建日志目录
public static string path = "C:\\WebSite\\DataCenter-NetCore2\\log"; //HttpRuntime.AppDomainAppPath + "log";
/**
* 向日志文件写入调试信息
* @param className 类名
* @param content 写入内容
*/
public static void Debug(string className, string content)
{
WriteLog("DEBUG", className, content);
}
/**
* 向日志文件写入运行时信息
* @param className 类名
* @param content 写入内容
*/
public static void Info(string className, string content)
{
WriteLog("INFO", className, content);
}
/**
* 向日志文件写入出错信息
* @param className 类名
* @param content 写入内容
*/
public static void Error(string className, string content)
{
WriteLog("ERROR", className, content);
}
/**
* 实际的写日志操作
* @param type 日志记录类型
* @param className 类名
* @param content 写入内容
*/
public static void WriteLog(string type, string className, string content)
{
try
{
if (!Directory.Exists(path))//如果日志目录不存在就创建
{
Directory.CreateDirectory(path);
}
string time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");//获取当前系统时间
string filename = path + "/" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt";//用日期对日志文件命名
//创建或打开日志文件，向日志文件末尾追加记录
StreamWriter mySw = File.AppendText(filename);
//向日志文件写入内容
string write_content = time + " " + type + " " + className + ": " + content;
mySw.WriteLine(write_content);
//关闭日志文件
mySw.Close();
}
catch (Exception)
{
}
}
}
}
Bailun.DC.Services/CommonServices.cs
......@@ -170,7 +170,6 @@ namespace Bailun.DC.Services
return datas;
}
tempLevel++;
}
}
string appId = "SystemDCUI";
......
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
......@@ -153,6 +153,118 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
});
}
public ActionResult ExportIndex(int type, DateTime day, int paycompanyvalue)
{
var date = day;
var list = new Services.FinanceReportServices().GetBalanceSheet(type, date, paycompanyvalue);
foreach (var m in list)
{
m.cl_count = m.cl_count ?? 0;
m.cl_dividends_payable = m.cl_dividends_payable ?? 0;
m.cl_notes_payable = m.cl_notes_payable ?? 0;
m.cl_oneyear_noncurrent_liabilities = m.cl_oneyear_noncurrent_liabilities ?? 0;
m.cl_other_liabilities = m.cl_other_liabilities ?? 0;
m.cl_payable_interest = m.cl_payable_interest ?? 0;
m.cl_trading_financ_liabilities = m.cl_trading_financ_liabilities ?? 0;
m.count_assets = m.count_assets ?? 0;
m.count_liabilities = m.count_liabilities ?? 0;
m.count_liabilities_and_oe = m.count_liabilities_and_oe ?? 0;
m.fa_bill_receivable = m.fa_bill_receivable ?? 0;
m.fa_count = m.fa_count ?? 0;
m.fa_dividends_receivable = m.fa_dividends_receivable ?? 0;
m.fa_interest_receivable = m.fa_interest_receivable ?? 0;
m.fa_oneyear_noncurrent_assets = m.fa_oneyear_noncurrent_assets ?? 0;
m.fa_other_assets = m.fa_other_assets ?? 0;
m.fa_trading_finan_asset = m.fa_trading_finan_asset ?? 0;
m.nca_avai_for_sale_fassets = m.nca_avai_for_sale_fassets ?? 0;
m.nca_construction_in_process = m.nca_construction_in_process ?? 0;
m.nca_count = m.nca_count ?? 0;
m.nca_deferred_tax_assets = m.nca_deferred_tax_assets ?? 0;
m.nca_development_expenditure = m.nca_development_expenditure ?? 0;
m.nca_disposal_of_fixed_assets = m.nca_disposal_of_fixed_assets ?? 0;
m.nca_engineering_material = m.nca_engineering_material ?? 0;
m.nca_goodwill = m.nca_goodwill ?? 0;
m.nca_heldon_investment = m.nca_heldon_investment ?? 0;
m.nca_investment_property = m.nca_investment_property ?? 0;
m.nca_longterm_equity_investment = m.nca_longterm_equity_investment ?? 0;
m.nca_longterm_receivable = m.nca_longterm_receivable ?? 0;
m.nca_longterm_unamortized_expenses = m.nca_longterm_unamortized_expenses ?? 0;
m.nca_oil_and_gas_assets = m.nca_oil_and_gas_assets ?? 0;
m.nca_intangible_assets = m.nca_intangible_assets ?? 0;
m.nca_other_assets = m.nca_other_assets ?? 0;
m.nca_productive_biological_asset = m.nca_productive_biological_asset ?? 0;
m.ncl_anticipation_liabilities = m.ncl_anticipation_liabilities ?? 0;
m.ncl_bonds_payable = m.ncl_bonds_payable ?? 0;
m.ncl_count = m.ncl_count ?? 0;
m.ncl_deferred_income_tax_liabilities = m.ncl_deferred_income_tax_liabilities ?? 0;
m.ncl_longterm_loan = m.ncl_longterm_loan ?? 0;
m.ncl_other_liabilities = m.ncl_other_liabilities ?? 0;
m.ncl_special_payable = m.ncl_special_payable ?? 0;
m.oe_capital_reserve = m.oe_capital_reserve ?? 0;
m.oe_count = m.oe_count ?? 0;
m.oe_inventory_amount = m.oe_inventory_amount ?? 0;
m.oe_paicl_up_capital = m.oe_paicl_up_capital ?? 0;
m.oe_surplus_public_accumulation = m.oe_surplus_public_accumulation ?? 0;
m.oe_undistributed_profit = m.oe_undistributed_profit ?? 0;
m.bank_account_balance = m.bank_account_balance ?? 0;
m.withdraw_amount = m.withdraw_amount ?? 0;
m.platform_balance = m.platform_balance ?? 0;
m.logistics_prepayment = m.logistics_prepayment ?? 0;
m.finished_prepayment = m.finished_prepayment ?? 0;
m.semi_prepayment = m.semi_prepayment ?? 0;
m.fba_inventory_amount = m.fba_inventory_amount ?? 0;
m.not_fba_inventory_amount = m.not_fba_inventory_amount ?? 0;
m.fba_transfer_amount = m.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_transfer_amount = m.semi_transfer_amount ?? 0;
m.logistics_accounts_payable = m.logistics_accounts_payable ?? 0;
m.finished_accounts_payable = m.finished_accounts_payable ?? 0;
m.semi_accounts_payable = m.semi_accounts_payable ?? 0;
//Add by Allan at 2019-01-30 16:04
m.prepayment = Math.Abs(m.prepayment);
//流动资产合计
m.fa_count = m.monetary_fund + m.fa_trading_finan_asset + m.fa_bill_receivable + m.accounts_receivable + m.prepayment + m.fa_interest_receivable + m.fa_dividends_receivable + m.other_accounts_receivable + m.inventory_amount + m.fa_oneyear_noncurrent_assets + m.fa_other_assets;
//非流动资产合计
m.nca_count = m.nca_avai_for_sale_fassets + m.nca_heldon_investment + m.nca_longterm_receivable + m.nca_longterm_equity_investment + m.nca_investment_property + m.fixed_assets + m.nca_construction_in_process + m.nca_engineering_material + m.nca_disposal_of_fixed_assets + m.nca_productive_biological_asset + m.nca_oil_and_gas_assets + m.nca_intangible_assets + m.nca_development_expenditure + m.nca_goodwill + m.nca_longterm_unamortized_expenses + m.nca_deferred_tax_assets + m.nca_other_assets;
//资产总计
m.count_assets = m.fa_count + m.nca_count;
//流动负债合计
m.cl_count = m.short_term_borrow + m.cl_trading_financ_liabilities + m.cl_notes_payable + m.accounts_payable + m.advance_received + m.payable_remuneration + m.taxes_payable + m.cl_payable_interest + m.cl_dividends_payable + m.other_accounts_payable + m.cl_oneyear_noncurrent_liabilities + m.cl_other_liabilities;
//非流动负债合计
m.ncl_count = m.ncl_longterm_loan + m.ncl_bonds_payable + m.long_term_accounts_payable + m.ncl_special_payable + m.ncl_anticipation_liabilities + m.ncl_deferred_income_tax_liabilities + m.ncl_other_liabilities;
//负债合计
m.count_liabilities = m.cl_count + m.ncl_count;
//所有者权益（或股东权益）合计
m.oe_count = m.oe_paicl_up_capital + m.oe_capital_reserve + m.oe_inventory_amount + m.oe_surplus_public_accumulation + m.oe_undistributed_profit;
//负债和所有者权益（或股东权益）总计
m.count_liabilities_and_oe = m.count_liabilities + m.oe_count;
}
return View();
}
/// <summary>
/// 更新资产负债表
/// </summary>
......
Bailun.DC.Web/Areas/Reports/Controllers/InventoryController.cs
......@@ -303,17 +303,6 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
});
}
}
/// <summary>
/// 保存仓库冗余记录
/// </summary>
/// <returns></returns>
public string SkuWarehouseRedundancy()
{
var result = new Services.InventoryServices().SaveSkuWarehouseRedundancy();
return result;
}
}
}
\ No newline at end of file
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
......@@ -32,12 +32,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="start"></param>
/// <param name="end"></param>
/// <returns></returns>
public string ListPlatformCostJson(BtTableParameter parameter, string platform, DateTime? start, DateTime? end,string website,string account)
public string ListPlatformCostJson(BtTableParameter parameter, string platform, DateTime? start, DateTime? end,string website,string account,string warehousetype,string warehousecode)
{
var total = 0;
var obj = new Services.OrdersServices().ListPlatformCost(parameter, platform, start, end,website,account, ref total);
var obj = new Services.OrdersServices().ListPlatformCost(parameter, platform, start, end,website,account,warehousetype,warehousecode, ref total);
var countM = new Services.OrdersServices().ListPlatformCostCount(platform, start, end,website,account);
var countM = new Services.OrdersServices().ListPlatformCostCount(platform, start, end,website,account, warehousetype, warehousecode);
var list = obj.Select(p => new {
p.origin_order_id,
......@@ -721,7 +721,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// 订单明细列表
/// </summary>
/// <returns></returns>
public ActionResult ListOrderDetail(string platform, string website,string account, DateTime? start, DateTime? end, string orderno,int? showsingle,string col,string coltitle)
public ActionResult ListOrderDetail(string platform, string website,string account, DateTime? start, DateTime? end, string orderno,int? showsingle,string col,string coltitle,DateTime? shipstart,DateTime? shipend)
{
ViewBag.platform = platform;
......@@ -734,6 +734,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
ViewBag.col = col;
ViewBag.coltitle = coltitle;
ViewBag.shipstart = shipstart.HasValue ? shipstart.Value.ToString("yyyy-MM-dd") : "";
ViewBag.shipend = shipend.HasValue ? shipend.Value.ToString("yyyy-MM-dd") : "";
return View();
}
......@@ -747,13 +750,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="end">付款结束时间</param>
/// <param name="orderno">百伦订单号</param>
/// <returns></returns>
public string ListOrderDetailJson(BtTableParameter parameter,string platform,string website,string account,DateTime? start,DateTime? end,string orderno)
public string ListOrderDetailJson(BtTableParameter parameter,string platform,string website,string account,DateTime? start,DateTime? end,string orderno,DateTime? shipstart,DateTime? shipend)
{
var total = 0;
var service = new Services.OrdersServices();
var obj = service.ListPlatformProfitOrders(parameter, platform, website, account, start, end, orderno, ref total);
var obj = service.ListPlatformProfitOrders(parameter, platform, website, account, start, end,shipstart,shipend,orderno, ref total);
var countM = service.ListPlatformProfitOrdersCount(platform, website, account, start, end, orderno);
var countM = service.ListPlatformProfitOrdersCount(platform, website, account, start, end, shipstart, shipend, orderno);
countM.bailun_order_id = "总计";
countM.amount_sales = Math.Round(countM.amount_sales, 2, MidpointRounding.AwayFromZero);
......
Bailun.DC.Web/Areas/Reports/Views/Orders/ListOrderDetail.cshtml
......@@ -30,9 +30,15 @@
</div>
<div class="form-group">
<label>付款时间</label>
<input id="start" name="start" type="text" class="form-control" style="width:130px;" value="@(ViewBag.start)" />
<input id="start" name="start" type="text" class="form-control" style="width:130px;" value="@(ViewBag.start)" placeholder="付款开始时间" />
<span>至</span>
<input id="end" name="end" type="text" class="form-control" style="width:130px;" value="@(ViewBag.end)" />
<input id="end" name="end" type="text" class="form-control" style="width:130px;" value="@(ViewBag.end)" placeholder="付款结束时间" />
</div>
<div class="form-group">
<label>发货时间</label>
<input id="shipstart" name="shipstart" type="text" class="form-control" style="width:130px;" value="@(ViewBag.shipstart)" placeholder="发货开始时间" />
<span>至</span>
<input id="shipend" name="shipend" type="text" class="form-control" style="width:130px;" value="@(ViewBag.shipend)" placeholder="发货结束时间" />
</div>
<div class="form-group">
<label>&nbsp;</label>
......@@ -68,6 +74,9 @@
laydate.render({ elem: '#start' });
laydate.render({ elem: '#end' });
laydate.render({ elem: '#shipstart' });
laydate.render({ elem: '#shipend' });
var height = document.body.clientHeight;
$("#roletable").attr("data-height", (height - 170));
......@@ -112,7 +121,7 @@
{ field: 'cost_handle_bailun', title: '处理费(百伦)', width: '130', sortable: true, iscount: true },
{ field: 'cost_handle_platform', title: '平台操作费', width: '130', sortable: true, iscount: true },
{ field: 'cost_first', title: '头程费', width: '100', sortable: true, iscount: true },
{ field: 'cost_logistics', title: '尾程费(估算)', width: '120', sortable: true, iscount: true },
{ field: 'cost_logistics', title: '尾程费', width: '120', sortable: true, iscount: true },
{ field: 'profit_total', title: '利润', width: '100', sortable: true, iscount: true },
{ field: 'profit_rate', title: '利润率', width: '100', sortable: true, iscount: true },
{ field: 'amount_prepaid', title: '预收款', width: '100', sortable: true,iscount: true },
......@@ -185,7 +194,7 @@
func: function (result) {
layer.close(lindex);
if (result != null && result != undefined) {
$('#website').html('<option value="">选择平台</option>');
$('#website').html('<option value="">选择站点</option>');
for (var i = 0; i < result.length; i++) {
$('#website').append('<option value="' + result[i] + '">' + result[i]+'</option>');
}
......@@ -205,7 +214,7 @@
paramData: 'platform=@(ViewBag.platform)',
func: function (result) {
if (result != null && result != undefined) {
$('#account').html('<option value="">选择平台</option>');
$('#account').html('<option value="">选择帐号</option>');
for (var i = 0; i < result.length; i++) {
$('#account').append('<option value="' + result[i] + '">' + result[i]+'</option>');
}
......
Bailun.DC.Web/Areas/Reports/Views/Orders/ListPlatformCost.cshtml
......@@ -12,6 +12,21 @@
<div class="form-inline" style="line-height:40px;">
<input type="hidden" id="platform" name="platform" value="@ViewBag.platform" />
<div class="form-group">
<label>仓库类型</label>
<select id="warehousetype" name="warehousetype" class="form-control">
<option value="">仓库类型</option>
<option value="国内仓">国内仓</option>
<option value="海外仓">海外仓</option>
<option value="第三方仓库">第三方仓库</option>
</select>
</div>
<div class="form-group">
<label>仓库</label>
<select id="warehousecode" name="warehousecode" class="form-control">
<option value="">选择仓库</option>
</select>
</div>
<div class="form-group">
<label>站点：</label>
<select id="website" name="website" class="form-control">
<option value="">选择站点</option>
......@@ -74,6 +89,10 @@
//listWarehouse();
$('#warehousetype').change(function () {
listwarehouse();
})
})
function list() {
......@@ -164,8 +183,23 @@
})
}
function ShowDetail(platform, website, account, coltitle, colval, single) {
layer_show(platform + " " + website + " " + $('#start').val() + "至" + $('#end').val() + ' 订单明细', '@Url.Content("~/Reports/Orders/ListOrderDetail?platform=")' + platform + '&website=' + website + '&account=' + account + '&start=' + $('#start').val() + '&end=' + $('#end').val() + '&col=' + colval + '&coltitle=' + coltitle + '&showsingle=' + single, '90%', '90%');
function listwarehouse() {
var wtype = $('#warehousetype').val();
$.submit({
url: '@Url.Content("~/Home/ListWareHouse")',
paramData: 'warehousetype=' + wtype,
type:'POST',
func: function (result) {
if (result != null && result != undefined) {
$('#warehousecode').html('<option value="">选择仓库</option>');
for (var i = 0; i < result.length; i++) {
$('#warehousecode').append('<option value="' + result[i].warehouse_code + '">' + result[i].warehouse_name + '</option>');
}
}
}
})
}
......
Bailun.DC.Web/Areas/Reports/Views/Orders/PlatformProfitCount.cshtml
......@@ -187,7 +187,7 @@
}
function ShowDetail(platform, coltitle, colval, single) {
layer_show(platform + " " + $('#start').val() + "至" + $('#end').val() + ' 订单明细', '@Url.Content("~/Reports/Orders/ListOrderDetail?platform=")' + platform + '&start=' + $('#start').val() + '&end=' + $('#end').val() + '&col=' + colval + '&coltitle=' + coltitle + '&showsingle=' + single, '90%', '90%');
layer_show(platform + " " + $('#start').val() + "至" + $('#end').val() + ' 订单明细', '@Url.Content("~/Reports/Orders/ListOrderDetail?platform=")' + platform + '&start=' + $('#start').val() + '&end=' + $('#end').val() + '&col=' + colval + '&coltitle=' + coltitle + '&showsingle=' + single + '&shipstart=' + $('#shipstart').val() + '&shipend=' + $('#shipend').val(), '90%', '90%');
}
......
Bailun.DC.Web/Controllers/ApiController.cs
......@@ -50,5 +50,16 @@ namespace Bailun.DC.Web.Controllers
return Json(result);
}
/// <summary>
/// 保存仓库冗余记录
/// </summary>
/// <returns></returns>
public string SkuWarehouseRedundancy()
{
var result = new Services.InventoryServices().SaveSkuWarehouseRedundancy();
return result;
}
}
}
\ No newline at end of file
Bailun.DC.Web/appsettings.json
......@@ -7,5 +7,7 @@
"AllowedHosts": "*",
"FeeUrl": "http://api.fee.bailuntec.com/purchase/other/cost/api/manageCostList",
"cn_str": "server=gz-cdb-kp7s5i79.sql.tencentcdb.com;port=61691;database=bailun_datacenter;uid=root;password=#7kfnymAM$Y9-Ntf;",
"cwUrl": "http://cw.bailuntec.com/api/api/GetRepayPlanDetails"
"cwUrl": "http://cw.bailuntec.com/api/api/GetRepayPlanDetails",
"rootFilePath": "C:\\WebSite\\DataCenter-NetCore2"
}
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