From 96e080612c7a3b999342d739d4aced49ffbb33a9 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Mon, 6 Nov 2023 14:07:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/Controllers/TestController.cs |  2 +-
 .../Services/Public/ErpService.cs             | 20 ++++---------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index 935fcdbd..decf6cbc 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -35,7 +35,7 @@ namespace WMS.Web.Api.Controllers
         [Route("hj")]
         public async Task<string> TestHJ()
         {
-            //var res  = await this._erpService.BillQueryForDeliveryNoticeOutStock();
+            var res  = await this._erpService.BillQueryForDeliveryNoticeOutStock();
             //var result= await this._erpService.BillQueryForPurchaseInStock();
             //var result = await this._erpService.BillQueryForOrg();
             var result = await this._erpService.BillQueryForMaterial();
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index 4e3e5079..6ee95cf7 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -390,25 +390,13 @@ namespace WMS.Web.Domain.Services.Public
                 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
                 param.FilterString = "FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "' and FDocumentStatus='C' and FRemainOutQty>=0";
                 //string srt = JsonConvert.SerializeObject(stocks_codes);
-                //param.FilterString = param.FilterString + " and FStockID in (" + srt.Substring(1, srt.Length - 1) + ")";
-                //param.FilterString = param.FilterString + " and FSOSTOCKID.FNumber in (";
-
-                //var str = "";
-                //int index = 0;
-                //foreach (var scode in stocks_codes)
-                //{
-                //    index++;
-                //    if (index == stocks_codes.Count)
-                //        str = str + $"'{scode}'";
-                //    else
-                //        str = str + $"'{scode}'" + ",";
-                //}
-                //param.FilterString = param.FilterString + str + ")";
+                //param.FilterString = param.FilterString + " and FStockID in (" + srt.Substring(1, srt.Length - 2) + ")";
+               
                 //根据原订单号查询
                 if (sourceBillNos != null && sourceBillNos.Count() > 0)
                 {
-                    var srt = JsonConvert.SerializeObject(sourceBillNos);
-                    param.FilterString = param.FilterString + " and FBillNo in (" + srt.Substring(1, srt.Length - 1) + ")";
+                    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);