diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 2c633f26..84ba3309 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs index c0cf0583..8c783e23 100644 --- a/src/WMS.Web.Domain/Services/InStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs @@ -332,24 +332,28 @@ namespace WMS.Web.Domain.Services //新物料新增一条 foreach (var item in erp_list) { - var local_data = data_list_details_new.Where(t => t.ErpDetailId == item.ErpDetailId).FirstOrDefault(); - if (local_data != null) + var local_data_order = data_list.Where(t => t.SourceBillNo == item.BillNo).FirstOrDefault(); + if (local_data_order != null) { - - if (local_data.MaterialId != item.MaterialId) + var local_data = data_list_details_new.Where(t => t.ErpDetailId == item.ErpDetailId).FirstOrDefault(); + if (local_data != null) { - //明细的物料改变了:新的物料重新添加一条明细 - var Add_task_no_materials = _mapper.Map(item); - data_list.Where(x => x.SourceBillNo == item.BillNo).FirstOrDefault().Status = InstockStatus.Part; - data_list.Where(x => x.Id == local_data.Fid).FirstOrDefault()?.Details.Add(Add_task_no_materials); + + if (local_data.MaterialId != item.MaterialId) + { + //明细的物料改变了:新的物料重新添加一条明细 + var Add_task_no_materials = _mapper.Map(item); + data_list.Where(x => x.SourceBillNo == item.BillNo).FirstOrDefault().Status = InstockStatus.Part; + 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().Status = InstockStatus.Part; + data_list.Where(x => x.SourceBillNo == item.BillNo).FirstOrDefault()?.Details.Add(Add_task_det); } - } - else - { - //新增明细 - var Add_task_det = _mapper.Map(item); - data_list.Where(x => x.SourceBillNo == item.BillNo).FirstOrDefault().Status= InstockStatus.Part; - data_list.Where(x => x.SourceBillNo == item.BillNo).FirstOrDefault()?.Details.Add(Add_task_det); } }