From 83aed46e981b08a193936eeb9af7ec36ea9dcf6d Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 12 Jan 2024 13:55:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/Controllers/TestController.cs | 8 ++++---- src/WMS.Web.Domain/Services/BoxService.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index c712b882..3ca35432 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -82,9 +82,9 @@ namespace WMS.Web.Api.Controllers //var entity=await _takeStockRepositories.GetEntityList(new List() {2 }); //var r= await _takeStockService.Loss_Profit(entity.First()); //var list = await GetList(); - List<(string materialNumber, string orgCode, string stockCode, int subStockId)> request = new List<(string materialNumber, string orgCode, string stockCode, int subStockId)>(); - request.Add(("G03-60-551495", "101", "WMSCH001", 2683)); - var c = await _erpService.BillQueryForInventory(request); + //List<(string materialNumber, string orgCode, string stockCode, int subStockId)> request = new List<(string materialNumber, string orgCode, string stockCode, int subStockId)>(); + //request.Add(("G03-60-551495", "101", "WMSCH001", 2683)); + //var c = await _erpService.BillQueryForInventory(request); //var c = await _erpService.BillQueryForAssembledAppOutStock_Assembly(new List() { "ZZCX003061" }, DateTime.Now.AddDays(-10)); //var bc2 = await _erpService.BillQueryForDeliveryNoticeOutStock(new List() { "FHTZD8022232" }, DateTime.Now.AddDays(-10)); //var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10)); @@ -96,7 +96,7 @@ namespace WMS.Web.Api.Controllers // t.Details[0].Remark = "sdf"; // t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb"; // var s = await _outStockTaskRepositories.Edit(t); - //await _boxService.Sync(list); + await _boxService.Sync(); //var res = await this._erpService.BillQueryForAssembledAppOutStock_Dassembly(null,DateTime.Now.AddDays(-300)); //var result= await this._erpService.BillQueryForPurchaseInStock(); //var result = await this._erpService.BillQueryForOrg(); diff --git a/src/WMS.Web.Domain/Services/BoxService.cs b/src/WMS.Web.Domain/Services/BoxService.cs index 88142cc0..5a33d1f7 100644 --- a/src/WMS.Web.Domain/Services/BoxService.cs +++ b/src/WMS.Web.Domain/Services/BoxService.cs @@ -50,7 +50,7 @@ namespace WMS.Web.Domain.Services if (list == null || list.Count() <= 0) { DateTime begin = await _erpOpsSyncDateRepositories.Get(ErpOpsSyncType.Ops); - begin = begin.AddMinutes(-10); + begin = begin.AddDays(-1); OpsBoxRequest request = new OpsBoxRequest(begin, DateTime.Now); list = await _opsService.GetBox(request); } From 299756997fd45199f5fd1e43f6c4c25b37451392 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 12 Jan 2024 14:28:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/Controllers/TestController.cs | 2 +- src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 5 ----- src/WMS.Web.Domain/Services/BoxService.cs | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index 3ca35432..db3496cf 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -96,7 +96,7 @@ namespace WMS.Web.Api.Controllers // t.Details[0].Remark = "sdf"; // t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb"; // var s = await _outStockTaskRepositories.Edit(t); - await _boxService.Sync(); + //await _boxService.Sync(); //var res = await this._erpService.BillQueryForAssembledAppOutStock_Dassembly(null,DateTime.Now.AddDays(-300)); //var result= await this._erpService.BillQueryForPurchaseInStock(); //var result = await this._erpService.BillQueryForOrg(); diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 20811ea7..dfffa3f2 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -3492,11 +3492,6 @@ erp-Id - - - 采购入库：字段 - - 老ops对接 diff --git a/src/WMS.Web.Domain/Services/BoxService.cs b/src/WMS.Web.Domain/Services/BoxService.cs index 5a33d1f7..88142cc0 100644 --- a/src/WMS.Web.Domain/Services/BoxService.cs +++ b/src/WMS.Web.Domain/Services/BoxService.cs @@ -50,7 +50,7 @@ namespace WMS.Web.Domain.Services if (list == null || list.Count() <= 0) { DateTime begin = await _erpOpsSyncDateRepositories.Get(ErpOpsSyncType.Ops); - begin = begin.AddDays(-1); + begin = begin.AddMinutes(-10); OpsBoxRequest request = new OpsBoxRequest(begin, DateTime.Now); list = await _opsService.GetBox(request); } From e3cca2609d8cc6e8cfdf907dbb7c8fbe1e05e706 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Fri, 12 Jan 2024 14:30:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Domain/Services/BoxService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WMS.Web.Domain/Services/BoxService.cs b/src/WMS.Web.Domain/Services/BoxService.cs index 88142cc0..0a8dab8e 100644 --- a/src/WMS.Web.Domain/Services/BoxService.cs +++ b/src/WMS.Web.Domain/Services/BoxService.cs @@ -50,7 +50,7 @@ namespace WMS.Web.Domain.Services if (list == null || list.Count() <= 0) { DateTime begin = await _erpOpsSyncDateRepositories.Get(ErpOpsSyncType.Ops); - begin = begin.AddMinutes(-10); + begin = begin.AddHours(-1); OpsBoxRequest request = new OpsBoxRequest(begin, DateTime.Now); list = await _opsService.GetBox(request); }