This commit is contained in:
tongfei
2024-03-08 14:59:58 +08:00
parent 777c0ccd59
commit 8a57cd34f8
2 changed files with 19 additions and 10 deletions

View File

@@ -309,7 +309,6 @@ namespace WMS.Web.Domain.Services
} }
//金蝶修改了物料老物料应收数量修改为0,新物料新增一条 //金蝶修改了物料老物料应收数量修改为0,新物料新增一条
var noMartDetails = new List<InStockTaskDetails>();
var data_list_details_new = data_list.SelectMany(x => x.Details).ToList(); var data_list_details_new = data_list.SelectMany(x => x.Details).ToList();
data_list_details_new.ForEach(x => data_list_details_new.ForEach(x =>
{ {
@@ -319,24 +318,34 @@ namespace WMS.Web.Domain.Services
{ {
if (erp_data.MaterialId != x.MaterialId) if (erp_data.MaterialId != x.MaterialId)
{ {
//明细的物料改变了:新的物料重新添加一条明细
var Add_task_no_materials = _mapper.Map<InStockTaskDetails>(erp_data);
noMartDetails.Add(Add_task_no_materials);
//给老的物料应收数量改为0 //给老的物料应收数量改为0
x.AccruedQty = 0; x.AccruedQty = 0;
} }
} }
else else if(erp_data==null)
{ {
x.AccruedQty = 0; x.AccruedQty = 0;
} }
}); });
//明细的物料改变了:新的物料重新添加一条明细
if (noMartDetails.Count != 0) foreach (var item in erp_list)
{ {
foreach (var item in noMartDetails) var local_data = data_list_details_new.Where(t => t.ErpDetailId == item.ErpDetailId).FirstOrDefault();
if (local_data != null)
{ {
data_list_details_new.Add(item);
if (local_data.MaterialId != item.MaterialId)
{
//明细的物料改变了:新的物料重新添加一条明细
var Add_task_no_materials = _mapper.Map<InStockTaskDetails>(item);
data_list.Where(x => x.Id == local_data.Fid).FirstOrDefault()?.Details.Add(Add_task_no_materials);
}
}
else
{
//新增明细
var Add_task_det = _mapper.Map<InStockTaskDetails>(item);
data_list.Where(x => x.SourceBillNo == item.BillNo).FirstOrDefault()?.Details.Add(Add_task_det);
} }
} }

View File

@@ -56,7 +56,7 @@ namespace WMS.Web.Repositories.DependencyInjection
this.AddOther(); this.AddOther();
this.AddConfigOptions(); this.AddConfigOptions();
this.AddServiceRepositories(); this.AddServiceRepositories();
this.AddQuartzService(); //this.AddQuartzService();
} }
/// <summary> /// <summary>
/// 其它功能注入AutoMapper等其它 /// 其它功能注入AutoMapper等其它