diff --git a/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCustTemplate.cs b/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCustTemplate.cs
index 04deaa6c..24ca3f61 100644
--- a/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCustTemplate.cs
+++ b/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCustTemplate.cs
@@ -93,13 +93,13 @@ namespace DS.WMS.Core.Fee.Entity
///
/// 费用类别ID
///
- [SugarColumn(ColumnDescription = "费用类别ID", IsNullable = true)]
- public long? FeeCategoryId { get; set; }
+ [SugarColumn(ColumnDescription = "费用类别ID", Length = 50, IsNullable = true)]
+ public string? FeeCategoryId { get; set; }
///
/// 费用类别名称
///
- [SugarColumn(ColumnDescription = "费用类别名称", IsNullable = true)]
+ [SugarColumn(ColumnDescription = "费用类别名称", Length = 50, IsNullable = true)]
public string? FeeCategoryName { get; set; }
///
diff --git a/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCustTemplateRecord.cs b/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCustTemplateRecord.cs
index f2ed5f68..6d16578f 100644
--- a/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCustTemplateRecord.cs
+++ b/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeCustTemplateRecord.cs
@@ -43,8 +43,8 @@ namespace DS.WMS.Core.Fee.Entity
///
/// 费用类别ID
///
- [SugarColumn(ColumnDescription = "费用类别ID", IsNullable = true)]
- public long? FeeCategoryId { get; set; }
+ [SugarColumn(ColumnDescription = "费用类别ID", Length = 50, IsNullable = true)]
+ public string? FeeCategoryId { get; set; }
///
/// 创建人
diff --git a/ds-wms-service/DS.WMS.Core/HangfireJob/Interface/IFeeCustTemplateJobService.cs b/ds-wms-service/DS.WMS.Core/HangfireJob/Interface/IFeeCustTemplateJobService.cs
new file mode 100644
index 00000000..15850aa4
--- /dev/null
+++ b/ds-wms-service/DS.WMS.Core/HangfireJob/Interface/IFeeCustTemplateJobService.cs
@@ -0,0 +1,14 @@
+namespace DS.WMS.Core.HangfireJob.Interface
+{
+ ///
+ /// 自动费用模板后台任务
+ ///
+ public interface IFeeCustTemplateJobService
+ {
+ ///
+ /// 生成费用
+ ///
+ ///
+ Task GenerateFeesAsync();
+ }
+}
diff --git a/ds-wms-service/DS.WMS.Core/HangfireJob/Method/FeeCustTemplateJobService.cs b/ds-wms-service/DS.WMS.Core/HangfireJob/Method/FeeCustTemplateJobService.cs
new file mode 100644
index 00000000..224ba38f
--- /dev/null
+++ b/ds-wms-service/DS.WMS.Core/HangfireJob/Method/FeeCustTemplateJobService.cs
@@ -0,0 +1,36 @@
+using DS.Module.SqlSugar;
+using Microsoft.Extensions.DependencyInjection;
+using SqlSugar;
+
+namespace DS.WMS.Core.HangfireJob.Method
+{
+ ///
+ /// 自动费用模板后台任务
+ ///
+ public class FeeCustTemplateJobService
+ {
+ ISqlSugarClient db;
+
+ ///
+ /// 初始化
+ ///
+ ///
+ public FeeCustTemplateJobService(IServiceProvider serviceProvider)
+ {
+ db = serviceProvider.GetRequiredService();
+ }
+
+ ///
+ /// 生成费用
+ ///
+ ///
+ public async Task GenerateFeesAsync()
+ {
+ var dbLinks = await db.Queryable().ToListAsync();
+ foreach (var dbLink in dbLinks)
+ {
+
+ }
+ }
+ }
+}
diff --git a/ds-wms-service/DS.WMS.Core/HangfireJob/Method/JobMiddleware.cs b/ds-wms-service/DS.WMS.Core/HangfireJob/Method/JobMiddleware.cs
new file mode 100644
index 00000000..250b5322
--- /dev/null
+++ b/ds-wms-service/DS.WMS.Core/HangfireJob/Method/JobMiddleware.cs
@@ -0,0 +1,25 @@
+using DS.WMS.Core.HangfireJob.Interface;
+using Hangfire;
+using Microsoft.AspNetCore.Builder;
+
+namespace DS.WMS.Core.HangfireJob.Method
+{
+ ///
+ /// 注册Hangfire定时任务的中间件
+ ///
+ public static class JobMiddleware
+ {
+ ///
+ /// 注册Hangfire定时任务的中间件
+ ///
+ ///
+ ///
+ public static WebApplication UseJobMiddlewares(this WebApplication app)
+ {
+ //RecurringJob.AddOrUpdate(nameof(IFeeCustTemplateJobService),
+ // s => s.GenerateFeesAsync(), Cron.Daily(23, 30));
+
+ return app;
+ }
+ }
+}
diff --git a/ds-wms-service/DS.WMS.FeeApi/Program.cs b/ds-wms-service/DS.WMS.FeeApi/Program.cs
index 8009f086..b4ba9286 100644
--- a/ds-wms-service/DS.WMS.FeeApi/Program.cs
+++ b/ds-wms-service/DS.WMS.FeeApi/Program.cs
@@ -12,6 +12,7 @@ using DS.Module.SqlSugar;
using DS.Module.Swagger;
using DS.Module.UserModule;
using NLog.Web;
+using DS.WMS.Core.HangfireJob.Method;
var builder = WebApplication.CreateBuilder(args);
var environment = builder.Environment.EnvironmentName;
@@ -24,7 +25,7 @@ builder.Configuration
.Build();
builder.Configuration.AddEnvironmentVariables();
builder.Logging.AddNLog("nlog.config");
-// Add services to the container.
+
//Autofacע
builder.Host
.UseServiceProviderFactory(new AutofacServiceProviderFactory())
@@ -49,35 +50,7 @@ builder.Services.AddRuleEngineModuleInstall();//Djy
var app = builder.Build();
app.UsePublicMiddlewares();
-//var documentName = AppSetting.app(new string[] { "SwaggerDoc", "ContactName" });
-//app
-// .UseSwagger(c => { c.RouteTemplate = "{documentName}/swagger.json"; })
-// .UseSwaggerUI(c =>
-// {
-// c.SwaggerEndpoint("/" + documentName + "/swagger.json",
-// AppSetting.app(new string[] { "SwaggerDoc", "ContactName" }));
-// c.DocExpansion(DocExpansion.None);//DocExpansionΪNone۵з
-// c.DefaultModelExpandDepth(-1);//-1 ɲʾModels
-// });
-////
-//var policyName = AppSetting.app(new string[] { "Cors", "PolicyName" });
-//if (!policyName.IsNullOrEmpty())
-//{
-// app.UseCors(policyName); //ӿм
-//}
-
-//app.UseRouting();
-
-//app.UseStaticFiles();
-////м
-//app.UseMiddleware();
-//// //־м
-//// app.UseMiddleware();
-//// ȿ֤
-//app.UseAuthentication();
-//// ȻȨм
-//app.UseAuthorization();
-//app.UseEndpoints(endpoints => { endpoints.MapControllers(); });
+app.UseJobMiddlewares();
app.Run();
\ No newline at end of file
diff --git a/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
index aae55477..6a3dbfba 100644
--- a/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<_PublishTargetUrl>D:\Publish\DS8\FeeApi
- True|2024-09-27T11:01:59.6945760Z||;True|2024-09-27T18:45:48.2812860+08:00||;True|2024-09-27T18:10:25.5697467+08:00||;True|2024-09-27T17:39:06.3169139+08:00||;True|2024-09-27T17:30:14.1043193+08:00||;True|2024-09-27T16:02:09.0703159+08:00||;True|2024-09-27T15:53:05.1789245+08:00||;True|2024-09-27T15:32:52.1934490+08:00||;True|2024-09-27T13:51:24.9197626+08:00||;True|2024-09-27T13:48:17.2817346+08:00||;True|2024-09-27T11:51:46.8193040+08:00||;True|2024-09-27T10:58:33.1059648+08:00||;True|2024-09-27T10:37:35.0336563+08:00||;False|2024-09-27T10:31:52.6302264+08:00||;True|2024-09-26T19:50:15.5513195+08:00||;True|2024-09-26T19:47:14.0781788+08:00||;True|2024-09-26T19:01:26.5428388+08:00||;True|2024-09-26T18:35:28.7455319+08:00||;True|2024-09-26T18:24:30.8084807+08:00||;True|2024-09-26T18:20:47.3005460+08:00||;True|2024-09-26T18:04:39.8012913+08:00||;True|2024-09-26T17:48:13.8526872+08:00||;True|2024-09-26T16:08:20.1746970+08:00||;True|2024-09-26T16:01:01.1501975+08:00||;False|2024-09-26T16:00:34.1516745+08:00||;True|2024-09-26T14:33:03.4007570+08:00||;True|2024-09-25T19:14:27.8906774+08:00||;True|2024-09-25T18:57:40.1435131+08:00||;True|2024-09-25T17:38:44.0915841+08:00||;True|2024-09-25T15:33:58.4630618+08:00||;True|2024-09-25T15:10:31.3022063+08:00||;False|2024-09-25T14:14:40.9640545+08:00||;True|2024-09-25T10:09:32.2558600+08:00||;True|2024-09-25T09:59:17.1525160+08:00||;False|2024-09-25T09:57:58.7265103+08:00||;False|2024-09-25T09:53:36.7732713+08:00||;False|2024-09-24T18:40:10.0166224+08:00||;True|2024-09-24T08:59:56.1995425+08:00||;True|2024-09-23T18:07:54.7222163+08:00||;True|2024-09-23T17:23:57.7568406+08:00||;True|2024-09-23T16:28:49.3169826+08:00||;True|2024-09-23T15:57:31.8052490+08:00||;True|2024-09-23T11:47:21.1445419+08:00||;True|2024-09-23T09:24:36.0732229+08:00||;True|2024-09-21T11:59:19.0549926+08:00||;True|2024-09-21T11:24:32.4451752+08:00||;True|2024-09-21T10:39:11.5297411+08:00||;True|2024-09-20T18:24:31.7827684+08:00||;True|2024-09-19T17:55:53.1666689+08:00||;True|2024-09-19T17:42:47.9061485+08:00||;True|2024-09-19T16:08:21.7225571+08:00||;False|2024-09-19T14:15:42.9318446+08:00||;True|2024-09-19T11:20:03.5567568+08:00||;True|2024-09-18T11:35:18.1509724+08:00||;True|2024-09-18T09:08:59.1152574+08:00||;True|2024-09-14T15:48:22.9374486+08:00||;True|2024-09-14T15:42:19.0503983+08:00||;True|2024-09-14T11:51:53.3339222+08:00||;True|2024-09-14T11:41:38.3542237+08:00||;True|2024-09-14T11:19:13.1037012+08:00||;True|2024-09-13T14:31:12.4598160+08:00||;True|2024-09-13T10:44:56.1241214+08:00||;False|2024-09-13T10:44:26.6088271+08:00||;False|2024-09-13T10:44:06.1615137+08:00||;False|2024-09-13T10:43:19.2432517+08:00||;False|2024-09-13T10:38:18.1663387+08:00||;True|2024-09-06T18:49:17.9435308+08:00||;True|2024-09-06T17:01:39.6646353+08:00||;True|2024-09-06T10:27:36.9990456+08:00||;True|2024-09-06T09:48:23.4236094+08:00||;True|2024-09-05T13:57:23.8452431+08:00||;True|2024-09-05T10:21:34.6675149+08:00||;True|2024-09-05T09:12:44.5610882+08:00||;True|2024-09-04T10:07:38.3707398+08:00||;True|2024-09-04T09:52:47.0574599+08:00||;True|2024-09-03T16:41:23.7516960+08:00||;True|2024-09-03T15:22:31.8718097+08:00||;True|2024-09-03T10:01:09.7656702+08:00||;False|2024-09-03T09:46:46.8956531+08:00||;True|2024-09-02T17:07:41.0268500+08:00||;True|2024-09-02T13:50:22.0203254+08:00||;True|2024-09-02T13:34:23.3441546+08:00||;True|2024-08-30T11:25:14.7431645+08:00||;True|2024-08-29T16:38:26.3491372+08:00||;True|2024-08-29T16:32:31.8580864+08:00||;False|2024-08-29T16:30:41.4763198+08:00||;True|2024-08-09T09:18:05.8484398+08:00||;True|2024-08-09T08:45:38.7858906+08:00||;True|2024-08-05T11:37:07.3133020+08:00||;True|2024-07-24T16:45:58.2272340+08:00||;True|2024-07-24T15:48:52.0128987+08:00||;True|2024-07-23T17:41:01.7494842+08:00||;True|2024-07-23T17:25:11.8773492+08:00||;True|2024-07-23T17:07:16.5460273+08:00||;True|2024-07-22T08:59:23.3235603+08:00||;True|2024-07-12T17:35:11.1225017+08:00||;True|2024-07-11T11:40:17.3581147+08:00||;True|2024-07-04T17:20:50.0175739+08:00||;True|2024-07-02T11:26:14.2092751+08:00||;True|2024-07-02T09:21:51.3513605+08:00||;
+ True|2024-10-08T09:59:07.5583287Z||;True|2024-09-27T19:01:59.6945760+08:00||;True|2024-09-27T18:45:48.2812860+08:00||;True|2024-09-27T18:10:25.5697467+08:00||;True|2024-09-27T17:39:06.3169139+08:00||;True|2024-09-27T17:30:14.1043193+08:00||;True|2024-09-27T16:02:09.0703159+08:00||;True|2024-09-27T15:53:05.1789245+08:00||;True|2024-09-27T15:32:52.1934490+08:00||;True|2024-09-27T13:51:24.9197626+08:00||;True|2024-09-27T13:48:17.2817346+08:00||;True|2024-09-27T11:51:46.8193040+08:00||;True|2024-09-27T10:58:33.1059648+08:00||;True|2024-09-27T10:37:35.0336563+08:00||;False|2024-09-27T10:31:52.6302264+08:00||;True|2024-09-26T19:50:15.5513195+08:00||;True|2024-09-26T19:47:14.0781788+08:00||;True|2024-09-26T19:01:26.5428388+08:00||;True|2024-09-26T18:35:28.7455319+08:00||;True|2024-09-26T18:24:30.8084807+08:00||;True|2024-09-26T18:20:47.3005460+08:00||;True|2024-09-26T18:04:39.8012913+08:00||;True|2024-09-26T17:48:13.8526872+08:00||;True|2024-09-26T16:08:20.1746970+08:00||;True|2024-09-26T16:01:01.1501975+08:00||;False|2024-09-26T16:00:34.1516745+08:00||;True|2024-09-26T14:33:03.4007570+08:00||;True|2024-09-25T19:14:27.8906774+08:00||;True|2024-09-25T18:57:40.1435131+08:00||;True|2024-09-25T17:38:44.0915841+08:00||;True|2024-09-25T15:33:58.4630618+08:00||;True|2024-09-25T15:10:31.3022063+08:00||;False|2024-09-25T14:14:40.9640545+08:00||;True|2024-09-25T10:09:32.2558600+08:00||;True|2024-09-25T09:59:17.1525160+08:00||;False|2024-09-25T09:57:58.7265103+08:00||;False|2024-09-25T09:53:36.7732713+08:00||;False|2024-09-24T18:40:10.0166224+08:00||;True|2024-09-24T08:59:56.1995425+08:00||;True|2024-09-23T18:07:54.7222163+08:00||;True|2024-09-23T17:23:57.7568406+08:00||;True|2024-09-23T16:28:49.3169826+08:00||;True|2024-09-23T15:57:31.8052490+08:00||;True|2024-09-23T11:47:21.1445419+08:00||;True|2024-09-23T09:24:36.0732229+08:00||;True|2024-09-21T11:59:19.0549926+08:00||;True|2024-09-21T11:24:32.4451752+08:00||;True|2024-09-21T10:39:11.5297411+08:00||;True|2024-09-20T18:24:31.7827684+08:00||;True|2024-09-19T17:55:53.1666689+08:00||;True|2024-09-19T17:42:47.9061485+08:00||;True|2024-09-19T16:08:21.7225571+08:00||;False|2024-09-19T14:15:42.9318446+08:00||;True|2024-09-19T11:20:03.5567568+08:00||;True|2024-09-18T11:35:18.1509724+08:00||;True|2024-09-18T09:08:59.1152574+08:00||;True|2024-09-14T15:48:22.9374486+08:00||;True|2024-09-14T15:42:19.0503983+08:00||;True|2024-09-14T11:51:53.3339222+08:00||;True|2024-09-14T11:41:38.3542237+08:00||;True|2024-09-14T11:19:13.1037012+08:00||;True|2024-09-13T14:31:12.4598160+08:00||;True|2024-09-13T10:44:56.1241214+08:00||;False|2024-09-13T10:44:26.6088271+08:00||;False|2024-09-13T10:44:06.1615137+08:00||;False|2024-09-13T10:43:19.2432517+08:00||;False|2024-09-13T10:38:18.1663387+08:00||;True|2024-09-06T18:49:17.9435308+08:00||;True|2024-09-06T17:01:39.6646353+08:00||;True|2024-09-06T10:27:36.9990456+08:00||;True|2024-09-06T09:48:23.4236094+08:00||;True|2024-09-05T13:57:23.8452431+08:00||;True|2024-09-05T10:21:34.6675149+08:00||;True|2024-09-05T09:12:44.5610882+08:00||;True|2024-09-04T10:07:38.3707398+08:00||;True|2024-09-04T09:52:47.0574599+08:00||;True|2024-09-03T16:41:23.7516960+08:00||;True|2024-09-03T15:22:31.8718097+08:00||;True|2024-09-03T10:01:09.7656702+08:00||;False|2024-09-03T09:46:46.8956531+08:00||;True|2024-09-02T17:07:41.0268500+08:00||;True|2024-09-02T13:50:22.0203254+08:00||;True|2024-09-02T13:34:23.3441546+08:00||;True|2024-08-30T11:25:14.7431645+08:00||;True|2024-08-29T16:38:26.3491372+08:00||;True|2024-08-29T16:32:31.8580864+08:00||;False|2024-08-29T16:30:41.4763198+08:00||;True|2024-08-09T09:18:05.8484398+08:00||;True|2024-08-09T08:45:38.7858906+08:00||;True|2024-08-05T11:37:07.3133020+08:00||;True|2024-07-24T16:45:58.2272340+08:00||;True|2024-07-24T15:48:52.0128987+08:00||;True|2024-07-23T17:41:01.7494842+08:00||;True|2024-07-23T17:25:11.8773492+08:00||;True|2024-07-23T17:07:16.5460273+08:00||;True|2024-07-22T08:59:23.3235603+08:00||;True|2024-07-12T17:35:11.1225017+08:00||;True|2024-07-11T11:40:17.3581147+08:00||;True|2024-07-04T17:20:50.0175739+08:00||;True|2024-07-02T11:26:14.2092751+08:00||;
\ No newline at end of file
diff --git a/ds-wms-service/DS.WMS.JobService/Worker.cs b/ds-wms-service/DS.WMS.JobService/Worker.cs
index e0fa1e89..428e993a 100644
--- a/ds-wms-service/DS.WMS.JobService/Worker.cs
+++ b/ds-wms-service/DS.WMS.JobService/Worker.cs
@@ -1,5 +1,6 @@
using DS.Module.Core;
using DS.WMS.Core.Code.Entity;
+using DS.WMS.Core.HangfireJob.Interface;
using Hangfire;
using Hangfire.MySql;