From 23eb18524213b0b30190213dfbbbdd7ebe08443a Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Thu, 9 Nov 2023 17:07:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/InStockTaskController.cs      |  4 ++--
 .../Services/Public/ErpService.cs             | 22 ++++++++++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/InStockTaskController.cs b/src/WMS.Web.Api/Controllers/InStockTaskController.cs
index 140696d0..08dc39d1 100644
--- a/src/WMS.Web.Api/Controllers/InStockTaskController.cs
+++ b/src/WMS.Web.Api/Controllers/InStockTaskController.cs
@@ -90,8 +90,8 @@ namespace WMS.Web.Api.Controllers
         /// </summary>
         /// <param name="code"></param>
         /// <returns></returns>
-        [HttpPost]
-        [Route("InStockTask/{code}")]
+        [HttpGet]
+        [Route("GetSourceOrder/{code}")]
         public async Task<ResultList<InStockTaskBillNoQueryResponse>> InStockTask([FromRoute] string code)
         {
             var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index 0858c4ed..baed91e3 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -122,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 = " FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'";
                 param.FilterString = param.FilterString + " and FSOSTOCKID.FNumber in (";
 
                 var str = "";
@@ -140,8 +140,24 @@ namespace WMS.Web.Domain.Services.Public
                 //根据原订单号查询
                 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) + ")";
+                    param.FilterString = param.FilterString + " and FBillNo in (";
+
+                    var bill_str = "";
+                    int bill_index = 0;
+                    //var srt_b = JsonConvert.SerializeObject(sourceBillNos);
+                    foreach (var bill in sourceBillNos)
+                    {
+                        bill_index++;
+                        if (bill_index == sourceBillNos.Count)
+                            bill_str = bill_str + $"'{bill}'";
+                        else
+                            bill_str = bill_str + $"'{bill}'" + ",";
+                    }
+                    param.FilterString = param.FilterString + bill_str + ")";
+                }//注意：当有单据编号的查询的时候，时间条件去掉；不然就查不到数据了
+                else 
+                {
+                    param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
                 }
 
                 query.Data = JsonConvert.SerializeObject(param);