From e0183a8563e1da667025f096713b6b9a92386ad8 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Mon, 11 Mar 2024 15:37:10 +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/Services/InStockService.cs | 4 ++--
src/WMS.Web.Repositories/InStockTaskRepositories.cs | 9 +++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs
index 5ee01074..164ae6e3 100644
--- a/src/WMS.Web.Domain/Services/InStockService.cs
+++ b/src/WMS.Web.Domain/Services/InStockService.cs
@@ -341,7 +341,7 @@ namespace WMS.Web.Domain.Services
{
task.Details.ForEach(x =>
{
- var current_entityDets = dto.Details.Where(t => t.ErpDetailId == x.ErpDetailId).ToList();
+ var current_entityDets = dto.Details.Where(t => t.ErpDetailId == x.ErpDetailId && t.MaterialId==x.MaterialId).ToList();
if (current_entityDets != null && current_entityDets.Count != 0 && x.ErpDetailId == current_entityDets.FirstOrDefault().ErpDetailId)
{
var current_entityDet_matQty = current_entityDets.Sum(x => x.Qty);
@@ -477,7 +477,7 @@ namespace WMS.Web.Domain.Services
{
task.Details.ForEach(x =>
{
- var current_entityDets = entity.Details.Where(t => t.ErpDetailId == x.ErpDetailId).ToList();
+ var current_entityDets = entity.Details.Where(t => t.ErpDetailId == x.ErpDetailId && t.MaterialId==x.MaterialId).ToList();
if (current_entityDets != null && current_entityDets.Count != 0 && x.ErpDetailId == current_entityDets.FirstOrDefault().ErpDetailId)
{
var current_entityDet_matQty = current_entityDets.Sum(x => x.Qty);
diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index 35681b17..28f336e3 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -93,9 +93,14 @@ namespace WMS.Web.Repositories
///
public async Task> GetList(List ids)
{
+ //var entitys = await _context.InStockTask
+ // .Include(s => s.Details.Where(x=>x.AccruedQty>0))
+ // .Where(f => ids.Contains(f.Id) && f.Details.Where(x=>x.AccruedQty>0).Count()>0)
+ // .ToListAsync();
+ //return entitys;
var entitys = await _context.InStockTask
- .Include(s => s.Details.Where(x=>x.AccruedQty>0))
- .Where(f => ids.Contains(f.Id) && f.Details.Where(x=>x.AccruedQty>0).Count()>0)
+ .Include(s => s.Details)
+ .Where(f => ids.Contains(f.Id))
.ToListAsync();
return entitys;
}