From 27f19c3cd4a8fa3baa4916eb51b7f8a19d2da5e1 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Mon, 20 May 2024 19:01:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=92=8C?= =?UTF-8?q?=E6=94=B6=E5=AE=B9=E6=95=B0bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Incoming/PlanConverter.cs | 3 +-- .../ItemContainers/ItemContainerAppService.cs | 4 +++- .../Orders/PurchaseOrders/PurchaseOrderAppService.cs | 2 ++ .../Orders/PurchaseOrders/PurchaseOrder.cs | 2 ++ .../Orders/PurchaseOrders/PurchaseOrderDetail.cs | 6 ++++++ 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/PlanConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/PlanConverter.cs index 92ddb645a..689fe389b 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/PlanConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/PlanConverter.cs @@ -85,8 +85,7 @@ public class PlanConverter : IIncomingConverter wmsPo.PoType = "2"; wmsPo.IsConsignment = false; wmsPo.Version = ""; - wmsPo.TaxRate = 0; - + wmsPo.TaxRate = 0; wmsPo.Details = new List(); foreach (var incomingFromExternal in group.ToList()) { diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs index 0c77e19ed..ba8e2957d 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs @@ -84,7 +84,9 @@ public class ItemContainerAppService protected override async Task ValidateImportModelAsync(ItemContainerImportInput importInput, List validationRresult) { - await base.CheckItemBasicPackUomAsync(importInput.ItemCode, importInput.BasicUom, validationRresult).ConfigureAwait(false); + //20240520苑静雯删除 + await base.CheckItemBasicItemCodeAsync(importInput.ItemCode, validationRresult).ConfigureAwait(false); + // await base.CheckItemBasicPackUomAsync(importInput.ItemCode, importInput.BasicUom, validationRresult).ConfigureAwait(false); //await base.CheckItemContainerAsync(importInput.ContainerCode, validationRresult).ConfigureAwait(false); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs index 47cfe36e0..dcea1fb59 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs @@ -125,6 +125,7 @@ public class PurchaseOrderAppService : } var entity = ObjectMapper.Map(input); entity.Remark = "接口数据"; + entity.Details.ForEach(r => { r.SetDetailCreationTime(DateTime.Now); });//更新明细时间 await _purchaseOrderManager.CreateAsync(entity).ConfigureAwait(false); @@ -148,6 +149,7 @@ public class PurchaseOrderAppService : if (olditem == null) { entity.Remark = "接口数据"; + entity.Details.ForEach(r => { r.SetDetailCreationTime(DateTime.Now); });//更新明细时间 await _purchaseOrderManager.CreateAsync(entity).ConfigureAwait(false); } else diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrder.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrder.cs index 4afd29b45..b2191e8bc 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrder.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrder.cs @@ -109,4 +109,6 @@ public class PurchaseOrder : SfsStoreAggregateRootBase detail.LineStatus = EnumOrderStatus.Close; ReplaceDetail(detailId, detail); } + + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrderDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrderDetail.cs index 66d0e5e00..b576d9678 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrderDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrderDetail.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel.DataAnnotations; +using System.Runtime.ConstrainedExecution; using Win_in.Sfs.Shared.Domain; using Win_in.Sfs.Shared.Domain.Shared; @@ -109,4 +110,9 @@ public class PurchaseOrderDetail : SfsStoreDetailWithQtyEntityBase /// [Display(Name = "明细-订单备注")] public string OrderRemark { get; set; } + + public virtual void SetDetailCreationTime(DateTime dateTime) + { + CreationTime = dateTime; + } }