From ea8ea522d4f8cd943055a8a73d3f8849ef29469c Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 7 Dec 2023 15:48:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/Controllers/TestController.cs        | 6 +++---
 src/WMS.Web.Repositories/OutStockRepositories.cs     | 5 ++++-
 src/WMS.Web.Repositories/OutStockTaskRepositories.cs | 5 ++++-
 src/WMS.Web.Repositories/TakeStockRepositories.cs    | 5 ++++-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index 77378ec9..e60fc394 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -54,12 +54,12 @@ namespace WMS.Web.Api.Controllers
         [Route("hj")]
         public async Task<string> TestHJ()
         {
-            List<ErpCustomerDto> list = null;
-           var b= list.FirstOrDefault(f => f.Id == 123);
+           // List<ErpCustomerDto> list = null;
+           //var b= list.FirstOrDefault(f => f.Id == 123);
           //var entity=await  _takeStockRepositories.GetEntityList(new List<int>() {2 });
           //var r= await _takeStockService.Loss_Profit(entity.First());
           //var list = await GetList();
-          //var c = await _erpService.BillQueryForSubStock(null,null);
+          var c = await _erpService.BillQueryForAssembledAppOutStock_Assembly(new List<string>() { "ZZCX003061" }, DateTime.Now.AddDays(-10));
           //var bc2 = await _erpService.BillQueryForDeliveryNoticeOutStock(new List<string>() { "FHTZD8022232" }, DateTime.Now.AddDays(-10));
           //var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10));
           //var b=await _erpService.BillQueryForAssembledAppOutStock_Assembly(null, DateTime.Now.AddDays(-1));
diff --git a/src/WMS.Web.Repositories/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs
index 20561a8e..667be4f3 100644
--- a/src/WMS.Web.Repositories/OutStockRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockRepositories.cs
@@ -150,7 +150,10 @@ namespace WMS.Web.Repositories
             if (dto.DeliveryOrgId != null)
                 query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId);
             if (!string.IsNullOrEmpty(dto.StockCode))
-                query = query.Where(w => w.order.StockCode == dto.StockCode);
+            {
+                var split = dto.StockCode.Split("_$");
+                query = query.Where(w => w.order.StockCode == split[0] && w.order.OrgCode == split[1]);
+            }
             if (dto.CreateBeginDate != null)
                 query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate);
             if (dto.CreateEndDate != null)
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index ed247198..38700bef 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -273,7 +273,10 @@ namespace WMS.Web.Repositories
             if (dto.DeliveryOrgId != null)
                 query = query.Where(w => w.order.DeliveryOrgId == dto.DeliveryOrgId);
             if (!string.IsNullOrEmpty(dto.StockCode))
-                query = query.Where(w => w.order.StockCode == dto.StockCode);
+            {
+                var split = dto.StockCode.Split("_$");
+                query = query.Where(w => w.order.StockCode == split[0] && w.order.OrgCode == split[1]);
+            }
             if (dto.CreateBeginDate != null)
                 query = query.Where(w => w.order.OperateTime >= dto.CreateBeginDate);
             if (dto.CreateEndDate != null)
diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs
index 37cbb703..54beca11 100644
--- a/src/WMS.Web.Repositories/TakeStockRepositories.cs
+++ b/src/WMS.Web.Repositories/TakeStockRepositories.cs
@@ -186,7 +186,10 @@ namespace WMS.Web.Repositories
             if (!string.IsNullOrEmpty(dto.BillNo))
                 query = query.Where(w => EF.Functions.Like(w.order.BillNo, "%" + dto.BillNo + "%"));
             if (!string.IsNullOrEmpty(dto.StockCode))
-                query = query.Where(w => w.detail.StockCode == dto.StockCode);
+            {
+                var split = dto.StockCode.Split("_$");
+                query = query.Where(w => w.detail.StockCode == split[0] && w.detail.OrgCode == split[1]);
+            }
             if (dto.DateBeginDate != null)
                 query = query.Where(w => w.order.Date >= dto.DateBeginDate);
             if (dto.DateEndDate != null)