Skip to content

D
DataCenter_Core2.1_20190520
Commit 0994d767 by guanzhenshan
Options

资产负债表增加自产采购在途数据

parent 66241d1d
Showing with 48 additions and 32 deletions
Bailun.DC.DailyLogisticSupplierTransaction/Program.cs
......@@ -12,28 +12,28 @@ namespace Bailun.DC.DailyLogisticSupplierTransaction
/// </summary>
/// <param name="args"></param>
/// <returns></returns>
static async Task Main(string[] args)
{
Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
{
services.AddHostedService<Services>();
});
await builder.RunConsoleAsync();
}
//static void Main(string[] args)
//static async Task Main(string[] args)
//{
// var _services = new Services();
// var start = DateTime.Parse("2020-04-01");
// while (start.AddDays(1) < DateTime.Now)
// Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
// var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
// {
// Console.WriteLine(start);
// _services.Init(start);
// start = start.AddDays(1);
// }
// services.AddHostedService<Services>();
// });
// await builder.RunConsoleAsync();
//}
static void Main(string[] args)
{
var _services = new Services();
var start = DateTime.Parse("2020-04-01");
while (start.AddDays(1) < DateTime.Now)
{
Console.WriteLine(start);
_services.Init(start);
start = start.AddDays(1);
}
}
}
}
Bailun.DC.DailyLogisticSupplierTransaction/Services.cs
......@@ -80,13 +80,13 @@ namespace Bailun.DC.DailyLogisticSupplierTransaction
//付款额
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))
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))
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))
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))
group by t1.receive_unit";
listRecevice = cn.Query<dc_base_logistics>(sql).AsList();
......
Bailun.DC.Models/dc_balance_sheet.cs
......@@ -186,6 +186,9 @@ namespace Bailun.DC.Models
[Description("生产库存")]
public decimal? semi_prod_inventory_amount { get; set; }
[Description("自产采购在途")]
public decimal? purchase_pro_amount { get; set; }
/// <summary>
/// 一年内到期的非流动资产
/// </summary>
......
Bailun.DC.Services/FinanceReportServices.cs
......@@ -163,7 +163,9 @@ namespace Bailun.DC.Services
finished_accounts_payable=0,
semi_accounts_payable=0,
amount_borrowed = 0
amount_borrowed = 0,
purchase_pro_amount = 0,
};
......
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
......@@ -182,10 +182,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
//m.amount_borrowed = m.amount_borrowed; //借支金额
//Add by Allan at 2019-01-30 16:04
m.prepayment = Math.Abs(m.prepayment);
//Add by Allan at 20200608, 自产采购在途
m.purchase_pro_amount = m.purchase_pro_amount ?? 0;
//流动资产合计
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;
......@@ -226,9 +228,6 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
m.ismark = 2;
}
}
}
......@@ -355,6 +354,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
m.semi_hani_inventory_amount = m.semi_hani_inventory_amount ?? 0;
m.semi_hani_transfer_amount = m.semi_hani_transfer_amount ?? 0;
m.purchase_pro_amount = m.purchase_pro_amount ?? 0;
//Add by Allan at 2019-01-30 16:04
m.prepayment = Math.Abs(m.prepayment);
......@@ -3242,7 +3242,6 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
listval.Add(new mFinanceDebtChain { onelevelname = "", sencondlevelname = s[23], start = obj[0].semi_bailun_inventory_amount.Value, end = obj[1].semi_bailun_inventory_amount.Value, diff = (obj[0].semi_bailun_inventory_amount.Value == 0 ? 0 : (obj[1].semi_bailun_inventory_amount.Value - obj[0].semi_bailun_inventory_amount.Value) / obj[0].semi_bailun_inventory_amount.Value * 100).ToString("N2") });
listval.Add(new mFinanceDebtChain { onelevelname = "", sencondlevelname = s[24], start = obj[0].semi_hani_inventory_amount.Value, end = obj[1].semi_hani_inventory_amount.Value, diff = (obj[0].semi_hani_inventory_amount.Value == 0 ? 0 : (obj[1].semi_hani_inventory_amount.Value - obj[0].semi_hani_inventory_amount.Value) / obj[0].semi_hani_inventory_amount.Value * 100).ToString("N2") });
listval.Add(new mFinanceDebtChain { onelevelname = "", sencondlevelname = s[25], start = obj[0].semi_prod_inventory_amount.Value, end = obj[1].semi_prod_inventory_amount.Value, diff = (obj[0].semi_prod_inventory_amount.Value == 0 ? 0 : (obj[1].semi_prod_inventory_amount.Value - obj[0].semi_prod_inventory_amount.Value) / obj[0].semi_prod_inventory_amount.Value * 100).ToString("N2") });
listval.Add(new mFinanceDebtChain { onelevelname = "", sencondlevelname = s[26], start = obj[0].semi_transfer_amount.Value, end = obj[1].semi_transfer_amount.Value, diff = (obj[0].semi_transfer_amount.Value == 0 ? 0 : (obj[1].semi_transfer_amount.Value - obj[0].semi_transfer_amount.Value) / obj[0].semi_transfer_amount.Value * 100).ToString("N2") });
listval.Add(new mFinanceDebtChain { onelevelname = "", sencondlevelname = s[27], start = obj[0].semi_bailun_transfer_amount.Value, end = obj[1].semi_bailun_transfer_amount.Value, diff = (obj[0].semi_bailun_transfer_amount.Value == 0 ? 0 : (obj[1].semi_bailun_transfer_amount.Value - obj[0].semi_bailun_transfer_amount.Value) / obj[0].semi_bailun_transfer_amount.Value * 100).ToString("N2") });
listval.Add(new mFinanceDebtChain { onelevelname = "", sencondlevelname = s[28], start = obj[0].semi_hani_transfer_amount.Value, end = obj[1].semi_hani_transfer_amount.Value, diff = (obj[0].semi_hani_transfer_amount.Value == 0 ? 0 : (obj[1].semi_hani_transfer_amount.Value - obj[0].semi_hani_transfer_amount.Value) / obj[0].semi_hani_transfer_amount.Value * 100).ToString("N2") });
......
Bailun.DC.Web/Areas/Reports/Views/Finance/Index2.cshtml
......@@ -542,6 +542,20 @@
<div style="width:8%;"></div>
</div>
<div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;">9.自产采购在途</div>
<div style="width:11.5%;" class="purchase_pro_amount">0</div>
<div style="width:11.5%;" class="purchase_pro_amount">0</div>
<div style="width:11.5%;" class="purchase_pro_amount">0</div>
<div style="width:11.5%;" class="purchase_pro_amount">0</div>
<div style="width:11.5%;" class="purchase_pro_amount">0</div>
<div style="width:11.5%;" class="purchase_pro_amount">0</div>
<div style="width:11.5%;">
<input id="purchase_pro_amount" class="txtinput" type="number" value="0" style="width:110px;height:24px;line-height:24px;" />
<span id="purchase_pro_amount_1"></span>
</div>
<div style="width:8%;"></div>
</div>
<div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;">一年内到期的非流动资产</div>
<div style="width:11.5%;" class="fa_oneyear_noncurrent_assets">0</div>
<div style="width:11.5%;" class="fa_oneyear_noncurrent_assets">0</div>
......@@ -570,7 +584,7 @@
<div style="width:8%;"><a class="btn btn-primary btn-xs" onclick="UpdateData('fa_other_assets');">更新</a></div>
</div>
<div class="item-row" style="width:100%;">
<div style="width:11.5%;font-weight:bold;" onclick="showitem('fa1', this,1053,'ldzc');">
<div style="width:11.5%;font-weight:bold;" onclick="showitem('fa1', this,1089,'ldzc');">
流动资产合计
<img src="@Url.Content("~/img/downicon.png")" style="width:10px;position:absolute;float:right;margin-top:10px;right:5px;" />
</div>
......
Bailun.DC.Web/Controllers/ApiController.cs
......@@ -726,8 +726,6 @@ namespace Bailun.DC.Web.Controllers
msg = ex.Message
});
}
}
/// <summary>
......
Bailun.DC.Web/Controllers/HomeController.cs
......@@ -58,7 +58,7 @@ namespace Bailun.DC.Web.Controllers
public ActionResult Main()
{
#if DEBUG
var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjgwODExM2E5YjNkOWFjNTg3ZjUyYjUzMWRhY2E3M2FjIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTE0MTE1NTIsImV4cCI6MTU5MTQ0NzU1MiwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTkxNDExNTUyLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.q50r-9_dhbLH09jPAZ6kG2ReK_u4zlXAfs2wrq4ET3b1yQZ9YwWfHlW5mNUs24qKS4LWqUbGd6bX-YcQVPTdO2bc189PyhRB_gohLMNiK93KsuNqE1qs8eyQpza_cIvnJWSlk6mWEmNhFviak44o_2nWj2RhxkkOeJ0DUhDGEXWyRu4Zw96xDK5IX8OpYbw7Kh5povVNyAecam4svWWJne6o0CpAm-z6fB1wbp7AtdIwX-JE3S_8LH79heMtU-HKyxlP0KrXfY3aq7Pfkame4nG10K5q3E9woPWE4AKwV8yQ4STMhwOf6jq-Ys1bPoR95dEuhOO_FMkiNvZpBmYHGg";
var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjgwODExM2E5YjNkOWFjNTg3ZjUyYjUzMWRhY2E3M2FjIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTE1ODUwNjEsImV4cCI6MTU5MTYyMTA2MSwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTkxNTg1MDYxLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.ZeHADL0KvZqfD8DIwExk51EphU4r3borxxBkh3Wgex-Q6ZStYHMF3_6KmLsOg33UBhlCrjfa2mF1-gdz7WKHbZ9f8IXqv8XLfgsswsJNRdYz9QfQEUXlsSYdw33N2irTfyhHP_Dzm-TdZ5wJNqtRGClgCpX4QdGzF_5jtooxHyfDfkZAmBTybHf2HkwX1degvRAo1WiSUpCIzLnTPJ9T12IjoCEREB52MMK4P7BuVKSVjjHb4DICAmEmaBvp6-90LT5EDfS1zL5dqpZgOiWwMtP694nMo5Jjv8mXOO-zecszZwV4kdJFFd_V1D8ovfULak1RwADoOK7zA2beczAUmA";
#else
//var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
var cookie = HttpContext.Request.Cookies["BailunToken"];
......
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