diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs index 28aa02cc5..900b4cf8d 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs @@ -149,7 +149,7 @@ public class AgentModule : AbpModule public override void OnApplicationInitialization( ApplicationInitializationContext context) { - context.AddBackgroundWorkerAsync(); - context.AddBackgroundWorkerAsync(); + //context.AddBackgroundWorkerAsync(); + // context.AddBackgroundWorkerAsync(); } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Properties/launchSettings.json b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Properties/launchSettings.json index 33504c948..62d24b6bb 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Properties/launchSettings.json +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Properties/launchSettings.json @@ -3,6 +3,9 @@ "WSL": { "commandName": "WSL2", "distributionName": "" + }, + "配置文件 1": { + "commandName": "Project" } } } \ No newline at end of file diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/DocumentSettings/DocumentSettingAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/DocumentSettings/DocumentSettingAppService.cs index 0a05e48ff..2c2e7277c 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/DocumentSettings/DocumentSettingAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/DocumentSettings/DocumentSettingAppService.cs @@ -35,6 +35,7 @@ public class DocumentSettingAppService { var type = input.Type; var time = DateTime.ParseExact(input.Time, SharedConst.TimeFormat, CultureInfo.InvariantCulture); + return await _documentManager.GenerateNumberAsync(type, time).ConfigureAwait(false); } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ScrapNotes/ScrapNotePermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ScrapNotes/ScrapNotePermissions.cs index 957de7382..3dfe76f3f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ScrapNotes/ScrapNotePermissions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ScrapNotes/ScrapNotePermissions.cs @@ -23,4 +23,14 @@ public static class ScrapNotePermissions scrapNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); scrapNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); } + + public static void AddProductScrapNotePermissions(this PermissionGroupDefinition permissionGroup) + { + _ = permissionGroup.AddPermission(ProductScrapNote, StorePermissionDefinitionProvider.L("ProductScrapNote")); + } + + public static void AddWipScrapNotePermissions(this PermissionGroupDefinition permissionGroup) + { + _ = permissionGroup.AddPermission(WipScrapNote, StorePermissionDefinitionProvider.L("WipScrapNote")); + } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Permissions/StorePermissionDefinitionProvider.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Permissions/StorePermissionDefinitionProvider.cs index 419cf52ce..e889f5e54 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Permissions/StorePermissionDefinitionProvider.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Permissions/StorePermissionDefinitionProvider.cs @@ -105,6 +105,9 @@ public class StorePermissionDefinitionProvider : PermissionDefinitionProvider storeGroup.AddKittingPackagingNotePermission(); + storeGroup.AddProductScrapNotePermissions(); + storeGroup.AddWipScrapNotePermissions(); + #region Jobs storeGroup.AddPurchaseReceiptJobPermission(); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/CountJobs/CountJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/CountJobs/CountJobAppService.cs index 754c7856b..b96b8f1fb 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/CountJobs/CountJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/CountJobs/CountJobAppService.cs @@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using Castle.Components.DictionaryAdapter; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; @@ -243,7 +244,7 @@ public class CountJobAppService public virtual async Task> CreateWithConditionAsync(CountJobCreateRequestInput input) { var entity = ObjectMapper.Map(input); - + var entityList = await _countJobManager.CreateWithConditionAsync(entity, input.PartCondition, input.LocCondition, input.StatusList).ConfigureAwait(false); var dtoList = ObjectMapper.Map, List>(entityList);