From 4588c4baaed4403cbf1d26f1a9d2071c851c3de4 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Sat, 11 May 2024 15:09:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E7=A0=81=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E8=87=AA=E5=AE=9A=E4=B9=89=E9=85=8D=E7=BD=AE=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PositionCodes/PositionCodeAppService.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 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 97596b08d..a60a80354 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 @@ -74,7 +74,7 @@ public class PositionCodeAppService } input.PartName = itemBasic.Name; input.PartDesc = itemBasic.Desc1; - input.BasicUom = itemBasic.BasicUom; + var location = await LocationAppService.GetByCodeAsync(input.LocationCode).ConfigureAwait(false); Check.NotNull(location, "库位代码", $"库位 {input.LocationCode} 不存在"); @@ -125,8 +125,7 @@ public class PositionCodeAppService } entity.PartName = itemBasic.Name; entity.PartDesc = itemBasic.Desc1; - entity.BasicUom = itemBasic.BasicUom; - entity.StdPackQty = itemBasic.StdPackQty; + var location = await LocationAppService.GetByCodeAsync(input.LocationCode).ConfigureAwait(false); Check.NotNull(location, "库位代码", $"库位 {input.LocationCode} 不存在"); @@ -159,8 +158,8 @@ public class PositionCodeAppService var itemBasic = await ItemBasicAppService.GetByCodeAsync(positionCode.PartCode).ConfigureAwait(false); positionCode.PartName = itemBasic.Name; positionCode.PartDesc = itemBasic.Desc1; - positionCode.BasicUom = itemBasic.BasicUom; - positionCode.StdPackQty = itemBasic.StdPackQty; + //positionCode.BasicUom = itemBasic.BasicUom; + //positionCode.StdPackQty = itemBasic.StdPackQty; positionCode.Code = positionCode.Type + positionCode.Code; positionCode.CreatorId= CurrentUser.Id; var location = await LocationAppService.GetByCodeAsync(positionCode.LocationCode).ConfigureAwait(false); From 0dec7640c8720fd65ec94c6befa5a27e62c816e6 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Sat, 11 May 2024 15:51:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SfsCrudWithDetailsAppServiceBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs index 45001dae6..7c9416a5d 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs @@ -164,7 +164,7 @@ public abstract class SfsCrudWithDetailsAppServiceBase)); var hasDetails = tt.Length > 0 ? true : false; - return ExportImportService.Export(list,detailsProptyName: hasDetails ? nameof(TDetail) : null); + return ExportImportService.Export(list,detailsProptyName: hasDetails ? "Details" : null); } /// From 8bfd625b923bd3461359999e407a8041e6ccb52d Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Sat, 11 May 2024 16:47:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E6=8B=86bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductRecycleRequestAppService.cs | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductRecycleRequests/ProductRecycleRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductRecycleRequests/ProductRecycleRequestAppService.cs index 471b7068a..459d2b6d4 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductRecycleRequests/ProductRecycleRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductRecycleRequests/ProductRecycleRequestAppService.cs @@ -119,12 +119,6 @@ public class ProductRecycleRequestAppService : { detail.Status = balance.Status; } - // detail.Status = EnumInventoryStatus.OK; - - var locationDto = await _locationAppService.GetByCodeAsync(detail.LocationCode) - .ConfigureAwait(false); - CheckLocation(locationDto, detail.LocationCode); - await SetDetailPropertiesAsync(detail).ConfigureAwait(false); } } @@ -132,6 +126,7 @@ public class ProductRecycleRequestAppService : return dictionary; } + #region 校验 private void CheckItemBasic(ItemBasicDTO itemBasicDto, string itemCode) { @@ -148,6 +143,20 @@ public class ProductRecycleRequestAppService : throw new UserFriendlyException($"库位代码为【{locationCode}】不存在"); } } + private void CheckRawLocation(LocationDTO rawlocationDto, string locationCode) + { + if (rawlocationDto == null) + { + throw new UserFriendlyException($"库位代码为【{locationCode}】不存在"); + } + else + { + if (rawlocationDto.Type != EnumLocationType.WIP) + { + throw new UserFriendlyException($"库位代码为【{locationCode}】不存在"); + } + } + } #endregion private async Task SetRequestAutoPropertiesAsync(ProductRecycleRequest entity) @@ -177,7 +186,7 @@ public class ProductRecycleRequestAppService : detail.Qty = detail.Qty; } - var location = await LocationAclService.GetByCodeAsync(detail.LocationCode).ConfigureAwait(false); + var location = await _locationAppService.GetByCodeAsync(detail.LocationCode).ConfigureAwait(false); CheckLocation(location, detail.LocationCode); if (location != null) { @@ -187,8 +196,8 @@ public class ProductRecycleRequestAppService : detail.LocationArea = location.AreaCode; } - var rawLocation = await LocationAclService.GetByCodeAsync(detail.RawLocationCode).ConfigureAwait(false); - CheckLocation(rawLocation, detail.RawLocationCode); + var rawLocation = await _locationAppService.GetByCodeAsync(detail.RawLocationCode).ConfigureAwait(false); + CheckRawLocation(rawLocation, detail.RawLocationCode); if (rawLocation != null) { detail.RawLocationErpCode = rawLocation.ErpLocationCode; From 44acd50323365e8b5e56cc907332e09d8e6706d7 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Sat, 11 May 2024 17:16:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E7=A0=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8F=AB=E6=96=99=E5=BA=93=E4=BD=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=8F=AB=E6=96=99=E5=BA=93=E4=BD=8D=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PositionCode/DTOs/PositionCodeDTO.cs | 8 ++++---- .../PositionCode/Inputs/PositionCodeEditInput.cs | 8 ++++---- .../PositionCode/Inputs/PositionCodeImportInput.cs | 8 ++++---- .../PositionCodes/PositionCode.cs | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/DTOs/PositionCodeDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/DTOs/PositionCodeDTO.cs index cce3aaeff..11b6be027 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/DTOs/PositionCodeDTO.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/DTOs/PositionCodeDTO.cs @@ -39,15 +39,15 @@ public class PositionCodeDTO : SfsBaseDataDTOBase, IHasCode [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string BasicUom { get; set; } /// - /// 库位 + /// 叫料库位代码 /// - [Display(Name = "库位")] + [Display(Name = "叫料库位代码")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string LocationCode { get; set; } /// - /// 库位名称 + /// 叫料库位名称 /// - [Display(Name = "库位名称")] + [Display(Name = "叫料库位名称")] [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] public string LocationName { get; set; } /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeEditInput.cs index 6db7b8d01..2c41344f5 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeEditInput.cs @@ -31,15 +31,15 @@ public class PositionCodeEditInput : SfsBaseDataCreateOrUpdateInputBase [Display(Name = "基本计量单位")] public string BasicUom { get; set; } /// - /// 库位 + /// 叫料库位代码 /// - [Display(Name = "库位")] + [Display(Name = "叫料库位代码")] [Required(ErrorMessage = "{0}是必填项")] public string LocationCode { get; set; } /// - /// 库位名称 + /// 叫料库位名称 /// - [Display(Name = "库位名称")] + [Display(Name = "叫料库位名称")] public string LocationName { get; set; } /// /// 标包数量 diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs index 825994c1d..d70d1be04 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/PositionCode/Inputs/PositionCodeImportInput.cs @@ -41,16 +41,16 @@ public class PositionCodeImportInput : SfsBaseDataImportInputBase [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string BasicUom { get; set; } /// - /// 库位 + /// 叫料库位代码 /// - [Display(Name = "库位")] + [Display(Name = "叫料库位代码")] [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] [Required(ErrorMessage = "{0}是必填项")] public string LocationCode { get; set; } /// - /// 库位名称 + /// 叫料库位名称 /// - [Display(Name = "库位名称")] + [Display(Name = "叫料库位名称")] [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] public string LocationName { get; set; } /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PositionCodes/PositionCode.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PositionCodes/PositionCode.cs index 8c5028cdb..a8818eec0 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PositionCodes/PositionCode.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/PositionCodes/PositionCode.cs @@ -36,14 +36,14 @@ public class PositionCode : SfsBaseDataAggregateRootBase, IHasCode [Display(Name = "基本计量单位")] public string BasicUom { get; set; } /// - /// 库位 + /// 叫料库位代码 /// - [Display(Name = "库位")] + [Display(Name = "叫料库位代码")] public string LocationCode { get; set; } /// - /// 库位名称 + /// 叫料库位名称 /// - [Display(Name = "库位名称")] + [Display(Name = "叫料库位名称")] public string LocationName { get; set; } /// /// 标包数量