From 6a3ac38a8b7568131ab3f6b0dc281fc37b957a66 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Wed, 17 Apr 2024 09:15:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreApplicationAutoMapperProfile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs index 89d62533a..e83896751 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs @@ -2,7 +2,7 @@ using AutoMapper; namespace Win_in.Sfs.Wms.Store.Application; -public partial class StoreApplicationAutoMapperProfile : Profile +public partial class ChassisOperationSequenceAutoMapperProfile : Profile { public StoreApplicationAutoMapperProfile() { From 6c9e43ec9aded896c3f9595b8f1b0f0e122b968d Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Wed, 17 Apr 2024 09:15:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=20=E6=B7=BB=E5=8A=A0=20=E5=BA=95=E7=9B=98=E5=BA=8F?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rdPermissions.cs => ChassisPermissions.cs} | 1 + .../{EquipmentRecordDTO.cs => ChassisDTO.cs} | 0 ...ordAppService.cs => IChassisAppService.cs} | 0 ...RecordEditInput.cs => ChassisEditInput.cs} | 0 ...rdImportInput.cs => ChassisImportInput.cs} | 0 .../ChassisOperationSequencePermissions.cs | 21 +++++ .../DTOs/ChassisOperationSequenceDTO.cs | 48 ++++++++++ .../IChassisOperationSequenceAppService.cs | 12 +++ .../ChassisOperationSequenceEditInput.cs | 48 ++++++++++ .../ChassisOperationSequenceImportInput.cs | 51 +++++++++++ .../AssembleJobs/DTOs/AssembleJobDTO.cs | 2 +- .../Inputs/AssembleJobEditInput.cs | 2 +- .../StorePermissionDefinitionProvider.cs | 2 +- .../AssembleRequestPermissions.cs | 18 ++-- .../DTOs/AssembleRequestDTO.cs | 2 +- .../DTOs/AssembleRequestDetailDTO.cs | 2 +- .../IAssembleRequestAppService.cs | 6 +- .../Inputs/AssembleRequestDetailInput.cs | 2 +- .../Inputs/AssembleRequestEditInput.cs | 2 +- .../Inputs/AssembleRequestImportInput.cs | 2 +- .../Chassis/ChassisAppService.cs | 2 +- .../Chassis/ChassisAutoMapperProfile.cs | 24 ----- .../ChassisOperationSequenceAppService.cs | 87 +++++++++++++++++++ ...assisOperationSequenceAutoMapperProfile.cs | 19 ++++ .../AssembleJobs/AssembleJobAppService.cs | 4 +- .../AssembleRequestAppService.cs | 54 ++++++------ .../AssembleRequestAutoMapperProfile.cs | 14 +-- .../StoreApplicationAutoMapperProfile.cs | 4 +- .../Chassis/ChassisDetail.cs | 13 --- .../ChassisOperationSequence.cs | 49 +++++++++++ .../ChassisOperationSequenceManager.cs | 23 +++++ .../IChassisOperationSequenceManager.cs | 12 +++ .../IChassisOperationSequenceRepository.cs | 10 +++ .../IssueJobs/AssembleJobs/AssembleJob.cs | 2 +- .../AssembleRequests/AssembleRequest.cs | 4 +- .../AssembleRequests/AssembleRequestDetail.cs | 2 +- .../AssembleRequestManager.cs | 20 ++--- .../IAssembleRequestManager.cs | 6 +- .../IAssembleRequestRepository.cs | 4 +- ...equenceDbContextModelCreatingExtensions.cs | 31 +++++++ ...hassisOperationSequenceEfCoreRepository.cs | 18 ++++ .../IStoreDbContext.cs | 2 +- ...mbleJobDbContextModelCreatingExtensions.cs | 2 +- ...054940_Update_InjectionRequest.Designer.cs | 16 ++-- .../20240403054940_Update_InjectionRequest.cs | 34 ++++---- ...240403071320_transferLib_3temp.Designer.cs | 16 ++-- .../20240403071320_transferLib_3temp.cs | 34 ++++---- ...te_InjectionRequest_2024_04_09.Designer.cs | 16 ++-- ...0240412052222_Update_Injection.Designer.cs | 16 ++-- .../20240412061448_transferLibV2.Designer.cs | 16 ++-- ...0240415063138_transferLibV2222.Designer.cs | 16 ++-- .../20240416053509_Added_Chassis.Designer.cs | 16 ++-- .../20240416053509_Added_Chassis.cs | 20 ++--- .../Migrations/StoreDbContextModelSnapshot.cs | 16 ++-- ...RequestDbContextModelCreatingExtensions.cs | 12 +-- .../AssembleRequestEfCoreRepository.cs | 4 +- .../StoreDbContext.cs | 2 +- .../StoreDbContextModelCreatingExtensions.cs | 2 +- .../StoreEntityFrameworkCoreModule.cs | 4 +- .../Jobs/AssembleJobAutoMapperProfile.cs | 4 +- .../AssembleRequestAutoMapperProfile.cs | 6 +- .../Requests/AssembleRequestEventHandler.cs | 44 +++++----- .../StoreEventAutoMapperProfile.cs | 2 +- 63 files changed, 658 insertions(+), 265 deletions(-) rename be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/{EquipmentRecordPermissions.cs => ChassisPermissions.cs} (96%) rename be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/DTOs/{EquipmentRecordDTO.cs => ChassisDTO.cs} (100%) rename be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/{IEquipmentRecordAppService.cs => IChassisAppService.cs} (100%) rename be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/{EquipmentRecordEditInput.cs => ChassisEditInput.cs} (100%) rename be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/{EquipmentRecordImportInput.cs => ChassisImportInput.cs} (100%) create mode 100644 be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/ChassisOperationSequencePermissions.cs create mode 100644 be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/DTOs/ChassisOperationSequenceDTO.cs create mode 100644 be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/IChassisOperationSequenceAppService.cs create mode 100644 be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceEditInput.cs create mode 100644 be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceImportInput.cs create mode 100644 be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAppService.cs create mode 100644 be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAutoMapperProfile.cs delete mode 100644 be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/ChassisDetail.cs create mode 100644 be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/ChassisOperationSequence.cs create mode 100644 be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/ChassisOperationSequenceManager.cs create mode 100644 be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/IChassisOperationSequenceManager.cs create mode 100644 be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/IChassisOperationSequenceRepository.cs create mode 100644 be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ChassisOperationSequence/ChassisOperationSequenceDbContextModelCreatingExtensions.cs create mode 100644 be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ChassisOperationSequence/ChassisOperationSequenceEfCoreRepository.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/EquipmentRecordPermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/ChassisPermissions.cs similarity index 96% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/EquipmentRecordPermissions.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/ChassisPermissions.cs index cd76d45fa..9d3403ac7 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/EquipmentRecordPermissions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/ChassisPermissions.cs @@ -1,4 +1,5 @@ using Volo.Abp.Authorization.Permissions; +using Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.Application.Contracts; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/DTOs/EquipmentRecordDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/DTOs/ChassisDTO.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/DTOs/EquipmentRecordDTO.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/DTOs/ChassisDTO.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/IEquipmentRecordAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/IChassisAppService.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/IEquipmentRecordAppService.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/IChassisAppService.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/EquipmentRecordEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisEditInput.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/EquipmentRecordEditInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisEditInput.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/EquipmentRecordImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisImportInput.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/EquipmentRecordImportInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Chassis/Inputs/ChassisImportInput.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/ChassisOperationSequencePermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/ChassisOperationSequencePermissions.cs new file mode 100644 index 000000000..09fd991f1 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/ChassisOperationSequencePermissions.cs @@ -0,0 +1,21 @@ +using Volo.Abp.Authorization.Permissions; +using Win_in.Sfs.Wms.Store.Domain; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public static class ChassisOperationSequencePermissions +{ + public const string Default = StorePermissions.GroupName + "." + nameof(ChassisOperationSequence); + public const string Create = Default + "." + StorePermissions.CreateStr; + public const string Update = Default + "." + StorePermissions.UpdateStr; + public const string Delete = Default + "." + StorePermissions.DeleteStr; + + public static void AddChassisOperationSequencePermission(this PermissionGroupDefinition permissionGroup) + { + var purchaseOrderPermission = + permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(ChassisOperationSequence))); + purchaseOrderPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); + purchaseOrderPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); + purchaseOrderPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); + } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/DTOs/ChassisOperationSequenceDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/DTOs/ChassisOperationSequenceDTO.cs new file mode 100644 index 000000000..31994e458 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/DTOs/ChassisOperationSequenceDTO.cs @@ -0,0 +1,48 @@ +using System; +using System.ComponentModel.DataAnnotations; +using Win_in.Sfs.Shared.Application.Contracts; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +/// +/// 底盘信息 +/// +[Display(Name = "底盘信息")] +public class ChassisOperationSequenceDTO : SfsBasicDTOBase +{ + /// + /// Wms编号 + /// + [Display(Name = "Wms编号")] + public string Number { get; set; } + + /// + /// 底盘号 + /// + [Display(Name = "底盘号")] + public string ChassisOperationSequenceNumber { get; set; } + + /// + /// 描述 + /// + [Display(Name = "描述")] + public string Description { get; set; } + + /// + /// 底盘生产时间 + /// + [Display(Name = "底盘生产时间")] + public DateTime ProduceDateTime { get; set; } + + /// + /// 接收接口时间 + /// + [Display(Name = "接收接口时间")] + public DateTime ReceiveInterfaceDateTime { get; set; } + + /// + /// 执行位置排序列 + /// + [Display(Name = "执行位置排序列")] + public long SortNumber { get; set; } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/IChassisOperationSequenceAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/IChassisOperationSequenceAppService.cs new file mode 100644 index 000000000..7b5eb3a43 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/IChassisOperationSequenceAppService.cs @@ -0,0 +1,12 @@ +using Win_in.Sfs.Shared.Application.Contracts; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public interface IChassisOperationSequenceAppService + : + ISfsStoreMasterAppServiceBase, + ISfsCheckStatusAppService + , ISfsUpsertAppService +{ +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceEditInput.cs new file mode 100644 index 000000000..4876016ef --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceEditInput.cs @@ -0,0 +1,48 @@ +using System; +using System.ComponentModel.DataAnnotations; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +/// +/// 底盘信息 +/// +[Display(Name = "底盘信息")] +public class ChassisOperationSequenceEditInput + : SfsStoreCreateOrUpdateInputBase +{ + /// + /// Wms编号 + /// + [Display(Name = "Wms编号")] + public string Number { get; set; } + + /// + /// 底盘号 + /// + [Display(Name = "底盘号")] + public string ChassisOperationSequenceNumber { get; set; } + + /// + /// 描述 + /// + [Display(Name = "描述")] + public string Description { get; set; } + + /// + /// 底盘生产时间 + /// + [Display(Name = "底盘生产时间")] + public DateTime ProduceDateTime { get; set; } + + /// + /// 接收接口时间 + /// + [Display(Name = "接收接口时间")] + public DateTime ReceiveInterfaceDateTime { get; set; } + + /// + /// 执行位置排序列 + /// + [Display(Name = "执行位置排序列")] + public long SortNumber { get; set; } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceImportInput.cs new file mode 100644 index 000000000..d2c4942b4 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/Inputs/ChassisOperationSequenceImportInput.cs @@ -0,0 +1,51 @@ +using System; +using System.ComponentModel.DataAnnotations; +using Win_in.Sfs.Shared.Application.Contracts; +using Win_in.Sfs.Shared.Application.Contracts.ExportAndImport; +using Win_in.Sfs.Shared.Domain; +using Win_in.Sfs.Shared.Domain.Shared; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +/// +/// 底盘信息 +/// +[Display(Name = "底盘信息")] +public class ChassisOperationSequenceImportInput : SfsStoreImportInputBase +{ + /// + /// Wms编号 + /// + [Display(Name = "Wms编号")] + public string Number { get; set; } + + /// + /// 底盘号 + /// + [Display(Name = "底盘号")] + public string ChassisOperationSequenceNumber { get; set; } + + /// + /// 描述 + /// + [Display(Name = "描述")] + public string Description { get; set; } + + /// + /// 底盘生产时间 + /// + [Display(Name = "底盘生产时间")] + public DateTime ProduceDateTime { get; set; } + + /// + /// 接收接口时间 + /// + [Display(Name = "接收接口时间")] + public DateTime ReceiveInterfaceDateTime { get; set; } + + /// + /// 执行位置排序列 + /// + [Display(Name = "执行位置排序列")] + public long SortNumber { get; set; } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/DTOs/AssembleJobDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/DTOs/AssembleJobDTO.cs index 3e1f8691f..5d1a2a6e9 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/DTOs/AssembleJobDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/DTOs/AssembleJobDTO.cs @@ -28,7 +28,7 @@ public class AssembleJobDTO : SfsJobDTOBase /// [Display(Name = "要货单号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string AssembleRequestNumber { get; set; } + public string AssembleIssueRequestsNumber { get; set; } /// /// 车间 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobEditInput.cs index e5c187236..a1ba6509e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobEditInput.cs @@ -22,7 +22,7 @@ public class AssembleJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateIn [Display(Name = "要货单号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string AssembleRequestNumber { get; set; } + public string AssembleIssueRequestsNumber { get; set; } /// /// 叫料请求类型 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 a24dee8eb..520ad0cec 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 @@ -27,7 +27,7 @@ public class StorePermissionDefinitionProvider : PermissionDefinitionProvider storeGroup.AddPutawayNotePermission(); storeGroup.AddMaterialRequestPermission(); storeGroup.AddInjectionRequestPermission(); - storeGroup.AddAssembleRequestPermission(); + storeGroup.AddAssembleIssueRequestsPermission(); storeGroup.AddThirdLocationRequestPermission(); storeGroup.AddContainerRequestPermission(); storeGroup.AddIssueNotePermission(); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/AssembleRequestPermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/AssembleRequestPermissions.cs index f7c0f9228..7f54997fa 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/AssembleRequestPermissions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/AssembleRequestPermissions.cs @@ -3,25 +3,25 @@ using Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public static class AssembleRequestPermissions +public static class AssembleIssueRequestsPermissions { - public const string Default = StorePermissions.GroupName + "." + nameof(AssembleRequest); + public const string Default = StorePermissions.GroupName + "." + nameof(AssembleIssueRequests); public const string Create = Default + "." + StorePermissions.CreateStr; public const string Update = Default + "." + StorePermissions.UpdateStr; public const string Delete = Default + "." + StorePermissions.DeleteStr; //自动叫料申请 - public const string AutoAssembleRequest = StorePermissions.GroupName + "." + nameof(AutoAssembleRequest); + public const string AutoAssembleIssueRequests = StorePermissions.GroupName + "." + nameof(AutoAssembleIssueRequests); - public static void AddAssembleRequestPermission(this PermissionGroupDefinition permissionGroup) + public static void AddAssembleIssueRequestsPermission(this PermissionGroupDefinition permissionGroup) { - var AssembleRequestPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(AssembleRequest))); - AssembleRequestPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); - AssembleRequestPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); - AssembleRequestPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); + var AssembleIssueRequestsPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(AssembleIssueRequests))); + AssembleIssueRequestsPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); + AssembleIssueRequestsPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); + AssembleIssueRequestsPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); - permissionGroup.AddPermission(AutoAssembleRequest, StorePermissionDefinitionProvider.L(nameof(AutoAssembleRequest))); + permissionGroup.AddPermission(AutoAssembleIssueRequests, StorePermissionDefinitionProvider.L(nameof(AutoAssembleIssueRequests))); } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDTO.cs index 75aa1d02d..93b8b9821 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDTO.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class AssembleRequestDTO : SfsStoreRequestDTOBase, IHasNumber +public class AssembleIssueRequestsDTO : SfsStoreRequestDTOBase, IHasNumber { /// /// 叫料类型 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDetailDTO.cs index a0931f6e2..0b807b179 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/DTOs/AssembleRequestDetailDTO.cs @@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class AssembleRequestDetailDTO : SfsStoreDetailWithQtyDTOBase +public class AssembleIssueRequestsDetailDTO : SfsStoreDetailWithQtyDTOBase { /// /// 已发数量 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/IAssembleRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/IAssembleRequestAppService.cs index db3e91029..cdbf62d72 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/IAssembleRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/IAssembleRequestAppService.cs @@ -5,9 +5,9 @@ using Volo.Abp.Application.Dtos; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public interface IAssembleRequestAppService - : ISfsStoreRequestMasterAppServiceBase +public interface IAssembleIssueRequestsAppService + : ISfsStoreRequestMasterAppServiceBase { - Task CreateAndHandleAsync(AssembleRequestEditInput input); + Task CreateAndHandleAsync(AssembleIssueRequestsEditInput input); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestDetailInput.cs index 1e859f910..4b0c679e4 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestDetailInput.cs @@ -5,7 +5,7 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class AssembleRequestDetailInput : SfsStoreDetailWithQtyInputBase +public class AssembleIssueRequestsDetailInput : SfsStoreDetailWithQtyInputBase { #region 目标库位信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestEditInput.cs index c89acfc30..e2ba92350 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestEditInput.cs @@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class AssembleRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase +public class AssembleIssueRequestsEditInput : SfsStoreRequestCreateOrUpdateInputBase { #region Base diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestImportInput.cs index 3d637b4f5..b51832e9a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/Inputs/AssembleRequestImportInput.cs @@ -5,7 +5,7 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Application.Contracts; [Display(Name = "叫料申请")] -public class AssembleRequestImportInput : SfsStoreImportInputBase +public class AssembleIssueRequestsImportInput : SfsStoreImportInputBase { /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Chassis/ChassisAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Chassis/ChassisAppService.cs index 2e5ed4908..a9a359d8d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Chassis/ChassisAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Chassis/ChassisAppService.cs @@ -26,7 +26,7 @@ namespace Win_in.Sfs.Wms.Store.Application; [Authorize] [Route($"{StoreConsts.RootPath}Chassis")] public class ChassisAppService - : SfsStoreAppServiceBase , IChassisAppService diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Chassis/ChassisAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Chassis/ChassisAutoMapperProfile.cs index f3c0b0d18..dfefeb676 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Chassis/ChassisAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Chassis/ChassisAutoMapperProfile.cs @@ -15,29 +15,5 @@ public partial class StoreApplicationAutoMapperProfile : Profile { CreateMap() .ReverseMap(); - // CreateMap() - // .IgnoreAuditedObjectProperties() - // .Ignore(x => x.ConcurrencyStamp).Ignore(x => x.Id) - // ; - // CreateMap() - // .IgnoreAuditedObjectProperties() - // .Ignore(x => x.Id) ; - // ; - - // CreateMap() - // .IgnoreAuditedObjectProperties() - // .Ignore(x => x.TenantId) - // //.Ignore(x => x.Remark) - // .Ignore(x => x.ExtraProperties) - // .Ignore(x => x.ConcurrencyStamp) - // ; - - // CreateMap() - // .Ignore(x => x.ReportStatus) - // .Ignore(x => x.ReportReason) - // ; - - // CreateMap() - //; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAppService.cs new file mode 100644 index 000000000..b14ce3ce2 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAppService.cs @@ -0,0 +1,87 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using Castle.Components.DictionaryAdapter; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using Volo.Abp; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Domain.Entities; +using Volo.Abp.Domain.Repositories; +using Volo.Abp.ObjectMapping; +using Win_in.Sfs.Basedata.Equipments.DTOs; +using Win_in.Sfs.Shared.Application; +using Win_in.Sfs.Shared.Application.Contracts; +using Win_in.Sfs.Store.Application.Contracts; +using Win_in.Sfs.Wms.Store.Application.Contracts; +using Win_in.Sfs.Wms.Store.Domain; +using Win_in.Sfs.Wms.Store.Domain.Shared; +using Win_in.Sfs.Wms.Store.Equipments; + +namespace Win_in.Sfs.Wms.Store.Application; + +[Authorize] +[Route($"{StoreConsts.RootPath}ChassisOperationSequence")] +public class ChassisOperationSequenceAppService + : SfsStoreAppServiceBase + , IChassisOperationSequenceAppService + +{ + private new readonly IChassisOperationSequenceRepository _repository; + private readonly IChassisOperationSequenceManager _manager; + + public ChassisOperationSequenceAppService( + IChassisOperationSequenceRepository repository, IChassisOperationSequenceManager manager + ):base(repository) + { + base.CreatePolicyName = ChassisOperationSequencePermissions.Create; + base.UpdatePolicyName = ChassisOperationSequencePermissions.Update; + base.DeletePolicyName = ChassisOperationSequencePermissions.Delete; + + _repository = repository; + _manager = manager; + } + #region 无用 + + [NonAction] + public Task GetDetailAsync(Guid id, Guid detailId) + { + throw new NotImplementedException(); + } + + [NonAction] + public Task> GetDetailListAsync(Guid id, SfsStoreRequestInputBase requestInput) + { + throw new NotImplementedException(); + } + + [NonAction] + public Task AddDetailListAsync(Guid id, List list) + { + throw new NotImplementedException(); + } + + [NonAction] + public Task UpdateDetailAsync(Guid id, Guid detailId, ChassisOperationSequenceDTO updateDTO) + { + throw new NotImplementedException(); + } + + [NonAction] + public Task CheckStatusAsync(string number) + { + throw new NotImplementedException(); + } + + [NonAction] + public Task UpsertAsync(ChassisOperationSequenceEditInput input) + { + throw new NotImplementedException(); + } + + #endregion +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAutoMapperProfile.cs new file mode 100644 index 000000000..f5ae01ba8 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAutoMapperProfile.cs @@ -0,0 +1,19 @@ +using AutoMapper; +using Volo.Abp.AutoMapper; +using Win_in.Sfs.Basedata.Application.Contracts; +using Win_in.Sfs.Basedata.Domain; +using Win_in.Sfs.Store.Application.Contracts; +using Win_in.Sfs.Wms.Store.Application.Contracts; +using Win_in.Sfs.Wms.Store.Domain; +using Win_in.Sfs.Wms.Store.Equipments; + +namespace Win_in.Sfs.Wms.Store.Application; + +public partial class StoreApplicationAutoMapperProfile : Profile +{ + private void ChassisOperationSequenceAutoMapperProfile() + { + CreateMap() + .ReverseMap(); + } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleJobs/AssembleJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleJobs/AssembleJobAppService.cs index e58d26e1b..ac4126ccb 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleJobs/AssembleJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleJobs/AssembleJobAppService.cs @@ -57,7 +57,7 @@ public class AssembleJobAppService [HttpPost("cancel-by-request/{assembleNumber}")] public virtual async Task CancelByMaterialRequestAsync(string assembleNumber) { - var entities = await _repository.GetListAsync(p => p.AssembleRequestNumber == assembleNumber).ConfigureAwait(false); + var entities = await _repository.GetListAsync(p => p.AssembleIssueRequestsNumber == assembleNumber).ConfigureAwait(false); foreach (var entity in entities) { await _assembleJobManager.CancelAsync(entity).ConfigureAwait(false); @@ -107,7 +107,7 @@ public class AssembleJobAppService [HttpPost("by-request-number/{requestNumber}")] public virtual async Task> GetByRequestNumberAsync(string requestNumber) { - var entitys = await _repository.GetListAsync(p => p.AssembleRequestNumber == requestNumber).ConfigureAwait(false); + var entitys = await _repository.GetListAsync(p => p.AssembleIssueRequestsNumber == requestNumber).ConfigureAwait(false); return ObjectMapper.Map, List>(entitys); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAppService.cs index 567997a51..e511d4d21 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAppService.cs @@ -30,21 +30,21 @@ namespace Win_in.Sfs.Wms.Store.Application; /// [Authorize] [Route($"{StoreConsts.RootPath}assemble-request")] -public class AssembleRequestAppService : SfsStoreRequestAppServiceBase, - IAssembleRequestAppService +public class AssembleIssueRequestsAppService : SfsStoreRequestAppServiceBase, + IAssembleIssueRequestsAppService { - private readonly IAssembleRequestManager _assembleRequestManager; + private readonly IAssembleIssueRequestsManager _assembleRequestManager; private readonly IItemStoreRelationAppService _itemStoreRelationApp; private readonly IAreaAppService _areaApp; private readonly ILocationAppService _locationAppService; private readonly IItemBasicAppService _itemBasicAppService; private readonly IProductionLineAppService _productionLineAppService; private readonly IInjectionJobAppService _issueJobAppService; - public AssembleRequestAppService( - IAssembleRequestRepository repository, - IAssembleRequestManager assembleRequestManager, + public AssembleIssueRequestsAppService( + IAssembleIssueRequestsRepository repository, + IAssembleIssueRequestsManager assembleRequestManager, IPreparationPlanManager preparationPlanManager, IItemStoreRelationAppService itemStoreRelationApp, IAreaAppService areaApp, @@ -66,16 +66,16 @@ public class AssembleRequestAppService : SfsStoreRequestAppServiceBase HandleAsync(Guid id) + public override async Task HandleAsync(Guid id) { var entity = await _repository.GetAsync(id).ConfigureAwait(false); - await LocalEventBus.PublishAsync(new SfsHandledEntityEventData(entity), false).ConfigureAwait(false); - return ObjectMapper.Map(entity); + await LocalEventBus.PublishAsync(new SfsHandledEntityEventData(entity), false).ConfigureAwait(false); + return ObjectMapper.Map(entity); } [HttpPost("")] - //[Authorize(AssembleRequestPermissions.Create)] - public override async Task CreateAsync(AssembleRequestEditInput input) + //[Authorize(AssembleIssueRequestsPermissions.Create)] + public override async Task CreateAsync(AssembleIssueRequestsEditInput input) { foreach (var item in input.Details) { @@ -102,18 +102,18 @@ public class AssembleRequestAppService : SfsStoreRequestAppServiceBase(input); + var entity = ObjectMapper.Map(input); var result = await _assembleRequestManager.CreateAsync(entity).ConfigureAwait(false); - var dto = ObjectMapper.Map(result); + var dto = ObjectMapper.Map(result); return dto; } - //[Authorize(AssembleRequestPermissions.Create)] + //[Authorize(AssembleIssueRequestsPermissions.Create)] [HttpPost("create-and-handle")] - public async Task CreateAndHandleAsync(AssembleRequestEditInput input) + public async Task CreateAndHandleAsync(AssembleIssueRequestsEditInput input) { var assembleRequestDto = await CreateAsync(input).ConfigureAwait(false); @@ -130,11 +130,11 @@ public class AssembleRequestAppService : SfsStoreRequestAppServiceBase /// [HttpGet("list/by-type/{type}")] - public virtual async Task> GetListByTypeAsync(string type) + public virtual async Task> GetListByTypeAsync(string type) { var entities = await _repository.GetListAsync(c => c.Type == type).ConfigureAwait(false); - var dtos = ObjectMapper.Map, List>(entities); + var dtos = ObjectMapper.Map, List>(entities); return dtos; } @@ -146,8 +146,8 @@ public class AssembleRequestAppService : SfsStoreRequestAppServiceBase /// /// - protected override async Task> ImportProcessingEntityAsync( - Dictionary dictionary) + protected override async Task> ImportProcessingEntityAsync( + Dictionary dictionary) { var addList = dictionary.Where(p => p.Value == EntityState.Added).Select(p => p.Key); @@ -188,7 +188,7 @@ public class AssembleRequestAppService : SfsStoreRequestAppServiceBase /// /// - protected override async Task ValidateImportModelAsync(AssembleRequestImportInput model, + protected override async Task ValidateImportModelAsync(AssembleIssueRequestsImportInput model, List validationRresult) { _ = new Dictionary(); @@ -200,7 +200,7 @@ public class AssembleRequestAppService : SfsStoreRequestAppServiceBase ValidateImportEntities(Dictionary dict) + protected override async Task ValidateImportEntities(Dictionary dict) { foreach (var entity in dict.Keys) { @@ -219,7 +219,7 @@ public class AssembleRequestAppService : SfsStoreRequestAppServiceBase CheckItemBasicAsync(AssembleRequestImportInput importInput, + protected async Task CheckItemBasicAsync(AssembleIssueRequestsImportInput importInput, List validationRresult) { var item = await _itemBasicAppService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false); @@ -236,7 +236,7 @@ public class AssembleRequestAppService : SfsStoreRequestAppServiceBase CheckLocationAsync(AssembleRequestImportInput importInput, + protected async Task CheckLocationAsync(AssembleIssueRequestsImportInput importInput, List validationRresult) { var location = await _locationAppService.GetByCodeAsync(importInput.ToLocationCode).ConfigureAwait(false); @@ -248,7 +248,7 @@ public class AssembleRequestAppService : SfsStoreRequestAppServiceBase validationRresult) { var area = await _areaApp.GetByCodeAsync(importInput.FromLocationArea).ConfigureAwait(false); @@ -258,7 +258,7 @@ public class AssembleRequestAppService : SfsStoreRequestAppServiceBase validationRresult) { var itemStoreRelation = await _itemStoreRelationApp diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAutoMapperProfile.cs index ed88d670e..a53b2f166 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAutoMapperProfile.cs @@ -8,22 +8,22 @@ namespace Win_in.Sfs.Wms.Store.Application; public partial class StoreApplicationAutoMapperProfile : Profile { - private void AssembleRequestAutoMapperProfile() + private void AssembleIssueRequestsAutoMapperProfile() { - CreateMap() + CreateMap() .ReverseMap(); - CreateMap() + CreateMap() .ReverseMap(); - CreateMap() + CreateMap() .IgnoreAuditedObjectProperties() .Ignore(x => x.MasterID) .Ignore(x => x.TenantId) .Ignore(x => x.Number) .Ignore(x => x.Id); - CreateMap() + CreateMap() .IgnoreAuditedObjectProperties() .ForMember(x => x.Type, y => y.MapFrom(t => t.Type.ToString())) .Ignore(x => x.UseOnTheWayLocation) @@ -37,7 +37,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile .Ignore(x => x.ActiveDate) .Ignore(x => x.Remark); - CreateMap() + CreateMap() .IgnoreAuditedObjectProperties() .ForMember(x => x.Status, y => y.MapFrom(t => EnumStatus.Open)) .Ignore(x => x.ToLocationErpCode) @@ -58,7 +58,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile .Ignore(x => x.Number) .Ignore(x => x.Id) .Ignore(x => x.Remark); - CreateMap() + CreateMap() .IgnoreAuditedObjectProperties() .Ignore(x => x.RequestStatus) .Ignore(x => x.ConcurrencyStamp).Ignore(x => x.Id); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs index e83896751..1bc1e2b70 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs @@ -2,7 +2,7 @@ using AutoMapper; namespace Win_in.Sfs.Wms.Store.Application; -public partial class ChassisOperationSequenceAutoMapperProfile : Profile +public partial class StoreApplicationAutoMapperProfile : Profile { public StoreApplicationAutoMapperProfile() { @@ -15,7 +15,7 @@ public partial class ChassisOperationSequenceAutoMapperProfile : Profile ItemTransformRequestAutoMapperProfile(); MaterialRequestAutoMapperProfile(); InjectionRequestAutoMapperProfile(); - AssembleRequestAutoMapperProfile(); + AssembleIssueRequestsAutoMapperProfile(); ThirdLocationRequestAutoMapperProfile(); ProductionReturnRequestAutoMapperProfile(); ProductReceiptRequestAutoMapperProfile(); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/ChassisDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/ChassisDetail.cs deleted file mode 100644 index 786d63229..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Chassis/ChassisDetail.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Win_in.Sfs.Shared.Domain; -using Win_in.Sfs.Wms.Store.Domain; - -namespace Win_in.Sfs.Wms.Store.Chassis; -public class ChassisDetail: SfsStoreDetailEntityBase -{ - -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/ChassisOperationSequence.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/ChassisOperationSequence.cs new file mode 100644 index 000000000..72eba46d5 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/ChassisOperationSequence.cs @@ -0,0 +1,49 @@ +using System; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using Win_in.Sfs.Shared.Domain; + +namespace Win_in.Sfs.Wms.Store.Domain; + +/// +/// 底盘信息 +/// +[Display(Name = "底盘信息")] +public class ChassisOperationSequence : SfsAggregateRootBase +{ + /// + /// Wms编号 + /// + [Display(Name = "Wms编号")] + public string Number { get; set; } + + /// + /// 底盘号 + /// + [Display(Name = "底盘号")] + public string ChassisOperationSequenceNumber { get; set; } + + /// + /// 描述 + /// + [Display(Name = "描述")] + public string Description { get; set; } + + /// + /// 底盘生产时间 + /// + [Display(Name = "底盘生产时间")] + public DateTime ProduceDateTime { get; set; } + + /// + /// 接收接口时间 + /// + [Display(Name = "接收接口时间")] + public DateTime ReceiveInterfaceDateTime { get; set; } + + /// + /// 执行位置排序列 + /// + [Display(Name = "执行位置排序列")] + public long SortNumber { get; set; } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/ChassisOperationSequenceManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/ChassisOperationSequenceManager.cs new file mode 100644 index 000000000..2bc8488d2 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/ChassisOperationSequenceManager.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Volo.Abp.Domain.Services; + +namespace Win_in.Sfs.Wms.Store.Domain; + +public class ChassisOperationSequenceManager : DomainService, IChassisOperationSequenceManager +{ + private readonly IChassisOperationSequenceRepository _repository; + + public ChassisOperationSequenceManager( + IChassisOperationSequenceRepository repository + ) + { + _repository = repository; + } + + public Task ImportDataAsync(List entities, List deleteEntities = null) + { + throw new NotImplementedException(); + } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/IChassisOperationSequenceManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/IChassisOperationSequenceManager.cs new file mode 100644 index 000000000..163749f4e --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/IChassisOperationSequenceManager.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Win_in.Sfs.Basedata.Equipments.DTOs; +using Win_in.Sfs.Shared.Domain; +using Win_in.Sfs.Wms.Store.Equipments; + +namespace Win_in.Sfs.Wms.Store.Domain; + +public interface IChassisOperationSequenceManager : IBulkImportService +{ +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/IChassisOperationSequenceRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/IChassisOperationSequenceRepository.cs new file mode 100644 index 000000000..23203d2a2 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ChassisOperationSequence/IChassisOperationSequenceRepository.cs @@ -0,0 +1,10 @@ +using System.Threading.Tasks; +using Win_in.Sfs.Shared.Domain; +using Win_in.Sfs.Wms.Store.Equipments; + +namespace Win_in.Sfs.Wms.Store.Domain; + +public interface IChassisOperationSequenceRepository : ISfsStoreRepositoryBase, ISfsBulkRepositoryBase +{ + +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/AssembleJob.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/AssembleJob.cs index 74b1b7e0d..8edd88a1a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/AssembleJob.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/AssembleJob.cs @@ -28,7 +28,7 @@ public class AssembleJob : SfsJobAggregateRootBase /// 要货单号 /// [IgnoreUpdate] - public string AssembleRequestNumber { get; set; } + public string AssembleIssueRequestsNumber { get; set; } /// /// 车间 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequest.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequest.cs index 79b339e68..fc73fe2a1 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequest.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequest.cs @@ -7,7 +7,7 @@ namespace Win_in.Sfs.Wms.Store.Domain; /// /// 装配叫料申请 /// -public class AssembleRequest : SfsStoreRequestAggregateRootBase +public class AssembleIssueRequests : SfsStoreRequestAggregateRootBase { /// /// 叫料类型 @@ -25,5 +25,5 @@ public class AssembleRequest : SfsStoreRequestAggregateRootBase [IgnoreUpdate] - public override List Details { get; set; } = new List(); + public override List Details { get; set; } = new List(); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestDetail.cs index e6524a217..6322c1180 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestDetail.cs @@ -9,7 +9,7 @@ namespace Win_in.Sfs.Wms.Store.Domain; /// /// 装配叫料申请明细 /// -public class AssembleRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasToLocation +public class AssembleIssueRequestsDetail : SfsStoreDetailWithQtyEntityBase, IHasToLocation { #region 目标库位信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestManager.cs index 7d9d76b1f..6a11a1746 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/AssembleRequestManager.cs @@ -9,15 +9,15 @@ using static Win_in.Sfs.Wms.Store.Domain.Shared.StoreSettings; namespace Win_in.Sfs.Wms.Store.Domain; -public class AssembleRequestManager - : SfsStoreRequestManagerBase - , IAssembleRequestManager +public class AssembleIssueRequestsManager + : SfsStoreRequestManagerBase + , IAssembleIssueRequestsManager { - private readonly IAssembleRequestRepository _repository; + private readonly IAssembleIssueRequestsRepository _repository; - public AssembleRequestManager( - IAssembleRequestRepository repository + public AssembleIssueRequestsManager( + IAssembleIssueRequestsRepository repository ) : base(repository) { @@ -34,14 +34,14 @@ public class AssembleRequestManager /// /// /// - public virtual async Task CreateBynNumberAsync(AssembleRequest entity) + public virtual async Task CreateBynNumberAsync(AssembleIssueRequests entity) { - var number = string.IsNullOrEmpty(entity.Number) ? await GenerateNumberAsync(nameof(AssembleRequest), entity.ActiveDate).ConfigureAwait(false) : entity.Number; + var number = string.IsNullOrEmpty(entity.Number) ? await GenerateNumberAsync(nameof(AssembleIssueRequests), entity.ActiveDate).ConfigureAwait(false) : entity.Number; entity.SetIdAndNumberWithDetails(GuidGenerator, number); entity.Submit(); entity.Agree(); entity.RequestStatus = EnumRequestStatus.Partial; - await LocalEventBus.PublishAsync(new SfsHandledEntityEventData(entity), false) + await LocalEventBus.PublishAsync(new SfsHandledEntityEventData(entity), false) .ConfigureAwait(false); await _repository.InsertAsync(entity).ConfigureAwait(false); return entity; @@ -63,7 +63,7 @@ public class AssembleRequestManager /// /// 执行导入 /// - public virtual async Task ImportDataAsync(List mergeEntities, List deleteEntities = null) + public virtual async Task ImportDataAsync(List mergeEntities, List deleteEntities = null) { if (deleteEntities != null && deleteEntities.Count > 0) { diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestManager.cs index ce48dbfd9..0169d13c3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestManager.cs @@ -4,10 +4,10 @@ namespace Win_in.Sfs.Wms.Store.Domain; using Win_in.Sfs.Shared.Domain; -public interface IAssembleRequestManager : ISfsStoreRequestManager, - IBulkImportService +public interface IAssembleIssueRequestsManager : ISfsStoreRequestManager, + IBulkImportService { Task CompleteAsync(string number); - Task CreateBynNumberAsync(AssembleRequest entity); + Task CreateBynNumberAsync(AssembleIssueRequests entity); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestRepository.cs index a661ff0f8..0c423ee56 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestRepository.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleRequests/IAssembleRequestRepository.cs @@ -2,8 +2,8 @@ using Win_in.Sfs.Shared.Domain; namespace Win_in.Sfs.Wms.Store.Domain; -public interface IAssembleRequestRepository : ISfsStoreRepositoryBase, - ISfsBulkRepositoryBase +public interface IAssembleIssueRequestsRepository : ISfsStoreRepositoryBase, + ISfsBulkRepositoryBase { } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ChassisOperationSequence/ChassisOperationSequenceDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ChassisOperationSequence/ChassisOperationSequenceDbContextModelCreatingExtensions.cs new file mode 100644 index 000000000..1540e8f97 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ChassisOperationSequence/ChassisOperationSequenceDbContextModelCreatingExtensions.cs @@ -0,0 +1,31 @@ +using Microsoft.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore.Modeling; +using Win_in.Sfs.Shared.Domain.Shared; +using Win_in.Sfs.Wms.Store.Domain; +using Win_in.Sfs.Wms.Store.Equipments; + +namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; + +public static class ChassisOperationSequenceDbContextModelCreatingExtensions +{ + public static void ConfigureChassisOperationSequence(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options) + { + builder.Entity(b => + { + //Configure table & schema name + b.ToTable(options.TablePrefix + nameof(ChassisOperationSequence), options.Schema); + //Configure ABP properties + b.ConfigureByConvention(); + //Configure Sfs base properties + b.ConfigureSfsStoreBase(); + + b.Property(q => q.SortNumber).IsRequired(); + b.Property(q => q.ChassisOperationSequenceNumber).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength).IsRequired(); + b.Property(q => q.Number).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength).IsRequired(); + + b.HasIndex(q => q.ChassisOperationSequenceNumber).IsUnique(); + b.HasIndex(q => q.SortNumber).IsUnique(); + b.HasIndex(q => q.Number).IsUnique(); + }); + } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ChassisOperationSequence/ChassisOperationSequenceEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ChassisOperationSequence/ChassisOperationSequenceEfCoreRepository.cs new file mode 100644 index 000000000..cccc83d95 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ChassisOperationSequence/ChassisOperationSequenceEfCoreRepository.cs @@ -0,0 +1,18 @@ +using System.Linq; +using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore; +using Win_in.Sfs.Shared.Domain; +using Win_in.Sfs.Wms.Store.Domain; +using Win_in.Sfs.Wms.Store.Equipments; + +namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; + +public class ChassisOperationSequenceEfCoreRepository : SfsStoreEfCoreRepositoryBase, IChassisOperationSequenceRepository, ISfsBulkRepositoryBase +{ + public ChassisOperationSequenceEfCoreRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } + + +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/IStoreDbContext.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/IStoreDbContext.cs index 9cbe03d22..9ccc99663 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/IStoreDbContext.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/IStoreDbContext.cs @@ -22,7 +22,7 @@ public interface IStoreDbContext : IEfCoreDbContext public DbSet ProductReceiptRequests { get; } public DbSet MaterialRequests { get; } public DbSet InjectionRequests { get; } - public DbSet AssembleRequests { get; } + public DbSet AssembleIssueRequests { get; } public DbSet ThirdLocationRequests { get; } public DbSet ContainerRequests { get; } public DbSet DeliverRequests { get; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/AssembleJobs/AssembleJobDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/AssembleJobs/AssembleJobDbContextModelCreatingExtensions.cs index 3945e66f1..7588aed51 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/AssembleJobs/AssembleJobDbContextModelCreatingExtensions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/AssembleJobs/AssembleJobDbContextModelCreatingExtensions.cs @@ -22,7 +22,7 @@ public static class AssembleJobDbContextModelCreatingExtensions b.ConfigureJob(); //Properties b.Property(q => q.RequestType).HasMaxLength(SfsPropertyConst.CodeLength); - b.Property(q => q.AssembleRequestNumber).HasMaxLength(SfsPropertyConst.CodeLength); + b.Property(q => q.AssembleIssueRequestsNumber).HasMaxLength(SfsPropertyConst.CodeLength); b.Property(q => q.Workshop).HasMaxLength(SfsPropertyConst.CodeLength); b.Property(q => q.ProdLine).HasMaxLength(SfsPropertyConst.CodeLength); //Relations diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403054940_Update_InjectionRequest.Designer.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403054940_Update_InjectionRequest.Designer.cs index b1c273a9c..cce4d7739 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403054940_Update_InjectionRequest.Designer.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403054940_Update_InjectionRequest.Designer.cs @@ -41,7 +41,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("AssembleRequestNumber") + b.Property("AssembleIssueRequestsNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -840,7 +840,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_AssembleNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -928,10 +928,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_AssembleRequest", (string)null); + b.ToTable("Store_AssembleIssueRequests", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -1075,7 +1075,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_AssembleRequestDetail", (string)null); + b.ToTable("Store_AssembleIssueRequestsDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b => @@ -26388,9 +26388,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -27199,7 +27199,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => { b.Navigation("Details"); }); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403054940_Update_InjectionRequest.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403054940_Update_InjectionRequest.cs index c96d21b37..c451fd5f6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403054940_Update_InjectionRequest.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403054940_Update_InjectionRequest.cs @@ -47,7 +47,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations Id = table.Column(type: "uniqueidentifier", nullable: false), RequestType = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), ProdLine = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), - AssembleRequestNumber = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), + AssembleIssueRequestsNumber = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), Workshop = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), UseOnTheWayLocation = table.Column(type: "bit", nullable: false), ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), @@ -111,7 +111,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations }); migrationBuilder.CreateTable( - name: "Store_AssembleRequest", + name: "Store_AssembleIssueRequests", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -138,7 +138,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Store_AssembleRequest", x => x.Id); + table.PrimaryKey("PK_Store_AssembleIssueRequests", x => x.Id); }); migrationBuilder.CreateTable( @@ -331,7 +331,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations }); migrationBuilder.CreateTable( - name: "Store_AssembleRequestDetail", + name: "Store_AssembleIssueRequestsDetail", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -367,11 +367,11 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Store_AssembleRequestDetail", x => x.Id); + table.PrimaryKey("PK_Store_AssembleIssueRequestsDetail", x => x.Id); table.ForeignKey( - name: "FK_Store_AssembleRequestDetail_Store_AssembleRequest_MasterID", + name: "FK_Store_AssembleIssueRequestsDetail_Store_AssembleIssueRequests_MasterID", column: x => x.MasterID, - principalTable: "Store_AssembleRequest", + principalTable: "Store_AssembleIssueRequests", principalColumn: "Id", onDelete: ReferentialAction.Cascade); }); @@ -466,24 +466,24 @@ namespace Win_in.Sfs.Wms.Store.Migrations filter: "[FromPackingCode] IS NOT NULL"); migrationBuilder.CreateIndex( - name: "IX_Store_AssembleRequest_Number", - table: "Store_AssembleRequest", + name: "IX_Store_AssembleIssueRequests_Number", + table: "Store_AssembleIssueRequests", column: "Number", unique: true); migrationBuilder.CreateIndex( - name: "IX_Store_AssembleRequestDetail_ItemCode", - table: "Store_AssembleRequestDetail", + name: "IX_Store_AssembleIssueRequestsDetail_ItemCode", + table: "Store_AssembleIssueRequestsDetail", column: "ItemCode"); migrationBuilder.CreateIndex( - name: "IX_Store_AssembleRequestDetail_MasterID", - table: "Store_AssembleRequestDetail", + name: "IX_Store_AssembleIssueRequestsDetail_MasterID", + table: "Store_AssembleIssueRequestsDetail", column: "MasterID"); migrationBuilder.CreateIndex( - name: "IX_Store_AssembleRequestDetail_Number_ItemCode_ToLocationCode", - table: "Store_AssembleRequestDetail", + name: "IX_Store_AssembleIssueRequestsDetail_Number_ItemCode_ToLocationCode", + table: "Store_AssembleIssueRequestsDetail", columns: new[] { "Number", "ItemCode", "ToLocationCode" }, unique: true); @@ -515,7 +515,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations name: "Store_AssembleNoteDetail"); migrationBuilder.DropTable( - name: "Store_AssembleRequestDetail"); + name: "Store_AssembleIssueRequestsDetail"); migrationBuilder.DropTable( name: "Store_MesNoteDetail"); @@ -527,7 +527,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations name: "Store_AssembleNote"); migrationBuilder.DropTable( - name: "Store_AssembleRequest"); + name: "Store_AssembleIssueRequests"); migrationBuilder.DropTable( name: "Store_MesNote"); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403071320_transferLib_3temp.Designer.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403071320_transferLib_3temp.Designer.cs index fc5b5ad44..5d5d5ae5a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403071320_transferLib_3temp.Designer.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403071320_transferLib_3temp.Designer.cs @@ -41,7 +41,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("AssembleRequestNumber") + b.Property("AssembleIssueRequestsNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -840,7 +840,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_AssembleNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -928,10 +928,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_AssembleRequest", (string)null); + b.ToTable("Store_AssembleIssueRequests", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -1075,7 +1075,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_AssembleRequestDetail", (string)null); + b.ToTable("Store_AssembleIssueRequestsDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b => @@ -26128,9 +26128,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -26930,7 +26930,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => { b.Navigation("Details"); }); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403071320_transferLib_3temp.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403071320_transferLib_3temp.cs index d075f82dc..a38fff040 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403071320_transferLib_3temp.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240403071320_transferLib_3temp.cs @@ -43,7 +43,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations Id = table.Column(type: "uniqueidentifier", nullable: false), RequestType = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), ProdLine = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), - AssembleRequestNumber = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), + AssembleIssueRequestsNumber = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), Workshop = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), UseOnTheWayLocation = table.Column(type: "bit", nullable: false), ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), @@ -107,7 +107,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations }); migrationBuilder.CreateTable( - name: "Store_AssembleRequest", + name: "Store_AssembleIssueRequests", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -134,7 +134,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Store_AssembleRequest", x => x.Id); + table.PrimaryKey("PK_Store_AssembleIssueRequests", x => x.Id); }); migrationBuilder.CreateTable( @@ -302,7 +302,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations }); migrationBuilder.CreateTable( - name: "Store_AssembleRequestDetail", + name: "Store_AssembleIssueRequestsDetail", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -338,11 +338,11 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Store_AssembleRequestDetail", x => x.Id); + table.PrimaryKey("PK_Store_AssembleIssueRequestsDetail", x => x.Id); table.ForeignKey( - name: "FK_Store_AssembleRequestDetail_Store_AssembleRequest_MasterID", + name: "FK_Store_AssembleIssueRequestsDetail_Store_AssembleIssueRequests_MasterID", column: x => x.MasterID, - principalTable: "Store_AssembleRequest", + principalTable: "Store_AssembleIssueRequests", principalColumn: "Id", onDelete: ReferentialAction.Cascade); }); @@ -382,24 +382,24 @@ namespace Win_in.Sfs.Wms.Store.Migrations filter: "[FromPackingCode] IS NOT NULL"); migrationBuilder.CreateIndex( - name: "IX_Store_AssembleRequest_Number", - table: "Store_AssembleRequest", + name: "IX_Store_AssembleIssueRequests_Number", + table: "Store_AssembleIssueRequests", column: "Number", unique: true); migrationBuilder.CreateIndex( - name: "IX_Store_AssembleRequestDetail_ItemCode", - table: "Store_AssembleRequestDetail", + name: "IX_Store_AssembleIssueRequestsDetail_ItemCode", + table: "Store_AssembleIssueRequestsDetail", column: "ItemCode"); migrationBuilder.CreateIndex( - name: "IX_Store_AssembleRequestDetail_MasterID", - table: "Store_AssembleRequestDetail", + name: "IX_Store_AssembleIssueRequestsDetail_MasterID", + table: "Store_AssembleIssueRequestsDetail", column: "MasterID"); migrationBuilder.CreateIndex( - name: "IX_Store_AssembleRequestDetail_Number_ItemCode_ToLocationCode", - table: "Store_AssembleRequestDetail", + name: "IX_Store_AssembleIssueRequestsDetail_Number_ItemCode_ToLocationCode", + table: "Store_AssembleIssueRequestsDetail", columns: new[] { "Number", "ItemCode", "ToLocationCode" }, unique: true); } @@ -413,7 +413,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations name: "Store_AssembleNoteDetail"); migrationBuilder.DropTable( - name: "Store_AssembleRequestDetail"); + name: "Store_AssembleIssueRequestsDetail"); migrationBuilder.DropTable( name: "Job_AssembleJob"); @@ -422,7 +422,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations name: "Store_AssembleNote"); migrationBuilder.DropTable( - name: "Store_AssembleRequest"); + name: "Store_AssembleIssueRequests"); migrationBuilder.DropColumn( name: "JobNumber", diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240409090529_Update_InjectionRequest_2024_04_09.Designer.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240409090529_Update_InjectionRequest_2024_04_09.Designer.cs index 320226aed..77fc0454d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240409090529_Update_InjectionRequest_2024_04_09.Designer.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240409090529_Update_InjectionRequest_2024_04_09.Designer.cs @@ -41,7 +41,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("AssembleRequestNumber") + b.Property("AssembleIssueRequestsNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -840,7 +840,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_AssembleNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -928,10 +928,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_AssembleRequest", (string)null); + b.ToTable("Store_AssembleIssueRequests", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -1075,7 +1075,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_AssembleRequestDetail", (string)null); + b.ToTable("Store_AssembleIssueRequestsDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b => @@ -28245,9 +28245,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -29110,7 +29110,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => { b.Navigation("Details"); }); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240412052222_Update_Injection.Designer.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240412052222_Update_Injection.Designer.cs index 13991b8f4..839b41bf9 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240412052222_Update_Injection.Designer.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240412052222_Update_Injection.Designer.cs @@ -41,7 +41,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("AssembleRequestNumber") + b.Property("AssembleIssueRequestsNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -840,7 +840,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_AssembleNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -928,10 +928,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_AssembleRequest", (string)null); + b.ToTable("Store_AssembleIssueRequests", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -1075,7 +1075,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_AssembleRequestDetail", (string)null); + b.ToTable("Store_AssembleIssueRequestsDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b => @@ -28333,9 +28333,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -29198,7 +29198,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => { b.Navigation("Details"); }); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240412061448_transferLibV2.Designer.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240412061448_transferLibV2.Designer.cs index 8f301e493..c3033e043 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240412061448_transferLibV2.Designer.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240412061448_transferLibV2.Designer.cs @@ -41,7 +41,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("AssembleRequestNumber") + b.Property("AssembleIssueRequestsNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -840,7 +840,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_AssembleNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -928,10 +928,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_AssembleRequest", (string)null); + b.ToTable("Store_AssembleIssueRequests", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -1075,7 +1075,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_AssembleRequestDetail", (string)null); + b.ToTable("Store_AssembleIssueRequestsDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b => @@ -28423,9 +28423,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -29288,7 +29288,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => { b.Navigation("Details"); }); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240415063138_transferLibV2222.Designer.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240415063138_transferLibV2222.Designer.cs index 7abc825c9..acaf23912 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240415063138_transferLibV2222.Designer.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240415063138_transferLibV2222.Designer.cs @@ -41,7 +41,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("AssembleRequestNumber") + b.Property("AssembleIssueRequestsNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -840,7 +840,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_AssembleNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -928,10 +928,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_AssembleRequest", (string)null); + b.ToTable("Store_AssembleIssueRequests", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -1075,7 +1075,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_AssembleRequestDetail", (string)null); + b.ToTable("Store_AssembleIssueRequestsDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b => @@ -28798,9 +28798,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -29663,7 +29663,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => { b.Navigation("Details"); }); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240416053509_Added_Chassis.Designer.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240416053509_Added_Chassis.Designer.cs index 55dd880fa..df7700712 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240416053509_Added_Chassis.Designer.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240416053509_Added_Chassis.Designer.cs @@ -41,7 +41,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("AssembleRequestNumber") + b.Property("AssembleIssueRequestsNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -840,7 +840,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_AssembleNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -924,10 +924,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_AssembleRequest", (string)null); + b.ToTable("Store_AssembleIssueRequests", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -1064,7 +1064,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_AssembleRequestDetail", (string)null); + b.ToTable("Store_AssembleIssueRequestsDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b => @@ -29006,9 +29006,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -29880,7 +29880,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => { b.Navigation("Details"); }); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240416053509_Added_Chassis.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240416053509_Added_Chassis.cs index 69e0d2062..f3c57135a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240416053509_Added_Chassis.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240416053509_Added_Chassis.cs @@ -35,19 +35,19 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.DropColumn( name: "ExpiredTime", - table: "Store_AssembleRequestDetail"); + table: "Store_AssembleIssueRequestsDetail"); migrationBuilder.DropColumn( name: "FromLocationArea", - table: "Store_AssembleRequestDetail"); + table: "Store_AssembleIssueRequestsDetail"); migrationBuilder.DropColumn( name: "WorkStation", - table: "Store_AssembleRequestDetail"); + table: "Store_AssembleIssueRequestsDetail"); migrationBuilder.DropColumn( name: "ProdLine", - table: "Store_AssembleRequest"); + table: "Store_AssembleIssueRequests"); migrationBuilder.AddColumn( name: "BoxQty", @@ -58,7 +58,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "BoxQty", - table: "Store_AssembleRequestDetail", + table: "Store_AssembleIssueRequestsDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); @@ -177,7 +177,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.DropColumn( name: "BoxQty", - table: "Store_AssembleRequestDetail"); + table: "Store_AssembleIssueRequestsDetail"); migrationBuilder.AddColumn( name: "ExpiredTime", @@ -222,27 +222,27 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "ExpiredTime", - table: "Store_AssembleRequestDetail", + table: "Store_AssembleIssueRequestsDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "FromLocationArea", - table: "Store_AssembleRequestDetail", + table: "Store_AssembleIssueRequestsDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "WorkStation", - table: "Store_AssembleRequestDetail", + table: "Store_AssembleIssueRequestsDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ProdLine", - table: "Store_AssembleRequest", + table: "Store_AssembleIssueRequests", type: "nvarchar(64)", maxLength: 64, nullable: true); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/StoreDbContextModelSnapshot.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/StoreDbContextModelSnapshot.cs index a481219b5..631928205 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/StoreDbContextModelSnapshot.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/StoreDbContextModelSnapshot.cs @@ -39,7 +39,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("AssembleRequestNumber") + b.Property("AssembleIssueRequestsNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -838,7 +838,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_AssembleNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -922,10 +922,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_AssembleRequest", (string)null); + b.ToTable("Store_AssembleIssueRequests", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -1062,7 +1062,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_AssembleRequestDetail", (string)null); + b.ToTable("Store_AssembleIssueRequestsDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNote", b => @@ -29004,9 +29004,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequestsDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -29878,7 +29878,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => { b.Navigation("Details"); }); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleRequests/AssembleRequestDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleRequests/AssembleRequestDbContextModelCreatingExtensions.cs index 1d6944096..580ea86ba 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleRequests/AssembleRequestDbContextModelCreatingExtensions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleRequests/AssembleRequestDbContextModelCreatingExtensions.cs @@ -5,14 +5,14 @@ using Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; -public static class AssembleRequestDbContextModelCreatingExtensions +public static class AssembleIssueRequestsDbContextModelCreatingExtensions { - public static void ConfigureAssembleRequest(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options) + public static void ConfigureAssembleIssueRequests(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options) { - builder.Entity(b => + builder.Entity(b => { //Configure table & schema name - b.ToTable(options.TablePrefix + nameof(AssembleRequest), options.Schema); + b.ToTable(options.TablePrefix + nameof(AssembleIssueRequests), options.Schema); //Configure ABP properties b.ConfigureByConvention(); //Configure Sfs base properties @@ -29,10 +29,10 @@ public static class AssembleRequestDbContextModelCreatingExtensions b.HasIndex(q => new { q.Number }).IsUnique(); }); - builder.Entity(b => + builder.Entity(b => { //Configure table & schema name - b.ToTable(options.TablePrefix + nameof(AssembleRequestDetail), options.Schema); + b.ToTable(options.TablePrefix + nameof(AssembleIssueRequestsDetail), options.Schema); //Configure ABP properties b.ConfigureByConvention(); //Configure Sfs base properties diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleRequests/AssembleRequestEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleRequests/AssembleRequestEfCoreRepository.cs index 7541df1ec..e810335db 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleRequests/AssembleRequestEfCoreRepository.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleRequests/AssembleRequestEfCoreRepository.cs @@ -3,9 +3,9 @@ using Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; -public class AssembleRequestEfCoreRepository : SfsStoreEfCoreRepositoryBase, IAssembleRequestRepository +public class AssembleIssueRequestsEfCoreRepository : SfsStoreEfCoreRepositoryBase, IAssembleIssueRequestsRepository { - public AssembleRequestEfCoreRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + public AssembleIssueRequestsEfCoreRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) { } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs index 5415d4c22..767efd5d1 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContext.cs @@ -22,7 +22,7 @@ public class StoreDbContext : AbpDbContext, IStoreDbContext public DbSet ProductReceiptRequests { get; set; } public DbSet MaterialRequests { get; set; } public DbSet InjectionRequests { get; set; } - public DbSet AssembleRequests { get; set; } + public DbSet AssembleIssueRequests { get; set; } public DbSet ThirdLocationRequests { get; set; } public DbSet ContainerRequests { get; set; } public DbSet DeliverRequests { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContextModelCreatingExtensions.cs index a54b3557c..164956510 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContextModelCreatingExtensions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreDbContextModelCreatingExtensions.cs @@ -48,7 +48,7 @@ public static class StoreDbContextModelCreatingExtensions builder.ConfigurePurchaseReceiptRequest(options); builder.ConfigureMaterialRequest(options); builder.ConfigureInjectionRequest(options); - builder.ConfigureAssembleRequest(options); + builder.ConfigureAssembleIssueRequests(options); builder.ConfigureThirdLocationRequest(options); builder.ConfigureDeliverRequest(options); builder.ConfigureContainerRequest(options); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs index b2ffd0d38..de1faef15 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs @@ -61,7 +61,7 @@ public class StoreEntityFrameworkCoreModule : AbpModule context.Services.AddTransient(); context.Services.AddTransient(); context.Services.AddTransient(); - context.Services.AddTransient(); + context.Services.AddTransient(); context.Services.AddTransient(); context.Services.AddTransient(); context.Services.AddTransient(); @@ -209,7 +209,7 @@ public class StoreEntityFrameworkCoreModule : AbpModule orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details)); options.Entity(orderOptions => orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details)); - options.Entity(orderOptions => + options.Entity(orderOptions => orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details)); options.Entity(orderOptions => orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details)); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/AssembleJobAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/AssembleJobAutoMapperProfile.cs index f1cecd7c7..07defcd9e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/AssembleJobAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/AssembleJobAutoMapperProfile.cs @@ -15,7 +15,7 @@ public partial class StoreEventAutoMapperProfile : Profile CreateMap() .ForMember(x => x.JobNumber, y => y.MapFrom(d => d.Number)) - .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.AssembleRequestNumber)) + .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.AssembleIssueRequestsNumber)) .ForMember(x => x.ActiveDate, y => y.MapFrom(d => DateTime.Now)) .ForMember(x => x.Worker, y => y.MapFrom(d => d.CompleteUserName)) .Ignore(x => x.Confirmed) @@ -62,7 +62,7 @@ public partial class StoreEventAutoMapperProfile : Profile .Ignore(x => x.ExtraProperties); CreateMap() - .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.AssembleRequestNumber)) + .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.AssembleIssueRequestsNumber)) .Ignore(x => x.Confirmed) .Ignore(x => x.JobNumber) .Ignore(x => x.ActiveDate) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleRequestAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleRequestAutoMapperProfile.cs index f380fda18..9c6479128 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleRequestAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleRequestAutoMapperProfile.cs @@ -9,10 +9,10 @@ namespace Win_in.Sfs.Wms.Store.Event; public partial class StoreEventAutoMapperProfile : Profile { - private void AssembleRequestAutoMapperProfile() + private void AssembleIssueRequestsAutoMapperProfile() { - CreateMap() - .ForMember(x => x.AssembleRequestNumber, y => y.MapFrom(d => d.Number)) + CreateMap() + .ForMember(x => x.AssembleIssueRequestsNumber, y => y.MapFrom(d => d.Number)) .ForMember(x => x.RequestType, y => y.MapFrom(d => d.Type)) .Ignore(x => x.WarehouseCode) .Ignore(x => x.UpStreamJobNumber) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/AssembleRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/AssembleRequestEventHandler.cs index 85bc4ca67..7e541a66a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/AssembleRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/AssembleRequestEventHandler.cs @@ -16,24 +16,24 @@ using Win_in.Sfs.Wms.Store.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Event.BusinessRequest; -public class AssembleRequestEventHandler +public class AssembleIssueRequestsEventHandler : StoreEventHandlerBase - , ILocalEventHandler> - , ILocalEventHandler> - , ILocalEventHandler> - , ILocalEventHandler> - , ILocalEventHandler>> + , ILocalEventHandler> + , ILocalEventHandler> + , ILocalEventHandler> + , ILocalEventHandler> + , ILocalEventHandler>> { private readonly IAssembleJobAppService _assembleJobAppService; private readonly IProductionLineAppService _productionLineAppService; - private readonly IAssembleRequestManager _assembleRequestManager; + private readonly IAssembleIssueRequestsManager _assembleRequestManager; private readonly ILocationAppService _locationAppService; private readonly IBalanceAppService _balanceAppService; - public AssembleRequestEventHandler( + public AssembleIssueRequestsEventHandler( IAssembleJobAppService assembleJobAppService , IProductionLineAppService productionLineAppService - , IAssembleRequestManager assembleRequestManager + , IAssembleIssueRequestsManager assembleRequestManager , ILocationAppService locationAppService , IBalanceAppService balanceAppService) { @@ -48,7 +48,7 @@ public class AssembleRequestEventHandler /// 创建后 /// /// Event data - public virtual async Task HandleEventAsync(SfsCreatedEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsCreatedEntityEventData eventData) { var entity = eventData.Entity; @@ -62,7 +62,7 @@ public class AssembleRequestEventHandler /// 批量创建后 /// /// Event data - public virtual async Task HandleEventAsync(SfsCreatedEntityEventData> eventData) + public virtual async Task HandleEventAsync(SfsCreatedEntityEventData> eventData) { var entitys = eventData.Entity; foreach (var entity in entitys) @@ -80,7 +80,7 @@ public class AssembleRequestEventHandler /// /// /// - public virtual async Task HandleEventAsync(SfsHandledEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsHandledEntityEventData eventData) { var entity = eventData.Entity; var assembleJobs = await BuildAssembleJobAsync(entity).ConfigureAwait(false); @@ -95,7 +95,7 @@ public class AssembleRequestEventHandler /// /// /// - public virtual async Task HandleEventAsync(SfsAbortedEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsAbortedEntityEventData eventData) { } @@ -105,10 +105,10 @@ public class AssembleRequestEventHandler /// /// /// - public virtual async Task HandleEventAsync(SfsCompletedEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsCompletedEntityEventData eventData) { _ = eventData.Entity; - // await _assembleJobAppService.CompleteByAssembleRequestAsync(entity.Number); + // await _assembleJobAppService.CompleteByAssembleIssueRequestsAsync(entity.Number); await Task.CompletedTask.ConfigureAwait(false); } @@ -116,7 +116,7 @@ public class AssembleRequestEventHandler #region 私有 private async Task> BuildAssembleJobAsync - (AssembleRequest assembleRequest) + (AssembleIssueRequests assembleRequest) { var jobs = new List(); @@ -182,10 +182,10 @@ public class AssembleRequestEventHandler return jobs; } - private AssembleJobEditInput BuildAssembleJobCreateInput(AssembleRequest assembleRequest, LocationDTO fromLocation) + private AssembleJobEditInput BuildAssembleJobCreateInput(AssembleIssueRequests assembleRequest, LocationDTO fromLocation) { AssembleJobEditInput job; - job = ObjectMapper.Map(assembleRequest); + job = ObjectMapper.Map(assembleRequest); job.JobType = EnumJobType.IssueJob; job.JobStatus = EnumJobStatus.Open; job.WorkGroupCode = fromLocation.WorkGroupCode; @@ -196,12 +196,12 @@ public class AssembleRequestEventHandler { job.Worker = "admin"; } - job.AssembleRequestNumber = assembleRequest.Number; + job.AssembleIssueRequestsNumber = assembleRequest.Number; return job; } - private async Task> BuildAssembleJobDetailInputsAsync(AssembleRequest assembleRequest, - AssembleRequestDetail assembleRequestDetail, TransactionTypeDTO transactionType, string toLocationGroupCode) + private async Task> BuildAssembleJobDetailInputsAsync(AssembleIssueRequests assembleRequest, + AssembleIssueRequestsDetail assembleRequestDetail, TransactionTypeDTO transactionType, string toLocationGroupCode) { var jobDetails = new List(); var input = new RecommendBalanceRequestInput() @@ -239,7 +239,7 @@ public class AssembleRequestEventHandler return jobDetails; } - private async Task BuildAssembleJobDetailAsync(AssembleRequestDetail assembleRequestDetail, BalanceDTO balance, string toLocationGroupCode) + private async Task BuildAssembleJobDetailAsync(AssembleIssueRequestsDetail assembleRequestDetail, BalanceDTO balance, string toLocationGroupCode) { //ProductionLineDTO prodLine = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationGroupCode).ConfigureAwait(false); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/StoreEventAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/StoreEventAutoMapperProfile.cs index dfa9b1a82..9d40c7acc 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/StoreEventAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/StoreEventAutoMapperProfile.cs @@ -77,7 +77,7 @@ public partial class StoreEventAutoMapperProfile : Profile JisProductReceiptNoteAutoMapperProfile(); MaterialRequestAutoMapperProfile(); InjectionRequestAutoMapperProfile(); - AssembleRequestAutoMapperProfile(); + AssembleIssueRequestsAutoMapperProfile(); ThirdLocationRequestAutoMapperProfile(); ProductionReturnRequestAutoMapperProfile(); ProductionReturnNoteAutoMapperProfile();