diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs index d2766189..dae78915 100644 --- a/src/WMS.Web.Domain/Services/InStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs @@ -309,7 +309,6 @@ namespace WMS.Web.Domain.Services } //金蝶修改了物料:老物料,应收数量修改为0,新物料新增一条 - var noMartDetails = new List(); var data_list_details_new = data_list.SelectMany(x => x.Details).ToList(); data_list_details_new.ForEach(x => { @@ -319,24 +318,34 @@ namespace WMS.Web.Domain.Services { if (erp_data.MaterialId != x.MaterialId) { - //明细的物料改变了:新的物料重新添加一条明细 - var Add_task_no_materials = _mapper.Map(erp_data); - noMartDetails.Add(Add_task_no_materials); //给老的物料应收数量改为0 x.AccruedQty = 0; } } - else + else if(erp_data==null) { 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(item); + data_list.Where(x => x.Id == local_data.Fid).FirstOrDefault()?.Details.Add(Add_task_no_materials); + } + } + else + { + //新增明细 + var Add_task_det = _mapper.Map(item); + data_list.Where(x => x.SourceBillNo == item.BillNo).FirstOrDefault()?.Details.Add(Add_task_det); } } diff --git a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs index b2889efd..966944f9 100644 --- a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs +++ b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs @@ -56,7 +56,7 @@ namespace WMS.Web.Repositories.DependencyInjection this.AddOther(); this.AddConfigOptions(); this.AddServiceRepositories(); - this.AddQuartzService(); + //this.AddQuartzService(); } /// /// 其它功能注入:AutoMapper等其它