From b63ef64487fb0d517cd8eff2d4d83db46d3d58f2 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Fri, 31 May 2024 14:03:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs | 4 ++-- .../Properties/launchSettings.json | 3 +++ .../DocumentSettings/DocumentSettingAppService.cs | 1 + .../Notes/ScrapNotes/ScrapNotePermissions.cs | 10 ++++++++++ .../Permissions/StorePermissionDefinitionProvider.cs | 3 +++ .../Jobs/CountJobs/CountJobAppService.cs | 3 ++- 6 files changed, 21 insertions(+), 3 deletions(-) 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); From 476ab431c59466ebac26e919ca2930af9c25fde4 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Fri, 31 May 2024 14:23:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8F=91=E6=96=99=20?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Inventories/BalanceController.cs | 2 +- .../Requests/IssueRequest/AssembleIssueRequestEventHandler.cs | 2 +- .../Requests/IssueRequest/CoatingIssueRequestEventHandler.cs | 2 +- .../Requests/IssueRequest/InjectionIssueRequestEventHandler.cs | 2 +- .../Requests/IssueRequest/KittingIssueRequestEventHandler.cs | 2 +- .../Requests/IssueRequest/SparePartIssueRequestEventHandler.cs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs index f3c894493..52c3ba58b 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs @@ -536,7 +536,7 @@ public class BalanceController : AbpController } else { - throw new UserFriendlyException($"未找到 生产线【{productLine}】零件【{itemCode}】关系"); + throw new UserFriendlyException($"未找到生产线【{productLine}】零件【{itemCode}】关系"); } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/AssembleIssueRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/AssembleIssueRequestEventHandler.cs index a2141a90d..545a2c606 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/AssembleIssueRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/AssembleIssueRequestEventHandler.cs @@ -433,7 +433,7 @@ public class AssembleIssueRequestEventHandler detail.PositionCode = assembleIssueRequestDetail.PositionCode; detail.RecommendType = assembleIssueRequestDetail.RecommendType; - detail.ProdLine = assembleIssueRequestDetail.ToLocationCode; + detail.ProdLine = assembleIssueRequestDetail.ProdLine; detail.ItemCode = assembleIssueRequestDetail.ItemCode; detail.ItemName = assembleIssueRequestDetail.ItemName; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/CoatingIssueRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/CoatingIssueRequestEventHandler.cs index 1519695a2..4da179fbc 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/CoatingIssueRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/CoatingIssueRequestEventHandler.cs @@ -433,7 +433,7 @@ public class CoatingIssueRequestEventHandler detail.PositionCode = coatingIssueRequestDetail.PositionCode; detail.RecommendType = coatingIssueRequestDetail.RecommendType; - detail.ProdLine = coatingIssueRequestDetail.ToLocationCode; + detail.ProdLine = coatingIssueRequestDetail.ProdLine; detail.ItemCode = coatingIssueRequestDetail.ItemCode; detail.ItemName = coatingIssueRequestDetail.ItemName; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/InjectionIssueRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/InjectionIssueRequestEventHandler.cs index 9b01d9a4a..cbfae557b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/InjectionIssueRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/InjectionIssueRequestEventHandler.cs @@ -433,7 +433,7 @@ public class InjectionIssueRequestEventHandler detail.PositionCode = injectionIssueRequestDetail.PositionCode; detail.RecommendType = injectionIssueRequestDetail.RecommendType; - detail.ProdLine = injectionIssueRequestDetail.ToLocationCode; + detail.ProdLine = injectionIssueRequestDetail.ProdLine; detail.ItemCode = injectionIssueRequestDetail.ItemCode; detail.ItemName = injectionIssueRequestDetail.ItemName; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/KittingIssueRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/KittingIssueRequestEventHandler.cs index 4fea3fc46..a7e7fa77a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/KittingIssueRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/KittingIssueRequestEventHandler.cs @@ -431,7 +431,7 @@ public class KittingIssueRequestEventHandler detail.PositionCode = kittingIssueRequestDetail.PositionCode; detail.RecommendType = kittingIssueRequestDetail.RecommendType; - detail.ProdLine = kittingIssueRequestDetail.ToLocationCode; + detail.ProdLine = kittingIssueRequestDetail.ProdLine; detail.ItemCode = kittingIssueRequestDetail.ItemCode; detail.ItemName = kittingIssueRequestDetail.ItemName; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/SparePartIssueRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/SparePartIssueRequestEventHandler.cs index b6cd19803..3196a5aea 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/SparePartIssueRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/IssueRequest/SparePartIssueRequestEventHandler.cs @@ -431,7 +431,7 @@ public class SparePartIssueRequestEventHandler detail.PositionCode = sparePartIssueRequestDetail.PositionCode; detail.RecommendType = sparePartIssueRequestDetail.RecommendType; - detail.ProdLine = sparePartIssueRequestDetail.ToLocationCode; + detail.ProdLine = sparePartIssueRequestDetail.ProdLine; detail.ItemCode = sparePartIssueRequestDetail.ItemCode; detail.ItemName = sparePartIssueRequestDetail.ItemName;