Browse Source

采购订单和收容数bug修改

dev_DY_CC
lvzb 12 months ago
parent
commit
27f19c3cd4
  1. 3
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/PlanConverter.cs
  2. 4
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/ItemContainers/ItemContainerAppService.cs
  3. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs
  4. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrder.cs
  5. 6
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrderDetail.cs

3
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<PurchaseOrderDetailInput>();
foreach (var incomingFromExternal in group.ToList())
{

4
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<ValidationResult> 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);
}

2
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<PurchaseOrderEditInput, PurchaseOrder>(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

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Orders/PurchaseOrders/PurchaseOrder.cs

@ -109,4 +109,6 @@ public class PurchaseOrder : SfsStoreAggregateRootBase<PurchaseOrderDetail>
detail.LineStatus = EnumOrderStatus.Close;
ReplaceDetail(detailId, detail);
}
}

6
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
/// </summary>
[Display(Name = "明细-订单备注")]
public string OrderRemark { get; set; }
public virtual void SetDetailCreationTime(DateTime dateTime)
{
CreationTime = dateTime;
}
}

Loading…
Cancel
Save