From e41fcc8cc49331d2d23353218fcea532a5cc60d0 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Mon, 20 May 2024 09:19:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Outgoing/TyrpOutgoingBackgroundWorker.cs | 4 ++-- .../Stores/PurchaseReturnRequestController.cs | 2 +- .../ItemGuideBooks/ItemGuideBookAutoMapperProfile.cs | 11 +++++++++++ .../Inputs/PurchaseReturnRequestPdaInput.cs | 6 ++++++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs index a8b6552dd..038899008 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs @@ -29,9 +29,9 @@ public class TyrpOutgoingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase } - [UnitOfWork(true,isolationLevel:IsolationLevel.ReadUncommitted, 50)] + [UnitOfWork(true, isolationLevel: IsolationLevel.ReadUncommitted, 50)] protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext) - { + { Logger.LogInformation($"Starting: Handling {Outgoing}"); if (!_options.Value.OutgoingOptions.Active) diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/PurchaseReturnRequestController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/PurchaseReturnRequestController.cs index e0ccaa4bf..80c2ed4a6 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/PurchaseReturnRequestController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/PurchaseReturnRequestController.cs @@ -45,7 +45,7 @@ public class PurchaseReturnRequestController : AbpController entity.Details = new List(); foreach (var item in list) { - var detail = ObjectMapper.Map(list[0]); + var detail = ObjectMapper.Map(item); entity.Details.Add(detail); } entitys.Add(entity); diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemGuideBooks/ItemGuideBookAutoMapperProfile.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemGuideBooks/ItemGuideBookAutoMapperProfile.cs index be3e07403..b247733c3 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemGuideBooks/ItemGuideBookAutoMapperProfile.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemGuideBooks/ItemGuideBookAutoMapperProfile.cs @@ -27,5 +27,16 @@ public partial class BasedataApplicationAutoMapperProfile : Profile .Ignore(x => x.ReportStatus) .Ignore(x => x.ReportReason); + CreateMap() + .IgnoreAuditedObjectProperties() + .Ignore(x => x.Id) + .Ignore(x => x.TenantId) + .Ignore(x => x.Remark) + .Ignore(x => x.Name) + .Ignore(x => x.Desc1) + .Ignore(x => x.Desc2) + .Ignore(x => x.ConcurrencyStamp) + ; + } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/PurchaseReturnRequests/Inputs/PurchaseReturnRequestPdaInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/PurchaseReturnRequests/Inputs/PurchaseReturnRequestPdaInput.cs index b00091f9b..651872e7b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/PurchaseReturnRequests/Inputs/PurchaseReturnRequestPdaInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/PurchaseReturnRequests/Inputs/PurchaseReturnRequestPdaInput.cs @@ -53,4 +53,10 @@ public class PurchaseReturnRequestPdaInput : SfsStoreDetailWithLotPackingQtyLoca [Display(Name = "供应商包装")] public decimal SupplierPackQty { get; set; } + /// + /// 操作员 + /// + [Display(Name = "操作员")] + public string Worker { get; set; } + }