From 71e3bde35db7e883b64884ed99e2b50305a7f390 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Sat, 25 Nov 2023 15:36:41 +0800 Subject: [PATCH 1/3] =?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/SysConfigController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs index 044623d5..c523b01a 100644 --- a/src/WMS.Web.Api/Controllers/SysConfigController.cs +++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs @@ -209,7 +209,7 @@ namespace WMS.Web.Api.Controllers if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD")) { var subs = await _erpService.BillQueryForSubStock(number); - foreach (var s in subs.Data.Where(w => EF.Functions.Like(w.Name, "%" + name + "%"))) + foreach (var s in subs.Data.Where(w => w.Name.Contains(name))) { list.Add(new UcStockResponse() { From 53abdd58b5028c93a9b0bcf39f05024c3090b1b5 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Sat, 25 Nov 2023 15:59:31 +0800 Subject: [PATCH 2/3] =?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/SysConfigController.cs | 6 +++--- src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml | 2 +- src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 4 ++-- src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs | 1 - src/WMS.Web.Domain/IService/Public/IErpService.cs | 2 +- src/WMS.Web.Domain/Services/Public/ErpService.cs | 4 ++-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs index c523b01a..42043bfc 100644 --- a/src/WMS.Web.Api/Controllers/SysConfigController.cs +++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs @@ -198,8 +198,8 @@ namespace WMS.Web.Api.Controllers /// 模糊匹配 /// [HttpGet] - [Route("GetErp_SubUcStock/{number}")] - public async Task>> GetErp_SubUcStock([FromRoute] string number, [FromQuery] string name) + [Route("GetErp_SubUcStock/{number}/{orgCode}")] + public async Task>> GetErp_SubUcStock([FromRoute] string number,[FromRoute] string orgCode, [FromQuery] string name) { var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) @@ -208,7 +208,7 @@ namespace WMS.Web.Api.Controllers List list = new List(); if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD")) { - var subs = await _erpService.BillQueryForSubStock(number); + var subs = await _erpService.BillQueryForSubStock(number,orgCode); foreach (var s in subs.Data.Where(w => w.Name.Contains(name))) { list.Add(new UcStockResponse() diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 6d0db41a..af82acd0 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -481,7 +481,7 @@ 仓库id - + 根据仓库获取金蝶子仓库 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index e5c8bd99..7e1bface 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -2741,7 +2741,7 @@ - + 获取仓位信息信息 根据仓库编码 @@ -4021,7 +4021,7 @@ - + 根据仓库编码获取仓位 diff --git a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs index 461b8e53..ea277685 100644 --- a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs +++ b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs @@ -42,7 +42,6 @@ namespace WMS.Web.Core.Dto.TakeStock /// /// 序列号 /// - [Required(ErrorMessage = "序列号不能为空")] public List SerialNumbers { get; set; } = new List(); /// /// 备注 diff --git a/src/WMS.Web.Domain/IService/Public/IErpService.cs b/src/WMS.Web.Domain/IService/Public/IErpService.cs index 403bb89e..9de6d159 100644 --- a/src/WMS.Web.Domain/IService/Public/IErpService.cs +++ b/src/WMS.Web.Domain/IService/Public/IErpService.cs @@ -122,7 +122,7 @@ namespace WMS.Web.Domain.IService.Public /// 获取仓位信息信息 根据仓库编码 /// /// - Task> BillQueryForSubStock(string code=null); + Task> BillQueryForSubStock(string code=null, string orgCode = null); //同步数据(保存提交审核) Task> Save(T dto, string formId); //提交 diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 21351cd1..47697d93 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1131,7 +1131,7 @@ namespace WMS.Web.Domain.Services.Public /// /// /// - public async Task> BillQueryForSubStock(string code = null) + public async Task> BillQueryForSubStock(string code = null,string orgCode=null) { try { @@ -1148,7 +1148,7 @@ namespace WMS.Web.Domain.Services.Public param.FieldKeys = "FStockFlexDetail_FDetailID,FFlexEntryName,FFlexEntryId,'0'"; param.Limit = 100000; if (!string.IsNullOrEmpty(code)) - param.FilterString = "FNumber='" + code + "'";//FNumber='C' + param.FilterString = $"FNumber='{code}' and FUseOrgId.FNumber='{orgCode}'";//FNumber='C' query.Data = JsonConvert.SerializeObject(param); var json = JsonConvert.SerializeObject(query); From 79bab503d77fffba160f9b1afbebd3c85fc47ca9 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Sat, 25 Nov 2023 16:18:05 +0800 Subject: [PATCH 3/3] =?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];