From 021ac03d4b6ca6f5c52fb378c564f9a8e20ffdbd Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Mon, 11 Mar 2024 16:45:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Domain/Entitys/InstockTask.cs | 8 ++++++-- src/WMS.Web.Repositories/InStockTaskRepositories.cs | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/WMS.Web.Domain/Entitys/InstockTask.cs b/src/WMS.Web.Domain/Entitys/InstockTask.cs index 9b3262e8..f23149f2 100644 --- a/src/WMS.Web.Domain/Entitys/InstockTask.cs +++ b/src/WMS.Web.Domain/Entitys/InstockTask.cs @@ -144,8 +144,10 @@ namespace WMS.Web.Domain.Entitys { //明细中：所有的应入数量之和 var totalAccruedQty= this.Details.Sum(x => x.AccruedQty); + ////明细中：所有的收货数量之和 + //var totalReceiveQty = this.Details.Sum(x => x.ReceiveQty); //明细中：所有的收货数量之和 - var totalReceiveQty = this.Details.Sum(x => x.ReceiveQty); + var totalReceiveQty = this.Details.Where(x=>x.AccruedQty>0).Sum(x => x.ReceiveQty); if (totalAccruedQty == totalReceiveQty) this.Status = InstockStatus.Already; @@ -163,8 +165,10 @@ namespace WMS.Web.Domain.Entitys { //明细中：所有的应入数量之和 var totalAccruedQty = this.Details.Sum(x => x.AccruedQty); + ////明细中：所有的收货数量之和 + //var totalReceiveQty = this.Details.Sum(x => x.ReceiveQty); //明细中：所有的收货数量之和 - var totalReceiveQty = this.Details.Sum(x => x.ReceiveQty); + var totalReceiveQty = this.Details.Where(x => x.AccruedQty > 0).Sum(x => x.ReceiveQty); if (totalAccruedQty == totalReceiveQty) this.Status = InstockStatus.Already; diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index 28f336e3..76939c03 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -187,7 +187,7 @@ namespace WMS.Web.Repositories { list.ForEach(x => { - var current_instock_dets= instockDets.Where(t => t.ErpDetailId == x.ErpDetailId).ToList(); + var current_instock_dets= instockDets.Where(t => t.ErpDetailId == x.ErpDetailId && t.MaterialId==x.MaterialId).ToList(); if (current_instock_dets != null && current_instock_dets.Count != 0 && x.ErpDetailId==current_instock_dets.FirstOrDefault().ErpDetailId) { //+该明细的入库数量之和；在这里处理