diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs index 6ae2b1616..f4fd0eb3d 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs @@ -25,7 +25,7 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent.Incoming; public class InjectionMoldingRequestReader : IReader { - private readonly IInjectionRequestAppService _injectionRequest; + private readonly IInjectionIssueRequestAppService _injectionRequest; private readonly IItemBasicAppService _itemService; private readonly ILocationAppService _locService; @@ -34,7 +34,7 @@ public class InjectionMoldingRequestReader : IReader private readonly IHttpClientFactory _httpClientFactory; public InjectionMoldingRequestReader( - IInjectionRequestAppService injectionRequest + IInjectionIssueRequestAppService injectionRequest , ILogger logger , IOptions options @@ -86,13 +86,13 @@ public class InjectionMoldingRequestReader : IReader jobCondition.Condition.Filters.Add(filter); // 通过筛选条件获取作业列表 var jobs = await _injectionRequest.GetAllListByFilterAsync(jobCondition).ConfigureAwait(false); - List joblist = new List(); + List joblist = new List(); if (jobs.Count == 0) { // 调用 ReaderCameraApi 方法获取摄像头信息 string camera = await ReaderCameraApi().ConfigureAwait(false); - List cameraList = new List(); + List cameraList = new List(); if (camera == "Error occured") { @@ -101,15 +101,15 @@ public class InjectionMoldingRequestReader : IReader return new List(); } // 将摄像头信息转换为注塑叫料明细任务数据 - cameraList = System.Text.Json.JsonSerializer.Deserialize>(camera); + cameraList = System.Text.Json.JsonSerializer.Deserialize>(camera); - InjectionRequestEditInput input = new InjectionRequestEditInput(); - List injectionRequestDetails = new List(); + InjectionIssueRequestEditInput input = new InjectionIssueRequestEditInput(); + List injectionRequestDetails = new List(); foreach (var job in cameraList) { - var detailInput = new InjectionRequestDetailInput() + var detailInput = new InjectionIssueRequestDetailInput() { ItemCode = job.ItemCode, ToLocationCode = job.ToLocCode, @@ -158,7 +158,7 @@ public class InjectionMoldingRequestReader : IReader /// /// /// - private async Task> BindAsync(List p_list) + private async Task> BindAsync(List p_list) { // 异步方法，将输入的请求绑定到对应的零件和库位信息，返回错误列表 List errors = new List(); @@ -222,11 +222,11 @@ public class InjectionMoldingRequestReader : IReader return "Error occurred"; } - private List Parse(string p_str) + private List Parse(string p_str) { - List requests = new List(); + List requests = new List(); - return System.Text.Json.JsonSerializer.Deserialize>(p_str); + return System.Text.Json.JsonSerializer.Deserialize>(p_str); } @@ -236,7 +236,7 @@ public class InjectionMoldingRequestReader : IReader -public class InjectionRequest +public class InjectionIssueRequest { /// /// 零件M diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/InjectionJobController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/InjectionJobController.cs index 150bfd5f9..8f8bb48c2 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/InjectionJobController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/InjectionJobController.cs @@ -22,9 +22,9 @@ namespace Win_in.Sfs.Wms.Pda.Controllers.Jobs; /// [ApiController] [Route($"{PdaHostConst.ROOT_ROUTE}job/injection")] -public class InjectionJobController : AbpController +public class InjectionIssueJobController : AbpController { - private readonly IInjectionJobAppService _injectionJobAppService; + private readonly IInjectionIssueJobAppService _injectionJobAppService; private readonly IUserWorkGroupAppService _userWorkGroupAppService; @@ -35,8 +35,8 @@ public class InjectionJobController : AbpController /// /// /// - public InjectionJobController( - IInjectionJobAppService injectionJobAppService, + public InjectionIssueJobController( + IInjectionIssueJobAppService injectionJobAppService, IDictAppService dictApp , IUserWorkGroupAppService userWorkGroupAppService) { @@ -52,7 +52,7 @@ public class InjectionJobController : AbpController /// [HttpGet("{id}")] - public virtual async Task> GetAsync(Guid id) + public virtual async Task> GetAsync(Guid id) { var result = await _injectionJobAppService.GetAsync(id).ConfigureAwait(false); return Ok(result); @@ -64,7 +64,7 @@ public class InjectionJobController : AbpController /// /// [HttpPost("list")] - public virtual async Task> GetListAsync(SfsJobRequestInputBase sfsRequestDTO) + public virtual async Task> GetListAsync(SfsJobRequestInputBase sfsRequestDTO) { var list = await _injectionJobAppService.GetPagedListByFilterAsync(sfsRequestDTO, true).ConfigureAwait(false); return list; @@ -77,7 +77,7 @@ public class InjectionJobController : AbpController /// /// [HttpGet("list")] - public virtual async Task> GetListAsync(int pageSize, int pageIndex) + public virtual async Task> GetListAsync(int pageSize, int pageIndex) { var status = new List() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing }; var jsonStatus = JsonSerializer.Serialize(status); @@ -86,7 +86,7 @@ public class InjectionJobController : AbpController { MaxResultCount = pageSize, SkipCount = (pageIndex - 1) * pageSize, - Sorting = $"{nameof(InjectionJobDTO.CreationTime)} ASC", + Sorting = $"{nameof(InjectionIssueJobDTO.CreationTime)} ASC", Condition = new Condition { Filters = new List @@ -109,7 +109,7 @@ public class InjectionJobController : AbpController /// /// [HttpGet("by-number/{jobNumber}")] - public virtual async Task> GetByNumberAsync(string jobNumber) + public virtual async Task> GetByNumberAsync(string jobNumber) { var jobDto = await _injectionJobAppService.GetByNumberAsync(jobNumber).ConfigureAwait(false); if (jobDto == null) @@ -143,13 +143,13 @@ public class InjectionJobController : AbpController var request = new SfsJobRequestInputBase { - Sorting = $"{nameof(InjectionJobDTO.Priority)} ASC", + Sorting = $"{nameof(InjectionIssueJobDTO.Priority)} ASC", Condition = new Condition { Filters = new List { - new(nameof(InjectionJobDTO.WorkGroupCode),jsonCodes,"In"), - new(nameof(InjectionJobDTO.JobStatus),jsonStatus,"In") + new(nameof(InjectionIssueJobDTO.WorkGroupCode),jsonCodes,"In"), + new(nameof(InjectionIssueJobDTO.JobStatus),jsonStatus,"In") } } }; @@ -188,7 +188,7 @@ public class InjectionJobController : AbpController /// /// [HttpPost("finish/{id}")] - public virtual async Task FinishAsync(Guid id, [FromBody] InjectionJobDTO dto) + public virtual async Task FinishAsync(Guid id, [FromBody] InjectionIssueJobDTO dto) { await _injectionJobAppService.CompleteAsync(id, dto).ConfigureAwait(false); } diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/InjectionNoteController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/InjectionNoteController.cs index 9039a343f..10625ac23 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/InjectionNoteController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/InjectionNoteController.cs @@ -11,15 +11,15 @@ namespace Win_in.Sfs.Wms.Pda.Controllers.Stores; [ApiController] [Route($"{PdaHostConst.ROOT_ROUTE}store/injection-note")] -public class InjectionNoteController : AbpController +public class InjectionIssueNoteController : AbpController { - private readonly IInjectionNoteAppService _injectionNoteAppService; + private readonly IInjectionIssueNoteAppService _injectionNoteAppService; /// /// /// /// - public InjectionNoteController(IInjectionNoteAppService injectionNoteAppService) + public InjectionIssueNoteController(IInjectionIssueNoteAppService injectionNoteAppService) { _injectionNoteAppService = injectionNoteAppService; } @@ -30,7 +30,7 @@ public class InjectionNoteController : AbpController /// CreateInput /// [HttpPost("")] - public virtual async Task CreateAsync(InjectionNoteEditInput input) + public virtual async Task CreateAsync(InjectionIssueNoteEditInput input) { await _injectionNoteAppService.CreateAsync(input).ConfigureAwait(false); } diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/InjectionRequestController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/InjectionRequestController.cs index e3ddeda50..bdcb4dd23 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/InjectionRequestController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/InjectionRequestController.cs @@ -11,17 +11,17 @@ namespace Win_in.Sfs.Wms.Pda.Controllers.Stores; [ApiController] [Route($"{PdaHostConst.ROOT_ROUTE}store/injection-request")] -public class InjectionRequestController : AbpController +public class InjectionIssueRequestController : AbpController { - private readonly IInjectionRequestAppService _injectionRequestAppService; + private readonly IInjectionIssueRequestAppService _injectionRequestAppService; /// /// /// - /// - public InjectionRequestController(IInjectionRequestAppService InjectionRequestAppService) + /// + public InjectionIssueRequestController(IInjectionIssueRequestAppService InjectionIssueRequestAppService) { - _injectionRequestAppService = InjectionRequestAppService; + _injectionRequestAppService = InjectionIssueRequestAppService; } /// @@ -30,7 +30,7 @@ public class InjectionRequestController : AbpController /// /// [HttpPost("")] - public virtual async Task CreateAsync(InjectionRequestEditInput input) + public virtual async Task CreateAsync(InjectionIssueRequestEditInput input) { _ = await _injectionRequestAppService.CreateAsync(input).ConfigureAwait(false); } @@ -42,7 +42,7 @@ public class InjectionRequestController : AbpController /// [HttpGet("{number}")] - public virtual async Task> GetAsync(string number) + public virtual async Task> GetAsync(string number) { var result = await _injectionRequestAppService.GetByNumberAsync(number).ConfigureAwait(false); return Ok(result); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobPermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobPermissions.cs new file mode 100644 index 000000000..def0b7ecd --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobPermissions.cs @@ -0,0 +1,27 @@ +using Volo.Abp.Authorization.Permissions; +using Win_in.Sfs.Wms.Store.Domain; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public static class AssembleIssueJobPermissions +{ + + public const string Default = StorePermissions.GroupName + "." + nameof(AssembleIssueJob); + public const string Create = Default + "." + StorePermissions.CreateStr; + public const string Update = Default + "." + StorePermissions.UpdateStr; + public const string Delete = Default + "." + StorePermissions.DeleteStr; + + //自动发料任务 + public const string AutoAssembleIssueJob = StorePermissions.GroupName + "." + nameof(AutoAssembleIssueJob); + + public static void AddAssembleIssueJobPermission(this PermissionGroupDefinition permissionGroup) + { + var AssembleIssueJobPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(AssembleIssueJob))); + AssembleIssueJobPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); + AssembleIssueJobPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); + AssembleIssueJobPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); + + permissionGroup.AddPermission(AutoAssembleIssueJob, StorePermissionDefinitionProvider.L(nameof(AutoAssembleIssueJob))); + + } +} 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/AssembleIssueJobs/DTOs/AssembleIssueJobDTO.cs similarity index 93% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/DTOs/AssembleJobDTO.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/DTOs/AssembleIssueJobDTO.cs index 7f435efd2..ad35d8655 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/AssembleIssueJobs/DTOs/AssembleIssueJobDTO.cs @@ -7,7 +7,7 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; /// 装配发料任务 /// [Display(Name = "装配发料任务")] -public class AssembleJobDTO : SfsJobDTOBase +public class AssembleIssueJobDTO : SfsJobDTOBase { /// /// 叫料请求类型 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/DTOs/AssembleIssueJobDetailDTO.cs similarity index 99% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobDetailInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/DTOs/AssembleIssueJobDetailDTO.cs index 903d6df5a..0cd270e78 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/DTOs/AssembleIssueJobDetailDTO.cs @@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class AssembleJobDetailInput : SfsDetailInputBase +public class AssembleIssueJobDetailDTO : SfsDetailDTOBase { #region 库存基础信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/IAssembleIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/IAssembleIssueJobAppService.cs new file mode 100644 index 000000000..c922d9050 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/IAssembleIssueJobAppService.cs @@ -0,0 +1,15 @@ +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public interface IAssembleIssueJobAppService + : ISfsJobAppServiceBase +{ + Task CancelByMaterialRequestAsync(string assembleNumber); + + Task> GetByRequestNumberAsync(string requestNumber); + +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/Inputs/AssembleIssueJobCheckInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/Inputs/AssembleIssueJobCheckInput.cs new file mode 100644 index 000000000..5c83c1837 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/Inputs/AssembleIssueJobCheckInput.cs @@ -0,0 +1,6 @@ +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public class AssembleIssueJobCheckInput : SfsJobCheckInputBase +{ + +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/Inputs/AssembleIssueJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/Inputs/AssembleIssueJobDetailInput.cs new file mode 100644 index 000000000..d642ca4b2 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/Inputs/AssembleIssueJobDetailInput.cs @@ -0,0 +1,519 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Win_in.Sfs.Shared.Application.Contracts; +using Win_in.Sfs.Shared.Domain.Shared; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public class AssembleIssueJobDetailInput : SfsDetailInputBase +{ + #region 库存基础信息 + + /// + /// 物品代码 + /// + public string ItemCode { get; set; } + + /// + /// 物品名称 + /// + public string ItemName { get; set; } + + /// + /// 物品描述1 + /// + public string ItemDesc1 { get; set; } + + /// + /// 物品描述2 + /// + public string ItemDesc2 { get; set; } + + /// + /// 标包数量 + /// + [Display(Name = "标包数量")] + [Column(TypeName = "decimal(18,6)")] + public decimal StdPackQty { get; set; } + + /// + /// 库存状态 + /// + public EnumInventoryStatus Status { get; set; } + + /// + /// 计量单位 + /// + public string Uom { get; set; } + + #endregion + + #region 请求信息 + + /// + /// 请求库位 + /// + public string RequestLocationCode { get; set; } + + /// + /// 到库区 + /// + public string RequestLocationArea { get; set; } + + /// + /// 到库位组 + /// + public string RequestLocationGroup { get; set; } + + /// + /// 到ERP库位 + /// + public string RequestLocationErpCode { get; set; } + + /// + /// 到仓库 + /// + public string RequestWarehouseCode { get; set; } + + /// + /// 在途库库位 + /// + public string OnTheWayLocationCode { get; set; } + + /// + /// 生产线 + /// + public string ProdLine { get; set; } + + /// + /// 位置码 + /// + public string PositionCode { get; set; } + + /// + /// 推荐的类型 + /// + public EnumRecommendType RecommendType { get; set; } + + /// + /// 需求数量 + /// + public decimal RequestQty { get; set; } + + #endregion + + #region 推荐来源 + + /// + /// 推荐来源托标签 + /// + public string RecommendFromContainerCode { get; set; } + + /// + /// 推荐来源箱标签 + /// + public string RecommendFromPackingCode { get; set; } + + /// + /// 推荐来源批次供应商批次 + /// + public string RecommendFromSupplierBatch { get; set; } + + /// + /// 推荐来源批次到货时间 + /// + public DateTime RecommendFromArriveDate { get; set; } + + /// + /// 推荐来源批次生产时间 + /// + public DateTime RecommendFromProduceDate { get; set; } + + /// + /// 推荐来源批次过期时间 + /// + public DateTime RecommendFromExpireDate { get; set; } + + /// + /// 推荐来源批次排序 + /// + public string RecommendFromLot { get; set; } + + /// + /// 推荐来源库位 + /// + public string RecommendFromLocationCode { get; set; } + + /// + /// 推荐来源库区 + /// + public string RecommendFromLocationArea { get; set; } + + /// + /// 推荐来源库位组 + /// + public string RecommendFromLocationGroup { get; set; } + + /// + /// 推荐来源ERP库位 + /// + public string RecommendFromLocationErpCode { get; set; } + + /// + /// 推荐来源仓库 + /// + public string RecommendFromWarehouseCode { get; set; } + + /// + /// 推荐来源数量 + /// + public decimal RecommendFromQty { get; set; } + + #endregion + + #region 推荐目标 + + /// + /// 推荐目标托标签 + /// + public string RecommendToContainerCode { get; set; } + + /// + /// 推荐目标箱标签 + /// + public string RecommendToPackingCode { get; set; } + + /// + /// 推荐目标批次供应商批次 + /// + public string RecommendToSupplierBatch { get; set; } + + /// + /// 推荐目标批次到货时间 + /// + public DateTime RecommendToArriveDate { get; set; } + + /// + /// 推荐目标批次生产时间 + /// + public DateTime RecommendToProduceDate { get; set; } + + /// + /// 推荐目标批次过期时间 + /// + public DateTime RecommendToExpireDate { get; set; } + + /// + /// 推荐目标批次排序 + /// + public string RecommendToLot { get; set; } + + /// + /// 推荐目标库位 + /// + public string RecommendToLocationCode { get; set; } + + /// + /// 推荐目标库区 + /// + public string RecommendToLocationArea { get; set; } + + /// + /// 推荐目标库位组 + /// + public string RecommendToLocationGroup { get; set; } + + /// + /// 推荐目标ERP库位 + /// + public string RecommendToLocationErpCode { get; set; } + + /// + /// 推荐目标仓库 + /// + public string RecommendToWarehouseCode { get; set; } + + /// + /// 推荐目标数量 + /// + public decimal RecommendToQty { get; set; } + + #endregion + + #region 库移来源 + + /// + /// 库移来源托标签 + /// + public string TransferLibFromContainerCode { get; set; } + + /// + /// 库移来源箱标签 + /// + public string TransferLibFromPackingCode { get; set; } + + /// + /// 库移来源批次供应商批次 + /// + public string TransferLibFromSupplierBatch { get; set; } + + /// + /// 库移来源批次到货时间 + /// + public DateTime TransferLibFromArriveDate { get; set; } + + /// + /// 库移来源批次生产时间 + /// + public DateTime TransferLibFromProduceDate { get; set; } + + /// + /// 库移来源批次过期时间 + /// + public DateTime TransferLibFromExpireDate { get; set; } + + /// + /// 库移来源批次排序 + /// + public string TransferLibFromLot { get; set; } + + /// + /// 库移来源库位 + /// + public string TransferLibFromLocationCode { get; set; } + + /// + /// 库移来源库区 + /// + public string TransferLibFromLocationArea { get; set; } + + /// + /// 库移来源库位组 + /// + public string TransferLibFromLocationGroup { get; set; } + + /// + /// 库移来源ERP库位 + /// + public string TransferLibFromLocationErpCode { get; set; } + + /// + /// 库移来源仓库 + /// + public string TransferLibFromWarehouseCode { get; set; } + + /// + /// 库移来源数量 + /// + public decimal TransferLibFromQty { get; set; } + + #endregion + + #region 库移目标 + + /// + /// 库移目标托标签 + /// + public string TransferLibToContainerCode { get; set; } + + /// + /// 库移目标箱标签 + /// + public string TransferLibToPackingCode { get; set; } + + /// + /// 库移目标批次供应商批次 + /// + public string TransferLibToSupplierBatch { get; set; } + + /// + /// 库移目标批次到货时间 + /// + public DateTime TransferLibToArriveDate { get; set; } + + /// + /// 库移目标批次生产时间 + /// + public DateTime TransferLibToProduceDate { get; set; } + + /// + /// 库移目标批次过期时间 + /// + public DateTime TransferLibToExpireDate { get; set; } + + /// + /// 库移目标批次排序 + /// + public string TransferLibToLot { get; set; } + + /// + /// 库移目标库位 + /// + public string TransferLibToLocationCode { get; set; } + + /// + /// 库移目标库区 + /// + public string TransferLibToLocationArea { get; set; } + + /// + /// 库移目标库位组 + /// + public string TransferLibToLocationGroup { get; set; } + + /// + /// 库移目标ERP库位 + /// + public string TransferLibToLocationErpCode { get; set; } + + /// + /// 库移目标仓库 + /// + public string TransferLibToWarehouseCode { get; set; } + + /// + /// 库移目标数量 + /// + public decimal TransferLibToQty { get; set; } + + #endregion + + #region 实际来源 + + /// + /// 实际目标托标签 + /// + public string HandledFromContainerCode { get; set; } + + /// + /// 实际箱标签 + /// + public string HandledFromPackingCode { get; set; } + + /// + /// 实际批次供应商批次 + /// + public string HandledFromSupplierBatch { get; set; } + + /// + /// 实际批次到货时间 + /// + public DateTime HandledFromArriveDate { get; set; } + + /// + /// 实际批次生产时间 + /// + public DateTime HandledFromProduceDate { get; set; } + + /// + /// 实际批次过期时间 + /// + public DateTime HandledFromExpireDate { get; set; } + + /// + /// 实际批次排序 + /// + public string HandledFromLot { get; set; } + + /// + /// 实际库位 + /// + public string HandledFromLocationCode { get; set; } + + /// + /// 实际库区 + /// + public string HandledFromLocationArea { get; set; } + + /// + /// 实际库位组 + /// + public string HandledFromLocationGroup { get; set; } + + /// + /// 实际ERP库位 + /// + public string HandledFromLocationErpCode { get; set; } + + /// + /// 实际仓库 + /// + public string HandledFromWarehouseCode { get; set; } + + /// + /// 实际数量 + /// + public decimal HandledFromQty { get; set; } + + #endregion + + #region 实际目标 + + /// + /// 实际目标托标签 + /// + public string HandledToContainerCode { get; set; } + + /// + /// 实际箱标签 + /// + public string HandledToPackingCode { get; set; } + + /// + /// 实际批次供应商批次 + /// + public string HandledToSupplierBatch { get; set; } + + /// + /// 实际批次到货时间 + /// + public DateTime HandledToArriveDate { get; set; } + + /// + /// 实际批次生产时间 + /// + public DateTime HandledToProduceDate { get; set; } + + /// + /// 实际批次过期时间 + /// + public DateTime HandledToExpireDate { get; set; } + + /// + /// 实际批次排序 + /// + public string HandledToLot { get; set; } + + /// + /// 实际库位 + /// + public string HandledToLocationCode { get; set; } + + /// + /// 实际库区 + /// + public string HandledToLocationArea { get; set; } + + /// + /// 实际库位组 + /// + public string HandledToLocationGroup { get; set; } + + /// + /// 实际ERP库位 + /// + public string HandledToLocationErpCode { get; set; } + + /// + /// 实际仓库 + /// + public string HandledToWarehouseCode { get; set; } + + /// + /// 实际数量 + /// + public decimal HandledToQty { get; set; } + + #endregion +} 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/AssembleIssueJobs/Inputs/AssembleIssueJobEditInput.cs similarity index 90% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobEditInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/Inputs/AssembleIssueJobEditInput.cs index a1ba6509e..0c6b3af6c 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/AssembleIssueJobs/Inputs/AssembleIssueJobEditInput.cs @@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class AssembleJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInput +public class AssembleIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInput { #region Create /// @@ -57,7 +57,7 @@ public class AssembleJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateIn /// [Display(Name = "任务明细")] [Required(ErrorMessage = "{0}是必填项")] - public List Details { get; set; } = new(); + public List Details { get; set; } = new(); /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/AssembleJobPermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/AssembleJobPermissions.cs deleted file mode 100644 index ec726a250..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/AssembleJobPermissions.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Volo.Abp.Authorization.Permissions; -using Win_in.Sfs.Wms.Store.Domain; - -namespace Win_in.Sfs.Wms.Store.Application.Contracts; - -public static class AssembleJobPermissions -{ - - public const string Default = StorePermissions.GroupName + "." + nameof(AssembleJob); - public const string Create = Default + "." + StorePermissions.CreateStr; - public const string Update = Default + "." + StorePermissions.UpdateStr; - public const string Delete = Default + "." + StorePermissions.DeleteStr; - - //自动发料任务 - public const string AutoAssembleJob = StorePermissions.GroupName + "." + nameof(AutoAssembleJob); - - public static void AddAssembleJobPermission(this PermissionGroupDefinition permissionGroup) - { - var AssembleJobPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(AssembleJob))); - AssembleJobPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); - AssembleJobPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); - AssembleJobPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); - - permissionGroup.AddPermission(AutoAssembleJob, StorePermissionDefinitionProvider.L(nameof(AutoAssembleJob))); - - } -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/IAssembleJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/IAssembleJobAppService.cs deleted file mode 100644 index 1051d7cf4..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/IAssembleJobAppService.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using Volo.Abp.Application.Dtos; - -namespace Win_in.Sfs.Wms.Store.Application.Contracts; - -public interface IAssembleJobAppService - : ISfsJobAppServiceBase -{ - Task CancelByMaterialRequestAsync(string assembleNumber); - - Task> GetByRequestNumberAsync(string requestNumber); - -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobCheckInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobCheckInput.cs deleted file mode 100644 index ef75e7d73..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/Inputs/AssembleJobCheckInput.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Win_in.Sfs.Wms.Store.Application.Contracts; - -public class AssembleJobCheckInput : SfsJobCheckInputBase -{ - -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionJobDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionIssueJobDTO.cs similarity index 88% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionJobDTO.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionIssueJobDTO.cs index c6dbd8249..a1d432a34 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionJobDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionIssueJobDTO.cs @@ -7,7 +7,7 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; /// 注塑发料任务 /// [Display(Name = "注塑发料任务")] -public class InjectionJobDTO : SfsJobDTOBase +public class InjectionIssueJobDTO : SfsJobDTOBase { /// /// 叫料请求类型 @@ -28,7 +28,7 @@ public class InjectionJobDTO : SfsJobDTOBase /// [Display(Name = "要货单号")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string InjectionRequestNumber { get; set; } + public string InjectionIssueRequestNumber { get; set; } /// /// 使用在途库 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionJobDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionIssueJobDetailDTO.cs similarity index 99% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionJobDetailDTO.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionIssueJobDetailDTO.cs index 4df8a0b19..b045edec5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionJobDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionIssueJobDetailDTO.cs @@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class InjectionJobDetailDTO : SfsDetailDTOBase +public class InjectionIssueJobDetailDTO : SfsDetailDTOBase { #region 库存基础信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/IInjectionIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/IInjectionIssueJobAppService.cs new file mode 100644 index 000000000..79bcb7aff --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/IInjectionIssueJobAppService.cs @@ -0,0 +1,14 @@ +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public interface IInjectionIssueJobAppService + : ISfsJobAppServiceBase +{ + Task CancelByMaterialRequestAsync(string injectionNumber); + + Task> GetByRequestNumberAsync(string requestNumber); +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/IInjectionJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/IInjectionJobAppService.cs deleted file mode 100644 index fd7839757..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/IInjectionJobAppService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using Volo.Abp.Application.Dtos; - -namespace Win_in.Sfs.Wms.Store.Application.Contracts; - -public interface IInjectionJobAppService - : ISfsJobAppServiceBase -{ - Task CancelByMaterialRequestAsync(string injectionNumber); - - Task> GetByRequestNumberAsync(string requestNumber); -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/InjectionIssueJobPermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/InjectionIssueJobPermissions.cs new file mode 100644 index 000000000..096f143bf --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/InjectionIssueJobPermissions.cs @@ -0,0 +1,27 @@ +using Volo.Abp.Authorization.Permissions; +using Win_in.Sfs.Wms.Store.Domain; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public static class InjectionIssueJobPermissions +{ + + public const string Default = StorePermissions.GroupName + "." + nameof(InjectionIssueJob); + public const string Create = Default + "." + StorePermissions.CreateStr; + public const string Update = Default + "." + StorePermissions.UpdateStr; + public const string Delete = Default + "." + StorePermissions.DeleteStr; + + //自动发料任务 + public const string AutoInjectionIssueJob = StorePermissions.GroupName + "." + nameof(AutoInjectionIssueJob); + + public static void AddInjectionIssueJobPermission(this PermissionGroupDefinition permissionGroup) + { + var InjectionIssueJobPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionIssueJob))); + InjectionIssueJobPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); + InjectionIssueJobPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); + InjectionIssueJobPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); + + permissionGroup.AddPermission(AutoInjectionIssueJob, StorePermissionDefinitionProvider.L(nameof(AutoInjectionIssueJob))); + + } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/InjectionJobPermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/InjectionJobPermissions.cs deleted file mode 100644 index 31b455675..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/InjectionJobPermissions.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Volo.Abp.Authorization.Permissions; -using Win_in.Sfs.Wms.Store.Domain; - -namespace Win_in.Sfs.Wms.Store.Application.Contracts; - -public static class InjectionJobPermissions -{ - - public const string Default = StorePermissions.GroupName + "." + nameof(InjectionJob); - public const string Create = Default + "." + StorePermissions.CreateStr; - public const string Update = Default + "." + StorePermissions.UpdateStr; - public const string Delete = Default + "." + StorePermissions.DeleteStr; - - //自动发料任务 - public const string AutoInjectionJob = StorePermissions.GroupName + "." + nameof(AutoInjectionJob); - - public static void AddInjectionJobPermission(this PermissionGroupDefinition permissionGroup) - { - var InjectionJobPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionJob))); - InjectionJobPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); - InjectionJobPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); - InjectionJobPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); - - permissionGroup.AddPermission(AutoInjectionJob, StorePermissionDefinitionProvider.L(nameof(AutoInjectionJob))); - - } -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionIssueJobCheckInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionIssueJobCheckInput.cs new file mode 100644 index 000000000..70d5e6a3e --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionIssueJobCheckInput.cs @@ -0,0 +1,6 @@ +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public class InjectionIssueJobCheckInput : SfsJobCheckInputBase +{ + +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionIssueJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionIssueJobDetailInput.cs new file mode 100644 index 000000000..ce12a5905 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionIssueJobDetailInput.cs @@ -0,0 +1,519 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Win_in.Sfs.Shared.Application.Contracts; +using Win_in.Sfs.Shared.Domain.Shared; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public class InjectionIssueJobDetailInput : SfsDetailInputBase +{ + #region 库存基础信息 + + /// + /// 物品代码 + /// + public string ItemCode { get; set; } + + /// + /// 物品名称 + /// + public string ItemName { get; set; } + + /// + /// 物品描述1 + /// + public string ItemDesc1 { get; set; } + + /// + /// 物品描述2 + /// + public string ItemDesc2 { get; set; } + + /// + /// 标包数量 + /// + [Display(Name = "标包数量")] + [Column(TypeName = "decimal(18,6)")] + public decimal StdPackQty { get; set; } + + /// + /// 库存状态 + /// + public EnumInventoryStatus Status { get; set; } + + /// + /// 计量单位 + /// + public string Uom { get; set; } + + #endregion + + #region 请求信息 + + /// + /// 请求库位 + /// + public string RequestLocationCode { get; set; } + + /// + /// 到库区 + /// + public string RequestLocationArea { get; set; } + + /// + /// 到库位组 + /// + public string RequestLocationGroup { get; set; } + + /// + /// 到ERP库位 + /// + public string RequestLocationErpCode { get; set; } + + /// + /// 到仓库 + /// + public string RequestWarehouseCode { get; set; } + + /// + /// 在途库库位 + /// + public string OnTheWayLocationCode { get; set; } + + /// + /// 生产线 + /// + public string ProdLine { get; set; } + + /// + /// 位置码 + /// + public string PositionCode { get; set; } + + /// + /// 推荐的类型 + /// + public EnumRecommendType RecommendType { get; set; } + + /// + /// 需求数量 + /// + public decimal RequestQty { get; set; } + + #endregion + + #region 推荐来源 + + /// + /// 推荐来源托标签 + /// + public string RecommendFromContainerCode { get; set; } + + /// + /// 推荐来源箱标签 + /// + public string RecommendFromPackingCode { get; set; } + + /// + /// 推荐来源批次供应商批次 + /// + public string RecommendFromSupplierBatch { get; set; } + + /// + /// 推荐来源批次到货时间 + /// + public DateTime RecommendFromArriveDate { get; set; } + + /// + /// 推荐来源批次生产时间 + /// + public DateTime RecommendFromProduceDate { get; set; } + + /// + /// 推荐来源批次过期时间 + /// + public DateTime RecommendFromExpireDate { get; set; } + + /// + /// 推荐来源批次排序 + /// + public string RecommendFromLot { get; set; } + + /// + /// 推荐来源库位 + /// + public string RecommendFromLocationCode { get; set; } + + /// + /// 推荐来源库区 + /// + public string RecommendFromLocationArea { get; set; } + + /// + /// 推荐来源库位组 + /// + public string RecommendFromLocationGroup { get; set; } + + /// + /// 推荐来源ERP库位 + /// + public string RecommendFromLocationErpCode { get; set; } + + /// + /// 推荐来源仓库 + /// + public string RecommendFromWarehouseCode { get; set; } + + /// + /// 推荐来源数量 + /// + public decimal RecommendFromQty { get; set; } + + #endregion + + #region 推荐目标 + + /// + /// 推荐目标托标签 + /// + public string RecommendToContainerCode { get; set; } + + /// + /// 推荐目标箱标签 + /// + public string RecommendToPackingCode { get; set; } + + /// + /// 推荐目标批次供应商批次 + /// + public string RecommendToSupplierBatch { get; set; } + + /// + /// 推荐目标批次到货时间 + /// + public DateTime RecommendToArriveDate { get; set; } + + /// + /// 推荐目标批次生产时间 + /// + public DateTime RecommendToProduceDate { get; set; } + + /// + /// 推荐目标批次过期时间 + /// + public DateTime RecommendToExpireDate { get; set; } + + /// + /// 推荐目标批次排序 + /// + public string RecommendToLot { get; set; } + + /// + /// 推荐目标库位 + /// + public string RecommendToLocationCode { get; set; } + + /// + /// 推荐目标库区 + /// + public string RecommendToLocationArea { get; set; } + + /// + /// 推荐目标库位组 + /// + public string RecommendToLocationGroup { get; set; } + + /// + /// 推荐目标ERP库位 + /// + public string RecommendToLocationErpCode { get; set; } + + /// + /// 推荐目标仓库 + /// + public string RecommendToWarehouseCode { get; set; } + + /// + /// 推荐目标数量 + /// + public decimal RecommendToQty { get; set; } + + #endregion + + #region 库移来源 + + /// + /// 库移来源托标签 + /// + public string TransferLibFromContainerCode { get; set; } + + /// + /// 库移来源箱标签 + /// + public string TransferLibFromPackingCode { get; set; } + + /// + /// 库移来源批次供应商批次 + /// + public string TransferLibFromSupplierBatch { get; set; } + + /// + /// 库移来源批次到货时间 + /// + public DateTime TransferLibFromArriveDate { get; set; } + + /// + /// 库移来源批次生产时间 + /// + public DateTime TransferLibFromProduceDate { get; set; } + + /// + /// 库移来源批次过期时间 + /// + public DateTime TransferLibFromExpireDate { get; set; } + + /// + /// 库移来源批次排序 + /// + public string TransferLibFromLot { get; set; } + + /// + /// 库移来源库位 + /// + public string TransferLibFromLocationCode { get; set; } + + /// + /// 库移来源库区 + /// + public string TransferLibFromLocationArea { get; set; } + + /// + /// 库移来源库位组 + /// + public string TransferLibFromLocationGroup { get; set; } + + /// + /// 库移来源ERP库位 + /// + public string TransferLibFromLocationErpCode { get; set; } + + /// + /// 库移来源仓库 + /// + public string TransferLibFromWarehouseCode { get; set; } + + /// + /// 库移来源数量 + /// + public decimal TransferLibFromQty { get; set; } + + #endregion + + #region 库移目标 + + /// + /// 库移目标托标签 + /// + public string TransferLibToContainerCode { get; set; } + + /// + /// 库移目标箱标签 + /// + public string TransferLibToPackingCode { get; set; } + + /// + /// 库移目标批次供应商批次 + /// + public string TransferLibToSupplierBatch { get; set; } + + /// + /// 库移目标批次到货时间 + /// + public DateTime TransferLibToArriveDate { get; set; } + + /// + /// 库移目标批次生产时间 + /// + public DateTime TransferLibToProduceDate { get; set; } + + /// + /// 库移目标批次过期时间 + /// + public DateTime TransferLibToExpireDate { get; set; } + + /// + /// 库移目标批次排序 + /// + public string TransferLibToLot { get; set; } + + /// + /// 库移目标库位 + /// + public string TransferLibToLocationCode { get; set; } + + /// + /// 库移目标库区 + /// + public string TransferLibToLocationArea { get; set; } + + /// + /// 库移目标库位组 + /// + public string TransferLibToLocationGroup { get; set; } + + /// + /// 库移目标ERP库位 + /// + public string TransferLibToLocationErpCode { get; set; } + + /// + /// 库移目标仓库 + /// + public string TransferLibToWarehouseCode { get; set; } + + /// + /// 库移目标数量 + /// + public decimal TransferLibToQty { get; set; } + + #endregion + + #region 实际来源 + + /// + /// 实际目标托标签 + /// + public string HandledFromContainerCode { get; set; } + + /// + /// 实际箱标签 + /// + public string HandledFromPackingCode { get; set; } + + /// + /// 实际批次供应商批次 + /// + public string HandledFromSupplierBatch { get; set; } + + /// + /// 实际批次到货时间 + /// + public DateTime HandledFromArriveDate { get; set; } + + /// + /// 实际批次生产时间 + /// + public DateTime HandledFromProduceDate { get; set; } + + /// + /// 实际批次过期时间 + /// + public DateTime HandledFromExpireDate { get; set; } + + /// + /// 实际批次排序 + /// + public string HandledFromLot { get; set; } + + /// + /// 实际库位 + /// + public string HandledFromLocationCode { get; set; } + + /// + /// 实际库区 + /// + public string HandledFromLocationArea { get; set; } + + /// + /// 实际库位组 + /// + public string HandledFromLocationGroup { get; set; } + + /// + /// 实际ERP库位 + /// + public string HandledFromLocationErpCode { get; set; } + + /// + /// 实际仓库 + /// + public string HandledFromWarehouseCode { get; set; } + + /// + /// 实际数量 + /// + public decimal HandledFromQty { get; set; } + + #endregion + + #region 实际目标 + + /// + /// 实际目标托标签 + /// + public string HandledToContainerCode { get; set; } + + /// + /// 实际箱标签 + /// + public string HandledToPackingCode { get; set; } + + /// + /// 实际批次供应商批次 + /// + public string HandledToSupplierBatch { get; set; } + + /// + /// 实际批次到货时间 + /// + public DateTime HandledToArriveDate { get; set; } + + /// + /// 实际批次生产时间 + /// + public DateTime HandledToProduceDate { get; set; } + + /// + /// 实际批次过期时间 + /// + public DateTime HandledToExpireDate { get; set; } + + /// + /// 实际批次排序 + /// + public string HandledToLot { get; set; } + + /// + /// 实际库位 + /// + public string HandledToLocationCode { get; set; } + + /// + /// 实际库区 + /// + public string HandledToLocationArea { get; set; } + + /// + /// 实际库位组 + /// + public string HandledToLocationGroup { get; set; } + + /// + /// 实际ERP库位 + /// + public string HandledToLocationErpCode { get; set; } + + /// + /// 实际仓库 + /// + public string HandledToWarehouseCode { get; set; } + + /// + /// 实际数量 + /// + public decimal HandledToQty { get; set; } + + #endregion +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionJobEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionIssueJobEditInput.cs similarity index 88% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionJobEditInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionIssueJobEditInput.cs index 3afaf2500..744659c31 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionJobEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionIssueJobEditInput.cs @@ -7,7 +7,7 @@ using Win_in.Sfs.Shared.Domain.Shared.Enums.Store; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class InjectionJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInput +public class InjectionIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInput { #region Create /// @@ -23,7 +23,7 @@ public class InjectionJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateI [Display(Name = "要货单号")] [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string InjectionRequestNumber { get; set; } + public string InjectionIssueRequestNumber { get; set; } /// /// 叫料请求类型 @@ -58,7 +58,7 @@ public class InjectionJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateI /// [Display(Name = "任务明细")] [Required(ErrorMessage = "{0}是必填项")] - public List Details { get; set; } = new(); + public List Details { get; set; } = new(); /// /// 使用在途库 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionJobCheckInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionJobCheckInput.cs deleted file mode 100644 index 45aff0d7e..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionJobCheckInput.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Win_in.Sfs.Wms.Store.Application.Contracts; - -public class InjectionJobCheckInput : SfsJobCheckInputBase -{ - -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/DTOs/IssueJobDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IssueJobs/DTOs/IssueJobDTO.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/DTOs/IssueJobDTO.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IssueJobs/DTOs/IssueJobDTO.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/DTOs/IssueJobDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IssueJobs/DTOs/IssueJobDetailDTO.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/DTOs/IssueJobDetailDTO.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IssueJobs/DTOs/IssueJobDetailDTO.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IssueJobs/IIssueJobAppService.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IIssueJobAppService.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IssueJobs/IIssueJobAppService.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/Inputs/IssueJobCheckInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IssueJobs/Inputs/IssueJobCheckInput.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/Inputs/IssueJobCheckInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IssueJobs/Inputs/IssueJobCheckInput.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/Inputs/IssueJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IssueJobs/Inputs/IssueJobDetailInput.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/Inputs/IssueJobDetailInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IssueJobs/Inputs/IssueJobDetailInput.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/Inputs/IssueJobEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IssueJobs/Inputs/IssueJobEditInput.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/Inputs/IssueJobEditInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IssueJobs/Inputs/IssueJobEditInput.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IssueJobPermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IssueJobs/IssueJobPermissions.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IssueJobPermissions.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IssueJobs/IssueJobPermissions.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNotePermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNotePermissions.cs new file mode 100644 index 000000000..8624c5c4b --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNotePermissions.cs @@ -0,0 +1,30 @@ +using Volo.Abp.Authorization.Permissions; +using Win_in.Sfs.Wms.Store.Domain; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public static class AssembleIssueNotePermissions +{ + + public const string Default = StorePermissions.GroupName + "." + nameof(AssembleIssueNote); + public const string Create = Default + "." + StorePermissions.CreateStr; + public const string Update = Default + "." + StorePermissions.UpdateStr; + public const string Delete = Default + "." + StorePermissions.DeleteStr; + + //自动发料记录 + public const string AutoAssembleIssueNote = StorePermissions.GroupName + "." + nameof(AutoAssembleIssueNote); + + //直接发料 + public const string DirectAssembleIssueNote = StorePermissions.GroupName + "." + nameof(DirectAssembleIssueNote); + + public static void AddAssembleIssueNotePermission(this PermissionGroupDefinition permissionGroup) + { + var AssembleIssueNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(AssembleIssueNote))); + AssembleIssueNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); + AssembleIssueNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); + AssembleIssueNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); + + permissionGroup.AddPermission(AutoAssembleIssueNote, StorePermissionDefinitionProvider.L(nameof(AutoAssembleIssueNote))); + permissionGroup.AddPermission(DirectAssembleIssueNote, StorePermissionDefinitionProvider.L(nameof(DirectAssembleIssueNote))); + } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/DTOs/AssembleNoteDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/DTOs/AssembleIssueNoteDTO.cs similarity index 90% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/DTOs/AssembleNoteDTO.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/DTOs/AssembleIssueNoteDTO.cs index 9cb65b1a6..073f187c6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/DTOs/AssembleNoteDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/DTOs/AssembleIssueNoteDTO.cs @@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class AssembleNoteDTO : SfsStoreDTOBase, IHasJobNumber, IHasRequestNumber +public class AssembleIssueNoteDTO : SfsStoreDTOBase, IHasJobNumber, IHasRequestNumber { /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/DTOs/AssembleJobDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/DTOs/AssembleIssueNoteDetailDTO.cs similarity index 99% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/DTOs/AssembleJobDetailDTO.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/DTOs/AssembleIssueNoteDetailDTO.cs index 236b30fb3..ca19aaab2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleJobs/DTOs/AssembleJobDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/DTOs/AssembleIssueNoteDetailDTO.cs @@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class AssembleJobDetailDTO : SfsDetailDTOBase +public class AssembleIssueNoteDetailDTO : SfsDetailDTOBase { #region 库存基础信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/IAssembleIssueNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/IAssembleIssueNoteAppService.cs new file mode 100644 index 000000000..83f8e6bbc --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/IAssembleIssueNoteAppService.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public interface IAssembleIssueNoteAppService : ISfsStoreMasterReadOnlyAppServiceBase +{ + Task CreateAsync(AssembleIssueNoteEditInput input); + + Task ConfirmAsync(Guid id); + + Task ConfirmAsync(string number); + + Task> GetListByTypeAsync(SfsStoreRequestInputBase requestInput, + string requestType, bool includeDetails = false, CancellationToken cancellationToken = default); + + Task> GetListUnConfirmedByTypeAsync(string requestType); +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/Inputs/AssembleIssueNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/Inputs/AssembleIssueNoteDetailInput.cs new file mode 100644 index 000000000..145264c1f --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/Inputs/AssembleIssueNoteDetailInput.cs @@ -0,0 +1,519 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Win_in.Sfs.Shared.Application.Contracts; +using Win_in.Sfs.Shared.Domain.Shared; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public class AssembleIssueNoteDetailInput : SfsDetailInputBase +{ + #region 库存基础信息 + + /// + /// 物品代码 + /// + public string ItemCode { get; set; } + + /// + /// 物品名称 + /// + public string ItemName { get; set; } + + /// + /// 物品描述1 + /// + public string ItemDesc1 { get; set; } + + /// + /// 物品描述2 + /// + public string ItemDesc2 { get; set; } + + /// + /// 标包数量 + /// + [Display(Name = "标包数量")] + [Column(TypeName = "decimal(18,6)")] + public decimal StdPackQty { get; set; } + + /// + /// 库存状态 + /// + public EnumInventoryStatus Status { get; set; } + + /// + /// 计量单位 + /// + public string Uom { get; set; } + + #endregion + + #region 请求信息 + + /// + /// 请求库位 + /// + public string RequestLocationCode { get; set; } + + /// + /// 到库区 + /// + public string RequestLocationArea { get; set; } + + /// + /// 到库位组 + /// + public string RequestLocationGroup { get; set; } + + /// + /// 到ERP库位 + /// + public string RequestLocationErpCode { get; set; } + + /// + /// 到仓库 + /// + public string RequestWarehouseCode { get; set; } + + /// + /// 在途库库位 + /// + public string OnTheWayLocationCode { get; set; } + + /// + /// 生产线 + /// + public string ProdLine { get; set; } + + /// + /// 位置码 + /// + public string PositionCode { get; set; } + + /// + /// 推荐的类型 + /// + public EnumRecommendType RecommendType { get; set; } + + /// + /// 需求数量 + /// + public decimal RequestQty { get; set; } + + #endregion + + #region 推荐来源 + + /// + /// 推荐来源托标签 + /// + public string RecommendFromContainerCode { get; set; } + + /// + /// 推荐来源箱标签 + /// + public string RecommendFromPackingCode { get; set; } + + /// + /// 推荐来源批次供应商批次 + /// + public string RecommendFromSupplierBatch { get; set; } + + /// + /// 推荐来源批次到货时间 + /// + public DateTime RecommendFromArriveDate { get; set; } + + /// + /// 推荐来源批次生产时间 + /// + public DateTime RecommendFromProduceDate { get; set; } + + /// + /// 推荐来源批次过期时间 + /// + public DateTime RecommendFromExpireDate { get; set; } + + /// + /// 推荐来源批次排序 + /// + public string RecommendFromLot { get; set; } + + /// + /// 推荐来源库位 + /// + public string RecommendFromLocationCode { get; set; } + + /// + /// 推荐来源库区 + /// + public string RecommendFromLocationArea { get; set; } + + /// + /// 推荐来源库位组 + /// + public string RecommendFromLocationGroup { get; set; } + + /// + /// 推荐来源ERP库位 + /// + public string RecommendFromLocationErpCode { get; set; } + + /// + /// 推荐来源仓库 + /// + public string RecommendFromWarehouseCode { get; set; } + + /// + /// 推荐来源数量 + /// + public decimal RecommendFromQty { get; set; } + + #endregion + + #region 推荐目标 + + /// + /// 推荐目标托标签 + /// + public string RecommendToContainerCode { get; set; } + + /// + /// 推荐目标箱标签 + /// + public string RecommendToPackingCode { get; set; } + + /// + /// 推荐目标批次供应商批次 + /// + public string RecommendToSupplierBatch { get; set; } + + /// + /// 推荐目标批次到货时间 + /// + public DateTime RecommendToArriveDate { get; set; } + + /// + /// 推荐目标批次生产时间 + /// + public DateTime RecommendToProduceDate { get; set; } + + /// + /// 推荐目标批次过期时间 + /// + public DateTime RecommendToExpireDate { get; set; } + + /// + /// 推荐目标批次排序 + /// + public string RecommendToLot { get; set; } + + /// + /// 推荐目标库位 + /// + public string RecommendToLocationCode { get; set; } + + /// + /// 推荐目标库区 + /// + public string RecommendToLocationArea { get; set; } + + /// + /// 推荐目标库位组 + /// + public string RecommendToLocationGroup { get; set; } + + /// + /// 推荐目标ERP库位 + /// + public string RecommendToLocationErpCode { get; set; } + + /// + /// 推荐目标仓库 + /// + public string RecommendToWarehouseCode { get; set; } + + /// + /// 推荐目标数量 + /// + public decimal RecommendToQty { get; set; } + + #endregion + + #region 库移来源 + + /// + /// 库移来源托标签 + /// + public string TransferLibFromContainerCode { get; set; } + + /// + /// 库移来源箱标签 + /// + public string TransferLibFromPackingCode { get; set; } + + /// + /// 库移来源批次供应商批次 + /// + public string TransferLibFromSupplierBatch { get; set; } + + /// + /// 库移来源批次到货时间 + /// + public DateTime TransferLibFromArriveDate { get; set; } + + /// + /// 库移来源批次生产时间 + /// + public DateTime TransferLibFromProduceDate { get; set; } + + /// + /// 库移来源批次过期时间 + /// + public DateTime TransferLibFromExpireDate { get; set; } + + /// + /// 库移来源批次排序 + /// + public string TransferLibFromLot { get; set; } + + /// + /// 库移来源库位 + /// + public string TransferLibFromLocationCode { get; set; } + + /// + /// 库移来源库区 + /// + public string TransferLibFromLocationArea { get; set; } + + /// + /// 库移来源库位组 + /// + public string TransferLibFromLocationGroup { get; set; } + + /// + /// 库移来源ERP库位 + /// + public string TransferLibFromLocationErpCode { get; set; } + + /// + /// 库移来源仓库 + /// + public string TransferLibFromWarehouseCode { get; set; } + + /// + /// 库移来源数量 + /// + public decimal TransferLibFromQty { get; set; } + + #endregion + + #region 库移目标 + + /// + /// 库移目标托标签 + /// + public string TransferLibToContainerCode { get; set; } + + /// + /// 库移目标箱标签 + /// + public string TransferLibToPackingCode { get; set; } + + /// + /// 库移目标批次供应商批次 + /// + public string TransferLibToSupplierBatch { get; set; } + + /// + /// 库移目标批次到货时间 + /// + public DateTime TransferLibToArriveDate { get; set; } + + /// + /// 库移目标批次生产时间 + /// + public DateTime TransferLibToProduceDate { get; set; } + + /// + /// 库移目标批次过期时间 + /// + public DateTime TransferLibToExpireDate { get; set; } + + /// + /// 库移目标批次排序 + /// + public string TransferLibToLot { get; set; } + + /// + /// 库移目标库位 + /// + public string TransferLibToLocationCode { get; set; } + + /// + /// 库移目标库区 + /// + public string TransferLibToLocationArea { get; set; } + + /// + /// 库移目标库位组 + /// + public string TransferLibToLocationGroup { get; set; } + + /// + /// 库移目标ERP库位 + /// + public string TransferLibToLocationErpCode { get; set; } + + /// + /// 库移目标仓库 + /// + public string TransferLibToWarehouseCode { get; set; } + + /// + /// 库移目标数量 + /// + public decimal TransferLibToQty { get; set; } + + #endregion + + #region 实际来源 + + /// + /// 实际目标托标签 + /// + public string HandledFromContainerCode { get; set; } + + /// + /// 实际箱标签 + /// + public string HandledFromPackingCode { get; set; } + + /// + /// 实际批次供应商批次 + /// + public string HandledFromSupplierBatch { get; set; } + + /// + /// 实际批次到货时间 + /// + public DateTime HandledFromArriveDate { get; set; } + + /// + /// 实际批次生产时间 + /// + public DateTime HandledFromProduceDate { get; set; } + + /// + /// 实际批次过期时间 + /// + public DateTime HandledFromExpireDate { get; set; } + + /// + /// 实际批次排序 + /// + public string HandledFromLot { get; set; } + + /// + /// 实际库位 + /// + public string HandledFromLocationCode { get; set; } + + /// + /// 实际库区 + /// + public string HandledFromLocationArea { get; set; } + + /// + /// 实际库位组 + /// + public string HandledFromLocationGroup { get; set; } + + /// + /// 实际ERP库位 + /// + public string HandledFromLocationErpCode { get; set; } + + /// + /// 实际仓库 + /// + public string HandledFromWarehouseCode { get; set; } + + /// + /// 实际数量 + /// + public decimal HandledFromQty { get; set; } + + #endregion + + #region 实际目标 + + /// + /// 实际目标托标签 + /// + public string HandledToContainerCode { get; set; } + + /// + /// 实际箱标签 + /// + public string HandledToPackingCode { get; set; } + + /// + /// 实际批次供应商批次 + /// + public string HandledToSupplierBatch { get; set; } + + /// + /// 实际批次到货时间 + /// + public DateTime HandledToArriveDate { get; set; } + + /// + /// 实际批次生产时间 + /// + public DateTime HandledToProduceDate { get; set; } + + /// + /// 实际批次过期时间 + /// + public DateTime HandledToExpireDate { get; set; } + + /// + /// 实际批次排序 + /// + public string HandledToLot { get; set; } + + /// + /// 实际库位 + /// + public string HandledToLocationCode { get; set; } + + /// + /// 实际库区 + /// + public string HandledToLocationArea { get; set; } + + /// + /// 实际库位组 + /// + public string HandledToLocationGroup { get; set; } + + /// + /// 实际ERP库位 + /// + public string HandledToLocationErpCode { get; set; } + + /// + /// 实际仓库 + /// + public string HandledToWarehouseCode { get; set; } + + /// + /// 实际数量 + /// + public decimal HandledToQty { get; set; } + + #endregion +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/Inputs/AssembleNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/Inputs/AssembleIssueNoteEditInput.cs similarity index 90% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/Inputs/AssembleNoteEditInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/Inputs/AssembleIssueNoteEditInput.cs index 48447ccf5..731359c29 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/Inputs/AssembleNoteEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/Inputs/AssembleIssueNoteEditInput.cs @@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class AssembleNoteEditInput : SfsStoreCreateOrUpdateInputBase +public class AssembleIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase { #region Base /// @@ -32,7 +32,7 @@ public class AssembleNoteEditInput : SfsStoreCreateOrUpdateInputBase /// 明细列表 /// [Display(Name = "明细列表")] - public List Details { get; set; } + public List Details { get; set; } /// /// 请求号码 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/Inputs/AssembleNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/Inputs/AssembleIssueNoteImportInput.cs similarity index 88% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/Inputs/AssembleNoteImportInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/Inputs/AssembleIssueNoteImportInput.cs index 415f3334c..1a1487de5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/Inputs/AssembleNoteImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/Inputs/AssembleIssueNoteImportInput.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class AssembleNoteImportInput : SfsStoreImportInputBase, IHasJobNumber, IHasRequestNumber +public class AssembleIssueNoteImportInput : SfsStoreImportInputBase, IHasJobNumber, IHasRequestNumber { /// /// 任务ID diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/AssembleNotePermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/AssembleNotePermissions.cs deleted file mode 100644 index 1b05f191c..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/AssembleNotePermissions.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Volo.Abp.Authorization.Permissions; -using Win_in.Sfs.Wms.Store.Domain; - -namespace Win_in.Sfs.Wms.Store.Application.Contracts; - -public static class AssembleNotePermissions -{ - - public const string Default = StorePermissions.GroupName + "." + nameof(AssembleNote); - public const string Create = Default + "." + StorePermissions.CreateStr; - public const string Update = Default + "." + StorePermissions.UpdateStr; - public const string Delete = Default + "." + StorePermissions.DeleteStr; - - //自动发料记录 - public const string AutoAssembleNote = StorePermissions.GroupName + "." + nameof(AutoAssembleNote); - - //直接发料 - public const string DirectAssembleNote = StorePermissions.GroupName + "." + nameof(DirectAssembleNote); - - public static void AddAssembleNotePermission(this PermissionGroupDefinition permissionGroup) - { - var AssembleNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(AssembleNote))); - AssembleNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); - AssembleNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); - AssembleNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); - - permissionGroup.AddPermission(AutoAssembleNote, StorePermissionDefinitionProvider.L(nameof(AutoAssembleNote))); - permissionGroup.AddPermission(DirectAssembleNote, StorePermissionDefinitionProvider.L(nameof(DirectAssembleNote))); - } -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/DTOs/AssembleNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/DTOs/AssembleNoteDetailDTO.cs deleted file mode 100644 index 3e948f556..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/DTOs/AssembleNoteDetailDTO.cs +++ /dev/null @@ -1,519 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Win_in.Sfs.Shared.Application.Contracts; -using Win_in.Sfs.Shared.Domain.Shared; - -namespace Win_in.Sfs.Wms.Store.Application.Contracts; - -public class AssembleNoteDetailDTO : SfsDetailDTOBase -{ - #region 库存基础信息 - - /// - /// 物品代码 - /// - public string ItemCode { get; set; } - - /// - /// 物品名称 - /// - public string ItemName { get; set; } - - /// - /// 物品描述1 - /// - public string ItemDesc1 { get; set; } - - /// - /// 物品描述2 - /// - public string ItemDesc2 { get; set; } - - /// - /// 标包数量 - /// - [Display(Name = "标包数量")] - [Column(TypeName = "decimal(18,6)")] - public decimal StdPackQty { get; set; } - - /// - /// 库存状态 - /// - public EnumInventoryStatus Status { get; set; } - - /// - /// 计量单位 - /// - public string Uom { get; set; } - - #endregion - - #region 请求信息 - - /// - /// 请求库位 - /// - public string RequestLocationCode { get; set; } - - /// - /// 到库区 - /// - public string RequestLocationArea { get; set; } - - /// - /// 到库位组 - /// - public string RequestLocationGroup { get; set; } - - /// - /// 到ERP库位 - /// - public string RequestLocationErpCode { get; set; } - - /// - /// 到仓库 - /// - public string RequestWarehouseCode { get; set; } - - /// - /// 在途库库位 - /// - public string OnTheWayLocationCode { get; set; } - - /// - /// 生产线 - /// - public string ProdLine { get; set; } - - /// - /// 位置码 - /// - public string PositionCode { get; set; } - - /// - /// 推荐的类型 - /// - public EnumRecommendType RecommendType { get; set; } - - /// - /// 需求数量 - /// - public decimal RequestQty { get; set; } - - #endregion - - #region 推荐来源 - - /// - /// 推荐来源托标签 - /// - public string RecommendFromContainerCode { get; set; } - - /// - /// 推荐来源箱标签 - /// - public string RecommendFromPackingCode { get; set; } - - /// - /// 推荐来源批次供应商批次 - /// - public string RecommendFromSupplierBatch { get; set; } - - /// - /// 推荐来源批次到货时间 - /// - public DateTime RecommendFromArriveDate { get; set; } - - /// - /// 推荐来源批次生产时间 - /// - public DateTime RecommendFromProduceDate { get; set; } - - /// - /// 推荐来源批次过期时间 - /// - public DateTime RecommendFromExpireDate { get; set; } - - /// - /// 推荐来源批次排序 - /// - public string RecommendFromLot { get; set; } - - /// - /// 推荐来源库位 - /// - public string RecommendFromLocationCode { get; set; } - - /// - /// 推荐来源库区 - /// - public string RecommendFromLocationArea { get; set; } - - /// - /// 推荐来源库位组 - /// - public string RecommendFromLocationGroup { get; set; } - - /// - /// 推荐来源ERP库位 - /// - public string RecommendFromLocationErpCode { get; set; } - - /// - /// 推荐来源仓库 - /// - public string RecommendFromWarehouseCode { get; set; } - - /// - /// 推荐来源数量 - /// - public decimal RecommendFromQty { get; set; } - - #endregion - - #region 推荐目标 - - /// - /// 推荐目标托标签 - /// - public string RecommendToContainerCode { get; set; } - - /// - /// 推荐目标箱标签 - /// - public string RecommendToPackingCode { get; set; } - - /// - /// 推荐目标批次供应商批次 - /// - public string RecommendToSupplierBatch { get; set; } - - /// - /// 推荐目标批次到货时间 - /// - public DateTime RecommendToArriveDate { get; set; } - - /// - /// 推荐目标批次生产时间 - /// - public DateTime RecommendToProduceDate { get; set; } - - /// - /// 推荐目标批次过期时间 - /// - public DateTime RecommendToExpireDate { get; set; } - - /// - /// 推荐目标批次排序 - /// - public string RecommendToLot { get; set; } - - /// - /// 推荐目标库位 - /// - public string RecommendToLocationCode { get; set; } - - /// - /// 推荐目标库区 - /// - public string RecommendToLocationArea { get; set; } - - /// - /// 推荐目标库位组 - /// - public string RecommendToLocationGroup { get; set; } - - /// - /// 推荐目标ERP库位 - /// - public string RecommendToLocationErpCode { get; set; } - - /// - /// 推荐目标仓库 - /// - public string RecommendToWarehouseCode { get; set; } - - /// - /// 推荐目标数量 - /// - public decimal RecommendToQty { get; set; } - - #endregion - - #region 库移来源 - - /// - /// 库移来源托标签 - /// - public string TransferLibFromContainerCode { get; set; } - - /// - /// 库移来源箱标签 - /// - public string TransferLibFromPackingCode { get; set; } - - /// - /// 库移来源批次供应商批次 - /// - public string TransferLibFromSupplierBatch { get; set; } - - /// - /// 库移来源批次到货时间 - /// - public DateTime TransferLibFromArriveDate { get; set; } - - /// - /// 库移来源批次生产时间 - /// - public DateTime TransferLibFromProduceDate { get; set; } - - /// - /// 库移来源批次过期时间 - /// - public DateTime TransferLibFromExpireDate { get; set; } - - /// - /// 库移来源批次排序 - /// - public string TransferLibFromLot { get; set; } - - /// - /// 库移来源库位 - /// - public string TransferLibFromLocationCode { get; set; } - - /// - /// 库移来源库区 - /// - public string TransferLibFromLocationArea { get; set; } - - /// - /// 库移来源库位组 - /// - public string TransferLibFromLocationGroup { get; set; } - - /// - /// 库移来源ERP库位 - /// - public string TransferLibFromLocationErpCode { get; set; } - - /// - /// 库移来源仓库 - /// - public string TransferLibFromWarehouseCode { get; set; } - - /// - /// 库移来源数量 - /// - public decimal TransferLibFromQty { get; set; } - - #endregion - - #region 库移目标 - - /// - /// 库移目标托标签 - /// - public string TransferLibToContainerCode { get; set; } - - /// - /// 库移目标箱标签 - /// - public string TransferLibToPackingCode { get; set; } - - /// - /// 库移目标批次供应商批次 - /// - public string TransferLibToSupplierBatch { get; set; } - - /// - /// 库移目标批次到货时间 - /// - public DateTime TransferLibToArriveDate { get; set; } - - /// - /// 库移目标批次生产时间 - /// - public DateTime TransferLibToProduceDate { get; set; } - - /// - /// 库移目标批次过期时间 - /// - public DateTime TransferLibToExpireDate { get; set; } - - /// - /// 库移目标批次排序 - /// - public string TransferLibToLot { get; set; } - - /// - /// 库移目标库位 - /// - public string TransferLibToLocationCode { get; set; } - - /// - /// 库移目标库区 - /// - public string TransferLibToLocationArea { get; set; } - - /// - /// 库移目标库位组 - /// - public string TransferLibToLocationGroup { get; set; } - - /// - /// 库移目标ERP库位 - /// - public string TransferLibToLocationErpCode { get; set; } - - /// - /// 库移目标仓库 - /// - public string TransferLibToWarehouseCode { get; set; } - - /// - /// 库移目标数量 - /// - public decimal TransferLibToQty { get; set; } - - #endregion - - #region 实际来源 - - /// - /// 实际目标托标签 - /// - public string HandledFromContainerCode { get; set; } - - /// - /// 实际箱标签 - /// - public string HandledFromPackingCode { get; set; } - - /// - /// 实际批次供应商批次 - /// - public string HandledFromSupplierBatch { get; set; } - - /// - /// 实际批次到货时间 - /// - public DateTime HandledFromArriveDate { get; set; } - - /// - /// 实际批次生产时间 - /// - public DateTime HandledFromProduceDate { get; set; } - - /// - /// 实际批次过期时间 - /// - public DateTime HandledFromExpireDate { get; set; } - - /// - /// 实际批次排序 - /// - public string HandledFromLot { get; set; } - - /// - /// 实际库位 - /// - public string HandledFromLocationCode { get; set; } - - /// - /// 实际库区 - /// - public string HandledFromLocationArea { get; set; } - - /// - /// 实际库位组 - /// - public string HandledFromLocationGroup { get; set; } - - /// - /// 实际ERP库位 - /// - public string HandledFromLocationErpCode { get; set; } - - /// - /// 实际仓库 - /// - public string HandledFromWarehouseCode { get; set; } - - /// - /// 实际数量 - /// - public decimal HandledFromQty { get; set; } - - #endregion - - #region 实际目标 - - /// - /// 实际目标托标签 - /// - public string HandledToContainerCode { get; set; } - - /// - /// 实际箱标签 - /// - public string HandledToPackingCode { get; set; } - - /// - /// 实际批次供应商批次 - /// - public string HandledToSupplierBatch { get; set; } - - /// - /// 实际批次到货时间 - /// - public DateTime HandledToArriveDate { get; set; } - - /// - /// 实际批次生产时间 - /// - public DateTime HandledToProduceDate { get; set; } - - /// - /// 实际批次过期时间 - /// - public DateTime HandledToExpireDate { get; set; } - - /// - /// 实际批次排序 - /// - public string HandledToLot { get; set; } - - /// - /// 实际库位 - /// - public string HandledToLocationCode { get; set; } - - /// - /// 实际库区 - /// - public string HandledToLocationArea { get; set; } - - /// - /// 实际库位组 - /// - public string HandledToLocationGroup { get; set; } - - /// - /// 实际ERP库位 - /// - public string HandledToLocationErpCode { get; set; } - - /// - /// 实际仓库 - /// - public string HandledToWarehouseCode { get; set; } - - /// - /// 实际数量 - /// - public decimal HandledToQty { get; set; } - - #endregion -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/IAssembleNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/IAssembleNoteAppService.cs deleted file mode 100644 index af04bbaf4..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/IAssembleNoteAppService.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using Volo.Abp.Application.Dtos; - -namespace Win_in.Sfs.Wms.Store.Application.Contracts; - -public interface IAssembleNoteAppService : ISfsStoreMasterReadOnlyAppServiceBase -{ - Task CreateAsync(AssembleNoteEditInput input); - - Task ConfirmAsync(Guid id); - - Task ConfirmAsync(string number); - - Task> GetListByTypeAsync(SfsStoreRequestInputBase requestInput, - string requestType, bool includeDetails = false, CancellationToken cancellationToken = default); - - Task> GetListUnConfirmedByTypeAsync(string requestType); -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/Inputs/AssembleNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/Inputs/AssembleNoteDetailInput.cs deleted file mode 100644 index 9f9d71c36..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleNotes/Inputs/AssembleNoteDetailInput.cs +++ /dev/null @@ -1,519 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Win_in.Sfs.Shared.Application.Contracts; -using Win_in.Sfs.Shared.Domain.Shared; - -namespace Win_in.Sfs.Wms.Store.Application.Contracts; - -public class AssembleNoteDetailInput : SfsDetailInputBase -{ - #region 库存基础信息 - - /// - /// 物品代码 - /// - public string ItemCode { get; set; } - - /// - /// 物品名称 - /// - public string ItemName { get; set; } - - /// - /// 物品描述1 - /// - public string ItemDesc1 { get; set; } - - /// - /// 物品描述2 - /// - public string ItemDesc2 { get; set; } - - /// - /// 标包数量 - /// - [Display(Name = "标包数量")] - [Column(TypeName = "decimal(18,6)")] - public decimal StdPackQty { get; set; } - - /// - /// 库存状态 - /// - public EnumInventoryStatus Status { get; set; } - - /// - /// 计量单位 - /// - public string Uom { get; set; } - - #endregion - - #region 请求信息 - - /// - /// 请求库位 - /// - public string RequestLocationCode { get; set; } - - /// - /// 到库区 - /// - public string RequestLocationArea { get; set; } - - /// - /// 到库位组 - /// - public string RequestLocationGroup { get; set; } - - /// - /// 到ERP库位 - /// - public string RequestLocationErpCode { get; set; } - - /// - /// 到仓库 - /// - public string RequestWarehouseCode { get; set; } - - /// - /// 在途库库位 - /// - public string OnTheWayLocationCode { get; set; } - - /// - /// 生产线 - /// - public string ProdLine { get; set; } - - /// - /// 位置码 - /// - public string PositionCode { get; set; } - - /// - /// 推荐的类型 - /// - public EnumRecommendType RecommendType { get; set; } - - /// - /// 需求数量 - /// - public decimal RequestQty { get; set; } - - #endregion - - #region 推荐来源 - - /// - /// 推荐来源托标签 - /// - public string RecommendFromContainerCode { get; set; } - - /// - /// 推荐来源箱标签 - /// - public string RecommendFromPackingCode { get; set; } - - /// - /// 推荐来源批次供应商批次 - /// - public string RecommendFromSupplierBatch { get; set; } - - /// - /// 推荐来源批次到货时间 - /// - public DateTime RecommendFromArriveDate { get; set; } - - /// - /// 推荐来源批次生产时间 - /// - public DateTime RecommendFromProduceDate { get; set; } - - /// - /// 推荐来源批次过期时间 - /// - public DateTime RecommendFromExpireDate { get; set; } - - /// - /// 推荐来源批次排序 - /// - public string RecommendFromLot { get; set; } - - /// - /// 推荐来源库位 - /// - public string RecommendFromLocationCode { get; set; } - - /// - /// 推荐来源库区 - /// - public string RecommendFromLocationArea { get; set; } - - /// - /// 推荐来源库位组 - /// - public string RecommendFromLocationGroup { get; set; } - - /// - /// 推荐来源ERP库位 - /// - public string RecommendFromLocationErpCode { get; set; } - - /// - /// 推荐来源仓库 - /// - public string RecommendFromWarehouseCode { get; set; } - - /// - /// 推荐来源数量 - /// - public decimal RecommendFromQty { get; set; } - - #endregion - - #region 推荐目标 - - /// - /// 推荐目标托标签 - /// - public string RecommendToContainerCode { get; set; } - - /// - /// 推荐目标箱标签 - /// - public string RecommendToPackingCode { get; set; } - - /// - /// 推荐目标批次供应商批次 - /// - public string RecommendToSupplierBatch { get; set; } - - /// - /// 推荐目标批次到货时间 - /// - public DateTime RecommendToArriveDate { get; set; } - - /// - /// 推荐目标批次生产时间 - /// - public DateTime RecommendToProduceDate { get; set; } - - /// - /// 推荐目标批次过期时间 - /// - public DateTime RecommendToExpireDate { get; set; } - - /// - /// 推荐目标批次排序 - /// - public string RecommendToLot { get; set; } - - /// - /// 推荐目标库位 - /// - public string RecommendToLocationCode { get; set; } - - /// - /// 推荐目标库区 - /// - public string RecommendToLocationArea { get; set; } - - /// - /// 推荐目标库位组 - /// - public string RecommendToLocationGroup { get; set; } - - /// - /// 推荐目标ERP库位 - /// - public string RecommendToLocationErpCode { get; set; } - - /// - /// 推荐目标仓库 - /// - public string RecommendToWarehouseCode { get; set; } - - /// - /// 推荐目标数量 - /// - public decimal RecommendToQty { get; set; } - - #endregion - - #region 库移来源 - - /// - /// 库移来源托标签 - /// - public string TransferLibFromContainerCode { get; set; } - - /// - /// 库移来源箱标签 - /// - public string TransferLibFromPackingCode { get; set; } - - /// - /// 库移来源批次供应商批次 - /// - public string TransferLibFromSupplierBatch { get; set; } - - /// - /// 库移来源批次到货时间 - /// - public DateTime TransferLibFromArriveDate { get; set; } - - /// - /// 库移来源批次生产时间 - /// - public DateTime TransferLibFromProduceDate { get; set; } - - /// - /// 库移来源批次过期时间 - /// - public DateTime TransferLibFromExpireDate { get; set; } - - /// - /// 库移来源批次排序 - /// - public string TransferLibFromLot { get; set; } - - /// - /// 库移来源库位 - /// - public string TransferLibFromLocationCode { get; set; } - - /// - /// 库移来源库区 - /// - public string TransferLibFromLocationArea { get; set; } - - /// - /// 库移来源库位组 - /// - public string TransferLibFromLocationGroup { get; set; } - - /// - /// 库移来源ERP库位 - /// - public string TransferLibFromLocationErpCode { get; set; } - - /// - /// 库移来源仓库 - /// - public string TransferLibFromWarehouseCode { get; set; } - - /// - /// 库移来源数量 - /// - public decimal TransferLibFromQty { get; set; } - - #endregion - - #region 库移目标 - - /// - /// 库移目标托标签 - /// - public string TransferLibToContainerCode { get; set; } - - /// - /// 库移目标箱标签 - /// - public string TransferLibToPackingCode { get; set; } - - /// - /// 库移目标批次供应商批次 - /// - public string TransferLibToSupplierBatch { get; set; } - - /// - /// 库移目标批次到货时间 - /// - public DateTime TransferLibToArriveDate { get; set; } - - /// - /// 库移目标批次生产时间 - /// - public DateTime TransferLibToProduceDate { get; set; } - - /// - /// 库移目标批次过期时间 - /// - public DateTime TransferLibToExpireDate { get; set; } - - /// - /// 库移目标批次排序 - /// - public string TransferLibToLot { get; set; } - - /// - /// 库移目标库位 - /// - public string TransferLibToLocationCode { get; set; } - - /// - /// 库移目标库区 - /// - public string TransferLibToLocationArea { get; set; } - - /// - /// 库移目标库位组 - /// - public string TransferLibToLocationGroup { get; set; } - - /// - /// 库移目标ERP库位 - /// - public string TransferLibToLocationErpCode { get; set; } - - /// - /// 库移目标仓库 - /// - public string TransferLibToWarehouseCode { get; set; } - - /// - /// 库移目标数量 - /// - public decimal TransferLibToQty { get; set; } - - #endregion - - #region 实际来源 - - /// - /// 实际目标托标签 - /// - public string HandledFromContainerCode { get; set; } - - /// - /// 实际箱标签 - /// - public string HandledFromPackingCode { get; set; } - - /// - /// 实际批次供应商批次 - /// - public string HandledFromSupplierBatch { get; set; } - - /// - /// 实际批次到货时间 - /// - public DateTime HandledFromArriveDate { get; set; } - - /// - /// 实际批次生产时间 - /// - public DateTime HandledFromProduceDate { get; set; } - - /// - /// 实际批次过期时间 - /// - public DateTime HandledFromExpireDate { get; set; } - - /// - /// 实际批次排序 - /// - public string HandledFromLot { get; set; } - - /// - /// 实际库位 - /// - public string HandledFromLocationCode { get; set; } - - /// - /// 实际库区 - /// - public string HandledFromLocationArea { get; set; } - - /// - /// 实际库位组 - /// - public string HandledFromLocationGroup { get; set; } - - /// - /// 实际ERP库位 - /// - public string HandledFromLocationErpCode { get; set; } - - /// - /// 实际仓库 - /// - public string HandledFromWarehouseCode { get; set; } - - /// - /// 实际数量 - /// - public decimal HandledFromQty { get; set; } - - #endregion - - #region 实际目标 - - /// - /// 实际目标托标签 - /// - public string HandledToContainerCode { get; set; } - - /// - /// 实际箱标签 - /// - public string HandledToPackingCode { get; set; } - - /// - /// 实际批次供应商批次 - /// - public string HandledToSupplierBatch { get; set; } - - /// - /// 实际批次到货时间 - /// - public DateTime HandledToArriveDate { get; set; } - - /// - /// 实际批次生产时间 - /// - public DateTime HandledToProduceDate { get; set; } - - /// - /// 实际批次过期时间 - /// - public DateTime HandledToExpireDate { get; set; } - - /// - /// 实际批次排序 - /// - public string HandledToLot { get; set; } - - /// - /// 实际库位 - /// - public string HandledToLocationCode { get; set; } - - /// - /// 实际库区 - /// - public string HandledToLocationArea { get; set; } - - /// - /// 实际库位组 - /// - public string HandledToLocationGroup { get; set; } - - /// - /// 实际ERP库位 - /// - public string HandledToLocationErpCode { get; set; } - - /// - /// 实际仓库 - /// - public string HandledToWarehouseCode { get; set; } - - /// - /// 实际数量 - /// - public decimal HandledToQty { get; set; } - - #endregion -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/DTOs/InjectionNoteDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/DTOs/InjectionIssueNoteDTO.cs similarity index 90% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/DTOs/InjectionNoteDTO.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/DTOs/InjectionIssueNoteDTO.cs index 951df8a73..bd4ec40ee 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/DTOs/InjectionNoteDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/DTOs/InjectionIssueNoteDTO.cs @@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class InjectionNoteDTO : SfsStoreDTOBase, IHasJobNumber, IHasRequestNumber +public class InjectionIssueNoteDTO : SfsStoreDTOBase, IHasJobNumber, IHasRequestNumber { /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/DTOs/InjectionIssueNoteDetailDTO.cs similarity index 99% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionJobDetailInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/DTOs/InjectionIssueNoteDetailDTO.cs index 4fca06b3f..7d9411de5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionJobDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/DTOs/InjectionIssueNoteDetailDTO.cs @@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class InjectionJobDetailInput : SfsDetailInputBase +public class InjectionIssueNoteDetailDTO : SfsDetailDTOBase { #region 库存基础信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/IInjectionIssueNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/IInjectionIssueNoteAppService.cs new file mode 100644 index 000000000..f2d341edd --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/IInjectionIssueNoteAppService.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public interface IInjectionIssueNoteAppService : ISfsStoreMasterReadOnlyAppServiceBase +{ + Task CreateAsync(InjectionIssueNoteEditInput input); + + Task ConfirmAsync(Guid id); + + Task ConfirmAsync(string number); + + Task> GetListByTypeAsync(SfsStoreRequestInputBase requestInput, + string requestType, bool includeDetails = false, CancellationToken cancellationToken = default); + + Task> GetListUnConfirmedByTypeAsync(string requestType); +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/InjectionNotePermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNotePermissions.cs similarity index 57% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/InjectionNotePermissions.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNotePermissions.cs index ec202d6be..b0bb6e5a5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/InjectionNotePermissions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNotePermissions.cs @@ -3,28 +3,28 @@ using Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public static class InjectionNotePermissions +public static class InjectionIssueNotePermissions { - public const string Default = StorePermissions.GroupName + "." + nameof(InjectionNote); + public const string Default = StorePermissions.GroupName + "." + nameof(InjectionIssueNote); public const string Create = Default + "." + StorePermissions.CreateStr; public const string Update = Default + "." + StorePermissions.UpdateStr; public const string Delete = Default + "." + StorePermissions.DeleteStr; //自动发料记录 - public const string AutoInjectionNote = StorePermissions.GroupName + "." + nameof(AutoInjectionNote); + public const string AutoInjectionIssueNote = StorePermissions.GroupName + "." + nameof(AutoInjectionIssueNote); //直接发料 - public const string DirectInjectionNote = StorePermissions.GroupName + "." + nameof(DirectInjectionNote); + public const string DirectInjectionIssueNote = StorePermissions.GroupName + "." + nameof(DirectInjectionIssueNote); - public static void AddInjectionNotePermission(this PermissionGroupDefinition permissionGroup) + public static void AddInjectionIssueNotePermission(this PermissionGroupDefinition permissionGroup) { - var injectionNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionNote))); + var injectionNotePermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionIssueNote))); injectionNotePermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); injectionNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); injectionNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); - permissionGroup.AddPermission(AutoInjectionNote, StorePermissionDefinitionProvider.L(nameof(AutoInjectionNote))); - permissionGroup.AddPermission(DirectInjectionNote, StorePermissionDefinitionProvider.L(nameof(DirectInjectionNote))); + permissionGroup.AddPermission(AutoInjectionIssueNote, StorePermissionDefinitionProvider.L(nameof(AutoInjectionIssueNote))); + permissionGroup.AddPermission(DirectInjectionIssueNote, StorePermissionDefinitionProvider.L(nameof(DirectInjectionIssueNote))); } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteDetailInput.cs new file mode 100644 index 000000000..f05f28827 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteDetailInput.cs @@ -0,0 +1,519 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Win_in.Sfs.Shared.Application.Contracts; +using Win_in.Sfs.Shared.Domain.Shared; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public class InjectionIssueNoteDetailInput : SfsDetailInputBase +{ + #region 库存基础信息 + + /// + /// 物品代码 + /// + public string ItemCode { get; set; } + + /// + /// 物品名称 + /// + public string ItemName { get; set; } + + /// + /// 物品描述1 + /// + public string ItemDesc1 { get; set; } + + /// + /// 物品描述2 + /// + public string ItemDesc2 { get; set; } + + /// + /// 标包数量 + /// + [Display(Name = "标包数量")] + [Column(TypeName = "decimal(18,6)")] + public decimal StdPackQty { get; set; } + + /// + /// 库存状态 + /// + public EnumInventoryStatus Status { get; set; } + + /// + /// 计量单位 + /// + public string Uom { get; set; } + + #endregion + + #region 请求信息 + + /// + /// 请求库位 + /// + public string RequestLocationCode { get; set; } + + /// + /// 到库区 + /// + public string RequestLocationArea { get; set; } + + /// + /// 到库位组 + /// + public string RequestLocationGroup { get; set; } + + /// + /// 到ERP库位 + /// + public string RequestLocationErpCode { get; set; } + + /// + /// 到仓库 + /// + public string RequestWarehouseCode { get; set; } + + /// + /// 在途库库位 + /// + public string OnTheWayLocationCode { get; set; } + + /// + /// 生产线 + /// + public string ProdLine { get; set; } + + /// + /// 位置码 + /// + public string PositionCode { get; set; } + + /// + /// 推荐的类型 + /// + public EnumRecommendType RecommendType { get; set; } + + /// + /// 需求数量 + /// + public decimal RequestQty { get; set; } + + #endregion + + #region 推荐来源 + + /// + /// 推荐来源托标签 + /// + public string RecommendFromContainerCode { get; set; } + + /// + /// 推荐来源箱标签 + /// + public string RecommendFromPackingCode { get; set; } + + /// + /// 推荐来源批次供应商批次 + /// + public string RecommendFromSupplierBatch { get; set; } + + /// + /// 推荐来源批次到货时间 + /// + public DateTime RecommendFromArriveDate { get; set; } + + /// + /// 推荐来源批次生产时间 + /// + public DateTime RecommendFromProduceDate { get; set; } + + /// + /// 推荐来源批次过期时间 + /// + public DateTime RecommendFromExpireDate { get; set; } + + /// + /// 推荐来源批次排序 + /// + public string RecommendFromLot { get; set; } + + /// + /// 推荐来源库位 + /// + public string RecommendFromLocationCode { get; set; } + + /// + /// 推荐来源库区 + /// + public string RecommendFromLocationArea { get; set; } + + /// + /// 推荐来源库位组 + /// + public string RecommendFromLocationGroup { get; set; } + + /// + /// 推荐来源ERP库位 + /// + public string RecommendFromLocationErpCode { get; set; } + + /// + /// 推荐来源仓库 + /// + public string RecommendFromWarehouseCode { get; set; } + + /// + /// 推荐来源数量 + /// + public decimal RecommendFromQty { get; set; } + + #endregion + + #region 推荐目标 + + /// + /// 推荐目标托标签 + /// + public string RecommendToContainerCode { get; set; } + + /// + /// 推荐目标箱标签 + /// + public string RecommendToPackingCode { get; set; } + + /// + /// 推荐目标批次供应商批次 + /// + public string RecommendToSupplierBatch { get; set; } + + /// + /// 推荐目标批次到货时间 + /// + public DateTime RecommendToArriveDate { get; set; } + + /// + /// 推荐目标批次生产时间 + /// + public DateTime RecommendToProduceDate { get; set; } + + /// + /// 推荐目标批次过期时间 + /// + public DateTime RecommendToExpireDate { get; set; } + + /// + /// 推荐目标批次排序 + /// + public string RecommendToLot { get; set; } + + /// + /// 推荐目标库位 + /// + public string RecommendToLocationCode { get; set; } + + /// + /// 推荐目标库区 + /// + public string RecommendToLocationArea { get; set; } + + /// + /// 推荐目标库位组 + /// + public string RecommendToLocationGroup { get; set; } + + /// + /// 推荐目标ERP库位 + /// + public string RecommendToLocationErpCode { get; set; } + + /// + /// 推荐目标仓库 + /// + public string RecommendToWarehouseCode { get; set; } + + /// + /// 推荐目标数量 + /// + public decimal RecommendToQty { get; set; } + + #endregion + + #region 库移来源 + + /// + /// 库移来源托标签 + /// + public string TransferLibFromContainerCode { get; set; } + + /// + /// 库移来源箱标签 + /// + public string TransferLibFromPackingCode { get; set; } + + /// + /// 库移来源批次供应商批次 + /// + public string TransferLibFromSupplierBatch { get; set; } + + /// + /// 库移来源批次到货时间 + /// + public DateTime TransferLibFromArriveDate { get; set; } + + /// + /// 库移来源批次生产时间 + /// + public DateTime TransferLibFromProduceDate { get; set; } + + /// + /// 库移来源批次过期时间 + /// + public DateTime TransferLibFromExpireDate { get; set; } + + /// + /// 库移来源批次排序 + /// + public string TransferLibFromLot { get; set; } + + /// + /// 库移来源库位 + /// + public string TransferLibFromLocationCode { get; set; } + + /// + /// 库移来源库区 + /// + public string TransferLibFromLocationArea { get; set; } + + /// + /// 库移来源库位组 + /// + public string TransferLibFromLocationGroup { get; set; } + + /// + /// 库移来源ERP库位 + /// + public string TransferLibFromLocationErpCode { get; set; } + + /// + /// 库移来源仓库 + /// + public string TransferLibFromWarehouseCode { get; set; } + + /// + /// 库移来源数量 + /// + public decimal TransferLibFromQty { get; set; } + + #endregion + + #region 库移目标 + + /// + /// 库移目标托标签 + /// + public string TransferLibToContainerCode { get; set; } + + /// + /// 库移目标箱标签 + /// + public string TransferLibToPackingCode { get; set; } + + /// + /// 库移目标批次供应商批次 + /// + public string TransferLibToSupplierBatch { get; set; } + + /// + /// 库移目标批次到货时间 + /// + public DateTime TransferLibToArriveDate { get; set; } + + /// + /// 库移目标批次生产时间 + /// + public DateTime TransferLibToProduceDate { get; set; } + + /// + /// 库移目标批次过期时间 + /// + public DateTime TransferLibToExpireDate { get; set; } + + /// + /// 库移目标批次排序 + /// + public string TransferLibToLot { get; set; } + + /// + /// 库移目标库位 + /// + public string TransferLibToLocationCode { get; set; } + + /// + /// 库移目标库区 + /// + public string TransferLibToLocationArea { get; set; } + + /// + /// 库移目标库位组 + /// + public string TransferLibToLocationGroup { get; set; } + + /// + /// 库移目标ERP库位 + /// + public string TransferLibToLocationErpCode { get; set; } + + /// + /// 库移目标仓库 + /// + public string TransferLibToWarehouseCode { get; set; } + + /// + /// 库移目标数量 + /// + public decimal TransferLibToQty { get; set; } + + #endregion + + #region 实际来源 + + /// + /// 实际目标托标签 + /// + public string HandledFromContainerCode { get; set; } + + /// + /// 实际箱标签 + /// + public string HandledFromPackingCode { get; set; } + + /// + /// 实际批次供应商批次 + /// + public string HandledFromSupplierBatch { get; set; } + + /// + /// 实际批次到货时间 + /// + public DateTime HandledFromArriveDate { get; set; } + + /// + /// 实际批次生产时间 + /// + public DateTime HandledFromProduceDate { get; set; } + + /// + /// 实际批次过期时间 + /// + public DateTime HandledFromExpireDate { get; set; } + + /// + /// 实际批次排序 + /// + public string HandledFromLot { get; set; } + + /// + /// 实际库位 + /// + public string HandledFromLocationCode { get; set; } + + /// + /// 实际库区 + /// + public string HandledFromLocationArea { get; set; } + + /// + /// 实际库位组 + /// + public string HandledFromLocationGroup { get; set; } + + /// + /// 实际ERP库位 + /// + public string HandledFromLocationErpCode { get; set; } + + /// + /// 实际仓库 + /// + public string HandledFromWarehouseCode { get; set; } + + /// + /// 实际数量 + /// + public decimal HandledFromQty { get; set; } + + #endregion + + #region 实际目标 + + /// + /// 实际目标托标签 + /// + public string HandledToContainerCode { get; set; } + + /// + /// 实际箱标签 + /// + public string HandledToPackingCode { get; set; } + + /// + /// 实际批次供应商批次 + /// + public string HandledToSupplierBatch { get; set; } + + /// + /// 实际批次到货时间 + /// + public DateTime HandledToArriveDate { get; set; } + + /// + /// 实际批次生产时间 + /// + public DateTime HandledToProduceDate { get; set; } + + /// + /// 实际批次过期时间 + /// + public DateTime HandledToExpireDate { get; set; } + + /// + /// 实际批次排序 + /// + public string HandledToLot { get; set; } + + /// + /// 实际库位 + /// + public string HandledToLocationCode { get; set; } + + /// + /// 实际库区 + /// + public string HandledToLocationArea { get; set; } + + /// + /// 实际库位组 + /// + public string HandledToLocationGroup { get; set; } + + /// + /// 实际ERP库位 + /// + public string HandledToLocationErpCode { get; set; } + + /// + /// 实际仓库 + /// + public string HandledToWarehouseCode { get; set; } + + /// + /// 实际数量 + /// + public decimal HandledToQty { get; set; } + + #endregion +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/Inputs/InjectionNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteEditInput.cs similarity index 90% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/Inputs/InjectionNoteEditInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteEditInput.cs index 3aaa6bbd4..ac52e49e9 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/Inputs/InjectionNoteEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteEditInput.cs @@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class InjectionNoteEditInput : SfsStoreCreateOrUpdateInputBase +public class InjectionIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase { #region Base /// @@ -32,7 +32,7 @@ public class InjectionNoteEditInput : SfsStoreCreateOrUpdateInputBase /// 明细列表 /// [Display(Name = "明细列表")] - public List Details { get; set; } + public List Details { get; set; } /// /// 请求号码 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/Inputs/InjectionNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteImportInput.cs similarity index 88% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/Inputs/InjectionNoteImportInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteImportInput.cs index 2876aa4ee..8e79cfec6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/Inputs/InjectionNoteImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteImportInput.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class InjectionNoteImportInput : SfsStoreImportInputBase, IHasJobNumber, IHasRequestNumber +public class InjectionIssueNoteImportInput : SfsStoreImportInputBase, IHasJobNumber, IHasRequestNumber { /// /// 任务ID diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/DTOs/InjectionNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/DTOs/InjectionNoteDetailDTO.cs deleted file mode 100644 index 9ec6f5cfe..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/DTOs/InjectionNoteDetailDTO.cs +++ /dev/null @@ -1,519 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Win_in.Sfs.Shared.Application.Contracts; -using Win_in.Sfs.Shared.Domain.Shared; - -namespace Win_in.Sfs.Wms.Store.Application.Contracts; - -public class InjectionNoteDetailDTO : SfsDetailDTOBase -{ - #region 库存基础信息 - - /// - /// 物品代码 - /// - public string ItemCode { get; set; } - - /// - /// 物品名称 - /// - public string ItemName { get; set; } - - /// - /// 物品描述1 - /// - public string ItemDesc1 { get; set; } - - /// - /// 物品描述2 - /// - public string ItemDesc2 { get; set; } - - /// - /// 标包数量 - /// - [Display(Name = "标包数量")] - [Column(TypeName = "decimal(18,6)")] - public decimal StdPackQty { get; set; } - - /// - /// 库存状态 - /// - public EnumInventoryStatus Status { get; set; } - - /// - /// 计量单位 - /// - public string Uom { get; set; } - - #endregion - - #region 请求信息 - - /// - /// 请求库位 - /// - public string RequestLocationCode { get; set; } - - /// - /// 到库区 - /// - public string RequestLocationArea { get; set; } - - /// - /// 到库位组 - /// - public string RequestLocationGroup { get; set; } - - /// - /// 到ERP库位 - /// - public string RequestLocationErpCode { get; set; } - - /// - /// 到仓库 - /// - public string RequestWarehouseCode { get; set; } - - /// - /// 在途库库位 - /// - public string OnTheWayLocationCode { get; set; } - - /// - /// 生产线 - /// - public string ProdLine { get; set; } - - /// - /// 位置码 - /// - public string PositionCode { get; set; } - - /// - /// 推荐的类型 - /// - public EnumRecommendType RecommendType { get; set; } - - /// - /// 需求数量 - /// - public decimal RequestQty { get; set; } - - #endregion - - #region 推荐来源 - - /// - /// 推荐来源托标签 - /// - public string RecommendFromContainerCode { get; set; } - - /// - /// 推荐来源箱标签 - /// - public string RecommendFromPackingCode { get; set; } - - /// - /// 推荐来源批次供应商批次 - /// - public string RecommendFromSupplierBatch { get; set; } - - /// - /// 推荐来源批次到货时间 - /// - public DateTime RecommendFromArriveDate { get; set; } - - /// - /// 推荐来源批次生产时间 - /// - public DateTime RecommendFromProduceDate { get; set; } - - /// - /// 推荐来源批次过期时间 - /// - public DateTime RecommendFromExpireDate { get; set; } - - /// - /// 推荐来源批次排序 - /// - public string RecommendFromLot { get; set; } - - /// - /// 推荐来源库位 - /// - public string RecommendFromLocationCode { get; set; } - - /// - /// 推荐来源库区 - /// - public string RecommendFromLocationArea { get; set; } - - /// - /// 推荐来源库位组 - /// - public string RecommendFromLocationGroup { get; set; } - - /// - /// 推荐来源ERP库位 - /// - public string RecommendFromLocationErpCode { get; set; } - - /// - /// 推荐来源仓库 - /// - public string RecommendFromWarehouseCode { get; set; } - - /// - /// 推荐来源数量 - /// - public decimal RecommendFromQty { get; set; } - - #endregion - - #region 推荐目标 - - /// - /// 推荐目标托标签 - /// - public string RecommendToContainerCode { get; set; } - - /// - /// 推荐目标箱标签 - /// - public string RecommendToPackingCode { get; set; } - - /// - /// 推荐目标批次供应商批次 - /// - public string RecommendToSupplierBatch { get; set; } - - /// - /// 推荐目标批次到货时间 - /// - public DateTime RecommendToArriveDate { get; set; } - - /// - /// 推荐目标批次生产时间 - /// - public DateTime RecommendToProduceDate { get; set; } - - /// - /// 推荐目标批次过期时间 - /// - public DateTime RecommendToExpireDate { get; set; } - - /// - /// 推荐目标批次排序 - /// - public string RecommendToLot { get; set; } - - /// - /// 推荐目标库位 - /// - public string RecommendToLocationCode { get; set; } - - /// - /// 推荐目标库区 - /// - public string RecommendToLocationArea { get; set; } - - /// - /// 推荐目标库位组 - /// - public string RecommendToLocationGroup { get; set; } - - /// - /// 推荐目标ERP库位 - /// - public string RecommendToLocationErpCode { get; set; } - - /// - /// 推荐目标仓库 - /// - public string RecommendToWarehouseCode { get; set; } - - /// - /// 推荐目标数量 - /// - public decimal RecommendToQty { get; set; } - - #endregion - - #region 库移来源 - - /// - /// 库移来源托标签 - /// - public string TransferLibFromContainerCode { get; set; } - - /// - /// 库移来源箱标签 - /// - public string TransferLibFromPackingCode { get; set; } - - /// - /// 库移来源批次供应商批次 - /// - public string TransferLibFromSupplierBatch { get; set; } - - /// - /// 库移来源批次到货时间 - /// - public DateTime TransferLibFromArriveDate { get; set; } - - /// - /// 库移来源批次生产时间 - /// - public DateTime TransferLibFromProduceDate { get; set; } - - /// - /// 库移来源批次过期时间 - /// - public DateTime TransferLibFromExpireDate { get; set; } - - /// - /// 库移来源批次排序 - /// - public string TransferLibFromLot { get; set; } - - /// - /// 库移来源库位 - /// - public string TransferLibFromLocationCode { get; set; } - - /// - /// 库移来源库区 - /// - public string TransferLibFromLocationArea { get; set; } - - /// - /// 库移来源库位组 - /// - public string TransferLibFromLocationGroup { get; set; } - - /// - /// 库移来源ERP库位 - /// - public string TransferLibFromLocationErpCode { get; set; } - - /// - /// 库移来源仓库 - /// - public string TransferLibFromWarehouseCode { get; set; } - - /// - /// 库移来源数量 - /// - public decimal TransferLibFromQty { get; set; } - - #endregion - - #region 库移目标 - - /// - /// 库移目标托标签 - /// - public string TransferLibToContainerCode { get; set; } - - /// - /// 库移目标箱标签 - /// - public string TransferLibToPackingCode { get; set; } - - /// - /// 库移目标批次供应商批次 - /// - public string TransferLibToSupplierBatch { get; set; } - - /// - /// 库移目标批次到货时间 - /// - public DateTime TransferLibToArriveDate { get; set; } - - /// - /// 库移目标批次生产时间 - /// - public DateTime TransferLibToProduceDate { get; set; } - - /// - /// 库移目标批次过期时间 - /// - public DateTime TransferLibToExpireDate { get; set; } - - /// - /// 库移目标批次排序 - /// - public string TransferLibToLot { get; set; } - - /// - /// 库移目标库位 - /// - public string TransferLibToLocationCode { get; set; } - - /// - /// 库移目标库区 - /// - public string TransferLibToLocationArea { get; set; } - - /// - /// 库移目标库位组 - /// - public string TransferLibToLocationGroup { get; set; } - - /// - /// 库移目标ERP库位 - /// - public string TransferLibToLocationErpCode { get; set; } - - /// - /// 库移目标仓库 - /// - public string TransferLibToWarehouseCode { get; set; } - - /// - /// 库移目标数量 - /// - public decimal TransferLibToQty { get; set; } - - #endregion - - #region 实际来源 - - /// - /// 实际目标托标签 - /// - public string HandledFromContainerCode { get; set; } - - /// - /// 实际箱标签 - /// - public string HandledFromPackingCode { get; set; } - - /// - /// 实际批次供应商批次 - /// - public string HandledFromSupplierBatch { get; set; } - - /// - /// 实际批次到货时间 - /// - public DateTime HandledFromArriveDate { get; set; } - - /// - /// 实际批次生产时间 - /// - public DateTime HandledFromProduceDate { get; set; } - - /// - /// 实际批次过期时间 - /// - public DateTime HandledFromExpireDate { get; set; } - - /// - /// 实际批次排序 - /// - public string HandledFromLot { get; set; } - - /// - /// 实际库位 - /// - public string HandledFromLocationCode { get; set; } - - /// - /// 实际库区 - /// - public string HandledFromLocationArea { get; set; } - - /// - /// 实际库位组 - /// - public string HandledFromLocationGroup { get; set; } - - /// - /// 实际ERP库位 - /// - public string HandledFromLocationErpCode { get; set; } - - /// - /// 实际仓库 - /// - public string HandledFromWarehouseCode { get; set; } - - /// - /// 实际数量 - /// - public decimal HandledFromQty { get; set; } - - #endregion - - #region 实际目标 - - /// - /// 实际目标托标签 - /// - public string HandledToContainerCode { get; set; } - - /// - /// 实际箱标签 - /// - public string HandledToPackingCode { get; set; } - - /// - /// 实际批次供应商批次 - /// - public string HandledToSupplierBatch { get; set; } - - /// - /// 实际批次到货时间 - /// - public DateTime HandledToArriveDate { get; set; } - - /// - /// 实际批次生产时间 - /// - public DateTime HandledToProduceDate { get; set; } - - /// - /// 实际批次过期时间 - /// - public DateTime HandledToExpireDate { get; set; } - - /// - /// 实际批次排序 - /// - public string HandledToLot { get; set; } - - /// - /// 实际库位 - /// - public string HandledToLocationCode { get; set; } - - /// - /// 实际库区 - /// - public string HandledToLocationArea { get; set; } - - /// - /// 实际库位组 - /// - public string HandledToLocationGroup { get; set; } - - /// - /// 实际ERP库位 - /// - public string HandledToLocationErpCode { get; set; } - - /// - /// 实际仓库 - /// - public string HandledToWarehouseCode { get; set; } - - /// - /// 实际数量 - /// - public decimal HandledToQty { get; set; } - - #endregion -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/IInjectionNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/IInjectionNoteAppService.cs deleted file mode 100644 index 8d88bd51d..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/IInjectionNoteAppService.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using Volo.Abp.Application.Dtos; - -namespace Win_in.Sfs.Wms.Store.Application.Contracts; - -public interface IInjectionNoteAppService : ISfsStoreMasterReadOnlyAppServiceBase -{ - Task CreateAsync(InjectionNoteEditInput input); - - Task ConfirmAsync(Guid id); - - Task ConfirmAsync(string number); - - Task> GetListByTypeAsync(SfsStoreRequestInputBase requestInput, - string requestType, bool includeDetails = false, CancellationToken cancellationToken = default); - - Task> GetListUnConfirmedByTypeAsync(string requestType); -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/Inputs/InjectionNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/Inputs/InjectionNoteDetailInput.cs deleted file mode 100644 index 0dd37d099..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionNotes/Inputs/InjectionNoteDetailInput.cs +++ /dev/null @@ -1,519 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Win_in.Sfs.Shared.Application.Contracts; -using Win_in.Sfs.Shared.Domain.Shared; - -namespace Win_in.Sfs.Wms.Store.Application.Contracts; - -public class InjectionNoteDetailInput : SfsDetailInputBase -{ - #region 库存基础信息 - - /// - /// 物品代码 - /// - public string ItemCode { get; set; } - - /// - /// 物品名称 - /// - public string ItemName { get; set; } - - /// - /// 物品描述1 - /// - public string ItemDesc1 { get; set; } - - /// - /// 物品描述2 - /// - public string ItemDesc2 { get; set; } - - /// - /// 标包数量 - /// - [Display(Name = "标包数量")] - [Column(TypeName = "decimal(18,6)")] - public decimal StdPackQty { get; set; } - - /// - /// 库存状态 - /// - public EnumInventoryStatus Status { get; set; } - - /// - /// 计量单位 - /// - public string Uom { get; set; } - - #endregion - - #region 请求信息 - - /// - /// 请求库位 - /// - public string RequestLocationCode { get; set; } - - /// - /// 到库区 - /// - public string RequestLocationArea { get; set; } - - /// - /// 到库位组 - /// - public string RequestLocationGroup { get; set; } - - /// - /// 到ERP库位 - /// - public string RequestLocationErpCode { get; set; } - - /// - /// 到仓库 - /// - public string RequestWarehouseCode { get; set; } - - /// - /// 在途库库位 - /// - public string OnTheWayLocationCode { get; set; } - - /// - /// 生产线 - /// - public string ProdLine { get; set; } - - /// - /// 位置码 - /// - public string PositionCode { get; set; } - - /// - /// 推荐的类型 - /// - public EnumRecommendType RecommendType { get; set; } - - /// - /// 需求数量 - /// - public decimal RequestQty { get; set; } - - #endregion - - #region 推荐来源 - - /// - /// 推荐来源托标签 - /// - public string RecommendFromContainerCode { get; set; } - - /// - /// 推荐来源箱标签 - /// - public string RecommendFromPackingCode { get; set; } - - /// - /// 推荐来源批次供应商批次 - /// - public string RecommendFromSupplierBatch { get; set; } - - /// - /// 推荐来源批次到货时间 - /// - public DateTime RecommendFromArriveDate { get; set; } - - /// - /// 推荐来源批次生产时间 - /// - public DateTime RecommendFromProduceDate { get; set; } - - /// - /// 推荐来源批次过期时间 - /// - public DateTime RecommendFromExpireDate { get; set; } - - /// - /// 推荐来源批次排序 - /// - public string RecommendFromLot { get; set; } - - /// - /// 推荐来源库位 - /// - public string RecommendFromLocationCode { get; set; } - - /// - /// 推荐来源库区 - /// - public string RecommendFromLocationArea { get; set; } - - /// - /// 推荐来源库位组 - /// - public string RecommendFromLocationGroup { get; set; } - - /// - /// 推荐来源ERP库位 - /// - public string RecommendFromLocationErpCode { get; set; } - - /// - /// 推荐来源仓库 - /// - public string RecommendFromWarehouseCode { get; set; } - - /// - /// 推荐来源数量 - /// - public decimal RecommendFromQty { get; set; } - - #endregion - - #region 推荐目标 - - /// - /// 推荐目标托标签 - /// - public string RecommendToContainerCode { get; set; } - - /// - /// 推荐目标箱标签 - /// - public string RecommendToPackingCode { get; set; } - - /// - /// 推荐目标批次供应商批次 - /// - public string RecommendToSupplierBatch { get; set; } - - /// - /// 推荐目标批次到货时间 - /// - public DateTime RecommendToArriveDate { get; set; } - - /// - /// 推荐目标批次生产时间 - /// - public DateTime RecommendToProduceDate { get; set; } - - /// - /// 推荐目标批次过期时间 - /// - public DateTime RecommendToExpireDate { get; set; } - - /// - /// 推荐目标批次排序 - /// - public string RecommendToLot { get; set; } - - /// - /// 推荐目标库位 - /// - public string RecommendToLocationCode { get; set; } - - /// - /// 推荐目标库区 - /// - public string RecommendToLocationArea { get; set; } - - /// - /// 推荐目标库位组 - /// - public string RecommendToLocationGroup { get; set; } - - /// - /// 推荐目标ERP库位 - /// - public string RecommendToLocationErpCode { get; set; } - - /// - /// 推荐目标仓库 - /// - public string RecommendToWarehouseCode { get; set; } - - /// - /// 推荐目标数量 - /// - public decimal RecommendToQty { get; set; } - - #endregion - - #region 库移来源 - - /// - /// 库移来源托标签 - /// - public string TransferLibFromContainerCode { get; set; } - - /// - /// 库移来源箱标签 - /// - public string TransferLibFromPackingCode { get; set; } - - /// - /// 库移来源批次供应商批次 - /// - public string TransferLibFromSupplierBatch { get; set; } - - /// - /// 库移来源批次到货时间 - /// - public DateTime TransferLibFromArriveDate { get; set; } - - /// - /// 库移来源批次生产时间 - /// - public DateTime TransferLibFromProduceDate { get; set; } - - /// - /// 库移来源批次过期时间 - /// - public DateTime TransferLibFromExpireDate { get; set; } - - /// - /// 库移来源批次排序 - /// - public string TransferLibFromLot { get; set; } - - /// - /// 库移来源库位 - /// - public string TransferLibFromLocationCode { get; set; } - - /// - /// 库移来源库区 - /// - public string TransferLibFromLocationArea { get; set; } - - /// - /// 库移来源库位组 - /// - public string TransferLibFromLocationGroup { get; set; } - - /// - /// 库移来源ERP库位 - /// - public string TransferLibFromLocationErpCode { get; set; } - - /// - /// 库移来源仓库 - /// - public string TransferLibFromWarehouseCode { get; set; } - - /// - /// 库移来源数量 - /// - public decimal TransferLibFromQty { get; set; } - - #endregion - - #region 库移目标 - - /// - /// 库移目标托标签 - /// - public string TransferLibToContainerCode { get; set; } - - /// - /// 库移目标箱标签 - /// - public string TransferLibToPackingCode { get; set; } - - /// - /// 库移目标批次供应商批次 - /// - public string TransferLibToSupplierBatch { get; set; } - - /// - /// 库移目标批次到货时间 - /// - public DateTime TransferLibToArriveDate { get; set; } - - /// - /// 库移目标批次生产时间 - /// - public DateTime TransferLibToProduceDate { get; set; } - - /// - /// 库移目标批次过期时间 - /// - public DateTime TransferLibToExpireDate { get; set; } - - /// - /// 库移目标批次排序 - /// - public string TransferLibToLot { get; set; } - - /// - /// 库移目标库位 - /// - public string TransferLibToLocationCode { get; set; } - - /// - /// 库移目标库区 - /// - public string TransferLibToLocationArea { get; set; } - - /// - /// 库移目标库位组 - /// - public string TransferLibToLocationGroup { get; set; } - - /// - /// 库移目标ERP库位 - /// - public string TransferLibToLocationErpCode { get; set; } - - /// - /// 库移目标仓库 - /// - public string TransferLibToWarehouseCode { get; set; } - - /// - /// 库移目标数量 - /// - public decimal TransferLibToQty { get; set; } - - #endregion - - #region 实际来源 - - /// - /// 实际目标托标签 - /// - public string HandledFromContainerCode { get; set; } - - /// - /// 实际箱标签 - /// - public string HandledFromPackingCode { get; set; } - - /// - /// 实际批次供应商批次 - /// - public string HandledFromSupplierBatch { get; set; } - - /// - /// 实际批次到货时间 - /// - public DateTime HandledFromArriveDate { get; set; } - - /// - /// 实际批次生产时间 - /// - public DateTime HandledFromProduceDate { get; set; } - - /// - /// 实际批次过期时间 - /// - public DateTime HandledFromExpireDate { get; set; } - - /// - /// 实际批次排序 - /// - public string HandledFromLot { get; set; } - - /// - /// 实际库位 - /// - public string HandledFromLocationCode { get; set; } - - /// - /// 实际库区 - /// - public string HandledFromLocationArea { get; set; } - - /// - /// 实际库位组 - /// - public string HandledFromLocationGroup { get; set; } - - /// - /// 实际ERP库位 - /// - public string HandledFromLocationErpCode { get; set; } - - /// - /// 实际仓库 - /// - public string HandledFromWarehouseCode { get; set; } - - /// - /// 实际数量 - /// - public decimal HandledFromQty { get; set; } - - #endregion - - #region 实际目标 - - /// - /// 实际目标托标签 - /// - public string HandledToContainerCode { get; set; } - - /// - /// 实际箱标签 - /// - public string HandledToPackingCode { get; set; } - - /// - /// 实际批次供应商批次 - /// - public string HandledToSupplierBatch { get; set; } - - /// - /// 实际批次到货时间 - /// - public DateTime HandledToArriveDate { get; set; } - - /// - /// 实际批次生产时间 - /// - public DateTime HandledToProduceDate { get; set; } - - /// - /// 实际批次过期时间 - /// - public DateTime HandledToExpireDate { get; set; } - - /// - /// 实际批次排序 - /// - public string HandledToLot { get; set; } - - /// - /// 实际库位 - /// - public string HandledToLocationCode { get; set; } - - /// - /// 实际库区 - /// - public string HandledToLocationArea { get; set; } - - /// - /// 实际库位组 - /// - public string HandledToLocationGroup { get; set; } - - /// - /// 实际ERP库位 - /// - public string HandledToLocationErpCode { get; set; } - - /// - /// 实际仓库 - /// - public string HandledToWarehouseCode { get; set; } - - /// - /// 实际数量 - /// - public decimal HandledToQty { get; set; } - - #endregion -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/DTOs/IssueNoteDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotes/DTOs/IssueNoteDTO.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/DTOs/IssueNoteDTO.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotes/DTOs/IssueNoteDTO.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/DTOs/IssueNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotes/DTOs/IssueNoteDetailDTO.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/DTOs/IssueNoteDetailDTO.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotes/DTOs/IssueNoteDetailDTO.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IIssueNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotes/IIssueNoteAppService.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IIssueNoteAppService.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotes/IIssueNoteAppService.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/Inputs/IssueNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotes/Inputs/IssueNoteDetailInput.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/Inputs/IssueNoteDetailInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotes/Inputs/IssueNoteDetailInput.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/Inputs/IssueNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotes/Inputs/IssueNoteEditInput.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/Inputs/IssueNoteEditInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotes/Inputs/IssueNoteEditInput.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/Inputs/IssueNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotes/Inputs/IssueNoteImportInput.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/Inputs/IssueNoteImportInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotes/Inputs/IssueNoteImportInput.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotePermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotes/IssueNotePermissions.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotePermissions.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/IssueNotes/IssueNotePermissions.cs 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 82c83a21f..b8455a7de 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 @@ -26,13 +26,13 @@ public class StorePermissionDefinitionProvider : PermissionDefinitionProvider storeGroup.AddPurchaseReturnNotePermission(); storeGroup.AddPutawayNotePermission(); storeGroup.AddMaterialRequestPermission(); - storeGroup.AddInjectionRequestPermission(); + storeGroup.AddInjectionIssueRequestPermission(); storeGroup.AddAssembleIssueRequestsPermission(); storeGroup.AddThirdLocationRequestPermission(); storeGroup.AddContainerRequestPermission(); storeGroup.AddIssueNotePermission(); - storeGroup.AddInjectionNotePermission(); - storeGroup.AddAssembleNotePermission(); + storeGroup.AddInjectionIssueNotePermission(); + storeGroup.AddAssembleIssueNotePermission(); storeGroup.AddThirdLocationNotePermission(); storeGroup.AddContainerNotePermission(); storeGroup.AddUnplannedReceiptNotePermission(); @@ -99,9 +99,9 @@ public class StorePermissionDefinitionProvider : PermissionDefinitionProvider storeGroup.AddInspectJobPermission(); storeGroup.AddPutawayJobPermission(); storeGroup.AddIssueJobPermission(); - storeGroup.AddInjectionJobPermission(); + storeGroup.AddInjectionIssueJobPermission(); storeGroup.AddCoatingIssueJobPermission(); - storeGroup.AddAssembleJobPermission(); + storeGroup.AddAssembleIssueJobPermission(); storeGroup.AddThirdLocationJobPermission(); storeGroup.AddContainerJobPermission(); storeGroup.AddDeliverJobPermission(); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestDTO.cs similarity index 88% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDTO.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestDTO.cs index 6926849da..b15802513 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestDTO.cs @@ -3,7 +3,7 @@ using Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests; -public class CoatingMaterialRequestDTO : SfsStoreRequestDTOBase, IHasNumber +public class CoatingIssueRequestDTO : SfsStoreRequestDTOBase, IHasNumber { /// /// 叫料类型 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestDetailDTO.cs similarity index 94% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailDTO.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestDetailDTO.cs index f1caa1b83..1a60286f0 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestDetailDTO.cs @@ -7,7 +7,7 @@ using Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests; -public class CoatingMaterialRequestDetailDTO : SfsStoreDetailWithQtyDTOBase +public class CoatingIssueRequestDetailDTO : SfsStoreDetailWithQtyDTOBase { /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestDetailInput.cs similarity index 96% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestDetailInput.cs index 9ffc4ca40..fbb5165b3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestDetailInput.cs @@ -6,7 +6,7 @@ using Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests; -public class CoatingMaterialRequestDetailInput : SfsStoreDetailWithQtyInputBase +public class CoatingIssueRequestDetailInput : SfsStoreDetailWithQtyInputBase { #region 目标库位信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestEditInput.cs similarity index 76% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestEditInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestEditInput.cs index ab7e554b1..e6f879431 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestEditInput.cs @@ -5,7 +5,7 @@ using Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests; -public class CoatingMaterialRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase +public class CoatingIssueRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase { #region Base @@ -25,7 +25,7 @@ public class CoatingMaterialRequestEditInput : SfsStoreRequestCreateOrUpdateInpu /// 明细列表 /// [Display(Name = "明细列表")] - public List Details { get; set; } = new List(); + public List Details { get; set; } = new List(); #endregion #region Create diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestImportInput.cs similarity index 95% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestImportInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestImportInput.cs index 345975e85..097ed69be 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestImportInput.cs @@ -6,7 +6,7 @@ using Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests; [Display(Name = "叫料申请")] -public class CoatingMaterialRequestImportInput : SfsStoreImportInputBase +public class CoatingIssueRequestImportInput : SfsStoreImportInputBase { /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestPermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestPermissions.cs similarity index 84% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestPermissions.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestPermissions.cs index 6c4b538a1..684172de3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestPermissions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/CoatingIssueRequestPermissions.cs @@ -3,10 +3,10 @@ using Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests; -public static class CoatingMaterialRequestPermissions +public static class CoatingIssueRequestPermissions { - public const string Default = StorePermissions.GroupName + "." + nameof(CoatingMaterialRequest); + public const string Default = StorePermissions.GroupName + "." + nameof(CoatingIssueRequest); public const string Create = Default + "." + StorePermissions.CreateStr; public const string Update = Default + "." + StorePermissions.UpdateStr; public const string Delete = Default + "." + StorePermissions.DeleteStr; @@ -14,9 +14,9 @@ public static class CoatingMaterialRequestPermissions //自动叫料申请 public const string AutoMaterialRequest = StorePermissions.GroupName + "." + nameof(AutoMaterialRequest); - public static void AddCoatingMaterialRequestPermission(this PermissionGroupDefinition permissionGroup) + public static void AddCoatingIssueRequestPermission(this PermissionGroupDefinition permissionGroup) { - var MaterialRequestPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(CoatingMaterialRequest))); + var MaterialRequestPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(CoatingIssueRequest))); MaterialRequestPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); MaterialRequestPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); MaterialRequestPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/ICoatingIssueRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/ICoatingIssueRequestAppService.cs new file mode 100644 index 000000000..ac9f958ff --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingIssueRequests/ICoatingIssueRequestAppService.cs @@ -0,0 +1,15 @@ +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; +using Win_in.Sfs.Wms.Store.Application.Contracts; + +namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests; + +public interface ICoatingIssueRequestAppService + : ISfsStoreRequestMasterAppServiceBase + +{ + Task CreateAndHandleAsync(CoatingIssueRequestEditInput input); + +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs deleted file mode 100644 index 98d1ce710..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using Volo.Abp.Application.Dtos; -using Win_in.Sfs.Wms.Store.Application.Contracts; - -namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests; - -public interface ICoatingMaterialRequestAppService - : ISfsStoreRequestMasterAppServiceBase - -{ - Task CreateAndHandleAsync(CoatingMaterialRequestEditInput input); - -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/DTOs/InjectionRequestDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/DTOs/InjectionIssueRequestDTO.cs similarity index 88% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/DTOs/InjectionRequestDTO.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/DTOs/InjectionIssueRequestDTO.cs index eec1cf4c4..fd24d8341 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/DTOs/InjectionRequestDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/DTOs/InjectionIssueRequestDTO.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class InjectionRequestDTO : SfsStoreRequestDTOBase, IHasNumber +public class InjectionIssueRequestDTO : SfsStoreRequestDTOBase, IHasNumber { /// /// 叫料类型 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/DTOs/InjectionRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/DTOs/InjectionIssueRequestDetailDTO.cs similarity index 94% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/DTOs/InjectionRequestDetailDTO.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/DTOs/InjectionIssueRequestDetailDTO.cs index 0800a8476..13c1f6bc0 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/DTOs/InjectionRequestDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/DTOs/InjectionIssueRequestDetailDTO.cs @@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class InjectionRequestDetailDTO : SfsStoreDetailWithQtyDTOBase +public class InjectionIssueRequestDetailDTO : SfsStoreDetailWithQtyDTOBase { /// /// 已发数量 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/IInjectionIssueRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/IInjectionIssueRequestAppService.cs new file mode 100644 index 000000000..2ddf7b647 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/IInjectionIssueRequestAppService.cs @@ -0,0 +1,13 @@ +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public interface IInjectionIssueRequestAppService + : ISfsStoreRequestMasterAppServiceBase + +{ + Task CreateAndHandleAsync(InjectionIssueRequestEditInput input); +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/InjectionIssueRequestPermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/InjectionIssueRequestPermissions.cs new file mode 100644 index 000000000..58491600a --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/InjectionIssueRequestPermissions.cs @@ -0,0 +1,27 @@ +using Volo.Abp.Authorization.Permissions; +using Win_in.Sfs.Wms.Store.Domain; + +namespace Win_in.Sfs.Wms.Store.Application.Contracts; + +public static class InjectionIssueRequestPermissions +{ + + public const string Default = StorePermissions.GroupName + "." + nameof(InjectionIssueRequest); + public const string Create = Default + "." + StorePermissions.CreateStr; + public const string Update = Default + "." + StorePermissions.UpdateStr; + public const string Delete = Default + "." + StorePermissions.DeleteStr; + + //自动叫料申请 + public const string AutoInjectionIssueRequest = StorePermissions.GroupName + "." + nameof(AutoInjectionIssueRequest); + + public static void AddInjectionIssueRequestPermission(this PermissionGroupDefinition permissionGroup) + { + var InjectionIssueRequestPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionIssueRequest))); + InjectionIssueRequestPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); + InjectionIssueRequestPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); + InjectionIssueRequestPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); + + permissionGroup.AddPermission(AutoInjectionIssueRequest, StorePermissionDefinitionProvider.L(nameof(AutoInjectionIssueRequest))); + + } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/Inputs/InjectionRequestDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/Inputs/InjectionIssueRequestDetailInput.cs similarity index 96% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/Inputs/InjectionRequestDetailInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/Inputs/InjectionIssueRequestDetailInput.cs index 47401acc8..5eae5606d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/Inputs/InjectionRequestDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/Inputs/InjectionIssueRequestDetailInput.cs @@ -5,7 +5,7 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class InjectionRequestDetailInput : SfsStoreDetailWithQtyInputBase +public class InjectionIssueRequestDetailInput : SfsStoreDetailWithQtyInputBase { #region 目标库位信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/Inputs/InjectionRequestEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/Inputs/InjectionIssueRequestEditInput.cs similarity index 75% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/Inputs/InjectionRequestEditInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/Inputs/InjectionIssueRequestEditInput.cs index 9228ec8ea..850f3ee63 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/Inputs/InjectionRequestEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/Inputs/InjectionIssueRequestEditInput.cs @@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain; namespace Win_in.Sfs.Wms.Store.Application.Contracts; -public class InjectionRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase +public class InjectionIssueRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase { #region Base @@ -24,7 +24,7 @@ public class InjectionRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase /// 明细列表 /// [Display(Name = "明细列表")] - public List Details { get; set; } = new List(); + public List Details { get; set; } = new List(); #endregion #region Create diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/Inputs/InjectionRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/Inputs/InjectionIssueRequestImportInput.cs similarity index 94% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/Inputs/InjectionRequestImportInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/Inputs/InjectionIssueRequestImportInput.cs index e661693ef..cca7cf5eb 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/Inputs/InjectionRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionIssueRequests/Inputs/InjectionIssueRequestImportInput.cs @@ -5,7 +5,7 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Application.Contracts; [Display(Name = "叫料申请")] -public class InjectionRequestImportInput : SfsStoreImportInputBase +public class InjectionIssueRequestImportInput : SfsStoreImportInputBase { /// /// 叫料类型 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/IInjectionRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/IInjectionRequestAppService.cs deleted file mode 100644 index ac46f98ef..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/IInjectionRequestAppService.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using Volo.Abp.Application.Dtos; - -namespace Win_in.Sfs.Wms.Store.Application.Contracts; - -public interface IInjectionRequestAppService - : ISfsStoreRequestMasterAppServiceBase - -{ - Task CreateAndHandleAsync(InjectionRequestEditInput input); -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/InjectionRequestPermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/InjectionRequestPermissions.cs deleted file mode 100644 index 1757aaada..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/InjectionRequests/InjectionRequestPermissions.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Volo.Abp.Authorization.Permissions; -using Win_in.Sfs.Wms.Store.Domain; - -namespace Win_in.Sfs.Wms.Store.Application.Contracts; - -public static class InjectionRequestPermissions -{ - - public const string Default = StorePermissions.GroupName + "." + nameof(InjectionRequest); - public const string Create = Default + "." + StorePermissions.CreateStr; - public const string Update = Default + "." + StorePermissions.UpdateStr; - public const string Delete = Default + "." + StorePermissions.DeleteStr; - - //自动叫料申请 - public const string AutoInjectionRequest = StorePermissions.GroupName + "." + nameof(AutoInjectionRequest); - - public static void AddInjectionRequestPermission(this PermissionGroupDefinition permissionGroup) - { - var InjectionRequestPermission = permissionGroup.AddPermission(Default, StorePermissionDefinitionProvider.L(nameof(InjectionRequest))); - InjectionRequestPermission.AddChild(Create, StorePermissionDefinitionProvider.L(StorePermissions.CreateStr)); - InjectionRequestPermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); - InjectionRequestPermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); - - permissionGroup.AddPermission(AutoInjectionRequest, StorePermissionDefinitionProvider.L(nameof(AutoInjectionRequest))); - - } -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/DTOs/MaterialRequestDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/MaterialRequests/DTOs/MaterialRequestDTO.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/DTOs/MaterialRequestDTO.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/MaterialRequests/DTOs/MaterialRequestDTO.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/DTOs/MaterialRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/MaterialRequests/DTOs/MaterialRequestDetailDTO.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/DTOs/MaterialRequestDetailDTO.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/MaterialRequests/DTOs/MaterialRequestDetailDTO.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/IMaterialRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/MaterialRequests/IMaterialRequestAppService.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/IMaterialRequestAppService.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/MaterialRequests/IMaterialRequestAppService.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/MaterialRequestDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/MaterialRequests/Inputs/MaterialRequestDetailInput.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/MaterialRequestDetailInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/MaterialRequests/Inputs/MaterialRequestDetailInput.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/MaterialRequestEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/MaterialRequests/Inputs/MaterialRequestEditInput.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/MaterialRequestEditInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/MaterialRequests/Inputs/MaterialRequestEditInput.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/MaterialRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/MaterialRequests/Inputs/MaterialRequestImportInput.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/MaterialRequestImportInput.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/MaterialRequests/Inputs/MaterialRequestImportInput.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/MaterialRequestPermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/MaterialRequests/MaterialRequestPermissions.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/MaterialRequestPermissions.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/MaterialRequests/MaterialRequestPermissions.cs 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/AssembleIssueJobs/AssembleIssueJobAppService.cs similarity index 90% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleJobs/AssembleJobAppService.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs index 1a1a6edc9..5d025c921 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/AssembleIssueJobs/AssembleIssueJobAppService.cs @@ -23,17 +23,17 @@ namespace Win_in.Sfs.Wms.Store.Application; [Authorize] [Route($"{StoreConsts.RootPath}assemble-job")] -public class AssembleJobAppService - : SfsJobAppServiceBase, - IAssembleJobAppService, ITransferLibCallback +public class AssembleIssueJobAppService + : SfsJobAppServiceBase, + IAssembleIssueJobAppService, ITransferLibCallback { - private readonly IAssembleJobManager _assembleJobManager; + private readonly IAssembleIssueJobManager _assembleJobManager; private readonly ILocationAppService _locationAppService; private readonly ITransferLibJobAppService _transferLibJobAppService; - public AssembleJobAppService( - IAssembleJobRepository repository, IAssembleJobManager assembleJobManager, + public AssembleIssueJobAppService( + IAssembleIssueJobRepository repository, IAssembleIssueJobManager assembleJobManager, ILocationAppService locationAppService, ITransferLibJobAppService transferLibJobAppService) : base(repository, assembleJobManager) { _assembleJobManager = assembleJobManager; @@ -42,7 +42,7 @@ public class AssembleJobAppService } [HttpPost("add-many")] - public override async Task> CreateManyAsync(List inputs) + public override async Task> CreateManyAsync(List inputs) { foreach (var input in inputs) { @@ -53,7 +53,7 @@ public class AssembleJobAppService } [HttpPost("")] - public override async Task CreateAsync(AssembleJobEditInput input) + public override async Task CreateAsync(AssembleIssueJobEditInput input) { await CheckMinRowAndSetStatusAsync(input).ConfigureAwait(false); @@ -65,7 +65,7 @@ public class AssembleJobAppService /// /// /// - private async Task CheckMinRowAndSetStatusAsync(AssembleJobEditInput input) + private async Task CheckMinRowAndSetStatusAsync(AssembleIssueJobEditInput input) { var jobDetailInputdetail = input.Details.FirstOrDefault(); @@ -130,11 +130,11 @@ public class AssembleJobAppService } [HttpPost("by-request-number/{requestNumber}")] - public virtual async Task> GetByRequestNumberAsync(string requestNumber) + public virtual async Task> GetByRequestNumberAsync(string requestNumber) { var entitys = await _repository.GetListAsync(p => p.AssembleRequestNumber == requestNumber) .ConfigureAwait(false); - return ObjectMapper.Map, List>(entitys); + return ObjectMapper.Map, List>(entitys); } [HttpPost("Do-Call-Back")] diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleJobs/AssembleJobAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAutoMapperProfile.cs similarity index 60% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleJobs/AssembleJobAutoMapperProfile.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAutoMapperProfile.cs index d60824554..216f451be 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleJobs/AssembleJobAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAutoMapperProfile.cs @@ -7,18 +7,18 @@ namespace Win_in.Sfs.Wms.Store.Application; public partial class StoreApplicationAutoMapperProfile : Profile { - private void AssembleJobAutoMapperProfile() + private void AssembleIssueJobAutoMapperProfile() { - CreateMap() + CreateMap() .ReverseMap(); - CreateMap() + CreateMap() ; - CreateMap() + CreateMap() ; - CreateMap() + CreateMap() .IgnoreAuditedObjectProperties() .Ignore(x => x.MasterID) .Ignore(x => x.TenantId) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionJobs/InjectionJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs similarity index 89% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionJobs/InjectionJobAppService.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs index 684a017e5..7a599cb67 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionJobs/InjectionJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs @@ -23,17 +23,17 @@ namespace Win_in.Sfs.Wms.Store.Application; [Authorize] [Route($"{StoreConsts.RootPath}injection-job")] -public class InjectionJobAppService - : SfsJobAppServiceBase, - IInjectionJobAppService, ITransferLibCallback +public class InjectionIssueJobAppService + : SfsJobAppServiceBase, + IInjectionIssueJobAppService, ITransferLibCallback { - private readonly IInjectionJobManager _injectionJobManager; + private readonly IInjectionIssueJobManager _injectionJobManager; private readonly ILocationAppService _locationAppService; private readonly ITransferLibJobAppService _transferLibJobAppService; - public InjectionJobAppService( - IInjectionJobRepository repository, IInjectionJobManager injectionJobManager, + public InjectionIssueJobAppService( + IInjectionIssueJobRepository repository, IInjectionIssueJobManager injectionJobManager, ILocationAppService locationAppService, ITransferLibJobAppService transferLibJobAppService) : base(repository, injectionJobManager) { _injectionJobManager = injectionJobManager; @@ -42,7 +42,7 @@ public class InjectionJobAppService } [HttpPost("add-many")] - public override async Task> CreateManyAsync(List inputs) + public override async Task> CreateManyAsync(List inputs) { foreach (var input in inputs) { @@ -53,7 +53,7 @@ public class InjectionJobAppService } [HttpPost("")] - public override async Task CreateAsync(InjectionJobEditInput input) + public override async Task CreateAsync(InjectionIssueJobEditInput input) { await CheckMinRowAndSetStatusAsync(input).ConfigureAwait(false); @@ -65,7 +65,7 @@ public class InjectionJobAppService /// /// /// - private async Task CheckMinRowAndSetStatusAsync(InjectionJobEditInput input) + private async Task CheckMinRowAndSetStatusAsync(InjectionIssueJobEditInput input) { var jobDetailInputdetail = input.Details.FirstOrDefault(); @@ -109,7 +109,7 @@ public class InjectionJobAppService [HttpPost("cancel-by-request/{injectionNumber}")] public virtual async Task CancelByMaterialRequestAsync(string injectionNumber) { - var entities = await _repository.GetListAsync(p => p.InjectionRequestNumber == injectionNumber) + var entities = await _repository.GetListAsync(p => p.InjectionIssueRequestNumber == injectionNumber) .ConfigureAwait(false); foreach (var entity in entities) { @@ -130,11 +130,11 @@ public class InjectionJobAppService } [HttpPost("by-request-number/{requestNumber}")] - public virtual async Task> GetByRequestNumberAsync(string requestNumber) + public virtual async Task> GetByRequestNumberAsync(string requestNumber) { - var entitys = await _repository.GetListAsync(p => p.InjectionRequestNumber == requestNumber) + var entitys = await _repository.GetListAsync(p => p.InjectionIssueRequestNumber == requestNumber) .ConfigureAwait(false); - return ObjectMapper.Map, List>(entitys); + return ObjectMapper.Map, List>(entitys); } [HttpPost("Do-Call-Back")] diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionJobs/InjectionJobAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAutoMapperProfile.cs similarity index 55% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionJobs/InjectionJobAutoMapperProfile.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAutoMapperProfile.cs index 883f77001..07a46c906 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionJobs/InjectionJobAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAutoMapperProfile.cs @@ -7,20 +7,20 @@ namespace Win_in.Sfs.Wms.Store.Application; public partial class StoreApplicationAutoMapperProfile : Profile { - private void InjectionJobAutoMapperProfile() + private void InjectionIssueJobAutoMapperProfile() { - CreateMap() + CreateMap() .ReverseMap(); - //CreateMap(); + //CreateMap(); - CreateMap() + CreateMap() ; - CreateMap() + CreateMap() ; - CreateMap() + CreateMap() .IgnoreAuditedObjectProperties() .Ignore(x => x.MasterID) .Ignore(x => x.TenantId) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/AssembleNotes/AssembleNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteAppService.cs similarity index 59% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/AssembleNotes/AssembleNoteAppService.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteAppService.cs index 32675638b..cfa6a3cc2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/AssembleNotes/AssembleNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteAppService.cs @@ -19,28 +19,28 @@ namespace Win_in.Sfs.Wms.Store.Application; [Authorize] [Route($"{StoreConsts.RootPath}assemble-note")] -public class AssembleNoteAppService : - SfsStoreWithDetailsAppServiceBase, - IAssembleNoteAppService +public class AssembleIssueNoteAppService : + SfsStoreWithDetailsAppServiceBase, + IAssembleIssueNoteAppService { - private readonly IAssembleNoteManager _assembleNoteManager; + private readonly IAssembleIssueNoteManager _assembleNoteManager; - public AssembleNoteAppService( - IAssembleNoteRepository repository, - IAssembleNoteManager assembleNoteManager + public AssembleIssueNoteAppService( + IAssembleIssueNoteRepository repository, + IAssembleIssueNoteManager assembleNoteManager ) : base(repository) { _assembleNoteManager = assembleNoteManager; } [HttpPost("")] - //[Authorize(AssembleNotePermissions.Create)] - public override async Task CreateAsync(AssembleNoteEditInput input) + //[Authorize(AssembleIssueNotePermissions.Create)] + public override async Task CreateAsync(AssembleIssueNoteEditInput input) { - var entity = ObjectMapper.Map(input); + var entity = ObjectMapper.Map(input); await _assembleNoteManager.CreateAsync(entity).ConfigureAwait(false); - var dto = ObjectMapper.Map(entity); + var dto = ObjectMapper.Map(entity); return dto; } @@ -50,22 +50,22 @@ public class AssembleNoteAppService : /// /// [HttpPost("confirm/{id}")] - public virtual async Task ConfirmAsync(Guid id) + public virtual async Task ConfirmAsync(Guid id) { var assembleNote= await _repository.GetAsync(id).ConfigureAwait(false); assembleNote.Confirmed = true; assembleNote=await _repository.UpdateAsync(assembleNote).ConfigureAwait(false); - await LocalEventBus.PublishAsync(new SfsConfirmedEntityEventData(assembleNote), false).ConfigureAwait(false); - return ObjectMapper.Map(assembleNote); + await LocalEventBus.PublishAsync(new SfsConfirmedEntityEventData(assembleNote), false).ConfigureAwait(false); + return ObjectMapper.Map(assembleNote); } [HttpPost("confirm-by-number/{number}")] - public virtual async Task ConfirmAsync(string number) + public virtual async Task ConfirmAsync(string number) { var entity = await _repository.FindAsync(p => p.Number == number).ConfigureAwait(false); - Check.NotNull(entity, nameof(AssembleNote)); + Check.NotNull(entity, nameof(AssembleIssueNote)); var result = await _assembleNoteManager.ConfirmAsync(entity.Id).ConfigureAwait(false); - var dto = ObjectMapper.Map(result); + var dto = ObjectMapper.Map(result); return dto; } /// @@ -81,13 +81,13 @@ public class AssembleNoteAppService : /// /// [HttpPost("by-type/{requestType}")] - public virtual async Task> GetListByTypeAsync(SfsStoreRequestInputBase requestInput, + public virtual async Task> GetListByTypeAsync(SfsStoreRequestInputBase requestInput, string requestType, bool includeDetails = false, CancellationToken cancellationToken = default) { - Expression> expression = p => p.RequestType == requestType; + Expression> expression = p => p.RequestType == requestType; if (requestInput.Condition.Filters?.Count > 0) { - expression = expression.And(requestInput.Condition.Filters.ToLambda()); + expression = expression.And(requestInput.Condition.Filters.ToLambda()); } return await GetPagedListAsync(expression, requestInput.SkipCount, requestInput.MaxResultCount, @@ -95,12 +95,12 @@ public class AssembleNoteAppService : } [HttpGet("list/un-confirmed/{requestType}")] - public virtual async Task> GetListUnConfirmedByTypeAsync(string requestType) + public virtual async Task> GetListUnConfirmedByTypeAsync(string requestType) { var entities = await _repository.GetListAsync(c => !c.Confirmed && c.RequestType == requestType) .ConfigureAwait(false); - var dtos = ObjectMapper.Map, List>(entities); + var dtos = ObjectMapper.Map, List>(entities); return dtos; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/InjectionNotes/InjectionNoteAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteAutoMapperProfile.cs similarity index 66% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/InjectionNotes/InjectionNoteAutoMapperProfile.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteAutoMapperProfile.cs index 937b4edcb..209ba72b6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/InjectionNotes/InjectionNoteAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteAutoMapperProfile.cs @@ -7,21 +7,21 @@ namespace Win_in.Sfs.Wms.Store.Application; public partial class StoreApplicationAutoMapperProfile : Profile { - private void InjectionNoteAutoMapperProfile() + private void AssembleIssueNoteAutoMapperProfile() { - CreateMap() + CreateMap() .ReverseMap(); - CreateMap(); + CreateMap(); - CreateMap() + CreateMap() .IgnoreAuditedObjectProperties() .Ignore(x => x.MasterID) .Ignore(x => x.TenantId) .Ignore(x => x.Number) .Ignore(x => x.Id); - CreateMap() + CreateMap() .IgnoreAuditedObjectProperties() .Ignore(x => x.TenantId) .Ignore(x => x.Number) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/InjectionNotes/InjectionNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteAppService.cs similarity index 59% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/InjectionNotes/InjectionNoteAppService.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteAppService.cs index c4bad1cfb..e172732a7 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/InjectionNotes/InjectionNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteAppService.cs @@ -19,28 +19,28 @@ namespace Win_in.Sfs.Wms.Store.Application; [Authorize] [Route($"{StoreConsts.RootPath}injection-note")] -public class InjectionNoteAppService : - SfsStoreWithDetailsAppServiceBase, - IInjectionNoteAppService +public class InjectionIssueNoteAppService : + SfsStoreWithDetailsAppServiceBase, + IInjectionIssueNoteAppService { - private readonly IInjectionNoteManager _injectionNoteManager; + private readonly IInjectionIssueNoteManager _injectionNoteManager; - public InjectionNoteAppService( - IInjectionNoteRepository repository, - IInjectionNoteManager injectionNoteManager + public InjectionIssueNoteAppService( + IInjectionIssueNoteRepository repository, + IInjectionIssueNoteManager injectionNoteManager ) : base(repository) { _injectionNoteManager = injectionNoteManager; } [HttpPost("")] - //[Authorize(InjectionNotePermissions.Create)] - public override async Task CreateAsync(InjectionNoteEditInput input) + //[Authorize(InjectionIssueNotePermissions.Create)] + public override async Task CreateAsync(InjectionIssueNoteEditInput input) { - var entity = ObjectMapper.Map(input); + var entity = ObjectMapper.Map(input); await _injectionNoteManager.CreateAsync(entity).ConfigureAwait(false); - var dto = ObjectMapper.Map(entity); + var dto = ObjectMapper.Map(entity); return dto; } @@ -50,22 +50,22 @@ public class InjectionNoteAppService : /// /// [HttpPost("confirm/{id}")] - public virtual async Task ConfirmAsync(Guid id) + public virtual async Task ConfirmAsync(Guid id) { var injectionNote= await _repository.GetAsync(id).ConfigureAwait(false); injectionNote.Confirmed = true; injectionNote=await _repository.UpdateAsync(injectionNote).ConfigureAwait(false); - await LocalEventBus.PublishAsync(new SfsConfirmedEntityEventData(injectionNote), false).ConfigureAwait(false); - return ObjectMapper.Map(injectionNote); + await LocalEventBus.PublishAsync(new SfsConfirmedEntityEventData(injectionNote), false).ConfigureAwait(false); + return ObjectMapper.Map(injectionNote); } [HttpPost("confirm-by-number/{number}")] - public virtual async Task ConfirmAsync(string number) + public virtual async Task ConfirmAsync(string number) { var entity = await _repository.FindAsync(p => p.Number == number).ConfigureAwait(false); - Check.NotNull(entity, nameof(InjectionNote)); + Check.NotNull(entity, nameof(InjectionIssueNote)); var result = await _injectionNoteManager.ConfirmAsync(entity.Id).ConfigureAwait(false); - var dto = ObjectMapper.Map(result); + var dto = ObjectMapper.Map(result); return dto; } /// @@ -81,13 +81,13 @@ public class InjectionNoteAppService : /// /// [HttpPost("by-type/{requestType}")] - public virtual async Task> GetListByTypeAsync(SfsStoreRequestInputBase requestInput, + public virtual async Task> GetListByTypeAsync(SfsStoreRequestInputBase requestInput, string requestType, bool includeDetails = false, CancellationToken cancellationToken = default) { - Expression> expression = p => p.RequestType == requestType; + Expression> expression = p => p.RequestType == requestType; if (requestInput.Condition.Filters?.Count > 0) { - expression = expression.And(requestInput.Condition.Filters.ToLambda()); + expression = expression.And(requestInput.Condition.Filters.ToLambda()); } return await GetPagedListAsync(expression, requestInput.SkipCount, requestInput.MaxResultCount, @@ -95,12 +95,12 @@ public class InjectionNoteAppService : } [HttpGet("list/un-confirmed/{requestType}")] - public virtual async Task> GetListUnConfirmedByTypeAsync(string requestType) + public virtual async Task> GetListUnConfirmedByTypeAsync(string requestType) { var entities = await _repository.GetListAsync(c => !c.Confirmed && c.RequestType == requestType) .ConfigureAwait(false); - var dtos = ObjectMapper.Map, List>(entities); + var dtos = ObjectMapper.Map, List>(entities); return dtos; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/AssembleNotes/AssembleNoteAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteAutoMapperProfile.cs similarity index 65% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/AssembleNotes/AssembleNoteAutoMapperProfile.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteAutoMapperProfile.cs index 04a6875d3..2df9caffe 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/AssembleNotes/AssembleNoteAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteAutoMapperProfile.cs @@ -7,21 +7,21 @@ namespace Win_in.Sfs.Wms.Store.Application; public partial class StoreApplicationAutoMapperProfile : Profile { - private void AssembleNoteAutoMapperProfile() + private void InjectionIssueNoteAutoMapperProfile() { - CreateMap() + CreateMap() .ReverseMap(); - CreateMap(); + CreateMap(); - CreateMap() + CreateMap() .IgnoreAuditedObjectProperties() .Ignore(x => x.MasterID) .Ignore(x => x.TenantId) .Ignore(x => x.Number) .Ignore(x => x.Id); - CreateMap() + CreateMap() .IgnoreAuditedObjectProperties() .Ignore(x => x.TenantId) .Ignore(x => x.Number) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/AssembleIssueRequests/AssembleIssueRequestsAppService.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsAppService.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/AssembleIssueRequests/AssembleIssueRequestsAppService.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/AssembleIssueRequests/AssembleIssueRequestsAutoMapperProfile.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsAutoMapperProfile.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/AssembleIssueRequests/AssembleIssueRequestsAutoMapperProfile.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/CoatingIssueRequests/CoatingIssueRequestAppService.cs similarity index 86% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAppService.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/CoatingIssueRequests/CoatingIssueRequestAppService.cs index 8fe68a699..adb249fb6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/CoatingIssueRequests/CoatingIssueRequestAppService.cs @@ -32,12 +32,12 @@ namespace Win_in.Sfs.Wms.Store.Application; /// [Authorize] [Route($"{StoreConsts.RootPath}coating-request")] -public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase, - ICoatingMaterialRequestAppService +public class CoatingIssueRequestAppService : SfsStoreRequestAppServiceBase, + ICoatingIssueRequestAppService { - private readonly ICoatingMaterialRequestManager _coatingMaterialRequestManager; + private readonly ICoatingIssueRequestManager _coatingMaterialRequestManager; private readonly IItemStoreRelationAppService _itemStoreRelationApp; private readonly IAreaAppService _areaApp; private readonly ILocationAppService _locationAppService; @@ -45,9 +45,9 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase HandleAsync(Guid id) + public override async Task HandleAsync(Guid id) { await Task.CompletedTask.ConfigureAwait(false); return null; } [HttpPost("")] - public override async Task CreateAsync(CoatingMaterialRequestEditInput input) + public override async Task CreateAsync(CoatingIssueRequestEditInput input) { foreach (var item in input.Details) { @@ -113,11 +113,11 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase(input); + var entity = ObjectMapper.Map(input); var result = await _coatingMaterialRequestManager.CreateByNumberAsync(entity).ConfigureAwait(false); - var dto = ObjectMapper.Map(result); + var dto = ObjectMapper.Map(result); return dto; } @@ -127,7 +127,7 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase /// /// - private async Task SetRequestAutoPropertiesAsync(CoatingMaterialRequestEditInput entity) + private async Task SetRequestAutoPropertiesAsync(CoatingIssueRequestEditInput entity) { var tranType = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None).ConfigureAwait(false); Check.NotNull(tranType, "事务类型", "事务类型不存在"); @@ -139,7 +139,7 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase CreateAndHandleAsync(CoatingMaterialRequestEditInput input) + public async Task CreateAndHandleAsync(CoatingIssueRequestEditInput input) { var coatingMaterialRequestDto = await CreateAsync(input).ConfigureAwait(false); @@ -157,8 +157,8 @@ public class CoatingMaterialRequestAppService : 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); @@ -200,7 +200,7 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase /// /// - protected override async Task ValidateImportModelAsync(CoatingMaterialRequestImportInput model, + protected override async Task ValidateImportModelAsync(CoatingIssueRequestImportInput model, List validationRresult) { _ = new Dictionary(); @@ -214,7 +214,7 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase ValidateImportEntities(Dictionary dict) + protected override async Task ValidateImportEntities(Dictionary dict) { foreach (var entity in dict.Keys) { @@ -233,7 +233,7 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase validationRresult) { var area = await _areaApp.GetByCodeAsync(importInput.FromLocationArea).ConfigureAwait(false); @@ -243,7 +243,7 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase validationRresult) { var itemStoreRelation = await _itemStoreRelationApp @@ -276,7 +276,7 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase CheckItemBasicAsync(CoatingMaterialRequestImportInput importInput, + protected async Task CheckItemBasicAsync(CoatingIssueRequestImportInput importInput, List validationRresult) { var item = await _itemBasicAppService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false); @@ -293,7 +293,7 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase CheckLocationAsync(CoatingMaterialRequestImportInput importInput, + protected async Task CheckLocationAsync(CoatingIssueRequestImportInput importInput, List validationRresult) { var location = await _locationAppService.GetByCodeAsync(importInput.ToLocationCode).ConfigureAwait(false); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/CoatingIssueRequests/CoatingIssueRequestAutoMapperProfile.cs similarity index 79% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAutoMapperProfile.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/CoatingIssueRequests/CoatingIssueRequestAutoMapperProfile.cs index 4e519ec6e..9dd74e917 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/CoatingIssueRequests/CoatingIssueRequestAutoMapperProfile.cs @@ -9,22 +9,22 @@ namespace Win_in.Sfs.Wms.Store.Application; public partial class StoreApplicationAutoMapperProfile : Profile { - private void CoatingMaterialRequestAutoMapperProfile() + private void CoatingIssueRequestAutoMapperProfile() { - 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) @@ -38,7 +38,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) @@ -59,7 +59,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/Requests/MaterialRequests/InjectionRequests/InjectionRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs similarity index 86% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/InjectionRequests/InjectionRequestAppService.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs index 326324c3a..fe679a2f7 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/InjectionRequests/InjectionRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs @@ -31,12 +31,12 @@ namespace Win_in.Sfs.Wms.Store.Application; /// [Authorize] [Route($"{StoreConsts.RootPath}injection-request")] -public class InjectionRequestAppService : SfsStoreRequestAppServiceBase, - IInjectionRequestAppService +public class InjectionIssueRequestAppService : SfsStoreRequestAppServiceBase, + IInjectionIssueRequestAppService { - private readonly IInjectionRequestManager _injectionRequestManager; + private readonly IInjectionIssueRequestManager _injectionRequestManager; private readonly IItemStoreRelationAppService _itemStoreRelationApp; private readonly IAreaAppService _areaApp; private readonly ILocationAppService _locationAppService; @@ -45,9 +45,9 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase HandleAsync(Guid id) + public override async Task HandleAsync(Guid id) { await Task.CompletedTask.ConfigureAwait(false); return null; } [HttpPost("")] - public override async Task CreateAsync(InjectionRequestEditInput input) + public override async Task CreateAsync(InjectionIssueRequestEditInput input) { foreach (var item in input.Details) { @@ -114,11 +114,11 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase(input); + var entity = ObjectMapper.Map(input); var result = await _injectionRequestManager.CreateByNumberAsync(entity).ConfigureAwait(false); - var dto = ObjectMapper.Map(result); + var dto = ObjectMapper.Map(result); return dto; } @@ -128,7 +128,7 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase /// /// - private async Task SetRequestAutoPropertiesAsync(InjectionRequestEditInput entity) + private async Task SetRequestAutoPropertiesAsync(InjectionIssueRequestEditInput entity) { var tranType = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None).ConfigureAwait(false); Check.NotNull(tranType, "事务类型", "事务类型不存在"); @@ -140,7 +140,7 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase CreateAndHandleAsync(InjectionRequestEditInput input) + public async Task CreateAndHandleAsync(InjectionIssueRequestEditInput input) { var injectionRequestDto = await CreateAsync(input).ConfigureAwait(false); @@ -158,8 +158,8 @@ public class InjectionRequestAppService : 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); @@ -201,7 +201,7 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase /// /// - protected override async Task ValidateImportModelAsync(InjectionRequestImportInput model, + protected override async Task ValidateImportModelAsync(InjectionIssueRequestImportInput model, List validationRresult) { _ = new Dictionary(); @@ -215,7 +215,7 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase ValidateImportEntities(Dictionary dict) + protected override async Task ValidateImportEntities(Dictionary dict) { foreach (var entity in dict.Keys) { @@ -234,7 +234,7 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase validationRresult) { var area = await _areaApp.GetByCodeAsync(importInput.FromLocationArea).ConfigureAwait(false); @@ -244,7 +244,7 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase validationRresult) { var itemStoreRelation = await _itemStoreRelationApp @@ -277,7 +277,7 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase CheckItemBasicAsync(InjectionRequestImportInput importInput, + protected async Task CheckItemBasicAsync(InjectionIssueRequestImportInput importInput, List validationRresult) { var item = await _itemBasicAppService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false); @@ -294,7 +294,7 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase CheckLocationAsync(InjectionRequestImportInput importInput, + protected async Task CheckLocationAsync(InjectionIssueRequestImportInput importInput, List validationRresult) { var location = await _locationAppService.GetByCodeAsync(importInput.ToLocationCode).ConfigureAwait(false); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/InjectionRequests/InjectionRequestAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAutoMapperProfile.cs similarity index 80% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/InjectionRequests/InjectionRequestAutoMapperProfile.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAutoMapperProfile.cs index cdbf56567..b4a66ebf8 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/InjectionRequests/InjectionRequestAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAutoMapperProfile.cs @@ -8,22 +8,22 @@ namespace Win_in.Sfs.Wms.Store.Application; public partial class StoreApplicationAutoMapperProfile : Profile { - private void InjectionRequestAutoMapperProfile() + private void InjectionIssueRequestAutoMapperProfile() { - 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/Requests/MaterialRequests/MaterialRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/MaterialRequests/MaterialRequestAppService.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/MaterialRequestAppService.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/MaterialRequests/MaterialRequestAppService.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/MaterialRequestAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/MaterialRequests/MaterialRequestAutoMapperProfile.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/MaterialRequestAutoMapperProfile.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/MaterialRequests/MaterialRequestAutoMapperProfile.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAppService.cs index 27aa94ea5..1fd3e5d30 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAppService.cs @@ -43,7 +43,7 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase [Display(Name = "装配发料任务")] -public class AssembleJob : SfsJobAggregateRootBase +public class AssembleIssueJob : SfsJobAggregateRootBase { /// /// 叫料请求类型 @@ -41,7 +41,7 @@ public class AssembleJob : SfsJobAggregateRootBase /// 任务明细 /// [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/Jobs/IssueJobs/AssembleJobs/AssembleJobDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobDetail.cs similarity index 99% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/AssembleJobDetail.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobDetail.cs index bba4a3543..fd8a045b0 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/AssembleJobDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobDetail.cs @@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Domain; -public class AssembleJobDetail : SfsDetailEntityBase +public class AssembleIssueJobDetail : SfsDetailEntityBase { #region 库存基础信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/AssembleJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobManager.cs similarity index 87% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/AssembleJobManager.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobManager.cs index 6ece2c54a..043623119 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/AssembleJobManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobManager.cs @@ -12,13 +12,13 @@ using Win_in.Sfs.Wms.Inventory.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Domain; -public class AssembleJobManager : SfsJobManagerBase, IAssembleJobManager +public class AssembleIssueJobManager : SfsJobManagerBase, IAssembleIssueJobManager { private readonly IBalanceAppService _balanceAppService; private readonly IExpectOutAppService _expectOutAppService; - public AssembleJobManager( - IAssembleJobRepository repository, IBalanceAppService balanceAppService, IExpectOutAppService expectOutAppService) : base(repository) + public AssembleIssueJobManager( + IAssembleIssueJobRepository repository, IBalanceAppService balanceAppService, IExpectOutAppService expectOutAppService) : base(repository) { _balanceAppService = balanceAppService; _expectOutAppService = expectOutAppService; @@ -31,7 +31,7 @@ public class AssembleJobManager : SfsJobManagerBase /// /// - public override async Task CompleteAsync(AssembleJob input, ICurrentUser user) + public override async Task CompleteAsync(AssembleIssueJob input, ICurrentUser user) { var entity = await Repository.FindAsync(input.Id).ConfigureAwait(false); @@ -96,24 +96,24 @@ public class AssembleJobManager : SfsJobManagerBase GetAsync(Expression> expression) + public async Task GetAsync(Expression> expression) { return await Repository.FindAsync(expression).ConfigureAwait(false); } #region 无用 - public override Task> GetWorkingListByPackingAsync(string packingCode) + public override Task> GetWorkingListByPackingAsync(string packingCode) { throw new NotImplementedException(); } - public override Task> GetWorkingListByContainerAsync(string containerCode) + public override Task> GetWorkingListByContainerAsync(string containerCode) { throw new NotImplementedException(); } - public override void CheckDetails(AssembleJob entity, AbpValidationResult result) + public override void CheckDetails(AssembleIssueJob entity, AbpValidationResult result) { throw new NotImplementedException(); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/IAssembleIssueJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/IAssembleIssueJobManager.cs new file mode 100644 index 000000000..8ae5fe5dd --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/IAssembleIssueJobManager.cs @@ -0,0 +1,10 @@ +using System; +using System.Linq.Expressions; +using System.Threading.Tasks; + +namespace Win_in.Sfs.Wms.Store.Domain; + +public interface IAssembleIssueJobManager : IJobManager +{ + Task GetAsync(Expression> expression); +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/IAssembleIssueJobRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/IAssembleIssueJobRepository.cs new file mode 100644 index 000000000..a5c6709cd --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/IAssembleIssueJobRepository.cs @@ -0,0 +1,6 @@ +namespace Win_in.Sfs.Wms.Store.Domain; + +public interface IAssembleIssueJobRepository : ISfsJobRepositoryBase +{ + +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/IAssembleJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/IAssembleJobManager.cs deleted file mode 100644 index 480cf0cfd..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/IAssembleJobManager.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Linq.Expressions; -using System.Threading.Tasks; - -namespace Win_in.Sfs.Wms.Store.Domain; - -public interface IAssembleJobManager : IJobManager -{ - Task GetAsync(Expression> expression); -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/IAssembleJobRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/IAssembleJobRepository.cs deleted file mode 100644 index 568570c1e..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleJobs/IAssembleJobRepository.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Win_in.Sfs.Wms.Store.Domain; - -public interface IAssembleJobRepository : ISfsJobRepositoryBase -{ - -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/IInjectionIssueJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/IInjectionIssueJobManager.cs new file mode 100644 index 000000000..b2508fc97 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/IInjectionIssueJobManager.cs @@ -0,0 +1,10 @@ +using System; +using System.Linq.Expressions; +using System.Threading.Tasks; + +namespace Win_in.Sfs.Wms.Store.Domain; + +public interface IInjectionIssueJobManager : IJobManager +{ + Task GetAsync(Expression> expression); +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/IInjectionIssueJobRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/IInjectionIssueJobRepository.cs new file mode 100644 index 000000000..2fe887387 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/IInjectionIssueJobRepository.cs @@ -0,0 +1,6 @@ +namespace Win_in.Sfs.Wms.Store.Domain; + +public interface IInjectionIssueJobRepository : ISfsJobRepositoryBase +{ + +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionJobs/InjectionJob.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJob.cs similarity index 77% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionJobs/InjectionJob.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJob.cs index 0e75380e3..44bcd96f8 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionJobs/InjectionJob.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJob.cs @@ -10,7 +10,7 @@ namespace Win_in.Sfs.Wms.Store.Domain; /// 注塑发料任务 /// [Display(Name = "注塑发料任务")] -public class InjectionJob : SfsJobAggregateRootBase +public class InjectionIssueJob : SfsJobAggregateRootBase { /// /// 叫料请求类型 @@ -28,7 +28,7 @@ public class InjectionJob : SfsJobAggregateRootBase /// 注塑要料单号 /// [IgnoreUpdate] - public string InjectionRequestNumber { get; set; } + public string InjectionIssueRequestNumber { get; set; } /// /// 使用在途库 @@ -41,7 +41,7 @@ public class InjectionJob : SfsJobAggregateRootBase /// 任务明细 /// [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/Jobs/IssueJobs/InjectionJobs/InjectionJobDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobDetail.cs similarity index 99% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionJobs/InjectionJobDetail.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobDetail.cs index f5efad789..436d8104e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionJobs/InjectionJobDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobDetail.cs @@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Domain; -public class InjectionJobDetail : SfsDetailEntityBase +public class InjectionIssueJobDetail : SfsDetailEntityBase { #region 库存基础信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionJobs/InjectionJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobManager.cs similarity index 86% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionJobs/InjectionJobManager.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobManager.cs index 8c7956654..7707d2f7a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionJobs/InjectionJobManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobManager.cs @@ -12,13 +12,13 @@ using Win_in.Sfs.Wms.Inventory.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Domain; -public class InjectionJobManager : SfsJobManagerBase, IInjectionJobManager +public class InjectionIssueJobManager : SfsJobManagerBase, IInjectionIssueJobManager { private readonly IBalanceAppService _balanceAppService; private readonly IExpectOutAppService _expectOutAppService; - public InjectionJobManager( - IInjectionJobRepository repository, IBalanceAppService balanceAppService, IExpectOutAppService expectOutAppService) : base(repository) + public InjectionIssueJobManager( + IInjectionIssueJobRepository repository, IBalanceAppService balanceAppService, IExpectOutAppService expectOutAppService) : base(repository) { _balanceAppService = balanceAppService; _expectOutAppService = expectOutAppService; @@ -31,7 +31,7 @@ public class InjectionJobManager : SfsJobManagerBase /// /// - public override async Task CompleteAsync(InjectionJob input, ICurrentUser user) + public override async Task CompleteAsync(InjectionIssueJob input, ICurrentUser user) { var entity = await Repository.FindAsync(input.Id).ConfigureAwait(false); @@ -95,24 +95,24 @@ public class InjectionJobManager : SfsJobManagerBase GetAsync(Expression> expression) + public async Task GetAsync(Expression> expression) { return await Repository.FindAsync(expression).ConfigureAwait(false); } #region 无用 - public override Task> GetWorkingListByPackingAsync(string packingCode) + public override Task> GetWorkingListByPackingAsync(string packingCode) { throw new NotImplementedException(); } - public override Task> GetWorkingListByContainerAsync(string containerCode) + public override Task> GetWorkingListByContainerAsync(string containerCode) { throw new NotImplementedException(); } - public override void CheckDetails(InjectionJob entity, AbpValidationResult result) + public override void CheckDetails(InjectionIssueJob entity, AbpValidationResult result) { throw new NotImplementedException(); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionJobs/IInjectionJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionJobs/IInjectionJobManager.cs deleted file mode 100644 index 7be96ee4a..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionJobs/IInjectionJobManager.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Linq.Expressions; -using System.Threading.Tasks; - -namespace Win_in.Sfs.Wms.Store.Domain; - -public interface IInjectionJobManager : IJobManager -{ - Task GetAsync(Expression> expression); -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionJobs/IInjectionJobRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionJobs/IInjectionJobRepository.cs deleted file mode 100644 index f507ca852..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionJobs/IInjectionJobRepository.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Win_in.Sfs.Wms.Store.Domain; - -public interface IInjectionJobRepository : ISfsJobRepositoryBase -{ - -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IIssueJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobs/IIssueJobManager.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IIssueJobManager.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobs/IIssueJobManager.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IIssueJobRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobs/IIssueJobRepository.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IIssueJobRepository.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobs/IIssueJobRepository.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueExtension.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobs/IssueExtension.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueExtension.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobs/IssueExtension.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJob.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobs/IssueJob.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJob.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobs/IssueJob.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobs/IssueJobDetail.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobDetail.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobs/IssueJobDetail.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobs/IssueJobManager.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobManager.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/IssueJobs/IssueJobManager.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/AssembleNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNote.cs similarity index 86% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/AssembleNote.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNote.cs index 69242626e..533852b2d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/AssembleNote.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNote.cs @@ -9,7 +9,7 @@ namespace Win_in.Sfs.Wms.Store.Domain; /// /// 装配发料记录 /// -public class AssembleNote : SfsStoreAggregateRootBase, IHasJobNumber, IHasRequestNumber +public class AssembleIssueNote : SfsStoreAggregateRootBase, IHasJobNumber, IHasRequestNumber { /// /// 任务ID @@ -21,7 +21,7 @@ public class AssembleNote : SfsStoreAggregateRootBase, IHasJ /// 明细列表 /// [IgnoreUpdate] - public override List Details { get; set; } = new List(); + public override List Details { get; set; } = new List(); [IgnoreUpdate] public string RequestNumber { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/AssembleNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteDetail.cs similarity index 99% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/AssembleNoteDetail.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteDetail.cs index 79c0d9b2b..a4244773a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/AssembleNoteDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteDetail.cs @@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Domain; -public class AssembleNoteDetail : SfsStoreDetailEntityBase +public class AssembleIssueNoteDetail : SfsStoreDetailEntityBase { #region 库存基础信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/AssembleNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteManager.cs similarity index 59% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/AssembleNoteManager.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteManager.cs index 1f658983e..4e8b63bd7 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/AssembleNoteManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteManager.cs @@ -7,17 +7,17 @@ using Win_in.Sfs.Shared.Event; namespace Win_in.Sfs.Wms.Store.Domain; -public class AssembleNoteManager : SfsStoreManagerBase, IAssembleNoteManager +public class AssembleIssueNoteManager : SfsStoreManagerBase, IAssembleIssueNoteManager { - public AssembleNoteManager( - IAssembleNoteRepository repository + public AssembleIssueNoteManager( + IAssembleIssueNoteRepository repository ) : base(repository) { } [UnitOfWork] - public virtual async Task ConfirmAsync(Guid id) + public virtual async Task ConfirmAsync(Guid id) { var entity = await Repository.FindAsync(id).ConfigureAwait(false); Check.NotNull(entity, EntityClassName); @@ -25,15 +25,15 @@ public class AssembleNoteManager : SfsStoreManagerBase(entity), false).ConfigureAwait(false); + await LocalEventBus.PublishAsync(new SfsConfirmedEntityEventData(entity), false).ConfigureAwait(false); } catch (Exception ex) { - Logger.LogDebug($"{nameof(AssembleNote)} Confirmed Event:{ex.Message}", null); + Logger.LogDebug($"{nameof(AssembleIssueNote)} Confirmed Event:{ex.Message}", null); Console.WriteLine(ex.Source); throw; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/IAssembleIssueNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/IAssembleIssueNoteManager.cs new file mode 100644 index 000000000..051a79c7b --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/IAssembleIssueNoteManager.cs @@ -0,0 +1,10 @@ +using System; +using System.Threading.Tasks; + +namespace Win_in.Sfs.Wms.Store.Domain; + +public interface IAssembleIssueNoteManager : ISfsStoreManager +{ + Task ConfirmAsync(Guid id); + +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/IAssembleIssueNoteRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/IAssembleIssueNoteRepository.cs new file mode 100644 index 000000000..6a69e233b --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleIssueNotes/IAssembleIssueNoteRepository.cs @@ -0,0 +1,6 @@ +namespace Win_in.Sfs.Wms.Store.Domain; + +public interface IAssembleIssueNoteRepository : ISfsStoreRepositoryBase +{ + +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/IAssembleNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/IAssembleNoteManager.cs deleted file mode 100644 index 9a9ad6da1..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/IAssembleNoteManager.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Threading.Tasks; - -namespace Win_in.Sfs.Wms.Store.Domain; - -public interface IAssembleNoteManager : ISfsStoreManager -{ - Task ConfirmAsync(Guid id); - -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/IAssembleNoteRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/IAssembleNoteRepository.cs deleted file mode 100644 index 280ab1dfd..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/AssembleNotes/IAssembleNoteRepository.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Win_in.Sfs.Wms.Store.Domain; - -public interface IAssembleNoteRepository : ISfsStoreRepositoryBase -{ - -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/CoatingIssueNotes/ICoatingIssueNoteRepository.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteRepository.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/CoatingIssueNotes/ICoatingIssueNoteRepository.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/IInjectionIssueNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/IInjectionIssueNoteManager.cs new file mode 100644 index 000000000..5002b97e7 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/IInjectionIssueNoteManager.cs @@ -0,0 +1,10 @@ +using System; +using System.Threading.Tasks; + +namespace Win_in.Sfs.Wms.Store.Domain; + +public interface IInjectionIssueNoteManager : ISfsStoreManager +{ + Task ConfirmAsync(Guid id); + +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/IInjectionIssueNoteRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/IInjectionIssueNoteRepository.cs new file mode 100644 index 000000000..5fd10cdaa --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/IInjectionIssueNoteRepository.cs @@ -0,0 +1,6 @@ +namespace Win_in.Sfs.Wms.Store.Domain; + +public interface IInjectionIssueNoteRepository : ISfsStoreRepositoryBase +{ + +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionNotes/InjectionNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNote.cs similarity index 85% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionNotes/InjectionNote.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNote.cs index f5e97fd45..6f650d255 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionNotes/InjectionNote.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNote.cs @@ -9,7 +9,7 @@ namespace Win_in.Sfs.Wms.Store.Domain; /// /// 注塑发料记录 /// -public class InjectionNote : SfsStoreAggregateRootBase, IHasJobNumber, IHasRequestNumber +public class InjectionIssueNote : SfsStoreAggregateRootBase, IHasJobNumber, IHasRequestNumber { /// /// 任务ID @@ -21,7 +21,7 @@ public class InjectionNote : SfsStoreAggregateRootBase, IHa /// 明细列表 /// [IgnoreUpdate] - public override List Details { get; set; } = new List(); + public override List Details { get; set; } = new List(); [IgnoreUpdate] public string RequestNumber { get; set; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionNotes/InjectionNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteDetail.cs similarity index 99% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionNotes/InjectionNoteDetail.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteDetail.cs index 128c44d6e..2ebdcc003 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionNotes/InjectionNoteDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteDetail.cs @@ -6,7 +6,7 @@ using Win_in.Sfs.Shared.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Domain; -public class InjectionNoteDetail : SfsStoreDetailEntityBase +public class InjectionIssueNoteDetail : SfsStoreDetailEntityBase { #region 库存基础信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionNotes/InjectionNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteManager.cs similarity index 59% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionNotes/InjectionNoteManager.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteManager.cs index c75194264..31f33ccef 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionNotes/InjectionNoteManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteManager.cs @@ -7,17 +7,17 @@ using Win_in.Sfs.Shared.Event; namespace Win_in.Sfs.Wms.Store.Domain; -public class InjectionNoteManager : SfsStoreManagerBase, IInjectionNoteManager +public class InjectionIssueNoteManager : SfsStoreManagerBase, IInjectionIssueNoteManager { - public InjectionNoteManager( - IInjectionNoteRepository repository + public InjectionIssueNoteManager( + IInjectionIssueNoteRepository repository ) : base(repository) { } [UnitOfWork] - public virtual async Task ConfirmAsync(Guid id) + public virtual async Task ConfirmAsync(Guid id) { var entity = await Repository.FindAsync(id).ConfigureAwait(false); Check.NotNull(entity, EntityClassName); @@ -25,15 +25,15 @@ public class InjectionNoteManager : SfsStoreManagerBase(entity), false).ConfigureAwait(false); + await LocalEventBus.PublishAsync(new SfsConfirmedEntityEventData(entity), false).ConfigureAwait(false); } catch (Exception ex) { - Logger.LogDebug($"{nameof(InjectionNote)} Confirmed Event:{ex.Message}", null); + Logger.LogDebug($"{nameof(InjectionIssueNote)} Confirmed Event:{ex.Message}", null); Console.WriteLine(ex.Source); throw; } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionNotes/IInjectionNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionNotes/IInjectionNoteManager.cs deleted file mode 100644 index 281cc8cba..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionNotes/IInjectionNoteManager.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Threading.Tasks; - -namespace Win_in.Sfs.Wms.Store.Domain; - -public interface IInjectionNoteManager : ISfsStoreManager -{ - Task ConfirmAsync(Guid id); - -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionNotes/IInjectionNoteRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionNotes/IInjectionNoteRepository.cs deleted file mode 100644 index fb894c737..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionNotes/IInjectionNoteRepository.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Win_in.Sfs.Wms.Store.Domain; - -public interface IInjectionNoteRepository : ISfsStoreRepositoryBase -{ - -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IIssueNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNotes/IIssueNoteManager.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IIssueNoteManager.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNotes/IIssueNoteManager.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNotes/IssueNote.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNote.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNotes/IssueNote.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNotes/IssueNoteDetail.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNoteDetail.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNotes/IssueNoteDetail.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNotes/IssueNoteManager.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNoteManager.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNotes/IssueNoteManager.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNoteRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNotes/IssueNoteRepository.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNoteRepository.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/IssueNotes/IssueNoteRepository.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequests.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequests.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequests.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequests.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestsDetail.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsDetail.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestsDetail.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestsManager.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsManager.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestsManager.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleIssueRequests/IAssembleIssueRequestsManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/IAssembleIssueRequestsManager.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleIssueRequests/IAssembleIssueRequestsManager.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/IAssembleIssueRequestsManager.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleIssueRequests/IAssembleIssueRequestsRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/IAssembleIssueRequestsRepository.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/AssembleIssueRequests/IAssembleIssueRequestsRepository.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/IAssembleIssueRequestsRepository.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequest.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/CoatingIssueRequest.cs similarity index 73% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequest.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/CoatingIssueRequest.cs index 0fb1bb36d..1af995bc6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequest.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/CoatingIssueRequest.cs @@ -8,7 +8,7 @@ namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests; /// /// 喷涂叫料申请 /// -public class CoatingMaterialRequest : SfsStoreRequestAggregateRootBase +public class CoatingIssueRequest : SfsStoreRequestAggregateRootBase { /// /// 叫料类型 @@ -26,6 +26,6 @@ public class CoatingMaterialRequest : 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/CoatingMaterialRequests/CoatingMaterialRequestDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/CoatingIssueRequestDetail.cs similarity index 96% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetail.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/CoatingIssueRequestDetail.cs index 68cf75e44..8dee468c5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/CoatingIssueRequestDetail.cs @@ -7,7 +7,7 @@ using Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests; -public class CoatingMaterialRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasToLocation +public class CoatingIssueRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasToLocation { #region 目标库位信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/CoatingIssueRequestManager.cs similarity index 70% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestManager.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/CoatingIssueRequestManager.cs index f74b0509c..e806acc61 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/CoatingIssueRequestManager.cs @@ -11,15 +11,15 @@ using static Win_in.Sfs.Wms.Store.Domain.Shared.StoreSettings; namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests; -public class CoatingMaterialRequestManager - : SfsStoreRequestManagerBase - , ICoatingMaterialRequestManager +public class CoatingIssueRequestManager + : SfsStoreRequestManagerBase + , ICoatingIssueRequestManager { - private readonly ICoatingMaterialRequestRepository _repository; + private readonly ICoatingIssueRequestRepository _repository; - public CoatingMaterialRequestManager( - ICoatingMaterialRequestRepository repository + public CoatingIssueRequestManager( + ICoatingIssueRequestRepository repository , ICoatingIssueJobRepository issueJobRepository ) : base(repository) { @@ -32,14 +32,14 @@ public class CoatingMaterialRequestManager /// /// /// - public virtual async Task CreateByNumberAsync(CoatingMaterialRequest entity) + public virtual async Task CreateByNumberAsync(CoatingIssueRequest entity) { - var number = string.IsNullOrEmpty(entity.Number) ? await GenerateNumberAsync(nameof(CoatingMaterialRequest), entity.ActiveDate).ConfigureAwait(false) : entity.Number; + var number = string.IsNullOrEmpty(entity.Number) ? await GenerateNumberAsync(nameof(CoatingIssueRequest), 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; @@ -59,7 +59,7 @@ public class CoatingMaterialRequestManager /// /// 执行导入 /// - 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/CoatingMaterialRequests/ICoatingMaterialRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/ICoatingIssueRequestManager.cs similarity index 53% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestManager.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/ICoatingIssueRequestManager.cs index bfac8b9ef..cc47111f5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/ICoatingIssueRequestManager.cs @@ -5,10 +5,10 @@ namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests; using Win_in.Sfs.Shared.Domain; -public interface ICoatingMaterialRequestManager : ISfsStoreRequestManager, - IBulkImportService +public interface ICoatingIssueRequestManager : ISfsStoreRequestManager, + IBulkImportService { Task CompleteAsync(string number); - Task CreateByNumberAsync(CoatingMaterialRequest entity); + Task CreateByNumberAsync(CoatingIssueRequest entity); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/ICoatingIssueRequestRepository.cs similarity index 59% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestRepository.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/ICoatingIssueRequestRepository.cs index b9f449b9a..4fab6934a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestRepository.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/ICoatingIssueRequestRepository.cs @@ -3,8 +3,8 @@ using Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests; -public interface ICoatingMaterialRequestRepository : ISfsStoreRepositoryBase, - ISfsBulkRepositoryBase +public interface ICoatingIssueRequestRepository : ISfsStoreRepositoryBase, + ISfsBulkRepositoryBase { } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/IInjectionIssueRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/IInjectionIssueRequestManager.cs new file mode 100644 index 000000000..a9026e358 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/IInjectionIssueRequestManager.cs @@ -0,0 +1,13 @@ +using System.Threading.Tasks; +using Win_in.Sfs.Shared.Domain; + +namespace Win_in.Sfs.Wms.Store.Domain; + +public interface IInjectionIssueRequestManager : ISfsStoreRequestManager, + IBulkImportService +{ + + Task CompleteAsync(string number); + + Task CreateByNumberAsync(InjectionIssueRequest entity); +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionIssueRequests/IInjectionRequestRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/IInjectionIssueRequestRepository.cs similarity index 52% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionIssueRequests/IInjectionRequestRepository.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/IInjectionIssueRequestRepository.cs index ce92572ec..1d27d64be 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionIssueRequests/IInjectionRequestRepository.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/IInjectionIssueRequestRepository.cs @@ -2,8 +2,8 @@ using Win_in.Sfs.Shared.Domain; namespace Win_in.Sfs.Wms.Store.Domain; -public interface IInjectionRequestRepository : ISfsStoreRepositoryBase, - ISfsBulkRepositoryBase +public interface IInjectionIssueRequestRepository : ISfsStoreRepositoryBase, + ISfsBulkRepositoryBase { } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionIssueRequests/InjectionRequest.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/InjectionIssueRequest.cs similarity index 71% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionIssueRequests/InjectionRequest.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/InjectionIssueRequest.cs index f8a899725..fc8355c98 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionIssueRequests/InjectionRequest.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/InjectionIssueRequest.cs @@ -7,7 +7,7 @@ namespace Win_in.Sfs.Wms.Store.Domain; /// /// 注塑申请 /// -public class InjectionRequest : SfsStoreRequestAggregateRootBase +public class InjectionIssueRequest : SfsStoreRequestAggregateRootBase { /// /// 叫料类型 @@ -25,5 +25,5 @@ public class InjectionRequest : 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/InjectionIssueRequests/InjectionRequestDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/InjectionIssueRequestDetail.cs similarity index 96% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionIssueRequests/InjectionRequestDetail.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/InjectionIssueRequestDetail.cs index e1cfa692d..843bdcb62 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionIssueRequests/InjectionRequestDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/InjectionIssueRequestDetail.cs @@ -9,7 +9,7 @@ namespace Win_in.Sfs.Wms.Store.Domain; /// /// 注塑叫料申请明细 /// -public class InjectionRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasToLocation +public class InjectionIssueRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasToLocation { #region 目标库位信息 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionIssueRequests/InjectionRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/InjectionIssueRequestManager.cs similarity index 65% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionIssueRequests/InjectionRequestManager.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/InjectionIssueRequestManager.cs index 5c09a2626..1110d1e48 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionIssueRequests/InjectionRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/InjectionIssueRequests/InjectionIssueRequestManager.cs @@ -6,16 +6,16 @@ using Win_in.Sfs.Shared.Event; namespace Win_in.Sfs.Wms.Store.Domain; -public class InjectionRequestManager - : SfsStoreRequestManagerBase - , IInjectionRequestManager +public class InjectionIssueRequestManager + : SfsStoreRequestManagerBase + , IInjectionIssueRequestManager { - private readonly IInjectionRequestRepository _repository; - private readonly IInjectionJobRepository _injectionJobRepository; + private readonly IInjectionIssueRequestRepository _repository; + private readonly IInjectionIssueJobRepository _injectionJobRepository; - public InjectionRequestManager( - IInjectionRequestRepository repository - , IInjectionJobRepository injectionJobRepository + public InjectionIssueRequestManager( + IInjectionIssueRequestRepository repository + , IInjectionIssueJobRepository injectionJobRepository ) : base(repository) { _repository = repository; @@ -32,16 +32,16 @@ public class InjectionRequestManager /// /// /// - public virtual async Task CreateByNumberAsync(InjectionRequest entity) + public virtual async Task CreateByNumberAsync(InjectionIssueRequest entity) { var number = string.IsNullOrEmpty(entity.Number) - ? await GenerateNumberAsync(nameof(InjectionRequest), entity.ActiveDate).ConfigureAwait(false) + ? await GenerateNumberAsync(nameof(InjectionIssueRequest), 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; @@ -62,8 +62,8 @@ public class InjectionRequestManager /// /// 执行导入 /// - 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/IMaterialRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/MaterialRequests/IMaterialRequestManager.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/IMaterialRequestManager.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/MaterialRequests/IMaterialRequestManager.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/IMaterialRequestRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/MaterialRequests/IMaterialRequestRepository.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/IMaterialRequestRepository.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/MaterialRequests/IMaterialRequestRepository.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequest.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/MaterialRequests/MaterialRequest.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequest.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/MaterialRequests/MaterialRequest.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/MaterialRequests/MaterialRequestDetail.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestDetail.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/MaterialRequests/MaterialRequestDetail.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/MaterialRequests/MaterialRequestManager.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/MaterialRequestManager.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/MaterialRequests/MaterialRequestManager.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionIssueRequests/IInjectionRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionIssueRequests/IInjectionRequestManager.cs deleted file mode 100644 index efa9c5dd5..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionIssueRequests/IInjectionRequestManager.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Threading.Tasks; -using Win_in.Sfs.Shared.Domain; - -namespace Win_in.Sfs.Wms.Store.Domain; - -public interface IInjectionRequestManager : ISfsStoreRequestManager, - IBulkImportService -{ - - Task CompleteAsync(string number); - - Task CreateByNumberAsync(InjectionRequest entity); -} 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 9ccc99663..9b3f332a1 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 @@ -21,7 +21,7 @@ public interface IStoreDbContext : IEfCoreDbContext public DbSet ProductReceiptRequests { get; } public DbSet MaterialRequests { get; } - public DbSet InjectionRequests { get; } + public DbSet InjectionIssueRequests { get; } public DbSet AssembleIssueRequests { get; } public DbSet ThirdLocationRequests { get; } public DbSet ContainerRequests { get; } @@ -78,8 +78,8 @@ public interface IStoreDbContext : IEfCoreDbContext public DbSet InventoryTransferNotes { get; } public DbSet WarehouseTransferNotes { get; } public DbSet IssueNotes { get; } - public DbSet InjectionNotes { get; } - public DbSet AssembleNotes { get; } + public DbSet InjectionIssueNotes { get; } + public DbSet AssembleIssueNotes { get; } public DbSet ThirdLocationNotes { get; } public DbSet ContainerNotes { get; } public DbSet UnplannedReceiptNotes { get; } @@ -106,8 +106,8 @@ public interface IStoreDbContext : IEfCoreDbContext public DbSet InspectJobs { get; } public DbSet PutawayJobs { get; } public DbSet IssueJobs { get; } - public DbSet InjectionJobs { get; } - public DbSet AssembleJobs { get; } + public DbSet InjectionIssueJobs { get; } + public DbSet AssembleIssueJobs { get; } public DbSet ThirdLocationJobs { get; } public DbSet ContainerJobs { get; } public DbSet DeliverJobs { 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/AssembleIssueJobs/AssembleIssueJobDbContextModelCreatingExtensions.cs similarity index 85% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/AssembleJobs/AssembleJobDbContextModelCreatingExtensions.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobDbContextModelCreatingExtensions.cs index 0a72cedd1..b5fd375b9 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/AssembleIssueJobs/AssembleIssueJobDbContextModelCreatingExtensions.cs @@ -6,20 +6,20 @@ using Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; -public static class AssembleJobDbContextModelCreatingExtensions +public static class AssembleIssueJobDbContextModelCreatingExtensions { - public static void ConfigureAssembleJob(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options) + public static void ConfigureAssembleIssueJob(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options) { - builder.Entity(b => + builder.Entity(b => { //Configure table & schema name - b.ToTable(StoreDbProperties.JobDbTablePrefix + nameof(AssembleJob), options.Schema); + b.ToTable(StoreDbProperties.JobDbTablePrefix + nameof(AssembleIssueJob), options.Schema); //Configure ABP properties b.ConfigureByConvention(); //Configure Sfs base properties b.ConfigureSfsBase(); //Configure Job base properties - b.ConfigureJob(); + b.ConfigureJob(); //Properties b.Property(q => q.RequestType).HasMaxLength(SfsPropertyConst.CodeLength); b.Property(q => q.AssembleRequestNumber).HasMaxLength(SfsPropertyConst.CodeLength); @@ -32,10 +32,10 @@ public static class AssembleJobDbContextModelCreatingExtensions b.HasIndex(q => new { q.Number }).IsUnique(); }); - builder.Entity(b => + builder.Entity(b => { //Configure table & schema name - b.ToTable(StoreDbProperties.JobDbTablePrefix + nameof(AssembleJobDetail), options.Schema); + b.ToTable(StoreDbProperties.JobDbTablePrefix + nameof(AssembleIssueJobDetail), options.Schema); //Configure ABP properties b.ConfigureByConvention(); //Configure Sfs base properties diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobEfCoreRepository.cs new file mode 100644 index 000000000..526e075d0 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobEfCoreRepository.cs @@ -0,0 +1,11 @@ +using Volo.Abp.EntityFrameworkCore; +using Win_in.Sfs.Wms.Store.Domain; + +namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; + +public class AssembleIssueJobEfCoreRepository : SfsJobEfCoreRepositoryBase, IAssembleIssueJobRepository +{ + public AssembleIssueJobEfCoreRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/AssembleJobs/AssembleJobEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/AssembleJobs/AssembleJobEfCoreRepository.cs deleted file mode 100644 index 6430424b9..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/AssembleJobs/AssembleJobEfCoreRepository.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Volo.Abp.EntityFrameworkCore; -using Win_in.Sfs.Wms.Store.Domain; - -namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; - -public class AssembleJobEfCoreRepository : SfsJobEfCoreRepositoryBase, IAssembleJobRepository -{ - public AssembleJobEfCoreRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - } -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/InjectionJobs/InjectionJobDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobDbContextModelCreatingExtensions.cs similarity index 81% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/InjectionJobs/InjectionJobDbContextModelCreatingExtensions.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobDbContextModelCreatingExtensions.cs index 8c62bee6b..70a34bc6f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/InjectionJobs/InjectionJobDbContextModelCreatingExtensions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobDbContextModelCreatingExtensions.cs @@ -6,23 +6,23 @@ using Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; -public static class InjectionJobDbContextModelCreatingExtensions +public static class InjectionIssueJobDbContextModelCreatingExtensions { - public static void ConfigureInjectionJob(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options) + public static void ConfigureInjectionIssueJob(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options) { - builder.Entity(b => + builder.Entity(b => { //Configure table & schema name - b.ToTable(StoreDbProperties.JobDbTablePrefix + nameof(InjectionJob), options.Schema); + b.ToTable(StoreDbProperties.JobDbTablePrefix + nameof(InjectionIssueJob), options.Schema); //Configure ABP properties b.ConfigureByConvention(); //Configure Sfs base properties b.ConfigureSfsBase(); //Configure Job base properties - b.ConfigureJob(); + b.ConfigureJob(); //Properties b.Property(q => q.RequestType).HasMaxLength(SfsPropertyConst.CodeLength); - b.Property(q => q.InjectionRequestNumber).HasMaxLength(SfsPropertyConst.CodeLength); + b.Property(q => q.InjectionIssueRequestNumber).HasMaxLength(SfsPropertyConst.CodeLength); b.Property(q => q.ProdLine).HasMaxLength(SfsPropertyConst.CodeLength); b.Property(q => q.JobType).HasConversion(); b.Property(q => q.JobStatus).HasConversion(); @@ -32,10 +32,10 @@ public static class InjectionJobDbContextModelCreatingExtensions b.HasIndex(q => new { q.Number }).IsUnique(); }); - builder.Entity(b => + builder.Entity(b => { //Configure table & schema name - b.ToTable(StoreDbProperties.JobDbTablePrefix + nameof(InjectionJobDetail), options.Schema); + b.ToTable(StoreDbProperties.JobDbTablePrefix + nameof(InjectionIssueJobDetail), options.Schema); //Configure ABP properties b.ConfigureByConvention(); //Configure Sfs base properties diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobEfCoreRepository.cs new file mode 100644 index 000000000..3f2cbc803 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobEfCoreRepository.cs @@ -0,0 +1,11 @@ +using Volo.Abp.EntityFrameworkCore; +using Win_in.Sfs.Wms.Store.Domain; + +namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; + +public class InjectionIssueJobEfCoreRepository : SfsJobEfCoreRepositoryBase, IInjectionIssueJobRepository +{ + public InjectionIssueJobEfCoreRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/InjectionJobs/InjectionJobEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/InjectionJobs/InjectionJobEfCoreRepository.cs deleted file mode 100644 index 3f08eb44e..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/InjectionJobs/InjectionJobEfCoreRepository.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Volo.Abp.EntityFrameworkCore; -using Win_in.Sfs.Wms.Store.Domain; - -namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; - -public class InjectionJobEfCoreRepository : SfsJobEfCoreRepositoryBase, IInjectionJobRepository -{ - public InjectionJobEfCoreRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - } -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/IssueJobDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/IssueJobs/IssueJobDbContextModelCreatingExtensions.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/IssueJobDbContextModelCreatingExtensions.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/IssueJobs/IssueJobDbContextModelCreatingExtensions.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/IssueJobEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/IssueJobs/IssueJobEfCoreRepository.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/IssueJobEfCoreRepository.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/IssueJobs/IssueJobEfCoreRepository.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240328035332_Update_2024_03_28_ProductLine.Designer.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240328035332_Update_2024_03_28_ProductLine.Designer.cs index e22cdcc7a..aa13f26a0 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240328035332_Update_2024_03_28_ProductLine.Designer.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240328035332_Update_2024_03_28_ProductLine.Designer.cs @@ -4836,7 +4836,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_ExchangeData", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -4879,7 +4879,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("InjectionRequestNumber") + b.Property("InjectionIssueRequestNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -4968,10 +4968,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_InjectionJob", (string)null); + b.ToTable("Job_InjectionIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -5235,10 +5235,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_InjectionJobDetail", (string)null); + b.ToTable("Job_InjectionIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -5321,10 +5321,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionNote", (string)null); + b.ToTable("Store_InjectionIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -5647,10 +5647,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[FromPackingCode] IS NOT NULL"); - b.ToTable("Store_InjectionNoteDetail", (string)null); + b.ToTable("Store_InjectionIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -5746,10 +5746,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionRequest", (string)null); + b.ToTable("Store_InjectionIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -5893,7 +5893,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_InjectionRequestDetail", (string)null); + b.ToTable("Store_InjectionIssueRequestDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InspectAbnormalNote", b => @@ -24737,7 +24737,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_CoatingIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -24834,10 +24834,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequest", (string)null); + b.ToTable("Store_CoatingIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -24981,7 +24981,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequestDetail", (string)null); + b.ToTable("Store_CoatingIssueRequestDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNoteDetail", b => @@ -25137,27 +25137,27 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -25758,9 +25758,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -25852,17 +25852,17 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Navigation("Details"); }); @@ -26185,7 +26185,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", b => { b.Navigation("Details"); }); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240328035332_Update_2024_03_28_ProductLine.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240328035332_Update_2024_03_28_ProductLine.cs index 098d5c63a..5d6552301 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240328035332_Update_2024_03_28_ProductLine.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240328035332_Update_2024_03_28_ProductLine.cs @@ -58,13 +58,13 @@ namespace Win_in.Sfs.Wms.Store.Migrations }); migrationBuilder.CreateTable( - name: "Job_InjectionJob", + name: "Job_InjectionIssueJob", columns: table => new { 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), - InjectionRequestNumber = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), + InjectionIssueRequestNumber = 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), @@ -95,7 +95,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Job_InjectionJob", x => x.Id); + table.PrimaryKey("PK_Job_InjectionIssueJob", x => x.Id); }); migrationBuilder.CreateTable( @@ -128,7 +128,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations }); migrationBuilder.CreateTable( - name: "Store_CoatingMaterialRequest", + name: "Store_CoatingIssueRequest", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -157,11 +157,11 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Store_CoatingMaterialRequest", x => x.Id); + table.PrimaryKey("PK_Store_CoatingIssueRequest", x => x.Id); }); migrationBuilder.CreateTable( - name: "Store_InjectionNote", + name: "Store_InjectionIssueNote", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -186,11 +186,11 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Store_InjectionNote", x => x.Id); + table.PrimaryKey("PK_Store_InjectionIssueNote", x => x.Id); }); migrationBuilder.CreateTable( - name: "Store_InjectionRequest", + name: "Store_InjectionIssueRequest", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -219,7 +219,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Store_InjectionRequest", x => x.Id); + table.PrimaryKey("PK_Store_InjectionIssueRequest", x => x.Id); }); migrationBuilder.CreateTable( @@ -300,7 +300,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations }); migrationBuilder.CreateTable( - name: "Job_InjectionJobDetail", + name: "Job_InjectionIssueJobDetail", 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_Job_InjectionJobDetail", x => x.Id); + table.PrimaryKey("PK_Job_InjectionIssueJobDetail", x => x.Id); table.ForeignKey( - name: "FK_Job_InjectionJobDetail_Job_InjectionJob_MasterID", + name: "FK_Job_InjectionIssueJobDetail_Job_InjectionIssueJob_MasterID", column: x => x.MasterID, - principalTable: "Job_InjectionJob", + principalTable: "Job_InjectionIssueJob", principalColumn: "Id", onDelete: ReferentialAction.Cascade); }); @@ -464,7 +464,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations }); migrationBuilder.CreateTable( - name: "Store_CoatingMaterialRequestDetail", + name: "Store_CoatingIssueRequestDetail", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -500,17 +500,17 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Store_CoatingMaterialRequestDetail", x => x.Id); + table.PrimaryKey("PK_Store_CoatingIssueRequestDetail", x => x.Id); table.ForeignKey( - name: "FK_Store_CoatingMaterialRequestDetail_Store_CoatingMaterialRequest_MasterID", + name: "FK_Store_CoatingIssueRequestDetail_Store_CoatingIssueRequest_MasterID", column: x => x.MasterID, - principalTable: "Store_CoatingMaterialRequest", + principalTable: "Store_CoatingIssueRequest", principalColumn: "Id", onDelete: ReferentialAction.Cascade); }); migrationBuilder.CreateTable( - name: "Store_InjectionNoteDetail", + name: "Store_InjectionIssueNoteDetail", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -587,17 +587,17 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Store_InjectionNoteDetail", x => x.Id); + table.PrimaryKey("PK_Store_InjectionIssueNoteDetail", x => x.Id); table.ForeignKey( - name: "FK_Store_InjectionNoteDetail_Store_InjectionNote_MasterID", + name: "FK_Store_InjectionIssueNoteDetail_Store_InjectionIssueNote_MasterID", column: x => x.MasterID, - principalTable: "Store_InjectionNote", + principalTable: "Store_InjectionIssueNote", principalColumn: "Id", onDelete: ReferentialAction.Cascade); }); migrationBuilder.CreateTable( - name: "Store_InjectionRequestDetail", + name: "Store_InjectionIssueRequestDetail", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -633,11 +633,11 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Store_InjectionRequestDetail", x => x.Id); + table.PrimaryKey("PK_Store_InjectionIssueRequestDetail", x => x.Id); table.ForeignKey( - name: "FK_Store_InjectionRequestDetail_Store_InjectionRequest_MasterID", + name: "FK_Store_InjectionIssueRequestDetail_Store_InjectionIssueRequest_MasterID", column: x => x.MasterID, - principalTable: "Store_InjectionRequest", + principalTable: "Store_InjectionIssueRequest", principalColumn: "Id", onDelete: ReferentialAction.Cascade); }); @@ -654,14 +654,14 @@ namespace Win_in.Sfs.Wms.Store.Migrations column: "MasterID"); migrationBuilder.CreateIndex( - name: "IX_Job_InjectionJob_Number", - table: "Job_InjectionJob", + name: "IX_Job_InjectionIssueJob_Number", + table: "Job_InjectionIssueJob", column: "Number", unique: true); migrationBuilder.CreateIndex( - name: "IX_Job_InjectionJobDetail_MasterID", - table: "Job_InjectionJobDetail", + name: "IX_Job_InjectionIssueJobDetail_MasterID", + table: "Job_InjectionIssueJobDetail", column: "MasterID"); migrationBuilder.CreateIndex( @@ -688,69 +688,69 @@ namespace Win_in.Sfs.Wms.Store.Migrations filter: "[FromPackingCode] IS NOT NULL"); migrationBuilder.CreateIndex( - name: "IX_Store_CoatingMaterialRequest_Number", - table: "Store_CoatingMaterialRequest", + name: "IX_Store_CoatingIssueRequest_Number", + table: "Store_CoatingIssueRequest", column: "Number", unique: true); migrationBuilder.CreateIndex( - name: "IX_Store_CoatingMaterialRequestDetail_ItemCode", - table: "Store_CoatingMaterialRequestDetail", + name: "IX_Store_CoatingIssueRequestDetail_ItemCode", + table: "Store_CoatingIssueRequestDetail", column: "ItemCode"); migrationBuilder.CreateIndex( - name: "IX_Store_CoatingMaterialRequestDetail_MasterID", - table: "Store_CoatingMaterialRequestDetail", + name: "IX_Store_CoatingIssueRequestDetail_MasterID", + table: "Store_CoatingIssueRequestDetail", column: "MasterID"); migrationBuilder.CreateIndex( - name: "IX_Store_CoatingMaterialRequestDetail_Number_ItemCode_ToLocationCode", - table: "Store_CoatingMaterialRequestDetail", + name: "IX_Store_CoatingIssueRequestDetail_Number_ItemCode_ToLocationCode", + table: "Store_CoatingIssueRequestDetail", columns: new[] { "Number", "ItemCode", "ToLocationCode" }, unique: true); migrationBuilder.CreateIndex( - name: "IX_Store_InjectionNote_Number", - table: "Store_InjectionNote", + name: "IX_Store_InjectionIssueNote_Number", + table: "Store_InjectionIssueNote", column: "Number", unique: true); migrationBuilder.CreateIndex( - name: "IX_Store_InjectionNoteDetail_FromPackingCode", - table: "Store_InjectionNoteDetail", + name: "IX_Store_InjectionIssueNoteDetail_FromPackingCode", + table: "Store_InjectionIssueNoteDetail", column: "FromPackingCode"); migrationBuilder.CreateIndex( - name: "IX_Store_InjectionNoteDetail_MasterID", - table: "Store_InjectionNoteDetail", + name: "IX_Store_InjectionIssueNoteDetail_MasterID", + table: "Store_InjectionIssueNoteDetail", column: "MasterID"); migrationBuilder.CreateIndex( - name: "IX_Store_InjectionNoteDetail_Number_FromPackingCode_FromLocationCode_ToLocationCode", - table: "Store_InjectionNoteDetail", + name: "IX_Store_InjectionIssueNoteDetail_Number_FromPackingCode_FromLocationCode_ToLocationCode", + table: "Store_InjectionIssueNoteDetail", columns: new[] { "Number", "FromPackingCode", "FromLocationCode", "ToLocationCode" }, unique: true, filter: "[FromPackingCode] IS NOT NULL"); migrationBuilder.CreateIndex( - name: "IX_Store_InjectionRequest_Number", - table: "Store_InjectionRequest", + name: "IX_Store_InjectionIssueRequest_Number", + table: "Store_InjectionIssueRequest", column: "Number", unique: true); migrationBuilder.CreateIndex( - name: "IX_Store_InjectionRequestDetail_ItemCode", - table: "Store_InjectionRequestDetail", + name: "IX_Store_InjectionIssueRequestDetail_ItemCode", + table: "Store_InjectionIssueRequestDetail", column: "ItemCode"); migrationBuilder.CreateIndex( - name: "IX_Store_InjectionRequestDetail_MasterID", - table: "Store_InjectionRequestDetail", + name: "IX_Store_InjectionIssueRequestDetail_MasterID", + table: "Store_InjectionIssueRequestDetail", column: "MasterID"); migrationBuilder.CreateIndex( - name: "IX_Store_InjectionRequestDetail_Number_ItemCode_ToLocationCode", - table: "Store_InjectionRequestDetail", + name: "IX_Store_InjectionIssueRequestDetail_Number_ItemCode_ToLocationCode", + table: "Store_InjectionIssueRequestDetail", columns: new[] { "Number", "ItemCode", "ToLocationCode" }, unique: true); } @@ -761,37 +761,37 @@ namespace Win_in.Sfs.Wms.Store.Migrations name: "Job_CoatingIssueJobDetail"); migrationBuilder.DropTable( - name: "Job_InjectionJobDetail"); + name: "Job_InjectionIssueJobDetail"); migrationBuilder.DropTable( name: "Store_CoatingIssueNoteDetail"); migrationBuilder.DropTable( - name: "Store_CoatingMaterialRequestDetail"); + name: "Store_CoatingIssueRequestDetail"); migrationBuilder.DropTable( - name: "Store_InjectionNoteDetail"); + name: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropTable( - name: "Store_InjectionRequestDetail"); + name: "Store_InjectionIssueRequestDetail"); migrationBuilder.DropTable( name: "Job_CoatingIssueJob"); migrationBuilder.DropTable( - name: "Job_InjectionJob"); + name: "Job_InjectionIssueJob"); migrationBuilder.DropTable( name: "Store_CoatingIssueNote"); migrationBuilder.DropTable( - name: "Store_CoatingMaterialRequest"); + name: "Store_CoatingIssueRequest"); migrationBuilder.DropTable( - name: "Store_InjectionNote"); + name: "Store_InjectionIssueNote"); migrationBuilder.DropTable( - name: "Store_InjectionRequest"); + name: "Store_InjectionIssueRequest"); migrationBuilder.DropColumn( name: "Confirmed", diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240329030632_transferLib2.Designer.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240329030632_transferLib2.Designer.cs index d1347abfc..5931acdb9 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240329030632_transferLib2.Designer.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240329030632_transferLib2.Designer.cs @@ -4836,7 +4836,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_ExchangeData", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -4879,7 +4879,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("InjectionRequestNumber") + b.Property("InjectionIssueRequestNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -4968,10 +4968,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_InjectionJob", (string)null); + b.ToTable("Job_InjectionIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -5235,10 +5235,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_InjectionJobDetail", (string)null); + b.ToTable("Job_InjectionIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -5321,10 +5321,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionNote", (string)null); + b.ToTable("Store_InjectionIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -5647,10 +5647,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[FromPackingCode] IS NOT NULL"); - b.ToTable("Store_InjectionNoteDetail", (string)null); + b.ToTable("Store_InjectionIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -5746,10 +5746,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionRequest", (string)null); + b.ToTable("Store_InjectionIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -5893,7 +5893,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_InjectionRequestDetail", (string)null); + b.ToTable("Store_InjectionIssueRequestDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InspectAbnormalNote", b => @@ -24809,7 +24809,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_CoatingIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -24906,10 +24906,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequest", (string)null); + b.ToTable("Store_CoatingIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -25053,7 +25053,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequestDetail", (string)null); + b.ToTable("Store_CoatingIssueRequestDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.BackFlushNoteDetail", b => @@ -25209,27 +25209,27 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -25830,9 +25830,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -25924,17 +25924,17 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Navigation("Details"); }); @@ -26257,7 +26257,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", b => { b.Navigation("Details"); }); 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 cce4d7739..c1721d49e 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 @@ -13,8 +13,8 @@ using Win_in.Sfs.Wms.Store.EntityFrameworkCore; namespace Win_in.Sfs.Wms.Store.Migrations { [DbContext(typeof(StoreDbContext))] - [Migration("20240403054940_Update_InjectionRequest")] - partial class Update_InjectionRequest + [Migration("20240403054940_Update_InjectionIssueRequest")] + partial class Update_InjectionIssueRequest { protected override void BuildTargetModel(ModelBuilder modelBuilder) { @@ -26,7 +26,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -158,10 +158,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_AssembleJob", (string)null); + b.ToTable("Job_AssembleIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -425,10 +425,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_AssembleJobDetail", (string)null); + b.ToTable("Job_AssembleIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -511,10 +511,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_AssembleNote", (string)null); + b.ToTable("Store_AssembleIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -837,7 +837,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[FromPackingCode] IS NOT NULL"); - b.ToTable("Store_AssembleNoteDetail", (string)null); + b.ToTable("Store_AssembleIssueNoteDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => @@ -5888,7 +5888,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_ExchangeData", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -5931,7 +5931,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("InjectionRequestNumber") + b.Property("InjectionIssueRequestNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -6020,10 +6020,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_InjectionJob", (string)null); + b.ToTable("Job_InjectionIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6287,10 +6287,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_InjectionJobDetail", (string)null); + b.ToTable("Job_InjectionIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6373,10 +6373,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionNote", (string)null); + b.ToTable("Store_InjectionIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6699,10 +6699,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[FromPackingCode] IS NOT NULL"); - b.ToTable("Store_InjectionNoteDetail", (string)null); + b.ToTable("Store_InjectionIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6790,10 +6790,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionRequest", (string)null); + b.ToTable("Store_InjectionIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6934,7 +6934,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_InjectionRequestDetail", (string)null); + b.ToTable("Store_InjectionIssueRequestDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InspectAbnormalNote", b => @@ -26123,7 +26123,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_CoatingIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -26220,10 +26220,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequest", (string)null); + b.ToTable("Store_CoatingIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -26367,21 +26367,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequestDetail", (string)null); + b.ToTable("Store_CoatingIssueRequestDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -26550,27 +26550,27 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -27180,21 +27180,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", b => { b.Navigation("Details"); }); @@ -27289,17 +27289,17 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Navigation("Details"); }); @@ -27627,7 +27627,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", 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 c451fd5f6..51be20674 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 @@ -5,21 +5,21 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace Win_in.Sfs.Wms.Store.Migrations { - public partial class Update_InjectionRequest : Migration + public partial class Update_InjectionIssueRequest : Migration { protected override void Up(MigrationBuilder migrationBuilder) { migrationBuilder.DropColumn( name: "FromLocationArea", - table: "Store_InjectionRequestDetail"); + table: "Store_InjectionIssueRequestDetail"); migrationBuilder.DropColumn( name: "PreparationPlanNumber", - table: "Store_InjectionRequest"); + table: "Store_InjectionIssueRequest"); migrationBuilder.DropColumn( name: "Workshop", - table: "Store_InjectionRequest"); + table: "Store_InjectionIssueRequest"); migrationBuilder.AddColumn( name: "JobNumber", @@ -41,7 +41,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations nullable: true); migrationBuilder.CreateTable( - name: "Job_AssembleJob", + name: "Job_AssembleIssueJob", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -78,11 +78,11 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Job_AssembleJob", x => x.Id); + table.PrimaryKey("PK_Job_AssembleIssueJob", x => x.Id); }); migrationBuilder.CreateTable( - name: "Store_AssembleNote", + name: "Store_AssembleIssueNote", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -107,7 +107,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Store_AssembleNote", x => x.Id); + table.PrimaryKey("PK_Store_AssembleIssueNote", x => x.Id); }); migrationBuilder.CreateTable( @@ -167,7 +167,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations }); migrationBuilder.CreateTable( - name: "Job_AssembleJobDetail", + name: "Job_AssembleIssueJobDetail", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -234,17 +234,17 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Job_AssembleJobDetail", x => x.Id); + table.PrimaryKey("PK_Job_AssembleIssueJobDetail", x => x.Id); table.ForeignKey( - name: "FK_Job_AssembleJobDetail_Job_AssembleJob_MasterID", + name: "FK_Job_AssembleIssueJobDetail_Job_AssembleIssueJob_MasterID", column: x => x.MasterID, - principalTable: "Job_AssembleJob", + principalTable: "Job_AssembleIssueJob", principalColumn: "Id", onDelete: ReferentialAction.Cascade); }); migrationBuilder.CreateTable( - name: "Store_AssembleNoteDetail", + name: "Store_AssembleIssueNoteDetail", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -321,11 +321,11 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Store_AssembleNoteDetail", x => x.Id); + table.PrimaryKey("PK_Store_AssembleIssueNoteDetail", x => x.Id); table.ForeignKey( - name: "FK_Store_AssembleNoteDetail_Store_AssembleNote_MasterID", + name: "FK_Store_AssembleIssueNoteDetail_Store_AssembleIssueNote_MasterID", column: x => x.MasterID, - principalTable: "Store_AssembleNote", + principalTable: "Store_AssembleIssueNote", principalColumn: "Id", onDelete: ReferentialAction.Cascade); }); @@ -432,35 +432,35 @@ namespace Win_in.Sfs.Wms.Store.Migrations }); migrationBuilder.CreateIndex( - name: "IX_Job_AssembleJob_Number", - table: "Job_AssembleJob", + name: "IX_Job_AssembleIssueJob_Number", + table: "Job_AssembleIssueJob", column: "Number", unique: true); migrationBuilder.CreateIndex( - name: "IX_Job_AssembleJobDetail_MasterID", - table: "Job_AssembleJobDetail", + name: "IX_Job_AssembleIssueJobDetail_MasterID", + table: "Job_AssembleIssueJobDetail", column: "MasterID"); migrationBuilder.CreateIndex( - name: "IX_Store_AssembleNote_Number", - table: "Store_AssembleNote", + name: "IX_Store_AssembleIssueNote_Number", + table: "Store_AssembleIssueNote", column: "Number", unique: true); migrationBuilder.CreateIndex( - name: "IX_Store_AssembleNoteDetail_FromPackingCode", - table: "Store_AssembleNoteDetail", + name: "IX_Store_AssembleIssueNoteDetail_FromPackingCode", + table: "Store_AssembleIssueNoteDetail", column: "FromPackingCode"); migrationBuilder.CreateIndex( - name: "IX_Store_AssembleNoteDetail_MasterID", - table: "Store_AssembleNoteDetail", + name: "IX_Store_AssembleIssueNoteDetail_MasterID", + table: "Store_AssembleIssueNoteDetail", column: "MasterID"); migrationBuilder.CreateIndex( - name: "IX_Store_AssembleNoteDetail_Number_FromPackingCode_FromLocationCode_ToLocationCode", - table: "Store_AssembleNoteDetail", + name: "IX_Store_AssembleIssueNoteDetail_Number_FromPackingCode_FromLocationCode_ToLocationCode", + table: "Store_AssembleIssueNoteDetail", columns: new[] { "Number", "FromPackingCode", "FromLocationCode", "ToLocationCode" }, unique: true, filter: "[FromPackingCode] IS NOT NULL"); @@ -509,10 +509,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations protected override void Down(MigrationBuilder migrationBuilder) { migrationBuilder.DropTable( - name: "Job_AssembleJobDetail"); + name: "Job_AssembleIssueJobDetail"); migrationBuilder.DropTable( - name: "Store_AssembleNoteDetail"); + name: "Store_AssembleIssueNoteDetail"); migrationBuilder.DropTable( name: "Store_AssembleIssueRequestsDetail"); @@ -521,10 +521,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations name: "Store_MesNoteDetail"); migrationBuilder.DropTable( - name: "Job_AssembleJob"); + name: "Job_AssembleIssueJob"); migrationBuilder.DropTable( - name: "Store_AssembleNote"); + name: "Store_AssembleIssueNote"); migrationBuilder.DropTable( name: "Store_AssembleIssueRequests"); @@ -546,20 +546,20 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "FromLocationArea", - table: "Store_InjectionRequestDetail", + table: "Store_InjectionIssueRequestDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "PreparationPlanNumber", - table: "Store_InjectionRequest", + table: "Store_InjectionIssueRequest", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "Workshop", - table: "Store_InjectionRequest", + table: "Store_InjectionIssueRequest", type: "nvarchar(64)", maxLength: 64, nullable: true); 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 5d5d5ae5a..c0f33b576 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 @@ -26,7 +26,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -158,10 +158,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_AssembleJob", (string)null); + b.ToTable("Job_AssembleIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -425,10 +425,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_AssembleJobDetail", (string)null); + b.ToTable("Job_AssembleIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -511,10 +511,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_AssembleNote", (string)null); + b.ToTable("Store_AssembleIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -837,7 +837,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[FromPackingCode] IS NOT NULL"); - b.ToTable("Store_AssembleNoteDetail", (string)null); + b.ToTable("Store_AssembleIssueNoteDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => @@ -5888,7 +5888,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_ExchangeData", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -5931,7 +5931,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("InjectionRequestNumber") + b.Property("InjectionIssueRequestNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -6020,10 +6020,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_InjectionJob", (string)null); + b.ToTable("Job_InjectionIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6287,10 +6287,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_InjectionJobDetail", (string)null); + b.ToTable("Job_InjectionIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6373,10 +6373,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionNote", (string)null); + b.ToTable("Store_InjectionIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6699,10 +6699,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[FromPackingCode] IS NOT NULL"); - b.ToTable("Store_InjectionNoteDetail", (string)null); + b.ToTable("Store_InjectionIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6790,10 +6790,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionRequest", (string)null); + b.ToTable("Store_InjectionIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6937,7 +6937,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_InjectionRequestDetail", (string)null); + b.ToTable("Store_InjectionIssueRequestDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InspectAbnormalNote", b => @@ -25863,7 +25863,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_CoatingIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -25960,10 +25960,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequest", (string)null); + b.ToTable("Store_CoatingIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -26107,21 +26107,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequestDetail", (string)null); + b.ToTable("Store_CoatingIssueRequestDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -26290,27 +26290,27 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -26911,21 +26911,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", b => { b.Navigation("Details"); }); @@ -27020,17 +27020,17 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Navigation("Details"); }); @@ -27353,7 +27353,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", 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 a38fff040..19ceb2b6a 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 @@ -11,11 +11,11 @@ namespace Win_in.Sfs.Wms.Store.Migrations { migrationBuilder.DropColumn( name: "PreparationPlanNumber", - table: "Store_InjectionRequest"); + table: "Store_InjectionIssueRequest"); migrationBuilder.DropColumn( name: "Workshop", - table: "Store_InjectionRequest"); + table: "Store_InjectionIssueRequest"); migrationBuilder.AddColumn( name: "JobNumber", @@ -37,7 +37,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations nullable: true); migrationBuilder.CreateTable( - name: "Job_AssembleJob", + name: "Job_AssembleIssueJob", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -74,11 +74,11 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Job_AssembleJob", x => x.Id); + table.PrimaryKey("PK_Job_AssembleIssueJob", x => x.Id); }); migrationBuilder.CreateTable( - name: "Store_AssembleNote", + name: "Store_AssembleIssueNote", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -103,7 +103,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Store_AssembleNote", x => x.Id); + table.PrimaryKey("PK_Store_AssembleIssueNote", x => x.Id); }); migrationBuilder.CreateTable( @@ -138,7 +138,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations }); migrationBuilder.CreateTable( - name: "Job_AssembleJobDetail", + name: "Job_AssembleIssueJobDetail", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -205,17 +205,17 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Job_AssembleJobDetail", x => x.Id); + table.PrimaryKey("PK_Job_AssembleIssueJobDetail", x => x.Id); table.ForeignKey( - name: "FK_Job_AssembleJobDetail_Job_AssembleJob_MasterID", + name: "FK_Job_AssembleIssueJobDetail_Job_AssembleIssueJob_MasterID", column: x => x.MasterID, - principalTable: "Job_AssembleJob", + principalTable: "Job_AssembleIssueJob", principalColumn: "Id", onDelete: ReferentialAction.Cascade); }); migrationBuilder.CreateTable( - name: "Store_AssembleNoteDetail", + name: "Store_AssembleIssueNoteDetail", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -292,11 +292,11 @@ namespace Win_in.Sfs.Wms.Store.Migrations }, constraints: table => { - table.PrimaryKey("PK_Store_AssembleNoteDetail", x => x.Id); + table.PrimaryKey("PK_Store_AssembleIssueNoteDetail", x => x.Id); table.ForeignKey( - name: "FK_Store_AssembleNoteDetail_Store_AssembleNote_MasterID", + name: "FK_Store_AssembleIssueNoteDetail_Store_AssembleIssueNote_MasterID", column: x => x.MasterID, - principalTable: "Store_AssembleNote", + principalTable: "Store_AssembleIssueNote", principalColumn: "Id", onDelete: ReferentialAction.Cascade); }); @@ -348,35 +348,35 @@ namespace Win_in.Sfs.Wms.Store.Migrations }); migrationBuilder.CreateIndex( - name: "IX_Job_AssembleJob_Number", - table: "Job_AssembleJob", + name: "IX_Job_AssembleIssueJob_Number", + table: "Job_AssembleIssueJob", column: "Number", unique: true); migrationBuilder.CreateIndex( - name: "IX_Job_AssembleJobDetail_MasterID", - table: "Job_AssembleJobDetail", + name: "IX_Job_AssembleIssueJobDetail_MasterID", + table: "Job_AssembleIssueJobDetail", column: "MasterID"); migrationBuilder.CreateIndex( - name: "IX_Store_AssembleNote_Number", - table: "Store_AssembleNote", + name: "IX_Store_AssembleIssueNote_Number", + table: "Store_AssembleIssueNote", column: "Number", unique: true); migrationBuilder.CreateIndex( - name: "IX_Store_AssembleNoteDetail_FromPackingCode", - table: "Store_AssembleNoteDetail", + name: "IX_Store_AssembleIssueNoteDetail_FromPackingCode", + table: "Store_AssembleIssueNoteDetail", column: "FromPackingCode"); migrationBuilder.CreateIndex( - name: "IX_Store_AssembleNoteDetail_MasterID", - table: "Store_AssembleNoteDetail", + name: "IX_Store_AssembleIssueNoteDetail_MasterID", + table: "Store_AssembleIssueNoteDetail", column: "MasterID"); migrationBuilder.CreateIndex( - name: "IX_Store_AssembleNoteDetail_Number_FromPackingCode_FromLocationCode_ToLocationCode", - table: "Store_AssembleNoteDetail", + name: "IX_Store_AssembleIssueNoteDetail_Number_FromPackingCode_FromLocationCode_ToLocationCode", + table: "Store_AssembleIssueNoteDetail", columns: new[] { "Number", "FromPackingCode", "FromLocationCode", "ToLocationCode" }, unique: true, filter: "[FromPackingCode] IS NOT NULL"); @@ -407,19 +407,19 @@ namespace Win_in.Sfs.Wms.Store.Migrations protected override void Down(MigrationBuilder migrationBuilder) { migrationBuilder.DropTable( - name: "Job_AssembleJobDetail"); + name: "Job_AssembleIssueJobDetail"); migrationBuilder.DropTable( - name: "Store_AssembleNoteDetail"); + name: "Store_AssembleIssueNoteDetail"); migrationBuilder.DropTable( name: "Store_AssembleIssueRequestsDetail"); migrationBuilder.DropTable( - name: "Job_AssembleJob"); + name: "Job_AssembleIssueJob"); migrationBuilder.DropTable( - name: "Store_AssembleNote"); + name: "Store_AssembleIssueNote"); migrationBuilder.DropTable( name: "Store_AssembleIssueRequests"); @@ -438,14 +438,14 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "PreparationPlanNumber", - table: "Store_InjectionRequest", + table: "Store_InjectionIssueRequest", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "Workshop", - table: "Store_InjectionRequest", + table: "Store_InjectionIssueRequest", type: "nvarchar(64)", maxLength: 64, nullable: true); 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 77fc0454d..b057864bd 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 @@ -13,8 +13,8 @@ using Win_in.Sfs.Wms.Store.EntityFrameworkCore; namespace Win_in.Sfs.Wms.Store.Migrations { [DbContext(typeof(StoreDbContext))] - [Migration("20240409090529_Update_InjectionRequest_2024_04_09")] - partial class Update_InjectionRequest_2024_04_09 + [Migration("20240409090529_Update_InjectionIssueRequest_2024_04_09")] + partial class Update_InjectionIssueRequest_2024_04_09 { protected override void BuildTargetModel(ModelBuilder modelBuilder) { @@ -26,7 +26,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -158,10 +158,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_AssembleJob", (string)null); + b.ToTable("Job_AssembleIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -425,10 +425,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_AssembleJobDetail", (string)null); + b.ToTable("Job_AssembleIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -511,10 +511,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_AssembleNote", (string)null); + b.ToTable("Store_AssembleIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -837,7 +837,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[FromPackingCode] IS NOT NULL"); - b.ToTable("Store_AssembleNoteDetail", (string)null); + b.ToTable("Store_AssembleIssueNoteDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => @@ -6424,7 +6424,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_InjectioModelPlanDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6467,7 +6467,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("InjectionRequestNumber") + b.Property("InjectionIssueRequestNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -6556,10 +6556,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_InjectionJob", (string)null); + b.ToTable("Job_InjectionIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6823,10 +6823,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_InjectionJobDetail", (string)null); + b.ToTable("Job_InjectionIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6909,10 +6909,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionNote", (string)null); + b.ToTable("Store_InjectionIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7235,10 +7235,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[FromPackingCode] IS NOT NULL"); - b.ToTable("Store_InjectionNoteDetail", (string)null); + b.ToTable("Store_InjectionIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7326,10 +7326,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionRequest", (string)null); + b.ToTable("Store_InjectionIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7473,7 +7473,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_InjectionRequestDetail", (string)null); + b.ToTable("Store_InjectionIssueRequestDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InspectAbnormalNote", b => @@ -27980,7 +27980,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_CoatingIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -28077,10 +28077,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequest", (string)null); + b.ToTable("Store_CoatingIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -28224,21 +28224,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequestDetail", (string)null); + b.ToTable("Store_CoatingIssueRequestDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -28425,27 +28425,27 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -29091,21 +29091,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", b => { b.Navigation("Details"); }); @@ -29210,17 +29210,17 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Navigation("Details"); }); @@ -29568,7 +29568,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", b => { b.Navigation("Details"); }); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240409090529_Update_InjectionRequest_2024_04_09.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240409090529_Update_InjectionRequest_2024_04_09.cs index 4a454d38f..57ef13170 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240409090529_Update_InjectionRequest_2024_04_09.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240409090529_Update_InjectionRequest_2024_04_09.cs @@ -5,13 +5,13 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace Win_in.Sfs.Wms.Store.Migrations { - public partial class Update_InjectionRequest_2024_04_09 : Migration + public partial class Update_InjectionIssueRequest_2024_04_09 : Migration { protected override void Up(MigrationBuilder migrationBuilder) { migrationBuilder.AddColumn( name: "BoxQty", - table: "Store_InjectionRequestDetail", + table: "Store_InjectionIssueRequestDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); @@ -724,7 +724,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.DropColumn( name: "BoxQty", - table: "Store_InjectionRequestDetail"); + table: "Store_InjectionIssueRequestDetail"); } } } 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 839b41bf9..687aa619f 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 @@ -26,7 +26,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -158,10 +158,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_AssembleJob", (string)null); + b.ToTable("Job_AssembleIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -425,10 +425,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_AssembleJobDetail", (string)null); + b.ToTable("Job_AssembleIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -511,10 +511,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_AssembleNote", (string)null); + b.ToTable("Store_AssembleIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -837,7 +837,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[FromPackingCode] IS NOT NULL"); - b.ToTable("Store_AssembleNoteDetail", (string)null); + b.ToTable("Store_AssembleIssueNoteDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => @@ -6424,7 +6424,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_InjectioModelPlanDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6467,7 +6467,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("InjectionRequestNumber") + b.Property("InjectionIssueRequestNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -6552,10 +6552,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_InjectionJob", (string)null); + b.ToTable("Job_InjectionIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6886,10 +6886,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_InjectionJobDetail", (string)null); + b.ToTable("Job_InjectionIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6968,10 +6968,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionNote", (string)null); + b.ToTable("Store_InjectionIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7319,10 +7319,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[HandledFromPackingCode] IS NOT NULL AND [HandledFromLocationCode] IS NOT NULL AND [HandledToLocationCode] IS NOT NULL"); - b.ToTable("Store_InjectionNoteDetail", (string)null); + b.ToTable("Store_InjectionIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7410,10 +7410,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionRequest", (string)null); + b.ToTable("Store_InjectionIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7550,7 +7550,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_InjectionRequestDetail", (string)null); + b.ToTable("Store_InjectionIssueRequestDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InspectAbnormalNote", b => @@ -28068,7 +28068,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_CoatingIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -28165,10 +28165,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequest", (string)null); + b.ToTable("Store_CoatingIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -28312,21 +28312,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequestDetail", (string)null); + b.ToTable("Store_CoatingIssueRequestDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -28513,27 +28513,27 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -29179,21 +29179,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", b => { b.Navigation("Details"); }); @@ -29298,17 +29298,17 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Navigation("Details"); }); @@ -29656,7 +29656,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", b => { b.Navigation("Details"); }); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240412052222_Update_Injection.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240412052222_Update_Injection.cs index cabf8147e..d375ff170 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240412052222_Update_Injection.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240412052222_Update_Injection.cs @@ -10,286 +10,286 @@ namespace Win_in.Sfs.Wms.Store.Migrations protected override void Up(MigrationBuilder migrationBuilder) { migrationBuilder.DropIndex( - name: "IX_Store_InjectionNoteDetail_FromPackingCode", - table: "Store_InjectionNoteDetail"); + name: "IX_Store_InjectionIssueNoteDetail_FromPackingCode", + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropIndex( - name: "IX_Store_InjectionNoteDetail_Number_FromPackingCode_FromLocationCode_ToLocationCode", - table: "Store_InjectionNoteDetail"); + name: "IX_Store_InjectionIssueNoteDetail_Number_FromPackingCode_FromLocationCode_ToLocationCode", + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "ExpiredTime", - table: "Store_InjectionRequestDetail"); + table: "Store_InjectionIssueRequestDetail"); migrationBuilder.DropColumn( name: "WorkStation", - table: "Store_InjectionRequestDetail"); + table: "Store_InjectionIssueRequestDetail"); migrationBuilder.DropColumn( name: "FromLocationArea", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "FromLocationCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "FromLocationErpCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "FromLocationGroup", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "FromStatus", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "FromWarehouseCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledContainerCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledLot", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledPackingCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledSupplierBatch", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "Qty", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendContainerCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendLot", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendPackingCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendSupplierBatch", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "SupplierBatch", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "ToLocationArea", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "ToLocationCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "ToLocationErpCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "ToLocationGroup", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "ToStatus", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "ToWarehouseCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "WorkStation", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "Workshop", - table: "Store_InjectionNote"); + table: "Store_InjectionIssueNote"); migrationBuilder.DropColumn( name: "DistributionType", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledContainerCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledLot", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledPackingCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledSupplierBatch", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "Operation", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "PlannedSplitRule", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendContainerCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendLot", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendPackingCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendSupplierBatch", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "ToLocationArea", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "ToLocationCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "ToLocationErpCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "ToLocationGroup", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "ToWarehouseCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TruncType", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "WorkStation", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "Workshop", - table: "Job_InjectionJob"); + table: "Job_InjectionIssueJob"); migrationBuilder.RenameColumn( name: "ToPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToWarehouseCode"); migrationBuilder.RenameColumn( name: "ToLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToSupplierBatch"); migrationBuilder.RenameColumn( name: "ToContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToPackingCode"); migrationBuilder.RenameColumn( name: "RecommendQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToQty"); migrationBuilder.RenameColumn( name: "RecommendProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToProduceDate"); migrationBuilder.RenameColumn( name: "RecommendExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToExpireDate"); migrationBuilder.RenameColumn( name: "RecommendArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToArriveDate"); migrationBuilder.RenameColumn( name: "ProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibFromProduceDate"); migrationBuilder.RenameColumn( name: "IssueTime", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibFromExpireDate"); migrationBuilder.RenameColumn( name: "HandledQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibFromQty"); migrationBuilder.RenameColumn( name: "HandledProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibFromArriveDate"); migrationBuilder.RenameColumn( name: "HandledExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendToProduceDate"); migrationBuilder.RenameColumn( name: "HandledArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendToExpireDate"); migrationBuilder.RenameColumn( name: "FromPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "HandledToLocationCode"); migrationBuilder.RenameColumn( name: "FromLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToLot"); migrationBuilder.RenameColumn( name: "FromContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToLocationGroup"); migrationBuilder.RenameColumn( name: "ExpiredTime", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendToArriveDate"); migrationBuilder.RenameColumn( name: "ExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendFromProduceDate"); migrationBuilder.RenameColumn( name: "ArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendFromExpireDate"); migrationBuilder.RenameColumn( @@ -299,62 +299,62 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.RenameColumn( name: "RoundedQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "TransferLibToQty"); migrationBuilder.RenameColumn( name: "RecommendQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "TransferLibFromQty"); migrationBuilder.RenameColumn( name: "RecommendProduceDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "TransferLibToProduceDate"); migrationBuilder.RenameColumn( name: "RecommendExpireDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "TransferLibToExpireDate"); migrationBuilder.RenameColumn( name: "RecommendArriveDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "TransferLibToArriveDate"); migrationBuilder.RenameColumn( name: "PlanBeginTime", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "TransferLibFromProduceDate"); migrationBuilder.RenameColumn( name: "HandledQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RequestQty"); migrationBuilder.RenameColumn( name: "HandledProduceDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "TransferLibFromExpireDate"); migrationBuilder.RenameColumn( name: "HandledExpireDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "TransferLibFromArriveDate"); migrationBuilder.RenameColumn( name: "HandledArriveDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RecommendToProduceDate"); migrationBuilder.RenameColumn( name: "ExpiredTime", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RecommendToExpireDate"); migrationBuilder.RenameColumn( name: "DeliveryQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RecommendToQty"); migrationBuilder.AlterColumn( @@ -378,7 +378,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "Uom", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -387,7 +387,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -397,7 +397,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -407,7 +407,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -417,7 +417,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -427,7 +427,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -437,7 +437,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -447,7 +447,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -457,7 +457,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -467,7 +467,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(450)", nullable: true, oldClrType: typeof(string), @@ -477,7 +477,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -487,350 +487,350 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "HandledFromArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledFromContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledFromExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledFromLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledFromPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(450)", nullable: true); migrationBuilder.AddColumn( name: "HandledFromProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledFromQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); migrationBuilder.AddColumn( name: "HandledFromSupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledToContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledToLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledToQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); migrationBuilder.AddColumn( name: "HandledToSupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendFromArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "RecommendFromContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendFromLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendFromPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendFromQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); migrationBuilder.AddColumn( name: "RecommendFromSupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); migrationBuilder.AddColumn( name: "RecommendToSupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); migrationBuilder.AddColumn( name: "RequestWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "Status", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "int", nullable: false, defaultValue: 0); migrationBuilder.AddColumn( name: "TransferLibFromContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromSupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); @@ -843,7 +843,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "Status", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "int", nullable: false, oldClrType: typeof(string), @@ -852,7 +852,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -862,7 +862,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -872,7 +872,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -882,7 +882,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -892,7 +892,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -902,7 +902,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "Number", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -911,7 +911,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "ItemName", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -921,7 +921,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "ItemDesc2", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -931,7 +931,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "ItemDesc1", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -941,7 +941,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "ItemCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -950,7 +950,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -960,7 +960,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -970,7 +970,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -980,7 +980,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -990,7 +990,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -1000,391 +1000,391 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "HandledFromArriveDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledFromContainerCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledFromExpireDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledFromLot", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledFromPackingCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledFromProduceDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledFromQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); migrationBuilder.AddColumn( name: "HandledFromSupplierBatch", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToArriveDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledToContainerCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToExpireDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledToLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToLot", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToPackingCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToProduceDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledToQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); migrationBuilder.AddColumn( name: "HandledToSupplierBatch", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendFromArriveDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "RecommendFromContainerCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendFromExpireDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "RecommendFromLot", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendFromPackingCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendFromProduceDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "RecommendFromQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); migrationBuilder.AddColumn( name: "RecommendFromSupplierBatch", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToArriveDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "RecommendToContainerCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLot", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToPackingCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToSupplierBatch", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromContainerCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLot", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromPackingCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromSupplierBatch", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToContainerCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToLot", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToPackingCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToSupplierBatch", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.CreateIndex( - name: "IX_Store_InjectionNoteDetail_HandledFromPackingCode", - table: "Store_InjectionNoteDetail", + name: "IX_Store_InjectionIssueNoteDetail_HandledFromPackingCode", + table: "Store_InjectionIssueNoteDetail", column: "HandledFromPackingCode"); migrationBuilder.CreateIndex( - name: "IX_Store_InjectionNoteDetail_Number_HandledFromPackingCode_HandledFromLocationCode_HandledToLocationCode", - table: "Store_InjectionNoteDetail", + name: "IX_Store_InjectionIssueNoteDetail_Number_HandledFromPackingCode_HandledFromLocationCode_HandledToLocationCode", + table: "Store_InjectionIssueNoteDetail", columns: new[] { "Number", "HandledFromPackingCode", "HandledFromLocationCode", "HandledToLocationCode" }, unique: true, filter: "[HandledFromPackingCode] IS NOT NULL AND [HandledFromLocationCode] IS NOT NULL AND [HandledToLocationCode] IS NOT NULL"); @@ -1393,12 +1393,12 @@ namespace Win_in.Sfs.Wms.Store.Migrations protected override void Down(MigrationBuilder migrationBuilder) { migrationBuilder.DropIndex( - name: "IX_Store_InjectionNoteDetail_HandledFromPackingCode", - table: "Store_InjectionNoteDetail"); + name: "IX_Store_InjectionIssueNoteDetail_HandledFromPackingCode", + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropIndex( - name: "IX_Store_InjectionNoteDetail_Number_HandledFromPackingCode_HandledFromLocationCode_HandledToLocationCode", - table: "Store_InjectionNoteDetail"); + name: "IX_Store_InjectionIssueNoteDetail_Number_HandledFromPackingCode_HandledFromLocationCode_HandledToLocationCode", + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "FromLocationCode", @@ -1406,227 +1406,227 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.DropColumn( name: "HandledFromArriveDate", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledFromContainerCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledFromExpireDate", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledFromLot", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledFromPackingCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledFromProduceDate", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledFromQty", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledFromSupplierBatch", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToArriveDate", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToContainerCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToExpireDate", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToLocationArea", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToLocationErpCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToLocationGroup", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToLot", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToPackingCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToProduceDate", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToQty", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToSupplierBatch", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToWarehouseCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendFromArriveDate", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendFromContainerCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendFromLot", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendFromPackingCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendFromQty", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendFromSupplierBatch", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToContainerCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToLocationArea", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToLocationCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToLocationErpCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToLocationGroup", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToLot", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToPackingCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToQty", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToSupplierBatch", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToWarehouseCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RequestLocationArea", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RequestLocationCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RequestLocationErpCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RequestLocationGroup", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RequestQty", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RequestWarehouseCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "Status", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromContainerCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLocationArea", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLocationCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLocationErpCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLocationGroup", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLot", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromPackingCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromSupplierBatch", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromWarehouseCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibToContainerCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibToLocationArea", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibToLocationCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibToLocationErpCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "FromLocationArea", @@ -1634,341 +1634,341 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.DropColumn( name: "HandledFromArriveDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledFromContainerCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledFromExpireDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledFromLot", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledFromPackingCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledFromProduceDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledFromQty", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledFromSupplierBatch", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToArriveDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToContainerCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToExpireDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToLocationArea", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToLocationCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToLocationErpCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToLocationGroup", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToLot", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToPackingCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToProduceDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToQty", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToSupplierBatch", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToWarehouseCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendFromArriveDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendFromContainerCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendFromExpireDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendFromLot", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendFromPackingCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendFromProduceDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendFromQty", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendFromSupplierBatch", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToArriveDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToContainerCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToLocationArea", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToLocationCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToLocationErpCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToLocationGroup", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToLot", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToPackingCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToSupplierBatch", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToWarehouseCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RequestLocationArea", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RequestLocationErpCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RequestLocationGroup", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RequestWarehouseCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromContainerCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLocationArea", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLocationCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLocationErpCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLocationGroup", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLot", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromPackingCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromSupplierBatch", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromWarehouseCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToContainerCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToLocationArea", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToLocationCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToLocationErpCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToLocationGroup", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToLot", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToPackingCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToSupplierBatch", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToWarehouseCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.RenameColumn( name: "TransferLibToWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "ToPackingCode"); migrationBuilder.RenameColumn( name: "TransferLibToSupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "ToLot"); migrationBuilder.RenameColumn( name: "TransferLibToQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendQty"); migrationBuilder.RenameColumn( name: "TransferLibToProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendProduceDate"); migrationBuilder.RenameColumn( name: "TransferLibToPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "ToContainerCode"); migrationBuilder.RenameColumn( name: "TransferLibToLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "FromLot"); migrationBuilder.RenameColumn( name: "TransferLibToLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "FromContainerCode"); migrationBuilder.RenameColumn( name: "TransferLibToExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendExpireDate"); migrationBuilder.RenameColumn( name: "TransferLibToArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendArriveDate"); migrationBuilder.RenameColumn( name: "TransferLibFromQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "HandledQty"); migrationBuilder.RenameColumn( name: "TransferLibFromProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "ProduceDate"); migrationBuilder.RenameColumn( name: "TransferLibFromExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "IssueTime"); migrationBuilder.RenameColumn( name: "TransferLibFromArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "HandledProduceDate"); migrationBuilder.RenameColumn( name: "RecommendToProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "HandledExpireDate"); migrationBuilder.RenameColumn( name: "RecommendToExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "HandledArriveDate"); migrationBuilder.RenameColumn( name: "RecommendToArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "ExpiredTime"); migrationBuilder.RenameColumn( name: "RecommendFromProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "ExpireDate"); migrationBuilder.RenameColumn( name: "RecommendFromExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "ArriveDate"); migrationBuilder.RenameColumn( name: "HandledToLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "FromPackingCode"); migrationBuilder.RenameColumn( @@ -1978,62 +1978,62 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.RenameColumn( name: "TransferLibToQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RoundedQty"); migrationBuilder.RenameColumn( name: "TransferLibToProduceDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RecommendProduceDate"); migrationBuilder.RenameColumn( name: "TransferLibToExpireDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RecommendExpireDate"); migrationBuilder.RenameColumn( name: "TransferLibToArriveDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RecommendArriveDate"); migrationBuilder.RenameColumn( name: "TransferLibFromQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RecommendQty"); migrationBuilder.RenameColumn( name: "TransferLibFromProduceDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "PlanBeginTime"); migrationBuilder.RenameColumn( name: "TransferLibFromExpireDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "HandledProduceDate"); migrationBuilder.RenameColumn( name: "TransferLibFromArriveDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "HandledExpireDate"); migrationBuilder.RenameColumn( name: "RequestQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "HandledQty"); migrationBuilder.RenameColumn( name: "RecommendToQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "DeliveryQty"); migrationBuilder.RenameColumn( name: "RecommendToProduceDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "HandledArriveDate"); migrationBuilder.RenameColumn( name: "RecommendToExpireDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "ExpiredTime"); migrationBuilder.AlterColumn( @@ -2047,21 +2047,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "ExpiredTime", - table: "Store_InjectionRequestDetail", + table: "Store_InjectionIssueRequestDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "WorkStation", - table: "Store_InjectionRequestDetail", + table: "Store_InjectionIssueRequestDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AlterColumn( name: "Uom", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -2072,7 +2072,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2082,7 +2082,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2092,7 +2092,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2102,7 +2102,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2112,7 +2112,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2122,7 +2122,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2132,7 +2132,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2142,7 +2142,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2152,7 +2152,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2162,7 +2162,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2172,14 +2172,14 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "FromLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "FromLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -2187,7 +2187,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "FromLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -2195,14 +2195,14 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "FromLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "FromStatus", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -2210,7 +2210,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "FromWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -2218,35 +2218,35 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "HandledContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "HandledLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "HandledPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "HandledSupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "Qty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "decimal(18,6)", precision: 18, scale: 6, @@ -2255,49 +2255,49 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "RecommendContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "RecommendLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "RecommendPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "RecommendSupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "SupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ToLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ToLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -2305,7 +2305,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "ToLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -2313,14 +2313,14 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "ToLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ToStatus", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -2328,7 +2328,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "ToWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -2336,21 +2336,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "WorkStation", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "Workshop", - table: "Store_InjectionNote", + table: "Store_InjectionIssueNote", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AlterColumn( name: "Status", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -2359,7 +2359,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2369,7 +2369,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2379,7 +2379,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2389,7 +2389,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2399,7 +2399,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2409,7 +2409,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "Number", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -2420,7 +2420,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "ItemName", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2430,7 +2430,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "ItemDesc2", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2440,7 +2440,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "ItemDesc1", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2450,7 +2450,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "ItemCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -2461,7 +2461,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2471,7 +2471,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2481,7 +2481,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2491,7 +2491,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2501,7 +2501,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -2511,7 +2511,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "DistributionType", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -2519,42 +2519,42 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "HandledContainerCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "HandledLot", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "HandledPackingCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "HandledSupplierBatch", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "Operation", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "PlannedSplitRule", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -2562,70 +2562,70 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "RecommendContainerCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "RecommendLot", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "RecommendPackingCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "RecommendSupplierBatch", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ToLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ToLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ToLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ToLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ToWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "TruncType", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -2633,26 +2633,26 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "WorkStation", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "Workshop", - table: "Job_InjectionJob", + table: "Job_InjectionIssueJob", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.CreateIndex( - name: "IX_Store_InjectionNoteDetail_FromPackingCode", - table: "Store_InjectionNoteDetail", + name: "IX_Store_InjectionIssueNoteDetail_FromPackingCode", + table: "Store_InjectionIssueNoteDetail", column: "FromPackingCode"); migrationBuilder.CreateIndex( - name: "IX_Store_InjectionNoteDetail_Number_FromPackingCode_FromLocationCode_ToLocationCode", - table: "Store_InjectionNoteDetail", + name: "IX_Store_InjectionIssueNoteDetail_Number_FromPackingCode_FromLocationCode_ToLocationCode", + table: "Store_InjectionIssueNoteDetail", columns: new[] { "Number", "FromPackingCode", "FromLocationCode", "ToLocationCode" }, unique: true, filter: "[FromPackingCode] IS NOT NULL"); 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 c3033e043..45ec94daf 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 @@ -26,7 +26,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -158,10 +158,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_AssembleJob", (string)null); + b.ToTable("Job_AssembleIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -425,10 +425,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_AssembleJobDetail", (string)null); + b.ToTable("Job_AssembleIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -511,10 +511,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_AssembleNote", (string)null); + b.ToTable("Store_AssembleIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -837,7 +837,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[FromPackingCode] IS NOT NULL"); - b.ToTable("Store_AssembleNoteDetail", (string)null); + b.ToTable("Store_AssembleIssueNoteDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => @@ -6435,7 +6435,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_InjectioModelPlanDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6478,7 +6478,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("InjectionRequestNumber") + b.Property("InjectionIssueRequestNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -6567,10 +6567,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_InjectionJob", (string)null); + b.ToTable("Job_InjectionIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6834,10 +6834,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_InjectionJobDetail", (string)null); + b.ToTable("Job_InjectionIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6920,10 +6920,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionNote", (string)null); + b.ToTable("Store_InjectionIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7246,10 +7246,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[FromPackingCode] IS NOT NULL"); - b.ToTable("Store_InjectionNoteDetail", (string)null); + b.ToTable("Store_InjectionIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7337,10 +7337,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionRequest", (string)null); + b.ToTable("Store_InjectionIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7484,7 +7484,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_InjectionRequestDetail", (string)null); + b.ToTable("Store_InjectionIssueRequestDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InspectAbnormalNote", b => @@ -28158,7 +28158,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_CoatingIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -28255,10 +28255,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequest", (string)null); + b.ToTable("Store_CoatingIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -28402,21 +28402,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequestDetail", (string)null); + b.ToTable("Store_CoatingIssueRequestDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -28603,27 +28603,27 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -29269,21 +29269,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", b => { b.Navigation("Details"); }); @@ -29388,17 +29388,17 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Navigation("Details"); }); @@ -29746,7 +29746,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", 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 acaf23912..ae4ab7890 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 @@ -26,7 +26,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -158,10 +158,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_AssembleJob", (string)null); + b.ToTable("Job_AssembleIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -425,10 +425,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_AssembleJobDetail", (string)null); + b.ToTable("Job_AssembleIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -511,10 +511,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_AssembleNote", (string)null); + b.ToTable("Store_AssembleIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -837,7 +837,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[FromPackingCode] IS NOT NULL"); - b.ToTable("Store_AssembleNoteDetail", (string)null); + b.ToTable("Store_AssembleIssueNoteDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => @@ -6435,7 +6435,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_InjectioModelPlanDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6478,7 +6478,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("InjectionRequestNumber") + b.Property("InjectionIssueRequestNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -6563,10 +6563,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_InjectionJob", (string)null); + b.ToTable("Job_InjectionIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6899,10 +6899,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_InjectionJobDetail", (string)null); + b.ToTable("Job_InjectionIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6981,10 +6981,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionNote", (string)null); + b.ToTable("Store_InjectionIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7332,10 +7332,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[HandledFromPackingCode] IS NOT NULL AND [HandledFromLocationCode] IS NOT NULL AND [HandledToLocationCode] IS NOT NULL"); - b.ToTable("Store_InjectionNoteDetail", (string)null); + b.ToTable("Store_InjectionIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7419,10 +7419,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionRequest", (string)null); + b.ToTable("Store_InjectionIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7559,7 +7559,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_InjectionRequestDetail", (string)null); + b.ToTable("Store_InjectionIssueRequestDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InspectAbnormalNote", b => @@ -28533,7 +28533,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_CoatingIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -28630,10 +28630,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequest", (string)null); + b.ToTable("Store_CoatingIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -28777,21 +28777,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequestDetail", (string)null); + b.ToTable("Store_CoatingIssueRequestDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -28978,27 +28978,27 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -29644,21 +29644,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", b => { b.Navigation("Details"); }); @@ -29763,17 +29763,17 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Navigation("Details"); }); @@ -30121,7 +30121,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", b => { b.Navigation("Details"); }); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240415063138_transferLibV2222.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240415063138_transferLibV2222.cs index e0fc3953c..e477e3de2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240415063138_transferLibV2222.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240415063138_transferLibV2222.cs @@ -14,12 +14,12 @@ namespace Win_in.Sfs.Wms.Store.Migrations table: "Store_TransferLibNoteDetail"); migrationBuilder.DropIndex( - name: "IX_Store_InjectionNoteDetail_FromPackingCode", - table: "Store_InjectionNoteDetail"); + name: "IX_Store_InjectionIssueNoteDetail_FromPackingCode", + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropIndex( - name: "IX_Store_InjectionNoteDetail_Number_FromPackingCode_FromLocationCode_ToLocationCode", - table: "Store_InjectionNoteDetail"); + name: "IX_Store_InjectionIssueNoteDetail_Number_FromPackingCode_FromLocationCode_ToLocationCode", + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "FromContainerCode", @@ -143,111 +143,111 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.DropColumn( name: "ExpiredTime", - table: "Store_InjectionRequestDetail"); + table: "Store_InjectionIssueRequestDetail"); migrationBuilder.DropColumn( name: "WorkStation", - table: "Store_InjectionRequestDetail"); + table: "Store_InjectionIssueRequestDetail"); migrationBuilder.DropColumn( name: "ProdLine", - table: "Store_InjectionRequest"); + table: "Store_InjectionIssueRequest"); migrationBuilder.DropColumn( name: "FromLocationArea", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "FromLocationCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "FromLocationErpCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "FromLocationGroup", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "FromStatus", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "FromWarehouseCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledContainerCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledLot", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledPackingCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledSupplierBatch", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "Qty", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendContainerCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendLot", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendPackingCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendSupplierBatch", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "SupplierBatch", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "ToLocationArea", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "ToLocationCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "ToLocationErpCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "ToLocationGroup", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "ToStatus", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "ToWarehouseCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "WorkStation", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "Workshop", - table: "Store_InjectionNote"); + table: "Store_InjectionIssueNote"); migrationBuilder.DropColumn( name: "FromContainerCode", @@ -303,79 +303,79 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.DropColumn( name: "DistributionType", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledContainerCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledLot", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledPackingCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledSupplierBatch", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "Operation", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "PlannedSplitRule", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendContainerCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendLot", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendPackingCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendSupplierBatch", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "ToLocationArea", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "ToLocationCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "ToLocationErpCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "ToLocationGroup", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "ToWarehouseCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TruncType", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "WorkStation", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "Workshop", - table: "Job_InjectionJob"); + table: "Job_InjectionIssueJob"); migrationBuilder.RenameColumn( name: "ToLocationGroup", @@ -459,97 +459,97 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.RenameColumn( name: "ToPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToWarehouseCode"); migrationBuilder.RenameColumn( name: "ToLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToSupplierBatch"); migrationBuilder.RenameColumn( name: "ToContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToPackingCode"); migrationBuilder.RenameColumn( name: "RecommendQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToQty"); migrationBuilder.RenameColumn( name: "RecommendProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToProduceDate"); migrationBuilder.RenameColumn( name: "RecommendExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToExpireDate"); migrationBuilder.RenameColumn( name: "RecommendArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToArriveDate"); migrationBuilder.RenameColumn( name: "ProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibFromProduceDate"); migrationBuilder.RenameColumn( name: "IssueTime", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibFromExpireDate"); migrationBuilder.RenameColumn( name: "HandledQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibFromQty"); migrationBuilder.RenameColumn( name: "HandledProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibFromArriveDate"); migrationBuilder.RenameColumn( name: "HandledExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendToProduceDate"); migrationBuilder.RenameColumn( name: "HandledArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendToExpireDate"); migrationBuilder.RenameColumn( name: "FromPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "HandledToLocationCode"); migrationBuilder.RenameColumn( name: "FromLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToLot"); migrationBuilder.RenameColumn( name: "FromContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "TransferLibToLocationGroup"); migrationBuilder.RenameColumn( name: "ExpiredTime", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendToArriveDate"); migrationBuilder.RenameColumn( name: "ExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendFromProduceDate"); migrationBuilder.RenameColumn( name: "ArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendFromExpireDate"); migrationBuilder.RenameColumn( @@ -604,62 +604,62 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.RenameColumn( name: "RoundedQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "TransferLibToQty"); migrationBuilder.RenameColumn( name: "RecommendQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "TransferLibFromQty"); migrationBuilder.RenameColumn( name: "RecommendProduceDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "TransferLibToProduceDate"); migrationBuilder.RenameColumn( name: "RecommendExpireDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "TransferLibToExpireDate"); migrationBuilder.RenameColumn( name: "RecommendArriveDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "TransferLibToArriveDate"); migrationBuilder.RenameColumn( name: "PlanBeginTime", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "TransferLibFromProduceDate"); migrationBuilder.RenameColumn( name: "HandledQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RequestQty"); migrationBuilder.RenameColumn( name: "HandledProduceDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "TransferLibFromExpireDate"); migrationBuilder.RenameColumn( name: "HandledExpireDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "TransferLibFromArriveDate"); migrationBuilder.RenameColumn( name: "HandledArriveDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RecommendToProduceDate"); migrationBuilder.RenameColumn( name: "ExpiredTime", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RecommendToExpireDate"); migrationBuilder.RenameColumn( name: "DeliveryQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RecommendToQty"); migrationBuilder.AlterColumn( @@ -1659,7 +1659,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "Uom", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -1668,7 +1668,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -1678,7 +1678,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -1688,7 +1688,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -1698,7 +1698,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -1708,7 +1708,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -1718,7 +1718,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -1728,7 +1728,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -1738,7 +1738,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -1748,7 +1748,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(450)", nullable: true, oldClrType: typeof(string), @@ -1758,7 +1758,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -1768,350 +1768,350 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "HandledFromArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledFromContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledFromExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledFromLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledFromPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(450)", nullable: true); migrationBuilder.AddColumn( name: "HandledFromProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledFromQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); migrationBuilder.AddColumn( name: "HandledFromSupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledToContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledToLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledToQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); migrationBuilder.AddColumn( name: "HandledToSupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendFromArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "RecommendFromContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendFromLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendFromPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendFromQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); migrationBuilder.AddColumn( name: "RecommendFromSupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); migrationBuilder.AddColumn( name: "RecommendToSupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); migrationBuilder.AddColumn( name: "RequestWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "Status", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "int", nullable: false, defaultValue: 0); migrationBuilder.AddColumn( name: "TransferLibFromContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromSupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(max)", nullable: true); @@ -2707,7 +2707,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -2717,7 +2717,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -2727,7 +2727,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -2737,7 +2737,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -2747,7 +2747,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -2757,7 +2757,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "Number", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -2766,7 +2766,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "ItemName", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -2776,7 +2776,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "ItemDesc2", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -2786,7 +2786,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "ItemDesc1", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -2796,7 +2796,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "ItemCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -2805,7 +2805,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -2815,7 +2815,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -2825,7 +2825,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -2835,7 +2835,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -2845,7 +2845,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true, oldClrType: typeof(string), @@ -2855,380 +2855,380 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "HandledFromArriveDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledFromContainerCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledFromExpireDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledFromLot", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledFromPackingCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledFromProduceDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledFromQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); migrationBuilder.AddColumn( name: "HandledFromSupplierBatch", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToArriveDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledToContainerCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToExpireDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledToLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToLot", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToPackingCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToProduceDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "HandledToQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); migrationBuilder.AddColumn( name: "HandledToSupplierBatch", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "HandledToWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendFromArriveDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "RecommendFromContainerCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendFromExpireDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "RecommendFromLot", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendFromPackingCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendFromProduceDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "RecommendFromQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); migrationBuilder.AddColumn( name: "RecommendFromSupplierBatch", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToArriveDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "RecommendToContainerCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToLot", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToPackingCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToSupplierBatch", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RecommendToWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "RequestWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromContainerCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromLot", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromPackingCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromSupplierBatch", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibFromWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToContainerCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToLot", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToPackingCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToSupplierBatch", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "TransferLibToWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(max)", nullable: true); @@ -3239,13 +3239,13 @@ namespace Win_in.Sfs.Wms.Store.Migrations unique: true); migrationBuilder.CreateIndex( - name: "IX_Store_InjectionNoteDetail_HandledFromPackingCode", - table: "Store_InjectionNoteDetail", + name: "IX_Store_InjectionIssueNoteDetail_HandledFromPackingCode", + table: "Store_InjectionIssueNoteDetail", column: "HandledFromPackingCode"); migrationBuilder.CreateIndex( - name: "IX_Store_InjectionNoteDetail_Number_HandledFromPackingCode_HandledFromLocationCode_HandledToLocationCode", - table: "Store_InjectionNoteDetail", + name: "IX_Store_InjectionIssueNoteDetail_Number_HandledFromPackingCode_HandledFromLocationCode_HandledToLocationCode", + table: "Store_InjectionIssueNoteDetail", columns: new[] { "Number", "HandledFromPackingCode", "HandledFromLocationCode", "HandledToLocationCode" }, unique: true, filter: "[HandledFromPackingCode] IS NOT NULL AND [HandledFromLocationCode] IS NOT NULL AND [HandledToLocationCode] IS NOT NULL"); @@ -3258,12 +3258,12 @@ namespace Win_in.Sfs.Wms.Store.Migrations table: "Store_TransferLibNoteDetail"); migrationBuilder.DropIndex( - name: "IX_Store_InjectionNoteDetail_HandledFromPackingCode", - table: "Store_InjectionNoteDetail"); + name: "IX_Store_InjectionIssueNoteDetail_HandledFromPackingCode", + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropIndex( - name: "IX_Store_InjectionNoteDetail_Number_HandledFromPackingCode_HandledFromLocationCode_HandledToLocationCode", - table: "Store_InjectionNoteDetail"); + name: "IX_Store_InjectionIssueNoteDetail_Number_HandledFromPackingCode_HandledFromLocationCode_HandledToLocationCode", + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "IsItemCodeFrom", @@ -3639,227 +3639,227 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.DropColumn( name: "HandledFromArriveDate", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledFromContainerCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledFromExpireDate", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledFromLot", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledFromPackingCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledFromProduceDate", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledFromQty", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledFromSupplierBatch", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToArriveDate", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToContainerCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToExpireDate", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToLocationArea", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToLocationErpCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToLocationGroup", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToLot", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToPackingCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToProduceDate", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToQty", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToSupplierBatch", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledToWarehouseCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendFromArriveDate", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendFromContainerCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendFromLot", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendFromPackingCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendFromQty", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendFromSupplierBatch", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToContainerCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToLocationArea", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToLocationCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToLocationErpCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToLocationGroup", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToLot", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToPackingCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToQty", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToSupplierBatch", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RecommendToWarehouseCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RequestLocationArea", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RequestLocationCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RequestLocationErpCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RequestLocationGroup", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RequestQty", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "RequestWarehouseCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "Status", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromContainerCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLocationArea", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLocationCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLocationErpCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLocationGroup", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLot", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromPackingCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromSupplierBatch", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibFromWarehouseCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibToContainerCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibToLocationArea", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibToLocationCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "TransferLibToLocationErpCode", - table: "Store_InjectionNoteDetail"); + table: "Store_InjectionIssueNoteDetail"); migrationBuilder.DropColumn( name: "HandledFromArriveDate", @@ -4039,247 +4039,247 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.DropColumn( name: "HandledFromArriveDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledFromContainerCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledFromExpireDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledFromLot", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledFromPackingCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledFromProduceDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledFromQty", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledFromSupplierBatch", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToArriveDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToContainerCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToExpireDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToLocationArea", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToLocationCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToLocationErpCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToLocationGroup", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToLot", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToPackingCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToProduceDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToQty", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToSupplierBatch", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "HandledToWarehouseCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendFromArriveDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendFromContainerCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendFromExpireDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendFromLot", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendFromPackingCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendFromProduceDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendFromQty", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendFromSupplierBatch", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToArriveDate", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToContainerCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToLocationArea", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToLocationCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToLocationErpCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToLocationGroup", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToLot", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToPackingCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToSupplierBatch", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RecommendToWarehouseCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RequestLocationArea", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RequestLocationErpCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RequestLocationGroup", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "RequestWarehouseCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromContainerCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLocationArea", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLocationCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLocationErpCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLocationGroup", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromLot", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromPackingCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromSupplierBatch", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibFromWarehouseCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToContainerCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToLocationArea", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToLocationCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToLocationErpCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToLocationGroup", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToLot", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToPackingCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToSupplierBatch", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.DropColumn( name: "TransferLibToWarehouseCode", - table: "Job_InjectionJobDetail"); + table: "Job_InjectionIssueJobDetail"); migrationBuilder.RenameColumn( name: "RequestWarehouseCode", @@ -4363,97 +4363,97 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.RenameColumn( name: "TransferLibToWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "ToPackingCode"); migrationBuilder.RenameColumn( name: "TransferLibToSupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "ToLot"); migrationBuilder.RenameColumn( name: "TransferLibToQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendQty"); migrationBuilder.RenameColumn( name: "TransferLibToProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendProduceDate"); migrationBuilder.RenameColumn( name: "TransferLibToPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "ToContainerCode"); migrationBuilder.RenameColumn( name: "TransferLibToLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "FromLot"); migrationBuilder.RenameColumn( name: "TransferLibToLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "FromContainerCode"); migrationBuilder.RenameColumn( name: "TransferLibToExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendExpireDate"); migrationBuilder.RenameColumn( name: "TransferLibToArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "RecommendArriveDate"); migrationBuilder.RenameColumn( name: "TransferLibFromQty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "HandledQty"); migrationBuilder.RenameColumn( name: "TransferLibFromProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "ProduceDate"); migrationBuilder.RenameColumn( name: "TransferLibFromExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "IssueTime"); migrationBuilder.RenameColumn( name: "TransferLibFromArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "HandledProduceDate"); migrationBuilder.RenameColumn( name: "RecommendToProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "HandledExpireDate"); migrationBuilder.RenameColumn( name: "RecommendToExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "HandledArriveDate"); migrationBuilder.RenameColumn( name: "RecommendToArriveDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "ExpiredTime"); migrationBuilder.RenameColumn( name: "RecommendFromProduceDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "ExpireDate"); migrationBuilder.RenameColumn( name: "RecommendFromExpireDate", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "ArriveDate"); migrationBuilder.RenameColumn( name: "HandledToLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", newName: "FromPackingCode"); migrationBuilder.RenameColumn( @@ -4508,62 +4508,62 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.RenameColumn( name: "TransferLibToQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RoundedQty"); migrationBuilder.RenameColumn( name: "TransferLibToProduceDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RecommendProduceDate"); migrationBuilder.RenameColumn( name: "TransferLibToExpireDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RecommendExpireDate"); migrationBuilder.RenameColumn( name: "TransferLibToArriveDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RecommendArriveDate"); migrationBuilder.RenameColumn( name: "TransferLibFromQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "RecommendQty"); migrationBuilder.RenameColumn( name: "TransferLibFromProduceDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "PlanBeginTime"); migrationBuilder.RenameColumn( name: "TransferLibFromExpireDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "HandledProduceDate"); migrationBuilder.RenameColumn( name: "TransferLibFromArriveDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "HandledExpireDate"); migrationBuilder.RenameColumn( name: "RequestQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "HandledQty"); migrationBuilder.RenameColumn( name: "RecommendToQty", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "DeliveryQty"); migrationBuilder.RenameColumn( name: "RecommendToProduceDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "HandledArriveDate"); migrationBuilder.RenameColumn( name: "RecommendToExpireDate", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", newName: "ExpiredTime"); migrationBuilder.AlterColumn( @@ -5134,28 +5134,28 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "ExpiredTime", - table: "Store_InjectionRequestDetail", + table: "Store_InjectionIssueRequestDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "WorkStation", - table: "Store_InjectionRequestDetail", + table: "Store_InjectionIssueRequestDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ProdLine", - table: "Store_InjectionRequest", + table: "Store_InjectionIssueRequest", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AlterColumn( name: "Uom", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -5166,7 +5166,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5176,7 +5176,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5186,7 +5186,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5196,7 +5196,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5206,7 +5206,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5216,7 +5216,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5226,7 +5226,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5236,7 +5236,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5246,7 +5246,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5256,7 +5256,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5266,14 +5266,14 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "FromLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "FromLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -5281,7 +5281,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "FromLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -5289,14 +5289,14 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "FromLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "FromStatus", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -5304,7 +5304,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "FromWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -5312,35 +5312,35 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "HandledContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "HandledLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "HandledPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "HandledSupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "Qty", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "decimal(18,6)", precision: 18, scale: 6, @@ -5349,49 +5349,49 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "RecommendContainerCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "RecommendLot", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "RecommendPackingCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "RecommendSupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "SupplierBatch", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ToLocationArea", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ToLocationCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -5399,7 +5399,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "ToLocationErpCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -5407,14 +5407,14 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "ToLocationGroup", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ToStatus", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -5422,7 +5422,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "ToWarehouseCode", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -5430,14 +5430,14 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "WorkStation", - table: "Store_InjectionNoteDetail", + table: "Store_InjectionIssueNoteDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "Workshop", - table: "Store_InjectionNote", + table: "Store_InjectionIssueNote", type: "nvarchar(64)", maxLength: 64, nullable: true); @@ -5823,7 +5823,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5833,7 +5833,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5843,7 +5843,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5853,7 +5853,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5863,7 +5863,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "RecommendFromLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5873,7 +5873,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "Number", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -5884,7 +5884,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "ItemName", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5894,7 +5894,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "ItemDesc2", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5904,7 +5904,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "ItemDesc1", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5914,7 +5914,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "ItemCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -5925,7 +5925,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5935,7 +5935,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5945,7 +5945,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5955,7 +5955,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5965,7 +5965,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AlterColumn( name: "HandledFromLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true, @@ -5975,7 +5975,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "DistributionType", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -5983,42 +5983,42 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "HandledContainerCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "HandledLot", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "HandledPackingCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "HandledSupplierBatch", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "Operation", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "PlannedSplitRule", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -6026,70 +6026,70 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "RecommendContainerCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "RecommendLot", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "RecommendPackingCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "RecommendSupplierBatch", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ToLocationArea", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ToLocationCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ToLocationErpCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ToLocationGroup", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ToWarehouseCode", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "TruncType", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: false, @@ -6097,14 +6097,14 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "WorkStation", - table: "Job_InjectionJobDetail", + table: "Job_InjectionIssueJobDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "Workshop", - table: "Job_InjectionJob", + table: "Job_InjectionIssueJob", type: "nvarchar(64)", maxLength: 64, nullable: true); @@ -6117,13 +6117,13 @@ namespace Win_in.Sfs.Wms.Store.Migrations filter: "[FromPackingCode] IS NOT NULL"); migrationBuilder.CreateIndex( - name: "IX_Store_InjectionNoteDetail_FromPackingCode", - table: "Store_InjectionNoteDetail", + name: "IX_Store_InjectionIssueNoteDetail_FromPackingCode", + table: "Store_InjectionIssueNoteDetail", column: "FromPackingCode"); migrationBuilder.CreateIndex( - name: "IX_Store_InjectionNoteDetail_Number_FromPackingCode_FromLocationCode_ToLocationCode", - table: "Store_InjectionNoteDetail", + name: "IX_Store_InjectionIssueNoteDetail_Number_FromPackingCode_FromLocationCode_ToLocationCode", + table: "Store_InjectionIssueNoteDetail", columns: new[] { "Number", "FromPackingCode", "FromLocationCode", "ToLocationCode" }, unique: true, filter: "[FromPackingCode] IS NOT NULL"); 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 df7700712..9aa1915c7 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 @@ -26,7 +26,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -158,10 +158,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_AssembleJob", (string)null); + b.ToTable("Job_AssembleIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -425,10 +425,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_AssembleJobDetail", (string)null); + b.ToTable("Job_AssembleIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -511,10 +511,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_AssembleNote", (string)null); + b.ToTable("Store_AssembleIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -837,7 +837,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[FromPackingCode] IS NOT NULL"); - b.ToTable("Store_AssembleNoteDetail", (string)null); + b.ToTable("Store_AssembleIssueNoteDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => @@ -6662,7 +6662,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_InjectioModelPlanDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6705,7 +6705,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("InjectionRequestNumber") + b.Property("InjectionIssueRequestNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -6790,10 +6790,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_InjectionJob", (string)null); + b.ToTable("Job_InjectionIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7126,10 +7126,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_InjectionJobDetail", (string)null); + b.ToTable("Job_InjectionIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7208,10 +7208,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionNote", (string)null); + b.ToTable("Store_InjectionIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7559,10 +7559,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[HandledFromPackingCode] IS NOT NULL AND [HandledFromLocationCode] IS NOT NULL AND [HandledToLocationCode] IS NOT NULL"); - b.ToTable("Store_InjectionNoteDetail", (string)null); + b.ToTable("Store_InjectionIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7646,10 +7646,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionRequest", (string)null); + b.ToTable("Store_InjectionIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7786,7 +7786,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_InjectionRequestDetail", (string)null); + b.ToTable("Store_InjectionIssueRequestDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InspectAbnormalNote", b => @@ -28760,7 +28760,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_CoatingIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -28845,10 +28845,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequest", (string)null); + b.ToTable("Store_CoatingIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -28985,21 +28985,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequestDetail", (string)null); + b.ToTable("Store_CoatingIssueRequestDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -29195,27 +29195,27 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -29861,21 +29861,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", b => { b.Navigation("Details"); }); @@ -29982,17 +29982,17 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Navigation("Details"); }); @@ -30340,7 +30340,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", 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 f3c57135a..1af7af73a 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 @@ -11,27 +11,27 @@ namespace Win_in.Sfs.Wms.Store.Migrations { migrationBuilder.DropColumn( name: "ExpiredTime", - table: "Store_CoatingMaterialRequestDetail"); + table: "Store_CoatingIssueRequestDetail"); migrationBuilder.DropColumn( name: "FromLocationArea", - table: "Store_CoatingMaterialRequestDetail"); + table: "Store_CoatingIssueRequestDetail"); migrationBuilder.DropColumn( name: "WorkStation", - table: "Store_CoatingMaterialRequestDetail"); + table: "Store_CoatingIssueRequestDetail"); migrationBuilder.DropColumn( name: "PreparationPlanNumber", - table: "Store_CoatingMaterialRequest"); + table: "Store_CoatingIssueRequest"); migrationBuilder.DropColumn( name: "ProdLine", - table: "Store_CoatingMaterialRequest"); + table: "Store_CoatingIssueRequest"); migrationBuilder.DropColumn( name: "Workshop", - table: "Store_CoatingMaterialRequest"); + table: "Store_CoatingIssueRequest"); migrationBuilder.DropColumn( name: "ExpiredTime", @@ -51,7 +51,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "BoxQty", - table: "Store_CoatingMaterialRequestDetail", + table: "Store_CoatingIssueRequestDetail", type: "decimal(18,6)", nullable: false, defaultValue: 0m); @@ -173,7 +173,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.DropColumn( name: "BoxQty", - table: "Store_CoatingMaterialRequestDetail"); + table: "Store_CoatingIssueRequestDetail"); migrationBuilder.DropColumn( name: "BoxQty", @@ -181,41 +181,41 @@ namespace Win_in.Sfs.Wms.Store.Migrations migrationBuilder.AddColumn( name: "ExpiredTime", - table: "Store_CoatingMaterialRequestDetail", + table: "Store_CoatingIssueRequestDetail", type: "datetime2", nullable: false, defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); migrationBuilder.AddColumn( name: "FromLocationArea", - table: "Store_CoatingMaterialRequestDetail", + table: "Store_CoatingIssueRequestDetail", type: "nvarchar(max)", nullable: true); migrationBuilder.AddColumn( name: "WorkStation", - table: "Store_CoatingMaterialRequestDetail", + table: "Store_CoatingIssueRequestDetail", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "PreparationPlanNumber", - table: "Store_CoatingMaterialRequest", + table: "Store_CoatingIssueRequest", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "ProdLine", - table: "Store_CoatingMaterialRequest", + table: "Store_CoatingIssueRequest", type: "nvarchar(64)", maxLength: 64, nullable: true); migrationBuilder.AddColumn( name: "Workshop", - table: "Store_CoatingMaterialRequest", + table: "Store_CoatingIssueRequest", 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 631928205..057a56b4b 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 @@ -24,7 +24,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -156,10 +156,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_AssembleJob", (string)null); + b.ToTable("Job_AssembleIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -423,10 +423,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_AssembleJobDetail", (string)null); + b.ToTable("Job_AssembleIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -509,10 +509,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_AssembleNote", (string)null); + b.ToTable("Store_AssembleIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -835,7 +835,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[FromPackingCode] IS NOT NULL"); - b.ToTable("Store_AssembleNoteDetail", (string)null); + b.ToTable("Store_AssembleIssueNoteDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueRequests", b => @@ -6660,7 +6660,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_InjectioModelPlanDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -6703,7 +6703,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("InjectionRequestNumber") + b.Property("InjectionIssueRequestNumber") .HasMaxLength(64) .HasColumnType("nvarchar(64)"); @@ -6788,10 +6788,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Job_InjectionJob", (string)null); + b.ToTable("Job_InjectionIssueJob", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7124,10 +7124,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("MasterID"); - b.ToTable("Job_InjectionJobDetail", (string)null); + b.ToTable("Job_InjectionIssueJobDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7206,10 +7206,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionNote", (string)null); + b.ToTable("Store_InjectionIssueNote", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7557,10 +7557,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsUnique() .HasFilter("[HandledFromPackingCode] IS NOT NULL AND [HandledFromLocationCode] IS NOT NULL AND [HandledToLocationCode] IS NOT NULL"); - b.ToTable("Store_InjectionNoteDetail", (string)null); + b.ToTable("Store_InjectionIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7644,10 +7644,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_InjectionRequest", (string)null); + b.ToTable("Store_InjectionIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -7784,7 +7784,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_InjectionRequestDetail", (string)null); + b.ToTable("Store_InjectionIssueRequestDetail", (string)null); }); modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InspectAbnormalNote", b => @@ -28758,7 +28758,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.ToTable("Store_CoatingIssueNoteDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -28843,10 +28843,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequest", (string)null); + b.ToTable("Store_CoatingIssueRequest", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -28983,21 +28983,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.HasIndex("Number", "ItemCode", "ToLocationCode") .IsUnique(); - b.ToTable("Store_CoatingMaterialRequestDetail", (string)null); + b.ToTable("Store_CoatingIssueRequestDetail", (string)null); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -29193,27 +29193,27 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJobDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJobDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionJob", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNoteDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNoteDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionNote", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) @@ -29859,21 +29859,21 @@ namespace Win_in.Sfs.Wms.Store.Migrations .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequestDetail", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequestDetail", b => { - b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", null) + b.HasOne("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", null) .WithMany("Details") .HasForeignKey("MasterID") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.AssembleIssueNote", b => { b.Navigation("Details"); }); @@ -29980,17 +29980,17 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionJob", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueJob", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionNote", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueNote", b => { b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Domain.InjectionIssueRequest", b => { b.Navigation("Details"); }); @@ -30338,7 +30338,7 @@ namespace Win_in.Sfs.Wms.Store.Migrations b.Navigation("Details"); }); - modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequest", b => + modelBuilder.Entity("Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingIssueRequest", b => { b.Navigation("Details"); }); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/AssembleNotes/AssembleNoteDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteDbContextModelCreatingExtensions.cs similarity index 80% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/AssembleNotes/AssembleNoteDbContextModelCreatingExtensions.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteDbContextModelCreatingExtensions.cs index b739a5680..3ddeacd5c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/AssembleNotes/AssembleNoteDbContextModelCreatingExtensions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteDbContextModelCreatingExtensions.cs @@ -5,14 +5,14 @@ using Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; -public static class AssembleNoteDbContextModelCreatingExtensions +public static class AssembleIssueNoteDbContextModelCreatingExtensions { - public static void ConfigureAssembleNote(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options) + public static void ConfigureAssembleIssueNote(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options) { - builder.Entity(b => + builder.Entity(b => { //Configure table & schema name - b.ToTable(options.TablePrefix + nameof(AssembleNote), options.Schema); + b.ToTable(options.TablePrefix + nameof(AssembleIssueNote), options.Schema); //Configure ABP properties b.ConfigureByConvention(); //Configure Sfs base properties @@ -30,10 +30,10 @@ public static class AssembleNoteDbContextModelCreatingExtensions b.HasIndex(q => new { q.Number }).IsUnique(); }); - builder.Entity(b => + builder.Entity(b => { //Configure table & schema name - b.ToTable(options.TablePrefix + nameof(AssembleNoteDetail), options.Schema); + b.ToTable(options.TablePrefix + nameof(AssembleIssueNoteDetail), options.Schema); //Configure ABP properties b.ConfigureByConvention(); //Configure Sfs base properties diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteEfCoreRepository.cs new file mode 100644 index 000000000..3418c79e7 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/AssembleIssueNotes/AssembleIssueNoteEfCoreRepository.cs @@ -0,0 +1,11 @@ +using Volo.Abp.EntityFrameworkCore; +using Win_in.Sfs.Wms.Store.Domain; + +namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; + +public class AssembleIssueNoteEfCoreRepository : SfsStoreEfCoreRepositoryBase, IAssembleIssueNoteRepository +{ + public AssembleIssueNoteEfCoreRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/AssembleNotes/AssembleNoteEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/AssembleNotes/AssembleNoteEfCoreRepository.cs deleted file mode 100644 index 4ab8d2677..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/AssembleNotes/AssembleNoteEfCoreRepository.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Volo.Abp.EntityFrameworkCore; -using Win_in.Sfs.Wms.Store.Domain; - -namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; - -public class AssembleNoteEfCoreRepository : SfsStoreEfCoreRepositoryBase, IAssembleNoteRepository -{ - public AssembleNoteEfCoreRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - } -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/CoatingIssueNoteDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDbContextModelCreatingExtensions.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/CoatingIssueNoteDbContextModelCreatingExtensions.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDbContextModelCreatingExtensions.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/CoatingIssueNoteEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteEfCoreRepository.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/CoatingIssueNoteEfCoreRepository.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteEfCoreRepository.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/InjectionNotes/InjectionNoteDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteDbContextModelCreatingExtensions.cs similarity index 79% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/InjectionNotes/InjectionNoteDbContextModelCreatingExtensions.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteDbContextModelCreatingExtensions.cs index 601845cff..c6f35b84b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/InjectionNotes/InjectionNoteDbContextModelCreatingExtensions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteDbContextModelCreatingExtensions.cs @@ -5,14 +5,14 @@ using Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; -public static class InjectionNoteDbContextModelCreatingExtensions +public static class InjectionIssueNoteDbContextModelCreatingExtensions { - public static void ConfigureInjectionNote(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options) + public static void ConfigureInjectionIssueNote(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options) { - builder.Entity(b => + builder.Entity(b => { //Configure table & schema name - b.ToTable(options.TablePrefix + nameof(InjectionNote), options.Schema); + b.ToTable(options.TablePrefix + nameof(InjectionIssueNote), options.Schema); //Configure ABP properties b.ConfigureByConvention(); //Configure Sfs base properties @@ -30,10 +30,10 @@ public static class InjectionNoteDbContextModelCreatingExtensions b.HasIndex(q => new { q.Number }).IsUnique(); }); - builder.Entity(b => + builder.Entity(b => { //Configure table & schema name - b.ToTable(options.TablePrefix + nameof(InjectionNoteDetail), options.Schema); + b.ToTable(options.TablePrefix + nameof(InjectionIssueNoteDetail), options.Schema); //Configure ABP properties b.ConfigureByConvention(); //Configure Sfs base properties diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteEfCoreRepository.cs new file mode 100644 index 000000000..3d0672484 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteEfCoreRepository.cs @@ -0,0 +1,11 @@ +using Volo.Abp.EntityFrameworkCore; +using Win_in.Sfs.Wms.Store.Domain; + +namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; + +public class InjectionIssueNoteEfCoreRepository : SfsStoreEfCoreRepositoryBase, IInjectionIssueNoteRepository +{ + public InjectionIssueNoteEfCoreRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/InjectionNotes/InjectionNoteEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/InjectionNotes/InjectionNoteEfCoreRepository.cs deleted file mode 100644 index 26e8dc61c..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/InjectionNotes/InjectionNoteEfCoreRepository.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Volo.Abp.EntityFrameworkCore; -using Win_in.Sfs.Wms.Store.Domain; - -namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; - -public class InjectionNoteEfCoreRepository : SfsStoreEfCoreRepositoryBase, IInjectionNoteRepository -{ - public InjectionNoteEfCoreRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - } -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/IssueNoteDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/IssueNotes/IssueNoteDbContextModelCreatingExtensions.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/IssueNoteDbContextModelCreatingExtensions.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/IssueNotes/IssueNoteDbContextModelCreatingExtensions.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/IssueNoteEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/IssueNotes/IssueNoteEfCoreRepository.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/IssueNoteEfCoreRepository.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/IssueNotes/IssueNoteEfCoreRepository.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestsDbContextModelCreatingExtensions.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsDbContextModelCreatingExtensions.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestsDbContextModelCreatingExtensions.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestsEfCoreRepository.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/AssembleIssueRequests/AssembleIssueRequestsEfCoreRepository.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestsEfCoreRepository.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/CoatingMaterialRequestDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/CoatingIssueRequest/CoatingIssueRequestDbContextModelCreatingExtensions.cs similarity index 82% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/CoatingMaterialRequestDbContextModelCreatingExtensions.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/CoatingIssueRequest/CoatingIssueRequestDbContextModelCreatingExtensions.cs index 3b69edce7..e2f1ffdd5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/CoatingMaterialRequestDbContextModelCreatingExtensions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/CoatingIssueRequest/CoatingIssueRequestDbContextModelCreatingExtensions.cs @@ -5,14 +5,14 @@ using Win_in.Sfs.Wms.Store.Requests.MaterialRequests; namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; -public static class CoatingMaterialRequestDbContextModelCreatingExtensions +public static class CoatingIssueRequestDbContextModelCreatingExtensions { - public static void ConfigureCoatingMaterialRequest(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options) + public static void ConfigureCoatingIssueRequest(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options) { - builder.Entity(b => + builder.Entity(b => { //Configure table & schema name - b.ToTable(options.TablePrefix + nameof(CoatingMaterialRequest), options.Schema); + b.ToTable(options.TablePrefix + nameof(CoatingIssueRequest), options.Schema); //Configure ABP properties b.ConfigureByConvention(); //Configure Sfs base properties @@ -29,10 +29,10 @@ public static class CoatingMaterialRequestDbContextModelCreatingExtensions b.HasIndex(q => new { q.Number }).IsUnique(); }); - builder.Entity(b => + builder.Entity(b => { //Configure table & schema name - b.ToTable(options.TablePrefix + nameof(CoatingMaterialRequestDetail), options.Schema); + b.ToTable(options.TablePrefix + nameof(CoatingIssueRequestDetail), 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/IssueRequests/CoatingIssueRequest/CoatingIssueRequestEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/CoatingIssueRequest/CoatingIssueRequestEfCoreRepository.cs new file mode 100644 index 000000000..333de3a54 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/CoatingIssueRequest/CoatingIssueRequestEfCoreRepository.cs @@ -0,0 +1,11 @@ +using Volo.Abp.EntityFrameworkCore; +using Win_in.Sfs.Wms.Store.Requests.MaterialRequests; + +namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; + +public class CoatingIssueRequestEfCoreRepository : SfsStoreEfCoreRepositoryBase, ICoatingIssueRequestRepository +{ + public CoatingIssueRequestEfCoreRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/InjectionRequests/InjectionRequestDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/InjectionRequests/InjectionIssueRequestDbContextModelCreatingExtensions.cs similarity index 83% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/InjectionRequests/InjectionRequestDbContextModelCreatingExtensions.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/InjectionRequests/InjectionIssueRequestDbContextModelCreatingExtensions.cs index a5b17edeb..0e5261b27 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/InjectionRequests/InjectionRequestDbContextModelCreatingExtensions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/InjectionRequests/InjectionIssueRequestDbContextModelCreatingExtensions.cs @@ -5,14 +5,14 @@ using Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; -public static class InjectionRequestDbContextModelCreatingExtensions +public static class InjectionIssueRequestDbContextModelCreatingExtensions { - public static void ConfigureInjectionRequest(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options) + public static void ConfigureInjectionIssueRequest(this ModelBuilder builder, StoreModelBuilderConfigurationOptions options) { - builder.Entity(b => + builder.Entity(b => { //Configure table & schema name - b.ToTable(options.TablePrefix + nameof(InjectionRequest), options.Schema); + b.ToTable(options.TablePrefix + nameof(InjectionIssueRequest), options.Schema); //Configure ABP properties b.ConfigureByConvention(); //Configure Sfs base properties @@ -29,10 +29,10 @@ public static class InjectionRequestDbContextModelCreatingExtensions b.HasIndex(q => new { q.Number }).IsUnique(); }); - builder.Entity(b => + builder.Entity(b => { //Configure table & schema name - b.ToTable(options.TablePrefix + nameof(InjectionRequestDetail), options.Schema); + b.ToTable(options.TablePrefix + nameof(InjectionIssueRequestDetail), 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/IssueRequests/InjectionRequests/InjectionIssueRequestEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/InjectionRequests/InjectionIssueRequestEfCoreRepository.cs new file mode 100644 index 000000000..f493e9030 --- /dev/null +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/InjectionRequests/InjectionIssueRequestEfCoreRepository.cs @@ -0,0 +1,11 @@ +using Volo.Abp.EntityFrameworkCore; +using Win_in.Sfs.Wms.Store.Domain; + +namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; + +public class InjectionIssueRequestEfCoreRepository : SfsStoreEfCoreRepositoryBase, IInjectionIssueRequestRepository +{ + public InjectionIssueRequestEfCoreRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } +} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/MaterialRequestDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/IssueRequests/MaterialRequestDbContextModelCreatingExtensions.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/MaterialRequestDbContextModelCreatingExtensions.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/IssueRequests/MaterialRequestDbContextModelCreatingExtensions.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/MaterialRequestEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/IssueRequests/MaterialRequestEfCoreRepository.cs similarity index 100% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/MaterialRequestEfCoreRepository.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/IssueRequests/MaterialRequestEfCoreRepository.cs diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/CoatingMaterialRequestEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/CoatingMaterialRequestEfCoreRepository.cs deleted file mode 100644 index 14ee5826f..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/CoatingMaterialRequestEfCoreRepository.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Volo.Abp.EntityFrameworkCore; -using Win_in.Sfs.Wms.Store.Requests.MaterialRequests; - -namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; - -public class CoatingMaterialRequestEfCoreRepository : SfsStoreEfCoreRepositoryBase, ICoatingMaterialRequestRepository -{ - public CoatingMaterialRequestEfCoreRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - } -} diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/InjectionRequests/InjectionRequestEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/InjectionRequests/InjectionRequestEfCoreRepository.cs deleted file mode 100644 index 7b5e20a16..000000000 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/InjectionRequests/InjectionRequestEfCoreRepository.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Volo.Abp.EntityFrameworkCore; -using Win_in.Sfs.Wms.Store.Domain; - -namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore; - -public class InjectionRequestEfCoreRepository : SfsStoreEfCoreRepositoryBase, IInjectionRequestRepository -{ - public InjectionRequestEfCoreRepository(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 767efd5d1..44dab0289 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 @@ -21,7 +21,7 @@ public class StoreDbContext : AbpDbContext, IStoreDbContext public DbSet ProductReceiptRequests { get; set; } public DbSet MaterialRequests { get; set; } - public DbSet InjectionRequests { get; set; } + public DbSet InjectionIssueRequests { get; set; } public DbSet AssembleIssueRequests { get; set; } public DbSet ThirdLocationRequests { get; set; } public DbSet ContainerRequests { get; set; } @@ -78,8 +78,8 @@ public class StoreDbContext : AbpDbContext, IStoreDbContext public DbSet InventoryTransferNotes { get; set; } public DbSet WarehouseTransferNotes { get; set; } public DbSet IssueNotes { get; set; } - public DbSet InjectionNotes { get; set; } - public DbSet AssembleNotes { get; set; } + public DbSet InjectionIssueNotes { get; set; } + public DbSet AssembleIssueNotes { get; set; } public DbSet ThirdLocationNotes { get; set; } public DbSet ContainerNotes { get; set; } public DbSet UnplannedReceiptNotes { get; set; } @@ -106,8 +106,8 @@ public class StoreDbContext : AbpDbContext, IStoreDbContext public DbSet InspectJobs { get; set; } public DbSet PutawayJobs { get; set; } public DbSet IssueJobs { get; set; } - public DbSet InjectionJobs { get; set; } - public DbSet AssembleJobs { get; set; } + public DbSet InjectionIssueJobs { get; set; } + public DbSet AssembleIssueJobs { get; set; } public DbSet ThirdLocationJobs { get; set; } public DbSet ContainerJobs { get; set; } public DbSet DeliverJobs { 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 164956510..2495ebd04 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 @@ -47,7 +47,7 @@ public static class StoreDbContextModelCreatingExtensions builder.ConfigureProductReceiptRequest(options); builder.ConfigurePurchaseReceiptRequest(options); builder.ConfigureMaterialRequest(options); - builder.ConfigureInjectionRequest(options); + builder.ConfigureInjectionIssueRequest(options); builder.ConfigureAssembleIssueRequests(options); builder.ConfigureThirdLocationRequest(options); builder.ConfigureDeliverRequest(options); @@ -63,7 +63,7 @@ public static class StoreDbContextModelCreatingExtensions builder.ConfigureCountAdjustRequest(options); builder.ConfigureWipWarehouseAdjustRequest(options); builder.ConfigureCoatingIssueNote(options); - builder.ConfigureCoatingMaterialRequest(options); + builder.ConfigureCoatingIssueRequest(options); builder.ConfigureCoatingIssueJob(options); #endregion @@ -85,8 +85,8 @@ public static class StoreDbContextModelCreatingExtensions builder.ConfigureInventoryTransferNote(options); builder.ConfigureWarehouseTransferNote(options); builder.ConfigureIssueNote(options); - builder.ConfigureInjectionNote(options); - builder.ConfigureAssembleNote(options); + builder.ConfigureInjectionIssueNote(options); + builder.ConfigureAssembleIssueNote(options); builder.ConfigureThirdLocationNote(options); builder.ConfigureContainerNote(options); builder.ConfigureUnplannedReceiptNote(options); @@ -117,8 +117,8 @@ public static class StoreDbContextModelCreatingExtensions builder.ConfigureInspectJob(options); builder.ConfigurePutawayJob(options); builder.ConfigureIssueJob(options); - builder.ConfigureInjectionJob(options); - builder.ConfigureAssembleJob(options); + builder.ConfigureInjectionIssueJob(options); + builder.ConfigureAssembleIssueJob(options); builder.ConfigureThirdLocationJob(options); builder.ConfigureContainerJob(options); builder.ConfigureDeliverJob(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 9d8aad808..8b2b24281 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 @@ -60,7 +60,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(); @@ -76,7 +76,7 @@ public class StoreEntityFrameworkCoreModule : AbpModule context.Services.AddTransient(); context.Services.AddTransient(); - context.Services.AddTransient(); + context.Services.AddTransient(); @@ -103,8 +103,8 @@ 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(); context.Services.AddTransient(); context.Services.AddTransient(); @@ -137,8 +137,8 @@ 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(); context.Services.AddTransient(); context.Services.AddTransient(); @@ -207,7 +207,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)); @@ -266,9 +266,9 @@ 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 => + options.Entity(orderOptions => orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details)); options.Entity(orderOptions => orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details)); @@ -349,9 +349,9 @@ 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 => + 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 cfa65b89c..0b1c937e0 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 @@ -10,10 +10,10 @@ namespace Win_in.Sfs.Wms.Store.Event; public partial class StoreEventAutoMapperProfile : Profile { - private void AssembleJobAutoMapperProfile() + private void AssembleIssueJobAutoMapperProfile() { - CreateMap() + CreateMap() .ForMember(x => x.JobNumber, y => y.MapFrom(d => d.Number)) .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.AssembleRequestNumber)) .ForMember(x => x.ActiveDate, y => y.MapFrom(d => DateTime.Now)) @@ -22,16 +22,16 @@ public partial class StoreEventAutoMapperProfile : Profile .Ignore(x => x.Number) .Ignore(x => x.ConfirmTime); - CreateMap() + CreateMap() ; - CreateMap() + CreateMap() .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.AssembleRequestNumber)) .Ignore(x => x.Confirmed) .Ignore(x => x.JobNumber) .Ignore(x => x.ActiveDate) ; - CreateMap() + CreateMap() ; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/InjectionJobAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/InjectionJobAutoMapperProfile.cs index bf0a68f28..97daf0800 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/InjectionJobAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/InjectionJobAutoMapperProfile.cs @@ -10,28 +10,28 @@ namespace Win_in.Sfs.Wms.Store.Event; public partial class StoreEventAutoMapperProfile : Profile { - private void InjectionJobAutoMapperProfile() + private void InjectionIssueJobAutoMapperProfile() { - CreateMap() + CreateMap() .ForMember(x => x.JobNumber, y => y.MapFrom(d => d.Number)) - .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.InjectionRequestNumber)) + .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.InjectionIssueRequestNumber)) .ForMember(x => x.ActiveDate, y => y.MapFrom(d => DateTime.Now)) .ForMember(x => x.Worker, y => y.MapFrom(d => d.CompleteUserName)) .Ignore(x => x.Confirmed) .Ignore(x => x.Number) .Ignore(x => x.ConfirmTime); - CreateMap() + CreateMap() ; - CreateMap() - .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.InjectionRequestNumber)) + CreateMap() + .ForMember(x => x.RequestNumber, y => y.MapFrom(d => d.InjectionIssueRequestNumber)) .Ignore(x => x.Confirmed) .Ignore(x => x.JobNumber) .Ignore(x => x.ActiveDate) ; - CreateMap() + CreateMap() ; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Notes/AssembleNoteAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Notes/AssembleNoteAutoMapperProfile.cs index d9e072ec3..9838ad5a2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Notes/AssembleNoteAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Notes/AssembleNoteAutoMapperProfile.cs @@ -7,9 +7,9 @@ namespace Win_in.Sfs.Wms.Store.Event; public partial class StoreEventAutoMapperProfile : Profile { - private void AssembleNoteAutoMapperProfile() + private void AssembleIssueNoteAutoMapperProfile() { - CreateMap() + CreateMap() .Ignore(x => x.DocNumber) .Ignore(x => x.JobNumber) .Ignore(x => x.Worker) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Notes/InjectionNoteAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Notes/InjectionNoteAutoMapperProfile.cs index 815c19d23..178377edb 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Notes/InjectionNoteAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Notes/InjectionNoteAutoMapperProfile.cs @@ -7,9 +7,9 @@ namespace Win_in.Sfs.Wms.Store.Event; public partial class StoreEventAutoMapperProfile : Profile { - private void InjectionNoteAutoMapperProfile() + private void InjectionIssueNoteAutoMapperProfile() { - CreateMap() + CreateMap() .Ignore(x => x.DocNumber) .Ignore(x => x.JobNumber) .Ignore(x => x.Worker) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleIssueRequestsAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleIssueRequestsAutoMapperProfile.cs index 9c6479128..19bb2108f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleIssueRequestsAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleIssueRequestsAutoMapperProfile.cs @@ -11,7 +11,7 @@ public partial class StoreEventAutoMapperProfile : Profile { private void AssembleIssueRequestsAutoMapperProfile() { - CreateMap() + 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) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/CoatingMaterialRequestAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/CoatingMaterialRequestAutoMapperProfile.cs index ba680ff7c..91b1fc045 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/CoatingMaterialRequestAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/CoatingMaterialRequestAutoMapperProfile.cs @@ -11,9 +11,9 @@ namespace Win_in.Sfs.Wms.Store.Event; public partial class StoreEventAutoMapperProfile : Profile { - private void CoatingMaterialRequestAutoMapperProfile() + private void CoatingIssueRequestAutoMapperProfile() { - CreateMap() + CreateMap() .ForMember(x => x.MaterialRequestNumber, y => y.MapFrom(d => d.Number)) .ForMember(x => x.RequestType, y => y.MapFrom(d => d.Type)) .Ignore(x => x.WarehouseCode) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/InjectionRequestAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/InjectionRequestAutoMapperProfile.cs index bf79f15f5..a2e5c6569 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/InjectionRequestAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/InjectionRequestAutoMapperProfile.cs @@ -9,10 +9,10 @@ namespace Win_in.Sfs.Wms.Store.Event; public partial class StoreEventAutoMapperProfile : Profile { - private void InjectionRequestAutoMapperProfile() + private void InjectionIssueRequestAutoMapperProfile() { - CreateMap() - .ForMember(x => x.InjectionRequestNumber, y => y.MapFrom(d => d.Number)) + CreateMap() + .ForMember(x => x.InjectionIssueRequestNumber, 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/Jobs/AssembleJobEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/AssembleIssueJobEventHandler.cs similarity index 87% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/AssembleJobEventHandler.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/AssembleIssueJobEventHandler.cs index 6b212df3c..2474e5fbc 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/AssembleJobEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/AssembleIssueJobEventHandler.cs @@ -12,18 +12,18 @@ using Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.Event.BusinessJob; -public class AssembleJobEventHandler : +public class AssembleIssueJobEventHandler : StoreEventHandlerBase - , ILocalEventHandler> - , ILocalEventHandler> - , ILocalEventHandler>> + , ILocalEventHandler> + , ILocalEventHandler> + , ILocalEventHandler>> { - private readonly IAssembleNoteAppService _assembleNoteAppService; + private readonly IAssembleIssueNoteAppService _assembleNoteAppService; private readonly IExpectOutAppService _expectOutAppService; private readonly ILocationAppService _locationAppService; private readonly ITransferLibRequestAppService _transferLibRequestAppService; - public AssembleJobEventHandler(IAssembleNoteAppService assembleNoteAppService, + public AssembleIssueJobEventHandler(IAssembleIssueNoteAppService assembleNoteAppService, IExpectOutAppService expectOutAppService, ILocationAppService locationAppService, ITransferLibRequestAppService transferLibRequestAppService) { @@ -39,10 +39,10 @@ public class AssembleJobEventHandler : /// /// [UnitOfWork] - public virtual async Task HandleEventAsync(SfsCompletedEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsCompletedEntityEventData eventData) { var entity = eventData.Entity; - var assembleNote = await BuildAssembleNoteAsync(entity).ConfigureAwait(false); + var assembleNote = await BuildAssembleIssueNoteAsync(entity).ConfigureAwait(false); await _assembleNoteAppService.CreateAsync(assembleNote).ConfigureAwait(false); } @@ -51,7 +51,7 @@ public class AssembleJobEventHandler : /// /// /// - public virtual async Task HandleEventAsync(SfsCreatedEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsCreatedEntityEventData eventData) { var entity = eventData.Entity; @@ -65,7 +65,7 @@ public class AssembleJobEventHandler : /// /// /// - public virtual async Task HandleEventAsync(SfsCreatedEntityEventData> eventData) + public virtual async Task HandleEventAsync(SfsCreatedEntityEventData> eventData) { var entitys = eventData.Entity; @@ -84,7 +84,7 @@ public class AssembleJobEventHandler : /// /// /// - private async Task CreateExpectOutAsync(AssembleJob entity) + private async Task CreateExpectOutAsync(AssembleIssueJob entity) { var expectOutEditInputs = new List(); foreach (var detail in entity.Details) @@ -123,24 +123,24 @@ public class AssembleJobEventHandler : /// 根据是否在 第一层 来创建 是否生成库移任务 /// /// - private async Task CreateTransferLibAsync(AssembleJob assembleJob) + private async Task CreateTransferLibAsync(AssembleIssueJob assembleJob) { if (!await IsMinRowAsync(assembleJob).ConfigureAwait(false)) { foreach (var detail in assembleJob.Details) { var input = new TransferLibRequestEditInput(); - input.CallBusinessType = nameof(IAssembleJobAppService); + input.CallBusinessType = nameof(IAssembleIssueJobAppService); input.CallJobNumber = assembleJob.Number; input.CallRequestNumber = assembleJob.AssembleRequestNumber; - input.CallServerName = "Win_in.Sfs.Wms.Store.Application.AssembleJobAppService"; + input.CallServerName = "Win_in.Sfs.Wms.Store.Application.AssembleIssueJobAppService"; input.Type = "Transfer_Warehouse"; input.UseOnTheWayLocation = true; var detailInput = new TransferLibRequestDetailInput(); - detailInput.CallBusinessType = nameof(IAssembleJobAppService); + detailInput.CallBusinessType = nameof(IAssembleIssueJobAppService); detailInput.CallRequestNumber = assembleJob.AssembleRequestNumber; - detailInput.CallServerName = "Win_in.Sfs.Wms.Store.Application.AssembleJobAppService"; + detailInput.CallServerName = "Win_in.Sfs.Wms.Store.Application.AssembleIssueJobAppService"; detailInput.CallJobNumber = assembleJob.Number; detailInput.JobStatus = EnumJobStatus.Open; @@ -191,9 +191,9 @@ public class AssembleJobEventHandler : /// /// /// - private async Task BuildAssembleNoteAsync(AssembleJob entity) + private async Task BuildAssembleIssueNoteAsync(AssembleIssueJob entity) { - var assembleNoteCreateInput = ObjectMapper.Map(entity); + var assembleNoteCreateInput = ObjectMapper.Map(entity); assembleNoteCreateInput.JobNumber = entity.Number; await Task.CompletedTask.ConfigureAwait(false); @@ -206,7 +206,7 @@ public class AssembleJobEventHandler : /// /// /// - private async Task IsMinRowAsync(AssembleJob assembleJob) + private async Task IsMinRowAsync(AssembleIssueJob assembleJob) { var detail = assembleJob.Details.FirstOrDefault(); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/InjectionJobEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/InjectionIssueJobEventHandler.cs similarity index 88% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/InjectionJobEventHandler.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/InjectionIssueJobEventHandler.cs index 2654ce94a..8bd6ba2c5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/InjectionJobEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/InjectionIssueJobEventHandler.cs @@ -12,18 +12,18 @@ using Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.Event.BusinessJob; -public class InjectionJobEventHandler : +public class InjectionIssueJobEventHandler : StoreEventHandlerBase - , ILocalEventHandler> - , ILocalEventHandler> - , ILocalEventHandler>> + , ILocalEventHandler> + , ILocalEventHandler> + , ILocalEventHandler>> { - private readonly IInjectionNoteAppService _injectionNoteAppService; + private readonly IInjectionIssueNoteAppService _injectionNoteAppService; private readonly IExpectOutAppService _expectOutAppService; private readonly ILocationAppService _locationAppService; private readonly ITransferLibRequestAppService _transferLibRequestAppService; - public InjectionJobEventHandler(IInjectionNoteAppService injectionNoteAppService, + public InjectionIssueJobEventHandler(IInjectionIssueNoteAppService injectionNoteAppService, IExpectOutAppService expectOutAppService, ILocationAppService locationAppService, ITransferLibRequestAppService transferLibRequestAppService) { @@ -39,10 +39,10 @@ public class InjectionJobEventHandler : /// /// [UnitOfWork] - public virtual async Task HandleEventAsync(SfsCompletedEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsCompletedEntityEventData eventData) { var entity = eventData.Entity; - var injectionNote = await BuildInjectionNoteAsync(entity).ConfigureAwait(false); + var injectionNote = await BuildInjectionIssueNoteAsync(entity).ConfigureAwait(false); await _injectionNoteAppService.CreateAsync(injectionNote).ConfigureAwait(false); } @@ -51,7 +51,7 @@ public class InjectionJobEventHandler : /// /// /// - public virtual async Task HandleEventAsync(SfsCreatedEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsCreatedEntityEventData eventData) { var entity = eventData.Entity; @@ -65,7 +65,7 @@ public class InjectionJobEventHandler : /// /// /// - public virtual async Task HandleEventAsync(SfsCreatedEntityEventData> eventData) + public virtual async Task HandleEventAsync(SfsCreatedEntityEventData> eventData) { var entitys = eventData.Entity; @@ -84,7 +84,7 @@ public class InjectionJobEventHandler : /// /// /// - private async Task CreateExpectOutAsync(InjectionJob entity) + private async Task CreateExpectOutAsync(InjectionIssueJob entity) { var expectOutEditInputs = new List(); foreach (var detail in entity.Details) @@ -123,24 +123,24 @@ public class InjectionJobEventHandler : /// 根据是否在 第一层 来创建 是否生成库移任务 /// /// - private async Task CreateTransferLibAsync(InjectionJob injectionJob) + private async Task CreateTransferLibAsync(InjectionIssueJob injectionJob) { if (!await IsMinRowAsync(injectionJob).ConfigureAwait(false)) { foreach (var detail in injectionJob.Details) { var input = new TransferLibRequestEditInput(); - input.CallBusinessType = nameof(IInjectionJobAppService); + input.CallBusinessType = nameof(IInjectionIssueJobAppService); input.CallJobNumber = injectionJob.Number; - input.CallRequestNumber = injectionJob.InjectionRequestNumber; - input.CallServerName = "Win_in.Sfs.Wms.Store.Application.InjectionJobAppService"; + input.CallRequestNumber = injectionJob.InjectionIssueRequestNumber; + input.CallServerName = "Win_in.Sfs.Wms.Store.Application.InjectionIssueJobAppService"; input.Type = "Transfer_Warehouse"; input.UseOnTheWayLocation = true; var detailInput = new TransferLibRequestDetailInput(); - detailInput.CallBusinessType = nameof(IInjectionJobAppService); - detailInput.CallRequestNumber = injectionJob.InjectionRequestNumber; - detailInput.CallServerName = "Win_in.Sfs.Wms.Store.Application.InjectionJobAppService"; + detailInput.CallBusinessType = nameof(IInjectionIssueJobAppService); + detailInput.CallRequestNumber = injectionJob.InjectionIssueRequestNumber; + detailInput.CallServerName = "Win_in.Sfs.Wms.Store.Application.InjectionIssueJobAppService"; detailInput.CallJobNumber = injectionJob.Number; detailInput.JobStatus = EnumJobStatus.Open; @@ -191,9 +191,9 @@ public class InjectionJobEventHandler : /// /// /// - private async Task BuildInjectionNoteAsync(InjectionJob entity) + private async Task BuildInjectionIssueNoteAsync(InjectionIssueJob entity) { - var injectionNoteCreateInput = ObjectMapper.Map(entity); + var injectionNoteCreateInput = ObjectMapper.Map(entity); injectionNoteCreateInput.JobNumber = entity.Number; await Task.CompletedTask.ConfigureAwait(false); @@ -206,7 +206,7 @@ public class InjectionJobEventHandler : /// /// /// - private async Task IsMinRowAsync(InjectionJob injectionJob) + private async Task IsMinRowAsync(InjectionIssueJob injectionJob) { var detail = injectionJob.Details.FirstOrDefault(); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/AssembleIssueRequestsEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/AssembleIssueRequestsEventHandler.cs index 1a60eb749..97e9134d3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/AssembleIssueRequestsEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/AssembleIssueRequestsEventHandler.cs @@ -25,14 +25,14 @@ public class AssembleIssueRequestsEventHandler , ILocalEventHandler> , ILocalEventHandler>> { - private readonly IAssembleJobAppService _assembleJobAppService; + private readonly IAssembleIssueJobAppService _assembleJobAppService; private readonly IProductionLineAppService _productionLineAppService; private readonly IProductionLineItemAppService _productionLineItemAppService; private readonly ILocationAppService _locationAppService; private readonly IBalanceAppService _balanceAppService; public AssembleIssueRequestsEventHandler( - IAssembleJobAppService assembleJobAppService, IProductionLineAppService productionLineAppService, + IAssembleIssueJobAppService assembleJobAppService, IProductionLineAppService productionLineAppService, ILocationAppService locationAppService, IBalanceAppService balanceAppService, IProductionLineItemAppService productionLineItemAppService) { @@ -70,15 +70,15 @@ public class AssembleIssueRequestsEventHandler { var entity = eventData.Entity; - List assembleJobs = new EditableList(); + List assembleJobs = new EditableList(); switch (entity.Type) { case nameof(EnumIssueType.BoxQty): - assembleJobs = await CreateAssembleJobWithBoxQtyTypeAsync(entity).ConfigureAwait(false); + assembleJobs = await CreateAssembleIssueJobWithBoxQtyTypeAsync(entity).ConfigureAwait(false); break; case nameof(EnumIssueType.Qty): - assembleJobs = await CreateAssembleJobWithQtyTypeAsync(entity).ConfigureAwait(false); + assembleJobs = await CreateAssembleIssueJobWithQtyTypeAsync(entity).ConfigureAwait(false); break; } @@ -121,10 +121,10 @@ public class AssembleIssueRequestsEventHandler /// /// /// - private async Task> CreateAssembleJobWithQtyTypeAsync + private async Task> CreateAssembleIssueJobWithQtyTypeAsync (AssembleIssueRequests assembleRequest) { - var jobs = new List(); + var jobs = new List(); var toLocationCodes = assembleRequest.Details.Select(p => p.ToLocationCode).Distinct().ToList(); //所有发送库位的集合 var toLocations = await _locationAppService.GetByCodesAsync(toLocationCodes).ConfigureAwait(false); //所有库位的集合 @@ -138,7 +138,7 @@ public class AssembleIssueRequestsEventHandler //创建详情 var jobDetails = - await CreateAssembleJobDetailInputsWithQtyTypeAsync(assembleRequest, assembleRequestDetail, + await CreateAssembleIssueJobDetailInputsWithQtyTypeAsync(assembleRequest, assembleRequestDetail, toLocation.LocationGroupCode).ConfigureAwait(false); if (!jobDetails.Any()) { @@ -150,7 +150,7 @@ public class AssembleIssueRequestsEventHandler var job = jobs.FirstOrDefault(p => p.WorkGroupCode == fromLocation?.WorkGroupCode); if (job == null || job.Details.Any(p => p.RecommendToLocationCode != assembleRequestDetail.ToLocationCode)) { - job = await BuildAssembleJobCreateInputWithQtyTypeAsync(assembleRequest, fromLocation) + job = await BuildAssembleIssueJobCreateInputWithQtyTypeAsync(assembleRequest, fromLocation) .ConfigureAwait(false); jobs.Add(job); } @@ -173,9 +173,9 @@ public class AssembleIssueRequestsEventHandler } - var enableMultipleCreateAssembleJob = await SettingManager + var enableMultipleCreateAssembleIssueJob = await SettingManager .IsTrueAsync(StoreSettings.MaterialRequest.EnableMultipleCreateIssueJob).ConfigureAwait(false); - if (enableMultipleCreateAssembleJob) + if (enableMultipleCreateAssembleIssueJob) { //assembleRequest.Partial(); } @@ -200,12 +200,12 @@ public class AssembleIssueRequestsEventHandler /// /// /// - private async Task BuildAssembleJobCreateInputWithQtyTypeAsync( + private async Task BuildAssembleIssueJobCreateInputWithQtyTypeAsync( AssembleIssueRequests assembleRequest, LocationDTO fromLocation) { - AssembleJobEditInput job; - job = ObjectMapper.Map(assembleRequest); + AssembleIssueJobEditInput job; + job = ObjectMapper.Map(assembleRequest); job.JobType = EnumJobType.IssueJob; job.JobStatus = EnumJobStatus.Open; job.WorkGroupCode = fromLocation.WorkGroupCode; @@ -231,11 +231,11 @@ public class AssembleIssueRequestsEventHandler /// /// /// - private async Task> CreateAssembleJobDetailInputsWithQtyTypeAsync( + private async Task> CreateAssembleIssueJobDetailInputsWithQtyTypeAsync( AssembleIssueRequests assembleRequest, AssembleIssueRequestsDetail assembleRequestDetail, string toLocationGroupCode) { - var jobDetails = new List(); + var jobDetails = new List(); //获取推荐库存 var productionLineDto = await _productionLineAppService @@ -266,7 +266,7 @@ public class AssembleIssueRequestsEventHandler { //拿走需求量 var detail = - await BuildAssembleJobDetailWithQtyTypeAsync(assembleRequestDetail, recommend, + await BuildAssembleIssueJobDetailWithQtyTypeAsync(assembleRequestDetail, recommend, toLocationGroupCode) .ConfigureAwait(false); if (assembleRequest.UseOnTheWayLocation) @@ -295,12 +295,12 @@ public class AssembleIssueRequestsEventHandler /// /// /// - private async Task BuildAssembleJobDetailWithQtyTypeAsync( + private async Task BuildAssembleIssueJobDetailWithQtyTypeAsync( AssembleIssueRequestsDetail assembleRequestDetail, BalanceDTO balance, string toLocationGroupCode) { //ProductionLineDTO prodLine = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationGroupCode).ConfigureAwait(false); - var detail = ObjectMapper.Map(balance); + var detail = ObjectMapper.Map(balance); detail.RequestLocationCode = assembleRequestDetail.ToLocationCode; detail.PositionCode = assembleRequestDetail.PositionCode; detail.RecommendType = assembleRequestDetail.RecommendType; @@ -342,10 +342,10 @@ public class AssembleIssueRequestsEventHandler /// /// /// - private async Task> CreateAssembleJobWithBoxQtyTypeAsync + private async Task> CreateAssembleIssueJobWithBoxQtyTypeAsync (AssembleIssueRequests assembleRequest) { - var inputJobs = new List(); + var inputJobs = new List(); var inputExpectOutEditInput = new ExpectOutEditInput(); //已用的库存的箱码集合 var useBalanceList = new List(); @@ -398,7 +398,7 @@ public class AssembleIssueRequestsEventHandler usableList.Remove(firstUsable); var assembleJobEditInput = - await BuildAssembleJobCreateInputWithBoxQtyTypeAsync(assembleRequest, inputDetailTemplate, + await BuildAssembleIssueJobCreateInputWithBoxQtyTypeAsync(assembleRequest, inputDetailTemplate, firstUsable) .ConfigureAwait(false); @@ -417,11 +417,11 @@ public class AssembleIssueRequestsEventHandler /// /// /// - private async Task BuildAssembleJobCreateInputWithBoxQtyTypeAsync( + private async Task BuildAssembleIssueJobCreateInputWithBoxQtyTypeAsync( AssembleIssueRequests assembleRequest, AssembleIssueRequestsDetail assembleRequestDetail, BalanceDTO balanceDtos) { - var job = ObjectMapper.Map(assembleRequest); + var job = ObjectMapper.Map(assembleRequest); job.JobType = EnumJobType.IssueJob; job.JobStatus = EnumJobStatus.Open; job.WorkGroupCode = assembleRequestDetail.ToLocationGroup; @@ -429,7 +429,7 @@ public class AssembleIssueRequestsEventHandler job.Worker = assembleRequest.Worker; job.AssembleIssueRequestsNumber = assembleRequest.Number; - job.Details.Add(await BuildAssembleJobDetailWithBoxQtyTypeAsync(assembleRequestDetail, balanceDtos) + job.Details.Add(await BuildAssembleIssueJobDetailWithBoxQtyTypeAsync(assembleRequestDetail, balanceDtos) .ConfigureAwait(false)); await Task.CompletedTask.ConfigureAwait(false); @@ -444,10 +444,10 @@ public class AssembleIssueRequestsEventHandler /// /// /// - private async Task BuildAssembleJobDetailWithBoxQtyTypeAsync( + private async Task BuildAssembleIssueJobDetailWithBoxQtyTypeAsync( AssembleIssueRequestsDetail assembleRequestDetail, BalanceDTO balance) { - var detail = new AssembleJobDetailInput(); + var detail = new AssembleIssueJobDetailInput(); detail.RequestLocationCode = assembleRequestDetail.ToLocationCode; detail.RequestLocationGroup = assembleRequestDetail.ToLocationGroup; detail.RequestLocationArea = assembleRequestDetail.ToLocationArea; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/CoatingMaterialRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/CoatingMaterialRequestEventHandler.cs index 3189a4e5b..aca5239a6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/CoatingMaterialRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/CoatingMaterialRequestEventHandler.cs @@ -19,13 +19,13 @@ using Win_in.Sfs.Wms.Store.Requests.MaterialRequests; namespace Win_in.Sfs.Wms.Store.Event.BusinessRequest; -public class CoatingMaterialRequestEventHandler +public class CoatingIssueRequestEventHandler : StoreEventHandlerBase - , ILocalEventHandler> - , ILocalEventHandler> - , ILocalEventHandler> - , ILocalEventHandler> - , ILocalEventHandler>> + , ILocalEventHandler> + , ILocalEventHandler> + , ILocalEventHandler> + , ILocalEventHandler> + , ILocalEventHandler>> { private readonly ICoatingIssueJobAppService _coatingIssueJobAppService; private readonly IProductionLineAppService _productionLineAppService; @@ -33,7 +33,7 @@ public class CoatingMaterialRequestEventHandler private readonly ILocationAppService _locationAppService; private readonly IBalanceAppService _balanceAppService; - public CoatingMaterialRequestEventHandler( + public CoatingIssueRequestEventHandler( ICoatingIssueJobAppService coatingIssueJobAppService, IProductionLineAppService productionLineAppService, ILocationAppService locationAppService, IBalanceAppService balanceAppService, IProductionLineItemAppService productionLineItemAppService) @@ -49,7 +49,7 @@ public class CoatingMaterialRequestEventHandler /// 创建后 /// /// Event data - public virtual async Task HandleEventAsync(SfsCreatedEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsCreatedEntityEventData eventData) { await Task.CompletedTask.ConfigureAwait(false); } @@ -58,7 +58,7 @@ public class CoatingMaterialRequestEventHandler /// 批量创建后 /// /// Event data - public virtual async Task HandleEventAsync(SfsCreatedEntityEventData> eventData) + public virtual async Task HandleEventAsync(SfsCreatedEntityEventData> eventData) { await Task.CompletedTask.ConfigureAwait(false); } @@ -68,7 +68,7 @@ public class CoatingMaterialRequestEventHandler /// /// /// - public virtual async Task HandleEventAsync(SfsHandledEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsHandledEntityEventData eventData) { var entity = eventData.Entity; @@ -95,7 +95,7 @@ public class CoatingMaterialRequestEventHandler /// /// /// - public virtual async Task HandleEventAsync(SfsAbortedEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsAbortedEntityEventData eventData) { await Task.CompletedTask.ConfigureAwait(false); } @@ -105,10 +105,10 @@ public class CoatingMaterialRequestEventHandler /// /// /// - public virtual async Task HandleEventAsync(SfsCompletedEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsCompletedEntityEventData eventData) { _ = eventData.Entity; - // await _coatingIssueJobAppService.CompleteByCoatingMaterialRequestAsync(entity.Number); + // await _coatingIssueJobAppService.CompleteByCoatingIssueRequestAsync(entity.Number); await Task.CompletedTask.ConfigureAwait(false); } @@ -124,7 +124,7 @@ public class CoatingMaterialRequestEventHandler /// /// private async Task> CreateCoatingIssueJobWithQtyTypeAsync - (CoatingMaterialRequest coatingMaterialRequest) + (CoatingIssueRequest coatingMaterialRequest) { var jobs = new List(); @@ -203,11 +203,11 @@ public class CoatingMaterialRequestEventHandler /// /// private async Task BuildCoatingIssueJobCreateInputWithQtyTypeAsync( - CoatingMaterialRequest coatingMaterialRequest, + CoatingIssueRequest coatingMaterialRequest, LocationDTO fromLocation) { CoatingIssueJobEditInput job; - job = ObjectMapper.Map(coatingMaterialRequest); + job = ObjectMapper.Map(coatingMaterialRequest); job.JobType = EnumJobType.IssueJob; job.JobStatus = EnumJobStatus.Open; job.WorkGroupCode = fromLocation.WorkGroupCode; @@ -234,8 +234,8 @@ public class CoatingMaterialRequestEventHandler /// /// private async Task> CreateCoatingIssueJobDetailInputsWithQtyTypeAsync( - CoatingMaterialRequest coatingMaterialRequest, - CoatingMaterialRequestDetail coatingMaterialRequestDetail, string toLocationGroupCode) + CoatingIssueRequest coatingMaterialRequest, + CoatingIssueRequestDetail coatingMaterialRequestDetail, string toLocationGroupCode) { var jobDetails = new List(); @@ -298,7 +298,7 @@ public class CoatingMaterialRequestEventHandler /// /// private async Task BuildCoatingIssueJobDetailWithQtyTypeAsync( - CoatingMaterialRequestDetail coatingMaterialRequestDetail, BalanceDTO balance, string toLocationGroupCode) + CoatingIssueRequestDetail coatingMaterialRequestDetail, BalanceDTO balance, string toLocationGroupCode) { //ProductionLineDTO prodLine = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationGroupCode).ConfigureAwait(false); @@ -345,7 +345,7 @@ public class CoatingMaterialRequestEventHandler /// /// private async Task> CreateCoatingIssueJobWithBoxQtyTypeAsync - (CoatingMaterialRequest coatingMaterialRequest) + (CoatingIssueRequest coatingMaterialRequest) { var inputJobs = new List(); var inputExpectOutEditInput = new ExpectOutEditInput(); @@ -420,10 +420,10 @@ public class CoatingMaterialRequestEventHandler /// /// private async Task BuildCoatingIssueJobCreateInputWithBoxQtyTypeAsync( - CoatingMaterialRequest coatingMaterialRequest, - CoatingMaterialRequestDetail coatingMaterialRequestDetail, BalanceDTO balanceDtos) + CoatingIssueRequest coatingMaterialRequest, + CoatingIssueRequestDetail coatingMaterialRequestDetail, BalanceDTO balanceDtos) { - var job = ObjectMapper.Map(coatingMaterialRequest); + var job = ObjectMapper.Map(coatingMaterialRequest); job.JobType = EnumJobType.IssueJob; job.JobStatus = EnumJobStatus.Open; job.WorkGroupCode = coatingMaterialRequestDetail.ToLocationGroup; @@ -447,7 +447,7 @@ public class CoatingMaterialRequestEventHandler /// /// private async Task BuildCoatingIssueJobDetailWithBoxQtyTypeAsync( - CoatingMaterialRequestDetail coatingMaterialRequestDetail, BalanceDTO balance) + CoatingIssueRequestDetail coatingMaterialRequestDetail, BalanceDTO balance) { var detail = new CoatingIssueJobDetailInput(); detail.RequestLocationCode = coatingMaterialRequestDetail.ToLocationCode; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/InjectionRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/InjectionIssueRequestEventHandler.cs similarity index 83% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/InjectionRequestEventHandler.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/InjectionIssueRequestEventHandler.cs index e65bb7307..faf8ef288 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/InjectionRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/InjectionIssueRequestEventHandler.cs @@ -17,22 +17,22 @@ using Win_in.Sfs.Wms.Store.Domain.Shared; namespace Win_in.Sfs.Wms.Store.Event.BusinessRequest; -public class InjectionRequestEventHandler +public class InjectionIssueRequestEventHandler : StoreEventHandlerBase - , ILocalEventHandler> - , ILocalEventHandler> - , ILocalEventHandler> - , ILocalEventHandler> - , ILocalEventHandler>> + , ILocalEventHandler> + , ILocalEventHandler> + , ILocalEventHandler> + , ILocalEventHandler> + , ILocalEventHandler>> { - private readonly IInjectionJobAppService _injectionJobAppService; + private readonly IInjectionIssueJobAppService _injectionJobAppService; private readonly IProductionLineAppService _productionLineAppService; private readonly IProductionLineItemAppService _productionLineItemAppService; private readonly ILocationAppService _locationAppService; private readonly IBalanceAppService _balanceAppService; - public InjectionRequestEventHandler( - IInjectionJobAppService injectionJobAppService, IProductionLineAppService productionLineAppService, + public InjectionIssueRequestEventHandler( + IInjectionIssueJobAppService injectionJobAppService, IProductionLineAppService productionLineAppService, ILocationAppService locationAppService, IBalanceAppService balanceAppService, IProductionLineItemAppService productionLineItemAppService) { @@ -47,7 +47,7 @@ public class InjectionRequestEventHandler /// 创建后 /// /// Event data - public virtual async Task HandleEventAsync(SfsCreatedEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsCreatedEntityEventData eventData) { await Task.CompletedTask.ConfigureAwait(false); } @@ -56,7 +56,7 @@ public class InjectionRequestEventHandler /// 批量创建后 /// /// Event data - public virtual async Task HandleEventAsync(SfsCreatedEntityEventData> eventData) + public virtual async Task HandleEventAsync(SfsCreatedEntityEventData> eventData) { await Task.CompletedTask.ConfigureAwait(false); } @@ -66,19 +66,19 @@ public class InjectionRequestEventHandler /// /// /// - public virtual async Task HandleEventAsync(SfsHandledEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsHandledEntityEventData eventData) { var entity = eventData.Entity; - List injectionJobs = new EditableList(); + List injectionJobs = new EditableList(); switch (entity.Type) { case nameof(EnumIssueType.BoxQty): - injectionJobs = await CreateInjectionJobWithBoxQtyTypeAsync(entity).ConfigureAwait(false); + injectionJobs = await CreateInjectionIssueJobWithBoxQtyTypeAsync(entity).ConfigureAwait(false); break; case nameof(EnumIssueType.Qty): - injectionJobs = await CreateInjectionJobWithQtyTypeAsync(entity).ConfigureAwait(false); + injectionJobs = await CreateInjectionIssueJobWithQtyTypeAsync(entity).ConfigureAwait(false); break; } @@ -93,7 +93,7 @@ public class InjectionRequestEventHandler /// /// /// - public virtual async Task HandleEventAsync(SfsAbortedEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsAbortedEntityEventData eventData) { await Task.CompletedTask.ConfigureAwait(false); } @@ -103,10 +103,10 @@ public class InjectionRequestEventHandler /// /// /// - public virtual async Task HandleEventAsync(SfsCompletedEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsCompletedEntityEventData eventData) { _ = eventData.Entity; - // await _injectionJobAppService.CompleteByInjectionRequestAsync(entity.Number); + // await _injectionJobAppService.CompleteByInjectionIssueRequestAsync(entity.Number); await Task.CompletedTask.ConfigureAwait(false); } @@ -121,10 +121,10 @@ public class InjectionRequestEventHandler /// /// /// - private async Task> CreateInjectionJobWithQtyTypeAsync - (InjectionRequest injectionRequest) + private async Task> CreateInjectionIssueJobWithQtyTypeAsync + (InjectionIssueRequest injectionRequest) { - var jobs = new List(); + var jobs = new List(); var toLocationCodes = injectionRequest.Details.Select(p => p.ToLocationCode).Distinct().ToList(); //所有发送库位的集合 var toLocations = await _locationAppService.GetByCodesAsync(toLocationCodes).ConfigureAwait(false); //所有库位的集合 @@ -138,7 +138,7 @@ public class InjectionRequestEventHandler //创建详情 var jobDetails = - await CreateInjectionJobDetailInputsWithQtyTypeAsync(injectionRequest, injectionRequestDetail, + await CreateInjectionIssueJobDetailInputsWithQtyTypeAsync(injectionRequest, injectionRequestDetail, toLocation.LocationGroupCode).ConfigureAwait(false); if (!jobDetails.Any()) { @@ -150,7 +150,7 @@ public class InjectionRequestEventHandler var job = jobs.FirstOrDefault(p => p.WorkGroupCode == fromLocation?.WorkGroupCode); if (job == null || job.Details.Any(p => p.RecommendToLocationCode != injectionRequestDetail.ToLocationCode)) { - job = await BuildInjectionJobCreateInputWithQtyTypeAsync(injectionRequest, fromLocation) + job = await BuildInjectionIssueJobCreateInputWithQtyTypeAsync(injectionRequest, fromLocation) .ConfigureAwait(false); jobs.Add(job); } @@ -173,9 +173,9 @@ public class InjectionRequestEventHandler } - var enableMultipleCreateInjectionJob = await SettingManager + var enableMultipleCreateInjectionIssueJob = await SettingManager .IsTrueAsync(StoreSettings.MaterialRequest.EnableMultipleCreateIssueJob).ConfigureAwait(false); - if (enableMultipleCreateInjectionJob) + if (enableMultipleCreateInjectionIssueJob) { //injectionRequest.Partial(); } @@ -200,12 +200,12 @@ public class InjectionRequestEventHandler /// /// /// - private async Task BuildInjectionJobCreateInputWithQtyTypeAsync( - InjectionRequest injectionRequest, + private async Task BuildInjectionIssueJobCreateInputWithQtyTypeAsync( + InjectionIssueRequest injectionRequest, LocationDTO fromLocation) { - InjectionJobEditInput job; - job = ObjectMapper.Map(injectionRequest); + InjectionIssueJobEditInput job; + job = ObjectMapper.Map(injectionRequest); job.JobType = EnumJobType.IssueJob; job.JobStatus = EnumJobStatus.Open; job.WorkGroupCode = fromLocation.WorkGroupCode; @@ -216,7 +216,7 @@ public class InjectionRequestEventHandler job.Worker = "admin"; } - job.InjectionRequestNumber = injectionRequest.Number; + job.InjectionIssueRequestNumber = injectionRequest.Number; await Task.CompletedTask.ConfigureAwait(false); @@ -231,11 +231,11 @@ public class InjectionRequestEventHandler /// /// /// - private async Task> CreateInjectionJobDetailInputsWithQtyTypeAsync( - InjectionRequest injectionRequest, - InjectionRequestDetail injectionRequestDetail, string toLocationGroupCode) + private async Task> CreateInjectionIssueJobDetailInputsWithQtyTypeAsync( + InjectionIssueRequest injectionRequest, + InjectionIssueRequestDetail injectionRequestDetail, string toLocationGroupCode) { - var jobDetails = new List(); + var jobDetails = new List(); //获取推荐库存 var productionLineDto = await _productionLineAppService @@ -266,7 +266,7 @@ public class InjectionRequestEventHandler { //拿走需求量 var detail = - await BuildInjectionJobDetailWithQtyTypeAsync(injectionRequestDetail, recommend, + await BuildInjectionIssueJobDetailWithQtyTypeAsync(injectionRequestDetail, recommend, toLocationGroupCode) .ConfigureAwait(false); if (injectionRequest.UseOnTheWayLocation) @@ -295,12 +295,12 @@ public class InjectionRequestEventHandler /// /// /// - private async Task BuildInjectionJobDetailWithQtyTypeAsync( - InjectionRequestDetail injectionRequestDetail, BalanceDTO balance, string toLocationGroupCode) + private async Task BuildInjectionIssueJobDetailWithQtyTypeAsync( + InjectionIssueRequestDetail injectionRequestDetail, BalanceDTO balance, string toLocationGroupCode) { //ProductionLineDTO prodLine = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationGroupCode).ConfigureAwait(false); - var detail = ObjectMapper.Map(balance); + var detail = ObjectMapper.Map(balance); detail.RequestLocationCode = injectionRequestDetail.ToLocationCode; detail.PositionCode = injectionRequestDetail.PositionCode; detail.RecommendType = injectionRequestDetail.RecommendType; @@ -342,10 +342,10 @@ public class InjectionRequestEventHandler /// /// /// - private async Task> CreateInjectionJobWithBoxQtyTypeAsync - (InjectionRequest injectionRequest) + private async Task> CreateInjectionIssueJobWithBoxQtyTypeAsync + (InjectionIssueRequest injectionRequest) { - var inputJobs = new List(); + var inputJobs = new List(); var inputExpectOutEditInput = new ExpectOutEditInput(); //已用的库存的箱码集合 var useBalanceList = new List(); @@ -398,7 +398,7 @@ public class InjectionRequestEventHandler usableList.Remove(firstUsable); var injectionJobEditInput = - await BuildInjectionJobCreateInputWithBoxQtyTypeAsync(injectionRequest, inputDetailTemplate, + await BuildInjectionIssueJobCreateInputWithBoxQtyTypeAsync(injectionRequest, inputDetailTemplate, firstUsable) .ConfigureAwait(false); @@ -417,19 +417,19 @@ public class InjectionRequestEventHandler /// /// /// - private async Task BuildInjectionJobCreateInputWithBoxQtyTypeAsync( - InjectionRequest injectionRequest, - InjectionRequestDetail injectionRequestDetail, BalanceDTO balanceDtos) + private async Task BuildInjectionIssueJobCreateInputWithBoxQtyTypeAsync( + InjectionIssueRequest injectionRequest, + InjectionIssueRequestDetail injectionRequestDetail, BalanceDTO balanceDtos) { - var job = ObjectMapper.Map(injectionRequest); + var job = ObjectMapper.Map(injectionRequest); job.JobType = EnumJobType.IssueJob; job.JobStatus = EnumJobStatus.Open; job.WorkGroupCode = injectionRequestDetail.ToLocationGroup; job.WarehouseCode = injectionRequestDetail.ToWarehouseCode; job.Worker = injectionRequest.Worker; - job.InjectionRequestNumber = injectionRequest.Number; + job.InjectionIssueRequestNumber = injectionRequest.Number; - job.Details.Add(await BuildInjectionJobDetailWithBoxQtyTypeAsync(injectionRequestDetail, balanceDtos) + job.Details.Add(await BuildInjectionIssueJobDetailWithBoxQtyTypeAsync(injectionRequestDetail, balanceDtos) .ConfigureAwait(false)); await Task.CompletedTask.ConfigureAwait(false); @@ -444,10 +444,10 @@ public class InjectionRequestEventHandler /// /// /// - private async Task BuildInjectionJobDetailWithBoxQtyTypeAsync( - InjectionRequestDetail injectionRequestDetail, BalanceDTO balance) + private async Task BuildInjectionIssueJobDetailWithBoxQtyTypeAsync( + InjectionIssueRequestDetail injectionRequestDetail, BalanceDTO balance) { - var detail = new InjectionJobDetailInput(); + var detail = new InjectionIssueJobDetailInput(); detail.RequestLocationCode = injectionRequestDetail.ToLocationCode; detail.RequestLocationGroup=injectionRequestDetail.ToLocationGroup; detail.RequestLocationArea = injectionRequestDetail.ToLocationArea; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/Note/CoatingIssueNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/Note/CoatingIssueNoteEventHandler.cs index c53ed8426..71acd8c33 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/Note/CoatingIssueNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/Note/CoatingIssueNoteEventHandler.cs @@ -19,10 +19,10 @@ public class CoatingIssueNoteEventHandler , ILocalEventHandler>> , ILocalEventHandler> { - private readonly ICoatingMaterialRequestManager _materialRequestManager; + private readonly ICoatingIssueRequestManager _materialRequestManager; public CoatingIssueNoteEventHandler( - ICoatingMaterialRequestManager materialRequestManager + ICoatingIssueRequestManager materialRequestManager ) { _materialRequestManager = materialRequestManager; 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 9d40c7acc..4f6e5ff76 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 @@ -35,8 +35,8 @@ public partial class StoreEventAutoMapperProfile : Profile DeliverJobAutoMapperProfile(); InspectJobAutoMapperProfile(); IssueJobAutoMapperProfile(); - InjectionJobAutoMapperProfile(); - AssembleJobAutoMapperProfile(); + InjectionIssueJobAutoMapperProfile(); + AssembleIssueJobAutoMapperProfile(); ThirdLocationJobAutoMapperProfile(); JisDeliverJobAutoMapperProfile(); ProductionReturnJobAutoMapperProfile(); @@ -69,14 +69,14 @@ public partial class StoreEventAutoMapperProfile : Profile InventoryTransferNoteAutoMapperProfile(); IsolationNoteAutoMapperProfile(); IssueNoteAutoMapperProfile(); - InjectionNoteAutoMapperProfile(); - AssembleNoteAutoMapperProfile(); + InjectionIssueNoteAutoMapperProfile(); + AssembleIssueNoteAutoMapperProfile(); ThirdLocationNoteAutoMapperProfile(); ItemTransformNoteAutoMapperProfile(); JisDeliverNoteAutoMapperProfile(); JisProductReceiptNoteAutoMapperProfile(); MaterialRequestAutoMapperProfile(); - InjectionRequestAutoMapperProfile(); + InjectionIssueRequestAutoMapperProfile(); AssembleIssueRequestsAutoMapperProfile(); ThirdLocationRequestAutoMapperProfile(); ProductionReturnRequestAutoMapperProfile(); @@ -110,7 +110,7 @@ public partial class StoreEventAutoMapperProfile : Profile CoatingIssueJobAutoMapperProfile(); CoatingIssueNoteAutoMapperProfile(); - CoatingMaterialRequestAutoMapperProfile(); + CoatingIssueRequestAutoMapperProfile(); MesNoteAutoMapperProfile(); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/AssembleNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/AssembleIssueNoteEventHandler.cs similarity index 87% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/AssembleNoteEventHandler.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/AssembleIssueNoteEventHandler.cs index e6cffacd5..6ea4c044c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/AssembleNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/AssembleIssueNoteEventHandler.cs @@ -12,16 +12,16 @@ using Win_in.Sfs.Wms.Store.Event.Transaction; namespace Win_in.Sfs.Wms.Store.Event.Transactions; -public class AssembleNoteEventHandler +public class AssembleIssueNoteEventHandler : StoreInventoryEventHandlerBase - , ILocalEventHandler> - , ILocalEventHandler>> - , ILocalEventHandler> + , ILocalEventHandler> + , ILocalEventHandler>> + , ILocalEventHandler> { private const EnumTransType TransType = EnumTransType.Issue; [UnitOfWork] - public virtual async Task HandleEventAsync(SfsCreatedEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsCreatedEntityEventData eventData) { var entity = eventData.Entity; var transferLogs = new List(); @@ -34,7 +34,7 @@ public class AssembleNoteEventHandler } [UnitOfWork] - public virtual async Task HandleEventAsync(SfsCreatedEntityEventData> eventData) + public virtual async Task HandleEventAsync(SfsCreatedEntityEventData> eventData) { var entities = eventData.Entity; var transferLogs = new List(); @@ -48,7 +48,7 @@ public class AssembleNoteEventHandler } [UnitOfWork] - public virtual async Task HandleEventAsync(SfsConfirmedEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsConfirmedEntityEventData eventData) { var entity = eventData.Entity; @@ -66,12 +66,12 @@ public class AssembleNoteEventHandler await TransferLogAppService.AddManyAsync(transferLogs).ConfigureAwait(false); } - private async Task> BuildTransferLogsAsync(AssembleNote issueNote) + private async Task> BuildTransferLogsAsync(AssembleIssueNote issueNote) { var transferLogs = new List(); foreach (var detail in issueNote.Details.Where(detail => detail.HandledToQty != 0)) { - var transferLog = ObjectMapper.Map(detail); + var transferLog = ObjectMapper.Map(detail); transferLog.TransSubType = EnumTransSubType.Issue_WIP; transferLog.TransType = TransType; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/InjectionNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/InjectionIssueNoteEventHandler.cs similarity index 89% rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/InjectionNoteEventHandler.cs rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/InjectionIssueNoteEventHandler.cs index 7298a982f..5f10cad5d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/InjectionNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/InjectionIssueNoteEventHandler.cs @@ -12,16 +12,16 @@ using Win_in.Sfs.Wms.Store.Event.Transaction; namespace Win_in.Sfs.Wms.Store.Event.Transactions; -public class InjectionNoteEventHandler +public class InjectionIssueNoteEventHandler : StoreInventoryEventHandlerBase - , ILocalEventHandler> - , ILocalEventHandler>> - , ILocalEventHandler> + , ILocalEventHandler> + , ILocalEventHandler>> + , ILocalEventHandler> { private const EnumTransType TransType = EnumTransType.Issue; [UnitOfWork] - public virtual async Task HandleEventAsync(SfsCreatedEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsCreatedEntityEventData eventData) { var entity = eventData.Entity; var transferLogs = new List(); @@ -34,7 +34,7 @@ public class InjectionNoteEventHandler } [UnitOfWork] - public virtual async Task HandleEventAsync(SfsCreatedEntityEventData> eventData) + public virtual async Task HandleEventAsync(SfsCreatedEntityEventData> eventData) { var entities = eventData.Entity; var transferLogs = new List(); @@ -48,7 +48,7 @@ public class InjectionNoteEventHandler } [UnitOfWork] - public virtual async Task HandleEventAsync(SfsConfirmedEntityEventData eventData) + public virtual async Task HandleEventAsync(SfsConfirmedEntityEventData eventData) { var entity = eventData.Entity; @@ -66,12 +66,12 @@ public class InjectionNoteEventHandler await TransferLogAppService.AddManyAsync(transferLogs).ConfigureAwait(false); } - private async Task> BuildTransferLogsAsync(InjectionNote issueNote) + private async Task> BuildTransferLogsAsync(InjectionIssueNote issueNote) { var transferLogs = new List(); foreach (var detail in issueNote.Details.Where(detail => detail.HandledToQty != 0)) { - var transferLog = ObjectMapper.Map(detail); + var transferLog = ObjectMapper.Map(detail); transferLog.TransSubType = EnumTransSubType.Issue_WIP; transferLog.TransType = TransType;