Skip to content

D
DataCenter_Core2.1_20190520
Commit f61dd264 by guanzhenshan
Options

1、增加物流供应商往来报表统计服务；2、调整导出半成品采购单明细

parent 7b82f62d
Showing with 382 additions and 4 deletions
Bailun.DC.DailyLogisticSupplierTransaction/Bailun.DC.DailyLogisticSupplierTransaction.csproj 0 → 100644
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dapper" Version="2.0.35" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.4" />
<PackageReference Include="MySql.Data" Version="8.0.20" />
</ItemGroup>
</Project>
Bailun.DC.DailyLogisticSupplierTransaction/Dockerfile 0 → 100644
FROM microsoft/dotnet:2.1-runtime AS base
WORKDIR /app
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
FROM microsoft/dotnet:2.1-sdk AS build
WORKDIR /src
COPY Bailun.DC.DailyLogisticSupplierTransaction/Bailun.DC.DailyLogisticSupplierTransaction.csproj Bailun.DC.DailyLogisticSupplierTransaction/
RUN dotnet restore Bailun.DC.DailyLogisticSupplierTransaction/Bailun.DC.DailyLogisticSupplierTransaction.csproj
COPY . .
WORKDIR /src/Bailun.DC.DailyLogisticSupplierTransaction
RUN dotnet build Bailun.DC.DailyLogisticSupplierTransaction.csproj -c Release -o /app
FROM build AS publish
RUN dotnet publish Bailun.DC.DailyLogisticSupplierTransaction.csproj -c Release -o /app
FROM base AS final
WORKDIR /app
COPY --from=publish /app .
ENTRYPOINT ["dotnet", "Bailun.DC.DailyLogisticSupplierTransaction.dll"]
Bailun.DC.DailyLogisticSupplierTransaction/Models/dc_daily_logistics_supplier_transaction.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
namespace Bailun.DC.DailyLogisticSupplierTransaction.Models
{
/// <summary>
/// 物流供应商往来统计报表
/// </summary>
public class dc_daily_logistics_supplier_transaction
{
public int id { get; set; }
/// <summary>
/// 统计日期
/// </summary>
public DateTime day { get; set; }
/// <summary>
/// 供应商id
/// </summary>
public int? supplierid { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
public string suppliername { get; set; }
/// <summary>
/// 期初金额
/// </summary>
public decimal amount_start { get; set; }
/// <summary>
/// 发生额
/// </summary>
public decimal amount_happen { get; set; }
/// <summary>
/// 付款额
/// </summary>
public decimal amount_pay { get; set; }
/// <summary>
/// 收款额
/// </summary>
public decimal amount_receipt { get; set; }
/// <summary>
/// 其他金额（调整金额）
/// </summary>
public decimal amount_other { get; set; }
/// <summary>
/// 期末金额 = 期初+发生额-付款额+收款额+其他金额
/// </summary>
public decimal amount_end { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime createtime { get; set; }
/// <summary>
/// 最后更新时间
/// </summary>
public DateTime lastupdatetime { get; set; }
/// <summary>
/// 最后更新人id
/// </summary>
public int lastupdateuserid { get; set; }
/// <summary>
/// 最后更新人名称
/// </summary>
public string lastupdateusername { get; set; }
}
}
Bailun.DC.DailyLogisticSupplierTransaction/Program.cs 0 → 100644
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using System;
using System.Threading.Tasks;
namespace Bailun.DC.DailyLogisticSupplierTransaction
{
class Program
{
/// <summary>
/// 物流供应商往来统计报表
/// </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)
//{
// var _services = new Services();
// var start = DateTime.Parse("2020-04-01");
// while (start.AddDays(1) < DateTime.Now)
// {
// Console.WriteLine(start);
// _services.Init(start, start.AddDays(1));
// _services.SaveMoneyFlowCount(start, start.AddDays(1));
// start = start.AddDays(1);
// }
//}
}
}
Bailun.DC.DailyLogisticSupplierTransaction/Services.cs 0 → 100644
using Microsoft.Extensions.Hosting;
using System;
using System.Collections.Generic;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace Bailun.DC.DailyLogisticSupplierTransaction
{
public class Services : BackgroundService
{
private Timer _timer;
protected override Task ExecuteAsync(CancellationToken stoppingToken)
{
_timer = new Timer(DoWork, null, TimeSpan.Zero, TimeSpan.FromMinutes(1));
return Task.CompletedTask;
}
private void DoWork(object state)
{
try
{
var now = DateTime.Now;
if (now.Hour == 5 && now.Minute == 01) //凌晨5：01分启动
{
Console.WriteLine("开始启动 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
var day = DateTime.Parse(now.AddDays(-1).ToShortDateString());
Init(day);
Console.WriteLine("任务运行完成 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
}
else if (now.Hour % 8 == 0 && now.Minute == 1)
{
var day = DateTime.Parse(now.AddMonths(-1).ToShortDateString());
while (day.AddDays(1) < DateTime.Now)
{
Console.WriteLine(day);
Init(day);
Console.WriteLine("重跑 " + day.ToString("yyyy-MM-dd HH:mm:ss") + " 完成");
day = day.AddDays(1);
}
}
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
}
}
private void Init(DateTime day)
{
//业务逻辑
}
}
}
Bailun.DC.DailyPayAndIncoming/Program.cs
...@@ -7,6 +7,11 @@ namespace Bailun.DC.DailyPayAndIncoming ...@@ -7,6 +7,11 @@ namespace Bailun.DC.DailyPayAndIncoming
{ {
class Program class Program
{ {
/// <summary>
///
/// </summary>
/// <param name="args"></param>
/// <returns></returns>
static async Task Main(string[] args) static async Task Main(string[] args)
{ {
Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
......
Bailun.DC.HappenAmount/Program.cs
...@@ -28,6 +28,7 @@ namespace Bailun.DC.HappenAmount ...@@ -28,6 +28,7 @@ namespace Bailun.DC.HappenAmount
// new Services().Init(start, start.AddDays(1)); // new Services().Init(start, start.AddDays(1));
// //new Bailun.DC.Services.FinanceReportServices().AddLogisticsWaitPay(start, 0); // //new Bailun.DC.Services.FinanceReportServices().AddLogisticsWaitPay(start, 0);
// start = start.AddDays(1); // start = start.AddDays(1);
// } // }
// new Bailun.DC.Services.FinanceReportServices().UpdateLogisticsWaitPay(start, 0, "admin", null); // new Bailun.DC.Services.FinanceReportServices().UpdateLogisticsWaitPay(start, 0, "admin", null);
......
Bailun.DC.HappenAmount/Services.cs
...@@ -42,7 +42,7 @@ namespace Bailun.DC.HappenAmount ...@@ -42,7 +42,7 @@ namespace Bailun.DC.HappenAmount
else if (now.Hour==12 && now.Minute == 1) else if (now.Hour==12 && now.Minute == 1)
{ {
Console.WriteLine("重跑数据 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); Console.WriteLine("重跑数据 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
var start = now.AddMonths(-1); var start = now.AddMonths(-2);
while (start.AddDays(1) < DateTime.Now) while (start.AddDays(1) < DateTime.Now)
{ {
new Services().Init(start, start.AddDays(1)); new Services().Init(start, start.AddDays(1));
......
Bailun.DC.Models/dc_base_logistics.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
namespace Bailun.DC.Models
{
public class dc_base_logistics
{
public int id { get; set; }
public int wms_id { get; set; }
public string company_code { get; set; }
public string company_name { get; set; }
public string bill_code { get; set; }
public string tracking_no { get; set; }
public decimal merchant_output_weight_kg { get; set; }
public decimal merchant_shipment_cost_cny { get; set; }
public DateTime? merchant_reconciliation_time { get; set; }
public string reconciliation_type { get; set; }
public string info_id { get; set; }
public decimal output_weight_kg { get; set; }
public decimal bailun_shipment_cost_cny { get; set; }
public DateTime? shipment_time { get; set; }
public string diff_state_type { get; set; }
public decimal merchant_output_weight_kg_original { get; set; }
public decimal merchant_shipment_cost_sny_original { get; set; }
public decimal cost_diff_decimal { get; set; }
public decimal weight_diff_decimal { get; set; }
public string line_name { get; set; }
public string fee_code { get; set; }
public string remark { get; set; }
public string generate_bill_status { get; set; }
public string fee_product_type { get; set; }
public DateTime? last_modification_time { get; set; }
public DateTime gmt_create_time { get; set; }
public DateTime gmt_modify_time { get; set; }
}
}
Bailun.DC.Models/dc_daily_logistics_supplier_transaction.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Text;
namespace Bailun.DC.Models
{
/// <summary>
/// 物流供应商往来统计报表
/// </summary>
public class dc_daily_logistics_supplier_transaction
{
public int id { get; set; }
/// <summary>
/// 统计日期
/// </summary>
public DateTime day { get; set; }
/// <summary>
/// 供应商id
/// </summary>
public int? supplierid { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
public string suppliername { get; set; }
/// <summary>
/// 期初金额
/// </summary>
public decimal amount_start { get; set; }
/// <summary>
/// 发生额
/// </summary>
public decimal amount_happen { get; set; }
/// <summary>
/// 付款额
/// </summary>
public decimal amount_pay { get; set; }
/// <summary>
/// 收款额
/// </summary>
public decimal amount_receipt { get; set; }
/// <summary>
/// 其他金额（调整金额）
/// </summary>
public decimal amount_other { get; set; }
/// <summary>
/// 期末金额 = 期初+发生额-付款额+收款额+其他金额
/// </summary>
public decimal amount_end { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime createtime { get; set; }
/// <summary>
/// 最后更新时间
/// </summary>
public DateTime lastupdatetime { get; set; }
/// <summary>
/// 最后更新人id
/// </summary>
public int lastupdateuserid { get; set; }
/// <summary>
/// 最后更新人名称
/// </summary>
public string lastupdateusername { get; set; }
}
}
Bailun.DC.Services/PurchaseServices.cs
...@@ -185,7 +185,7 @@ namespace Bailun.DC.Services ...@@ -185,7 +185,7 @@ namespace Bailun.DC.Services
/// <returns></returns> /// <returns></returns>
public List<dc_semi_purchase_info> ListSemiPurchase(DateTime start, DateTime end) public List<dc_semi_purchase_info> ListSemiPurchase(DateTime start, DateTime end)
{ {
var sql = $@"select * from dc_semi_purchase_info t1 where `status`>-1 and deliver_name !='广州哈倪蔓生物科技有限公司' and deliver_name!='广州市花都区花城市象贸易商行-滋柔' and deliver_name!='LEIKESAER INFORMATION SERVICE LIMITED' and t1.create_time>='{start.ToString("yyyy-MM-dd")}' and t1.create_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}'"; var sql = $@"select * from dc_semi_purchase_info t1 where detail_delstatus=0 and `status`>-1 and deliver_name !='广州哈倪蔓生物科技有限公司' and deliver_name!='广州市花都区花城市象贸易商行-滋柔' and deliver_name!='LEIKESAER INFORMATION SERVICE LIMITED' and t1.create_time>='{start.ToString("yyyy-MM-dd")}' and t1.create_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}'";
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString)) using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{ {
......
Bailun.DC.SkuDailyPurchaseAndSales/Program.cs
...@@ -20,7 +20,7 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales ...@@ -20,7 +20,7 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
static void Main(string[] args) static void Main(string[] args)
{ {
var start = DateTime.Parse("2020-05-01"); var start = DateTime.Parse("2020-06-02");
while (start.AddDays(1) < DateTime.Now) while (start.AddDays(1) < DateTime.Now)
{ {
Console.WriteLine(start.ToString("yyyy-MM-dd")); Console.WriteLine(start.ToString("yyyy-MM-dd"));
......
Bailun.DC.SkuDailyPurchaseAndSales/Services.cs
...@@ -251,7 +251,7 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales ...@@ -251,7 +251,7 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
#region 原料 #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 and deliver_name !='广州哈倪蔓生物科技有限公司' and deliver_name!='广州市花都区花城市象贸易商行-滋柔' and deliver_name!='LEIKESAER INFORMATION SERVICE LIMITED' 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 detail_delstatus=0 and 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!='广州市花都区花城市象贸易商行-滋柔' and deliver_name!='LEIKESAER INFORMATION SERVICE LIMITED'
group by bailun_sku,warehouse_from_code"; group by bailun_sku,warehouse_from_code";
var objSemiPurchase = cn.Query<Models.mSkuCount>(sql, null, null, true, 2 * 60).AsList(); var objSemiPurchase = cn.Query<Models.mSkuCount>(sql, null, null, true, 2 * 60).AsList();
......
Bailun.DC.sln
...@@ -45,6 +45,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bailun.DC.DailyPlatformRece ...@@ -45,6 +45,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bailun.DC.DailyPlatformRece
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bailun.DC.MonthSalePutin", "Bailun.DC.MonthSalePutin\Bailun.DC.MonthSalePutin.csproj", "{08F12342-13D8-4FB3-B3EC-D35B4E738F35}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bailun.DC.MonthSalePutin", "Bailun.DC.MonthSalePutin\Bailun.DC.MonthSalePutin.csproj", "{08F12342-13D8-4FB3-B3EC-D35B4E738F35}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bailun.DC.DailyLogisticSupplierTransaction", "Bailun.DC.DailyLogisticSupplierTransaction\Bailun.DC.DailyLogisticSupplierTransaction.csproj", "{5163B1E9-43F8-4E5A-B4A9-546F5375515E}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -131,6 +133,10 @@ Global ...@@ -131,6 +133,10 @@ Global
{08F12342-13D8-4FB3-B3EC-D35B4E738F35}.Debug|Any CPU.Build.0 = Debug|Any CPU {08F12342-13D8-4FB3-B3EC-D35B4E738F35}.Debug|Any CPU.Build.0 = Debug|Any CPU
{08F12342-13D8-4FB3-B3EC-D35B4E738F35}.Release|Any CPU.ActiveCfg = Release|Any CPU {08F12342-13D8-4FB3-B3EC-D35B4E738F35}.Release|Any CPU.ActiveCfg = Release|Any CPU
{08F12342-13D8-4FB3-B3EC-D35B4E738F35}.Release|Any CPU.Build.0 = Release|Any CPU {08F12342-13D8-4FB3-B3EC-D35B4E738F35}.Release|Any CPU.Build.0 = Release|Any CPU
{5163B1E9-43F8-4E5A-B4A9-546F5375515E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5163B1E9-43F8-4E5A-B4A9-546F5375515E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5163B1E9-43F8-4E5A-B4A9-546F5375515E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5163B1E9-43F8-4E5A-B4A9-546F5375515E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
...@@ -150,6 +156,7 @@ Global ...@@ -150,6 +156,7 @@ Global
{BA2836C9-40CD-41FE-9BAD-7D897BB62AF8} = {AE2CE86A-8538-4142-920F-684DCF47C064} {BA2836C9-40CD-41FE-9BAD-7D897BB62AF8} = {AE2CE86A-8538-4142-920F-684DCF47C064}
{BFD01F3A-DEF2-4DEC-BC7C-3AAB7FBE3188} = {AE2CE86A-8538-4142-920F-684DCF47C064} {BFD01F3A-DEF2-4DEC-BC7C-3AAB7FBE3188} = {AE2CE86A-8538-4142-920F-684DCF47C064}
{08F12342-13D8-4FB3-B3EC-D35B4E738F35} = {AE2CE86A-8538-4142-920F-684DCF47C064} {08F12342-13D8-4FB3-B3EC-D35B4E738F35} = {AE2CE86A-8538-4142-920F-684DCF47C064}
{5163B1E9-43F8-4E5A-B4A9-546F5375515E} = {AE2CE86A-8538-4142-920F-684DCF47C064}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6E53AF28-A282-4FB0-A769-EAEA9769C02A} SolutionGuid = {6E53AF28-A282-4FB0-A769-EAEA9769C02A}
......
docker-compose.yml
...@@ -97,3 +97,10 @@ services: ...@@ -97,3 +97,10 @@ services:
context: . context: .
dockerfile: Bailun.DC.MonthSalePutin/Dockerfile dockerfile: Bailun.DC.MonthSalePutin/Dockerfile
bailun.dc.dailylogisticsuppliertransaction:
image: ${DOCKER_REGISTRY}bailundcdailylogisticsuppliertransaction
build:
context: .
dockerfile: Bailun.DC.DailyLogisticSupplierTransaction/Dockerfile
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