From c88c78b5562c7668c4cd7c734e25a076749e6d40 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Tue, 18 Jun 2024 15:19:43 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PositionCodes/PositionCodeAppService.cs | 12 ++++++------ .../Enums/Inventory/EnumTransType.cs | 4 ---- .../Inputs/InventoryInitialNoteImportInput.cs | 8 ++++++++ .../Inputs/SparePartIssueRequestImportInput.cs | 3 +++ .../AssembleIssueJobs/AssembleIssueJobAppService.cs | 4 +++- .../CoatingIssueJobs/CoatingIssueJobAppService.cs | 4 +++- .../InjectionIssueJobAppService.cs | 4 +++- .../KittingIssueJobs/KittingIssueJobAppService.cs | 4 +++- .../SparePartIssueJobAppService.cs | 4 +++- .../InventoryInitialNoteAppService.cs | 4 ++++ 10 files changed, 36 insertions(+), 15 deletions(-) diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs index d4390441c..0990cef3b 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/PositionCodes/PositionCodeAppService.cs @@ -56,14 +56,14 @@ public class PositionCodeAppService var existEntity = await GetByCodeAsync(input.Code).ConfigureAwait(false); if (existEntity != null) { - throw new UserFriendlyException($"{input.Code} 已存在"); + throw new UserFriendlyException($"位置码{input.Code} 已存在！"); } - var itemEntity = await _repository.FirstOrDefaultAsync(p => p.PartCode == input.PartCode).ConfigureAwait(false); - if(itemEntity != null) - { - throw new UserFriendlyException($"{input.PartCode} 物品已存在"); - } + //var itemEntity = await _repository.FirstOrDefaultAsync(p =>p.LocationCode==input.LocationCode && p.PartCode == input.PartCode&&p.Type==input.Type).ConfigureAwait(false); + //if(itemEntity != null) + //{ + // throw new UserFriendlyException($"类型{input.Type.ToString()}物品{input.PartCode}目标库位{input.LocationCode}已存在！"); + //} var itemBasic = await ItemBasicAppService.GetByCodeAsync(input.PartCode).ConfigureAwait(false); Check.NotNull(itemBasic, "ERP料号", $"物品 {input.PartCode} 不存在"); diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransType.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransType.cs index f1faf5320..e01e910a5 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransType.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransType.cs @@ -174,8 +174,4 @@ public enum EnumTransType MesUnFreezed = 41, - - - - } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InventoryInitialNotes/Inputs/InventoryInitialNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InventoryInitialNotes/Inputs/InventoryInitialNoteImportInput.cs index 96f27424d..25d037679 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InventoryInitialNotes/Inputs/InventoryInitialNoteImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/InventoryInitialNotes/Inputs/InventoryInitialNoteImportInput.cs @@ -10,6 +10,7 @@ public class InventoryInitialNoteImportInput : SfsStoreImportInputBase, IHasQty, /// 仓库代码 /// [Display(Name = "仓库代码")] + [Required(ErrorMessage = "{0}是必填项")] public string WarehouseCode { get; set; } /// @@ -22,6 +23,7 @@ public class InventoryInitialNoteImportInput : SfsStoreImportInputBase, IHasQty, /// ERP料号 /// [Display(Name = "ERP料号")] + [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } /// @@ -35,24 +37,28 @@ public class InventoryInitialNoteImportInput : SfsStoreImportInputBase, IHasQty, /// 单位 /// [Display(Name = "单位")] + [Required(ErrorMessage = "{0}是必填项")] public string Uom { get; set; } /// /// 批次 /// [Display(Name = "批次")] + [Required(ErrorMessage = "{0}是必填项")] public string Lot { get; set; } /// /// 库位代码 /// [Display(Name = "库位代码")] + [Required(ErrorMessage = "{0}是必填项")] public string LocationCode { get; set; } /// /// ERP库位 /// [Display(Name = "ERP库位")] + [Required(ErrorMessage = "{0}是必填项")] public string LocationErpCode { get; set; } /// @@ -72,11 +78,13 @@ public class InventoryInitialNoteImportInput : SfsStoreImportInputBase, IHasQty, /// 库区 /// [Display(Name = "库区")] + [Required(ErrorMessage = "{0}是必填项")] public string LocationArea { get; set; } /// /// 库位组 /// [Display(Name = "库位组")] + [Required(ErrorMessage = "{0}是必填项")] public string LocationGroup { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/Inputs/SparePartIssueRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/Inputs/SparePartIssueRequestImportInput.cs index 6c362dae4..ac1f6ee0e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/Inputs/SparePartIssueRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/Inputs/SparePartIssueRequestImportInput.cs @@ -13,18 +13,21 @@ public class SparePartIssueRequestImportInput : SfsStoreImportInputBase /// ERP料号 /// [Display(Name = "ERP料号")] + [Required(ErrorMessage = "{0}是必填项")] public string ItemCode { get; set; } /// /// 需求数量 /// [Display(Name = "需求数量")] + [Required(ErrorMessage = "{0}是必填项")] public decimal Qty { get; set; } /// /// 目标库位 /// [Display(Name = "目标库位")] + [Required(ErrorMessage = "{0}是必填项")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ToLocationCode { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs index e9e264da5..d45755a79 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs @@ -235,7 +235,9 @@ public class AssembleIssueJobAppService issueJobDetail.HandledToQty += issueJobDetailDto.HandledToQty; issueJobDetail.HandledFromQty += issueJobDetailDto.HandledFromQty; assembleIssueJob.Details = new EditableList { issueJobDetail }; - + assembleIssueJob.CompleteUserId = _currentUser.Id; + assembleIssueJob.CompleteUserName = _currentUser.Name; + assembleIssueJob.CompleteTime = DateTime.Now; if (assembleIssueJob.EnumIssueSendType == EnumIssueSendType.BoxQtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成 { if (issueJobDetailDto.RecommendToPackingCode != issueJobDetailDto.HandledToPackingCode) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs index 0f796ca16..373273410 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs @@ -249,7 +249,9 @@ public class CoatingIssueJobAppService issueJobDetail.HandledToQty += issueJobDetailDto.HandledToQty; issueJobDetail.HandledFromQty += issueJobDetailDto.HandledFromQty; coatingIssueJob.Details = new EditableList { issueJobDetail }; - + coatingIssueJob.CompleteUserId = _currentUser.Id; + coatingIssueJob.CompleteUserName = _currentUser.Name; + coatingIssueJob.CompleteTime = DateTime.Now; if (coatingIssueJob.EnumIssueSendType == EnumIssueSendType.BoxQtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成 { if (issueJobDetailDto.RecommendToPackingCode != issueJobDetailDto.HandledToPackingCode) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs index 7edfa7635..b45b43e2a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs @@ -227,7 +227,9 @@ public class InjectionIssueJobAppService issueJobDetail.HandledToQty += issueJobDetailDto.HandledToQty; issueJobDetail.HandledFromQty += issueJobDetailDto.HandledFromQty; injectionIssueJob.Details = new EditableList { issueJobDetail }; - + injectionIssueJob.CompleteUserId = _currentUser.Id; + injectionIssueJob.CompleteUserName = _currentUser.Name; + injectionIssueJob.CompleteTime = DateTime.Now; if (injectionIssueJob.EnumIssueSendType == EnumIssueSendType.BoxQtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成 { if (issueJobDetailDto.RecommendToPackingCode != issueJobDetailDto.HandledToPackingCode) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs index 1dcea8e63..dda5f1ffa 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs @@ -226,7 +226,9 @@ public class KittingIssueJobAppService issueJobDetail.HandledToQty += issueJobDetailDto.HandledToQty; issueJobDetail.HandledFromQty += issueJobDetailDto.HandledFromQty; kittingIssueJob.Details = new EditableList { issueJobDetail }; - + kittingIssueJob.CompleteUserId = _currentUser.Id; + kittingIssueJob.CompleteUserName = _currentUser.Name; + kittingIssueJob.CompleteTime = DateTime.Now; if (kittingIssueJob.EnumIssueSendType == EnumIssueSendType.BoxQtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成 { if (issueJobDetailDto.RecommendToPackingCode != issueJobDetailDto.HandledToPackingCode) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs index 140635d3e..5e9f7674d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs @@ -219,7 +219,9 @@ public class SparePartIssueJobAppService issueJobDetail.HandledToQty += issueJobDetailDto.HandledToQty; issueJobDetail.HandledFromQty += issueJobDetailDto.HandledFromQty; sparePartIssueJob.Details = new EditableList { issueJobDetail }; - + sparePartIssueJob.CompleteUserId = _currentUser.Id; + sparePartIssueJob.CompleteUserName = _currentUser.Name; + sparePartIssueJob.CompleteTime = DateTime.Now; if (sparePartIssueJob.EnumIssueSendType == EnumIssueSendType.BoxQtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成 { if (issueJobDetailDto.RecommendToPackingCode != issueJobDetailDto.HandledToPackingCode) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/InventoryInitialNotes/InventoryInitialNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/InventoryInitialNotes/InventoryInitialNoteAppService.cs index bbcb5d6be..fe2416939 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/InventoryInitialNotes/InventoryInitialNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/InventoryInitialNotes/InventoryInitialNoteAppService.cs @@ -61,6 +61,10 @@ public class InventoryInitialNoteAppService : request.ActiveDate = DateTime.Now; foreach (var detail in request.Details) { + if (string.IsNullOrEmpty(detail.PackingCode)) + { + detail.PackingCode = ""; + } var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false); CheckItemBasic(itemBasicDto, detail.ItemCode); detail.ItemDesc1 = itemBasicDto.Desc1;