From 92b4e3f794db65c17b7f7074b4d98be519cf7260 Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Thu, 7 Dec 2023 15:56:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8-=E4=BB=93=E5=BA=93=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Repositories/BoxInventoryRepositories.cs | 5 ++++- src/WMS.Web.Repositories/InStockRepositories.cs | 5 ++++- src/WMS.Web.Repositories/InStockTaskRepositories.cs | 5 ++++- src/WMS.Web.Repositories/InventoryDetailsRepositories.cs | 5 ++++- .../InventoryInOutDetailsRepositories.cs | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs index 3867bcea..64aab8ec 100644 --- a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs +++ b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs @@ -81,7 +81,10 @@ namespace WMS.Web.Repositories query = query.Where(w => EF.Functions.Like(w.box.BoxBillNo, "%" + dto.BoxBillNo + "%")); if (!string.IsNullOrEmpty(dto.StockCode)) - query = query.Where(w => w.order.StockCode == dto.StockCode); + { + var splitStrs= dto.StockCode.Split("_$"); + query = query.Where(w => w.order.StockCode == splitStrs[0] && w.order.OrgCode == splitStrs[1]); + } if (dto.SubStockId.HasValue) query = query.Where(w => w.order.SubStockId == dto.SubStockId.Value); diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs index 081c515b..db217993 100644 --- a/src/WMS.Web.Repositories/InStockRepositories.cs +++ b/src/WMS.Web.Repositories/InStockRepositories.cs @@ -102,7 +102,10 @@ namespace WMS.Web.Repositories query = query.Where(w => w.detail.OrgId == dto.OrgId.Value); if (!string.IsNullOrEmpty(dto.StockCode)) - query = query.Where(w => w.detail.StockCode == dto.StockCode); + { + var splitStrs = dto.StockCode.Split("_$"); + query = query.Where(w => w.detail.StockCode == splitStrs[0] && w.detail.OrgCode == splitStrs[1]); + } if (dto.Type.HasValue) query = query.Where(w => (int)w.order.Type == dto.Type.Value); diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index bd6ab039..e3558a17 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -120,7 +120,10 @@ namespace WMS.Web.Repositories query = query.Where(w => w.detail.OrgId == dto.OrgId.Value); if (!string.IsNullOrEmpty(dto.StockCode)) - query = query.Where(w => w.detail.StockCode == dto.StockCode); + { + var splitStrs = dto.StockCode.Split("_$"); + query = query.Where(w => w.detail.StockCode == splitStrs[0] && w.detail.OrgCode == splitStrs[1]); + } if (dto.Type.HasValue) query = query.Where(w => (int)w.order.Type == dto.Type.Value); diff --git a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs index 45d767f3..274a9929 100644 --- a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs +++ b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs @@ -81,7 +81,10 @@ namespace WMS.Web.Repositories } if (!string.IsNullOrEmpty(dto.StockCode)) - query = query.Where(w => w.StockCode == dto.StockCode); + { + var splitStrs = dto.StockCode.Split("_$"); + query = query.Where(w => w.StockCode == splitStrs[0] && w.OrgCode == splitStrs[1]); + } if (dto.Qty.HasValue) query = query.Where(w => w.Qty == dto.Qty); diff --git a/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs b/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs index 0e25615c..97962851 100644 --- a/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs +++ b/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs @@ -81,7 +81,10 @@ namespace WMS.Web.Repositories } if (!string.IsNullOrEmpty(dto.StockCode)) - query = query.Where(w => w.StockCode == dto.StockCode); + { + var splitStrs = dto.StockCode.Split("_$"); + query = query.Where(w => w.StockCode == splitStrs[0] && w.OrgCode == splitStrs[1]); + } if (dto.OrderType.HasValue) query = query.Where(w => (int)w.OrderType == dto.OrderType.Value);