From 2a6adea388d7da7e780d2312a13710350aaac50c Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Thu, 9 Nov 2023 15:07:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=87=87=E8=B4=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml    |  6 ++++--
 .../IService/Public/IErpService.cs            |  2 +-
 .../Services/Public/ErpService.cs             | 19 +++++++++++++++++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index a828d6c6..6c5d079d 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -1684,7 +1684,7 @@
             <param name="stockId"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForPurchaseInStock">
+        <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForPurchaseInStock(System.String,System.Collections.Generic.List{System.String})">
             <summary>
             erp:单据查询-采购入库单
             </summary>
@@ -2618,10 +2618,12 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForPurchaseInStock">
+        <member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForPurchaseInStock(System.String,System.Collections.Generic.List{System.String})">
             <summary>
             erp:单据查询-采购入库单
             </summary>
+            <param name="billNo">模糊搜索</param>
+            <param name="sourceBillNos">单据编号集合精确查找</param>
             <returns></returns>
         </member>
         <member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForMaterial">
diff --git a/src/WMS.Web.Domain/IService/Public/IErpService.cs b/src/WMS.Web.Domain/IService/Public/IErpService.cs
index d09b81b9..5f686191 100644
--- a/src/WMS.Web.Domain/IService/Public/IErpService.cs
+++ b/src/WMS.Web.Domain/IService/Public/IErpService.cs
@@ -19,7 +19,7 @@ namespace WMS.Web.Domain.IService.Public
         /// erp:单据查询-采购入库单
         /// </summary>
         /// <returns></returns>
-        Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock();
+        Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock(string billNo="", List<string> sourceBillNos = null);
         /// <summary>
         /// erp:单据查询-出库单
         /// </summary>
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index 35f86e58..f00836d1 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -89,8 +89,10 @@ namespace WMS.Web.Domain.Services.Public
         /// <summary>
         /// erp:单据查询-采购入库单
         /// </summary>
+        /// <param name="billNo">模糊搜索</param>
+        /// <param name="sourceBillNos">单据编号集合精确查找</param>
         /// <returns></returns>
-        public async Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock()
+        public async Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock(string billNo="", List<string> sourceBillNos = null)
         {
             try
             {
@@ -120,7 +122,7 @@ namespace WMS.Web.Domain.Services.Public
                 //3.单据类型：标准采购订单和标准委外订单
                 //4.明细关闭状态：正常
                 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
-                param.FilterString = "FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "' and FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'";
+                param.FilterString = "FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "' and FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'";                
                 param.FilterString = param.FilterString + " and FSOSTOCKID.FNumber in (";
 
                 var str = "";
@@ -135,6 +137,19 @@ namespace WMS.Web.Domain.Services.Public
                 }
                 param.FilterString = param.FilterString + str + ")";
 
+                //单据编号模糊查询
+                if (!string.IsNullOrEmpty(billNo)) 
+                {
+                    param.FilterString = param.FilterString + " and FBillNo like '%"+billNo+"%'";
+                }
+
+                //根据原订单号查询
+                if (sourceBillNos != null && sourceBillNos.Count() > 0)
+                {
+                    var srt_b = JsonConvert.SerializeObject(sourceBillNos);
+                    param.FilterString = param.FilterString + " and FBillNo in (" + srt_b.Substring(1, srt_b.Length - 2) + ")";
+                }
+
                 query.Data = JsonConvert.SerializeObject(param);
                 var json = JsonConvert.SerializeObject(query);