From 79bab503d77fffba160f9b1afbebd3c85fc47ca9 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Sat, 25 Nov 2023 16:18:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E4=BA=86=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/Controllers/SysConfigController.cs | 11 ++++++----- src/WMS.Web.Api/Controllers/TestController.cs | 2 +- src/WMS.Web.Domain/Services/Public/ErpService.cs | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs index 42043bfc..4b96d126 100644 --- a/src/WMS.Web.Api/Controllers/SysConfigController.cs +++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs @@ -206,11 +206,12 @@ namespace WMS.Web.Api.Controllers return Result>.ReFailure(ResultCodes.Token_Invalid_Error); List list = new List(); - if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD")) + //if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD")) + //{ + //var subs = await _erpService.BillQueryForSubStock(number,orgCode); + var subs = await _erpService.BillQueryForSubStock(null, null); + foreach (var s in subs.Data.Skip(0).Take(10))//.Where(w => w.Name.Contains(name) { - var subs = await _erpService.BillQueryForSubStock(number,orgCode); - foreach (var s in subs.Data.Where(w => w.Name.Contains(name))) - { list.Add(new UcStockResponse() { Id = s.Id, @@ -219,7 +220,7 @@ namespace WMS.Web.Api.Controllers Disable = false }); } - } + //} return Result>.ReSuccess(list); } diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index 8a51758e..9016008d 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -46,7 +46,7 @@ namespace WMS.Web.Api.Controllers [Route("hj")] public async Task TestHJ() { - var c = await _erpService.BillQueryForCustomer(); + var c = await _erpService.BillQueryForSubStock(null,null); //var bc2 = await _erpService.BillQueryForMisDeliveryOutStock(null, DateTime.Now.AddDays(-10)); //var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10)); //var b=await _erpService.BillQueryForAssembledAppOutStock_Assembly(null, DateTime.Now.AddDays(-1)); diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 47697d93..d83d8d0d 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1159,6 +1159,7 @@ namespace WMS.Web.Domain.Services.Public foreach (var item in result) { var lis = new ErpStockDto(); + if (item[0] == "0") continue; lis.Id = int.Parse(item[0]); lis.Name = item[1]; lis.Code = item[2];