18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-11-14 16:30:39 +08:00
parent d3e7027adb d02668a871
commit 622e5d3b2b
19 changed files with 309 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
View File

@@ -18,7 +18,7 @@ using WMS.Web.Repositories.Configuration;
namespace WMS.Web.Repositories
{
public class ChangeBoxRecordRepositories : IChangeBoxRecordRepositories
public class ChangeBoxRecordRepositories : IAllFielRepositories<ChangeBoxRecordQueryRequest>, IChangeBoxRecordRepositories
{
private readonly IMapper _mapper;
private readonly IServiceProvider _serviceProvider;
@@ -175,5 +175,10 @@ namespace WMS.Web.Repositories
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
return (list, total);
}
public async Task<(object obj, int total)> GetListField(ChangeBoxRecordQueryRequest dto, int companyId)
{
return await GetListAsync(dto);
}
}
}

26
src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs
View File

@@ -188,6 +188,8 @@ namespace WMS.Web.Repositories.DependencyInjection
{
var options = Configuration.GetSection("QuartzJobOptions").Get<QuartzJobOptions>();
Services.AddTransient<InStockOrderQuartzJob>();//添加注入定时服务
Services.AddTransient<OutStockOrderQuartzJob>();//添加注入定时服务
Services.AddTransient<BoxQuartzJob>();//添加注入定时服务
//Services.AddTransient<OrderContractQuartzJob>();//添加注入定时服务
Services.AddQuartz(q =>
{
@@ -227,6 +229,30 @@ namespace WMS.Web.Repositories.DependencyInjection
//.WithCronSchedule(CronScheduleBuilder.DailyAtHourAndMinute(options.JobStartHour[5], options.JobStartMinute[5]))
.WithDescription("InStockOrderQuartzJobTriggerDecs"));
#endregion
#region 出库任务单
var jobKey_out = new JobKey("OutStockOrderQuartzJob", options.QuartzJobValue);
q.AddJob<InStockOrderQuartzJob>(jobKey_out, j => j.WithDescription("OutStockOrderQuartzJob"));
q.AddTrigger(t => t
.WithIdentity("OutStockOrderQuartzJobTrigger")
.ForJob(jobKey_out)
.StartNow()
.WithCronSchedule(options.JobStartExpre)
//.WithCronSchedule(CronScheduleBuilder.DailyAtHourAndMinute(options.JobStartHour[5], options.JobStartMinute[5]))
.WithDescription("OutStockOrderQuartzJobTriggerDecs"));
#endregion
#region 箱信息老ops
var jobKey_box = new JobKey("BoxQuartzJob", options.QuartzJobValue);
q.AddJob<InStockOrderQuartzJob>(jobKey_box, j => j.WithDescription("BoxQuartzJob"));
q.AddTrigger(t => t
.WithIdentity("BoxQuartzJobTrigger")
.ForJob(jobKey_box)
.StartNow()
.WithCronSchedule(options.JobStartExpre)
//.WithCronSchedule(CronScheduleBuilder.DailyAtHourAndMinute(options.JobStartHour[5], options.JobStartMinute[5]))
.WithDescription("BoxQuartzJobTriggerDecs"));
#endregion
});
//.net core核心托管-添加Quartz服务器
Services.AddQuartzServer(options =>

8
src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs
View File

@@ -2,7 +2,11 @@
using System;
using System.Collections.Generic;
using System.Text;
using WMS.Web.Core.Dto.ChangeBoxRecord;
using WMS.Web.Core.Dto.MoveBoxRecord;
using WMS.Web.Core.Dto.OutStock;
using WMS.Web.Core.Dto.OutStockTask;
using WMS.Web.Core.Dto.TakeStock;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Repositories;
using WMS.Web.Repositories.Configuration;
@@ -40,6 +44,10 @@ namespace Microsoft.Extensions.DependencyInjection
#region 导出
services.AddTransient<IAllFielRepositories<OutStockTaskQueryRequest>, OutStockTaskRepositories>();
services.AddTransient<IAllFielRepositories<TakeStockQueryRequest>, TakeStockRepositories>();
services.AddTransient<IAllFielRepositories<OutStockQueryRequest>, OutStockRepositories>();
services.AddTransient<IAllFielRepositories<MoveBoxRecordQueryRequest>, MoveBoxRecordRepositories>();
services.AddTransient<IAllFielRepositories<ChangeBoxRecordQueryRequest>, ChangeBoxRecordRepositories>();
#endregion

7
src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
View File

@@ -18,7 +18,7 @@ using WMS.Web.Repositories.Configuration;
namespace WMS.Web.Repositories
{
public class MoveBoxRecordRepositories : IMoveBoxRecordRepositories
public class MoveBoxRecordRepositories : IAllFielRepositories<MoveBoxRecordQueryRequest>,IMoveBoxRecordRepositories
{
private readonly IMapper _mapper;
private readonly IServiceProvider _serviceProvider;
@@ -123,5 +123,10 @@ namespace WMS.Web.Repositories
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
return (list, total);
}
public async Task<(object obj, int total)> GetListField(MoveBoxRecordQueryRequest dto, int companyId)
{
return await GetListAsync(dto);
}
}
}

7
src/WMS.Web.Repositories/OutStockRepositories.cs
View File

@@ -19,7 +19,7 @@ using WMS.Web.Repositories.Configuration;
namespace WMS.Web.Repositories
{
public class OutStockRepositories : IOutStockRepositories
public class OutStockRepositories : IAllFielRepositories<OutStockQueryRequest>, IOutStockRepositories
{
private readonly IMapper _mapper;
private readonly IServiceProvider _serviceProvider;
@@ -292,5 +292,10 @@ namespace WMS.Web.Repositories
};
return response;
}
public async Task<(object obj, int total)> GetListField(OutStockQueryRequest dto, int companyId)
{
return await GetListAsync(dto);
}
}
}

7
src/WMS.Web.Repositories/TakeStockRepositories.cs
View File

@@ -18,7 +18,7 @@ using WMS.Web.Repositories.Configuration;
namespace WMS.Web.Repositories
{
public class TakeStockRepositories : ITakeStockRepositories
public class TakeStockRepositories : IAllFielRepositories<TakeStockQueryRequest>, ITakeStockRepositories
{
private readonly IMapper _mapper;
private readonly IServiceProvider _serviceProvider;
@@ -212,5 +212,10 @@ namespace WMS.Web.Repositories
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
return (list, total);
}
public async Task<(object obj, int total)> GetListField(TakeStockQueryRequest dto, int companyId)
{
return await GetListAsync(dto);
}
}
}