Skip to content

D
DataCenter_Core2.1_20190520
Commit 27efc824 by guanzhenshan
Options

修复现金流支出统计不对的问题；每日销进比原料采购维度排除自产数据

parent 04916595
Showing with 27 additions and 27 deletions
Bailun.DC.DailyPayAndIncoming/Program.cs
......@@ -22,7 +22,7 @@ namespace Bailun.DC.DailyPayAndIncoming
//{
// var _services = new Services();
// var start = DateTime.Parse("2019-10-01");
// var start = DateTime.Parse("2019-09-01");
// while (start < DateTime.Now)
// {
......
Bailun.DC.DailyPayAndIncoming/Services.cs
......@@ -60,7 +60,7 @@ namespace Bailun.DC.DailyPayAndIncoming
var url = "http://api.fee.bailuntec.com/purchase/other/cost/api/manageCostList?o=0";
var cwurl = "http://cw.bailuntec.com/api/api/GetRepayPlanDetails?";
url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.ToString("yyyy-MM-dd");
url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.AddDays(-1).ToString("yyyy-MM-dd");
cwurl += "BeginRepayTime=" + start.ToString("yyyy-MM-dd") + "&EndRepayTime=" + end.ToString("yyyy-MM-dd");
//利息支出
......@@ -71,8 +71,8 @@ namespace Bailun.DC.DailyPayAndIncoming
decimal costTotal = 0;
costTotal = listInterest.Count > 0 ? listInterest.Sum(a => a.RepayInterestRMB):0;
//管理成本 只取付款主体为广州百伦供应链科技有限公司、香港百伦科技有限公司、广州电子服装仓、阳山仓、深圳仓的数据
list = list.Where(a => a.companyValue == 1 || a.companyValue == 2 || a.companyValue == 5 || a.companyValue == 8 || a.companyValue == 7).ToList();
//管理成本 只取付款主体为广州百伦供应链科技有限公司、香港百伦科技有限公司、广州电子服装仓、阳山仓、深圳仓、的数据
list = list.Where(a => a.companyValue == 1 || a.companyValue == 2 || a.companyValue == 5 || a.companyValue == 8 || a.companyValue == 7||a.companyValue == 69).ToList();
if (list.Count > 0)
{
costTotal += list.Sum(a => a.amountRmb);
......@@ -80,7 +80,7 @@ namespace Bailun.DC.DailyPayAndIncoming
//支出 2、成品采购+半成品采购+百伦（广州、香港）支付给哈倪曼和拉古娜的费用+百伦管理费用
var sql = $@"select sum(cashier_paymoneyrmb) as amount from dc_base_finance_cashier where cashier_status=1 and cashier_type=1 and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and ((sourcecode in ('Buy','SemiFinishedProduct') and companymain_value_from !=14 and companymain_value_from!=48) or (tradeb_bjectname in ('广州哈倪蔓生物科技有限公司','广州拉古娜生物科技有限公司','广州美甲生产仓') and companymain_value_from in (1,2,5,7,8) and sourcecode='newCost'))";
var sql = $@"select sum(cashier_paymoneyrmb) as amount from dc_base_finance_cashier where cashier_status=1 and cashier_type=1 and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and ((sourcecode in ('Buy','SemiFinishedProduct') and companymain_value_from !=14 and companymain_value_from!=48) or (tradeb_bjectname in ('广州哈倪蔓生物科技有限公司','广州拉古娜生物科技有限公司','广州美甲生产仓') and companymain_value_from in (1,2,5,7,8) and sourcecode in ('newCost','IncomeAndExpenditure')))";
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{
......@@ -122,7 +122,7 @@ namespace Bailun.DC.DailyPayAndIncoming
var url = "http://api.fee.bailuntec.com/purchase/other/cost/api/manageCostList?o=0";
var cwurl = "http://cw.bailuntec.com/api/api/GetRepayPlanDetails?";
url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.ToString("yyyy-MM-dd");
url += "&startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.AddDays(-1).ToString("yyyy-MM-dd");
cwurl += "BeginRepayTime=" + start.ToString("yyyy-MM-dd") + "&EndRepayTime=" + end.ToString("yyyy-MM-dd");
//利息支出
......@@ -132,7 +132,7 @@ namespace Bailun.DC.DailyPayAndIncoming
decimal costTotal = 0;
costTotal = listInterest.Count > 0 ? listInterest.Sum(a => a.RepayInterestRMB) : 0;
list = list.Where(a => a.companyValue == 1 || a.companyValue == 2 || a.companyValue == 5 || a.companyValue == 8 || a.companyValue == 7).ToList();
list = list.Where(a => a.companyValue == 1 || a.companyValue == 2 || a.companyValue == 5 || a.companyValue == 8 || a.companyValue == 7 || a.companyValue== 69).ToList();
if (list.Count > 0)
{
costTotal += list.Sum(a => a.amountRmb);
......@@ -153,7 +153,7 @@ namespace Bailun.DC.DailyPayAndIncoming
var objPurchase = cn.QueryFirstOrDefault<decimal?>(sql, null, null, 2 * 60);
//财务付款 支出 2、成品采购+半成品采购+百伦（广州、香港）支付给哈倪曼和拉古娜的费用+百伦管理费用
sql = $@"select sum(cashier_paymoneyrmb) as amount from dc_base_finance_cashier where cashier_status=1 and cashier_type=1 and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and ((sourcecode in ('Buy','SemiFinishedProduct') and companymain_value_from !=14 and companymain_value_from!=48) or (tradeb_bjectname in ('广州哈倪蔓生物科技有限公司','广州拉古娜生物科技有限公司','广州美甲生产仓') and companymain_value_from in (1,2,5,7,8) and sourcecode='newCost'))";
sql = $@"select sum(cashier_paymoneyrmb) as amount from dc_base_finance_cashier where cashier_status=1 and cashier_type=1 and cashier_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and cashier_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and ((sourcecode in ('Buy','SemiFinishedProduct') and companymain_value_from !=14 and companymain_value_from!=48) or (tradeb_bjectname in ('广州哈倪蔓生物科技有限公司','广州拉古娜生物科技有限公司','广州美甲生产仓') and companymain_value_from in (1,2,5,7,8) and sourcecode in ('newCost','IncomeAndExpenditure')))";
var objPayed = cn.QueryFirstOrDefault<decimal?>(sql, null, null, 2 * 60);
//到货
......
Bailun.DC.SkuDailyPurchaseAndSales/Program.cs
......@@ -7,27 +7,27 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
{
class Program
{
//static async Task Main(string[] args)
//{
// Console.WriteLine("进入保存每日采购数和售出数");
// 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 start = DateTime.Parse("2019-10-21");
while (start.AddDays(1) < DateTime.Now)
Console.WriteLine("进入保存每日采购数和售出数");
var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
{
Console.WriteLine(start.ToString("yyyy-MM-dd"));
new Services().Init(start, start.AddDays(1));
start = start.AddDays(1);
}
services.AddHostedService<Services>();
});
await builder.RunConsoleAsync();
}
//static void Main(string[] args)
//{
// var start = DateTime.Parse("2019-09-01");
// while (start.AddDays(1) < DateTime.Now)
// {
// Console.WriteLine(start.ToString("yyyy-MM-dd"));
// new Services().Init(start, start.AddDays(1));
// start = start.AddDays(1);
// }
//}
}
}
Bailun.DC.SkuDailyPurchaseAndSales/Services.cs
......@@ -241,7 +241,7 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
#region 原料
//采购
sql = $@"select sum(quantity_purchase) as count,sum(quantity_purchase*unit_price) as amount,bailun_sku,warehouse_from_code as warehouse_code,warehouse_from_name as warehouse_name from dc_semi_purchase_info where create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and `status`>-1
sql = $@"select sum(quantity_purchase) as count,sum(quantity_purchase*unit_price) as amount,bailun_sku,warehouse_from_code as warehouse_code,warehouse_from_name as warehouse_name from dc_semi_purchase_info where create_time>='{start.ToString("yyyy-MM-dd HH:mm:ss")}' and create_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}' and `status`>-1 and deliver_name !='广州哈倪蔓生物科技有限公司' and deliver_name!='广州市花都区花城市象贸易商行-滋柔'
group by bailun_sku,warehouse_from_code";
var objSemiPurchase = cn.Query<Models.mSkuCount>(sql, null, null, true, 2 * 60).AsList();
......
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