Skip to content

D
DataCenter_Core2.1_20190520
Commit 9e6c60f8 by guanzhenshan
Options

解决统计库存数不对的问题，删除动态分析表的合计

parent 660a22b4
Showing with 105 additions and 22 deletions
Bailun.DC.DailyPayAndIncoming/Program.cs
......@@ -28,7 +28,7 @@ namespace Bailun.DC.DailyPayAndIncoming
// _services.Init(start, start.AddDays(1));
// _services.SaveMoneyFlowCount(start, start.AddDays(1));
// Console.WriteLine(start);
// start = start.AddDays(1);
// }
//}
......
Bailun.DC.DailyPayAndIncoming/Services.cs
......@@ -115,7 +115,7 @@ namespace Bailun.DC.DailyPayAndIncoming
var objArrival = cn.QueryFirstOrDefault<decimal?>(sql, null, null, 2 * 60);
//库存 每日晚上12点10分跑每日库存服务
sql = $"select sum((usable_sales+occupy_stock)*unit_price) amount from dc_daily_stock where record_time='{start.ToString("yyyy-MM-dd")}'";
sql = $"select sum((usable_stock+occupy_stock)*unit_price) amount from dc_daily_stock where record_time='{start.ToString("yyyy-MM-dd")}'";
var objStock = cn.QueryFirstOrDefault<decimal?>(sql, null, null, 2 * 60);
......
Bailun.DC.DailyPurchaseSellStock/Bailun.DC.DailyPurchaseSellStock.csproj 0 → 100644
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Bailun.DC.Common\Bailun.DC.Common.csproj" />
<ProjectReference Include="..\Bailun.DC.Models\Bailun.DC.Models.csproj" />
</ItemGroup>
</Project>
Bailun.DC.DailyPurchaseSellStock/Program.cs 0 → 100644
using System;
namespace Bailun.DC.DailyPurchaseSellStock
{
class Program
{
static void Main(string[] args)
{
Console.WriteLine("Hello World!");
}
}
}
Bailun.DC.DailyPurchaseSellStock/Services.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
namespace Bailun.DC.DailyPurchaseSellStock
{
public class Services
{
public void Init(DateTime day)
{
}
}
}
Bailun.DC.Models/dc_daily_purchase_sell_stock.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
namespace Bailun.DC.Models
{
public class dc_daily_purchase_sell_stock
{
public int id { get; set; }
public DateTime record_time { get; set; }
public string bailun_sku { get; set; }
public string warehouse_code { get; set; }
public string warehouse_name { get; set; }
public int start_stock_count { get; set; }
public decimal start_stock_amount { get; set; }
public int start_onway_count { get; set; }
public decimal start_onway_amount { get; set; }
public int end_stock_count { get; set; }
public decimal end_stock_amount { get; set; }
public int end_onway_count { get; set; }
public decimal end_onway_amount { get; set; }
public DateTime createtime { get; set; }
}
}
Bailun.DC.SkuDailyPurchaseAndSales/Program.cs
......@@ -7,28 +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-20");
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-10-20");
// 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.Web/Areas/Reports/Views/Finance/TotalIncomePay.cshtml
......@@ -36,7 +36,6 @@
<div class="col-sm-12">
<div class="ibox-content m-b-sm border-bottom">
<p>动态分析表格</p>
<p id="txtdetailcount" style="color:forestgreen;"></p>
<table id="roletable2" class="table table-hover table-bordered table-condensed table-striped">
<thead>
<tr></tr>
......@@ -230,7 +229,7 @@
$('#roletable2').find('tbody').append(row8);
$('#txtdetailcount').html('合计：采购下单：' + result.count.amount_purchase + '；财务付款：' + result.count.amount_payed + '；到货：' + result.count.amount_arrivaled + '；库存：' + result.count.amount_stock + '；售出：' + result.count.amount_sale + '；应收款：' + result.count.amount_receivable + '；放款在途：' + result.count.amount_withdrawonway + '；银行到账：' + result.count.amount_incoming+'；');
//$('#txtdetailcount').html('合计：采购下单：' + result.count.amount_purchase + '；财务付款：' + result.count.amount_payed + '；到货：' + result.count.amount_arrivaled + '；库存：' + result.count.amount_stock + '；售出：' + result.count.amount_sale + '；应收款：' + result.count.amount_receivable + '；放款在途：' + result.count.amount_withdrawonway + '；银行到账：' + result.count.amount_incoming+'；');
}
else {
......
Bailun.DC.sln
......@@ -35,6 +35,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bailun.DC.DailyPayAndIncomi
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bailun.DC.SkuDataWareHouse", "Bailun.DC.SkuDataWareHouse\Bailun.DC.SkuDataWareHouse.csproj", "{8DE8F6DB-679A-4012-B84E-5D317C7388A0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bailun.DC.DailyPurchaseSellStock", "Bailun.DC.DailyPurchaseSellStock\Bailun.DC.DailyPurchaseSellStock.csproj", "{10552EC1-917C-4A2D-A483-B16E5930D6FA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -101,6 +103,10 @@ Global
{8DE8F6DB-679A-4012-B84E-5D317C7388A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8DE8F6DB-679A-4012-B84E-5D317C7388A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8DE8F6DB-679A-4012-B84E-5D317C7388A0}.Release|Any CPU.Build.0 = Release|Any CPU
{10552EC1-917C-4A2D-A483-B16E5930D6FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10552EC1-917C-4A2D-A483-B16E5930D6FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10552EC1-917C-4A2D-A483-B16E5930D6FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{10552EC1-917C-4A2D-A483-B16E5930D6FA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -115,6 +121,7 @@ Global
{D47B1C2E-BD79-4D41-87E0-D7749F65371E} = {AE2CE86A-8538-4142-920F-684DCF47C064}
{D65CA330-DB1E-4B55-AFFA-5CC02518AB28} = {AE2CE86A-8538-4142-920F-684DCF47C064}
{8DE8F6DB-679A-4012-B84E-5D317C7388A0} = {AE2CE86A-8538-4142-920F-684DCF47C064}
{10552EC1-917C-4A2D-A483-B16E5930D6FA} = {AE2CE86A-8538-4142-920F-684DCF47C064}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6E53AF28-A282-4FB0-A769-EAEA9769C02A}
......
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