From 7db1399eb0ef2d7ff8576dcb30856fc4e154e720 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Fri, 22 Nov 2024 09:16:49 +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

---
 .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2      | Bin 277406 -> 277406 bytes
 .../Controllers/OutStockTaskController.cs     |  21 ++++++++++++++++++
 src/WMS.Web.Api/Controllers/TestController.cs |   3 ++-
 .../IOutStockTaskRepositories.cs              |   2 ++
 .../OutStockTaskRepositories.cs               |  21 ++++++++++++++++++
 5 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index 410f719fc5e37c25f9f1aa479982d9658ed5d1b3..4ee4ed0e2b339d39a333b65a8078511777945b19 100644
GIT binary patch
delta 61
zcmV-D0K)&C_Yj`<5Rj+>0W*QCg{uLzs{$xh0s%R<)>Q)RC<OvBG5{);TLBxFV1NPy
Thvj|(x8;5Vtbn(W{{s#@)EXBL

delta 58
zcmbRDU0~jKfe9;^nGB5@SGBHU+`5WMBNWK9*nTCH>5T>pqa}mZ^pEvS^6gLRn6^Ku
OV_ws+ed2#+UK;?Q%og4N

diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
index 72f0404d..5fe8ba99 100644
--- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
+++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
@@ -219,6 +219,27 @@ namespace WMS.Web.Api.Controllers
             return ResultPagedList<string>.ReSuccess(res, total);
         }
 
+        /// <summary>
+        /// 根据出库单任务编号模糊搜索下拉-PDA出库箱信息查询
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("GetOutStockTaskNosByNoBox")]
+        public async Task<ResultPagedList<string>> GetOutStockTaskNosByNoBox([FromBody] GetOutStockTaskNosByNoRequest dto)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return ResultPagedList<string>.ReFailure(ResultCodes.Token_Invalid_Error);
+
+            var res = await _repositories.GetOutStockTaskNosByNoBox(dto.BillNo, dto.StockCode);
+            int total = res.Count();
+            res = res.OrderByDescending(o => o).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToList();
+
+            if (res == null || res.Count() == 0) return ResultPagedList<string>.ReFailure(ResultCodes.OutStockTaskNoData);
+            return ResultPagedList<string>.ReSuccess(res, total);
+        }
+
         /// <summary>
         /// 根据出库单任务编号精确搜索(并且同步金蝶数据)-PDA出库
         /// </summary>
diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index 243dac0c..bf3be68b 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -126,7 +126,7 @@ namespace WMS.Web.Api.Controllers
             //var b = await _erpInventoryService.GetInventory(new List<string>() { "111"});
             //int count = 10 / 5;
             //var bcd=await _productInventoryService.LingXing();
-           //await _erpService.BillQueryForPurchaseInStock();
+            //await _erpService.BillQueryForPurchaseInStock();
 
             //LingXingResponse<LingXingStockResponse> r = new LingXingResponse<LingXingStockResponse>();
 
@@ -156,6 +156,7 @@ namespace WMS.Web.Api.Controllers
             //await _outStockTaskService.BillQueryForMisDeliveryOutStock(true, new List<string>() { "QTCK026812" });
             //await _inStockTaskService.SysnMiscellaneous(new List<string>() { "QTRK028204" }, true);
 
+           //var b=await _erpService.BillQueryForTransferOutOutStock(new List<string>() { "FBDC089527" });
 
             //  List<int> boxIds = new List<int>();
             //  boxIds.Add(5324);
diff --git a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
index 58357474..6524ad67 100644
--- a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
@@ -57,6 +57,8 @@ namespace WMS.Web.Domain.Infrastructure
         Task<List<GetOutStockTaskByNoResponse>> GetOutStockTaskListByNo(string billNo);
         //模糊搜索订单号
         Task<List<string>> GetOutStockTaskNosByNo(string billNo, string stockCode);
+        //模糊搜索订单号
+        Task<List<string>> GetOutStockTaskNosByNoBox(string billNo, string stockCode);
         //根据订单号获取订单信息
         Task<GetOutStockTaskByNoResponse> GetOutStockTaskByNo(string billNo);
     }
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index 810626c6..909ee554 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -562,6 +562,27 @@ namespace WMS.Web.Repositories
             return res.Distinct().ToList();
         }
 
+        public async Task<List<string>> GetOutStockTaskNosByNoBox(string billNo, string stockCode)
+        {
+            var split = stockCode.Split("_$");
+
+            var res = await _context.OutStockTask.Include(x => x.Details.Where(w => w.IsRepeal != true)).ThenInclude(s => s.ErpDetails)
+                .Where(f => EF.Functions.Like(f.BillNo, "%" + billNo + "%") &&
+                (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Already) && f.StockCode.Equals(split[0]) && f.OrgCode.Equals(split[1]))
+                .OrderByDescending(o => o.Id)
+                .Select(s => s.BillNo)
+                .ToListAsync();
+
+            var ress = await _context.OutStockTask.Include(x => x.Details.Where(w => w.IsRepeal != true)).ThenInclude(s => s.ErpDetails)
+                  .Where(f => (f.Details.SelectMany(s => s.ErpDetails).Where(w => EF.Functions.Like(w.SourceBillNo, "%" + billNo + "%")).Any()) &&
+                  (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Already) && f.StockCode.Equals(split[0]) && f.OrgCode.Equals(split[1]))
+                  .OrderByDescending(o => o.Id)
+                  .Select(s => s.BillNo)
+                  .ToListAsync();
+            res.AddRange(ress);
+            return res.Distinct().ToList();
+        }
+
         /// <summary>
         /// 导出列表
         /// </summary>