diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs index 159deb0e..b99a0ca5 100644 --- a/src/WMS.Web.Domain/Services/InStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs @@ -556,10 +556,14 @@ namespace WMS.Web.Domain.Services foreach (var erp_data in erp_list) { // if (det.MaterialId != erp_data.MaterialId || (det.MaterialId == erp_data.MaterialId && det.StockCode != erp_data.StockCode)) - var IsHaveNewMaterial = data_list.SelectMany(s => s.Details).Where(x => x.ErpDetailId == erp_data.ErpDetailId && erp_data.MaterialId == x.MaterialId).Any(); + var IsHaveNewMaterial = data_list.Where(x=>x.SourceBillNo==erp_data.BillNo).SelectMany(s => s.Details).Where(x =>x.ErpDetailId == erp_data.ErpDetailId && erp_data.MaterialId == x.MaterialId).Any(); if (!IsHaveNewMaterial) + { //当物料相同,仓库不同或者物料不同,就新增一条明细 erp_addDetailsList.Add(erp_data); + //操作完后剔除 + erp_removeList.Add(erp_data); + } } //2.2遍历任务单:添加新的明细