From 42eae47bb6af79ef352fe673e074792bed415457 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Fri, 17 Nov 2023 14:58:25 +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    | 7 +++++--
 src/WMS.Web.Domain/Services/Public/ErpService.cs | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index 094b39dc..4d30257f 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -28,9 +28,10 @@ namespace WMS.Web.Api.Controllers
         private readonly IOpsService _opsService;
         private readonly IBoxService _boxService;
         private readonly IOutStockTaskRepositories _outStockTaskRepositories;
+        private readonly IOutStockTaskService _outStockTaskService;
         public TestController(IErpService erpService, IInStockTaskService inStockTaskService, 
             IBasicsRepositories transactionRepositories, IOpsService opsService, IBoxService boxService,
-            IOutStockTaskRepositories outStockTaskRepositories)
+            IOutStockTaskRepositories outStockTaskRepositories, IOutStockTaskService outStockTaskService)
         {
             this._erpService = erpService;
             this._inStockTaskService = inStockTaskService;
@@ -38,18 +39,20 @@ namespace WMS.Web.Api.Controllers
             _opsService = opsService;
             _boxService = boxService;
             _outStockTaskRepositories = outStockTaskRepositories;
+            _outStockTaskService = outStockTaskService;
         }
 
         [HttpGet]
         [Route("hj")]
         public async Task<string> TestHJ()
         {
+           await _outStockTaskService.Sync(null);
             //var t=await _outStockTaskRepositories.Get(1);
             // t.Details[0].Remark = "sdf";
             // t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb";
             // var s = await _outStockTaskRepositories.Edit(t);
             // await _boxService.Sync();
-            var res = await this._erpService.BillQueryForAssembledAppOutStock_Dassembly(null,DateTime.Now.AddDays(-300));
+            //var res = await this._erpService.BillQueryForAssembledAppOutStock_Dassembly(null,DateTime.Now.AddDays(-300));
             //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 246f371b..cbd4067b 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -1701,7 +1701,7 @@ namespace WMS.Web.Domain.Services.Public
                 //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
                 param.FilterString = "FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9'";
                 //string srt = JsonConvert.SerializeObject(stocks_codes);
-                param.FilterString += " and FSrcStockID in (" + stocks_codes + ")";
+                param.FilterString += " and FStockId in (" + stocks_codes + ")";
 
                 //根据原订单号查询
                 if (sourceBillNos != null && sourceBillNos.Count() > 0)