diff --git a/src/WMS.Web.Domain/Entitys/InStock.cs b/src/WMS.Web.Domain/Entitys/InStock.cs index 7c257df1..e2a0249b 100644 --- a/src/WMS.Web.Domain/Entitys/InStock.cs +++ b/src/WMS.Web.Domain/Entitys/InStock.cs @@ -155,7 +155,7 @@ namespace WMS.Web.Domain.Entitys { det.SuccessSync = SyncStatus.Success; det.ErpSyncBillNo = erpBillNo; - }); + }); //所有erp明细同步成功才是整个单据成功 if (this.ErpDetails.Where(w => w.SuccessSync == SyncStatus.Success).Count() == this.ErpDetails.Count()) @@ -163,6 +163,8 @@ namespace WMS.Web.Domain.Entitys this.SuccessSync = SyncStatus.Success; this.Remark = ""; } + else + this.SuccessSync = SyncStatus.Fail; this.OperateId = operateId; this.SyncTime = DateTime.Now; } diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index 329a4ecd..ce3c1036 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -684,7 +684,7 @@ namespace WMS.Web.Domain.Services //1.1筛选出对应仓库的明细 - var task_details = task.Details.Where(x => x.StockCode == dto.StockCode).ToList(); + var task_details = task.Details.Where(x => x.StockCode == dto.StockCode && x.AccruedQty>0).ToList(); //2.找到箱对应的物料信息:多个箱 var boxs = await _boxRepositories.GetEntityListByNos(dto.BoxBillNos); diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index 75d9ccf5..7689636f 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -256,7 +256,7 @@ namespace WMS.Web.Repositories AvailableQty = s.AccruedQty - s.ReceiveQty, Remark = s.Remark, ErpDetailId=s.ErpDetailId - }).ToListAsync(); + }).Where(x=>x.AvailableQty>0).ToListAsync(); //找箱 var task_box = await _context.InstockTaskBox.Where(x => ids.Contains(x.TaskId)) @@ -279,8 +279,11 @@ namespace WMS.Web.Repositories var response = new List(); foreach (var item in taskList) { - if (item.Details.Count != 0) + if (item.Details.Count != 0) + { response.Add(item); + } + } return response; }