From b2f16c97db705d6d0ebaadc2160bdd9049176c6d Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Wed, 20 Mar 2024 14:49:03 +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.Domain/Services/SerialNumberService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs index 3190b46e..1615da51 100644 --- a/src/WMS.Web.Domain/Services/SerialNumberService.cs +++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs @@ -145,7 +145,7 @@ namespace WMS.Web.Domain.Services }; if (moveBoxRecord.Type == MoveBoxType.Up) { - var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockCode); + var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockCode+ moveBoxRecord.StockCode+ moveBoxRecord.OrgCode); op.Remark += "\r\n" + "仓位:" + srcSubStock; } sList.Add(op); @@ -322,7 +322,7 @@ namespace WMS.Web.Domain.Services var boxId = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0; var box = boxList.FirstOrDefault(f => f.Id == boxId); var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber); - var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, inStock.SubStockCode); + var subStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, inStock.SubStockCode+ inStock.StockCode+ inStock.OrgCode); //修改序列号和箱绑定关系 entity.InStock(instockDetail.SourceBillNo, inStock.Type); entity.Bind(boxId, box?.CompleteCartonTime ?? DateTime.Now); @@ -411,7 +411,7 @@ namespace WMS.Web.Domain.Services if (backRecord.Type == BackRecordType.OutstockOn) { var subStockId = backRecord?.SubStockCode ?? ""; - var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, subStockId); + var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, backRecord?.SubStockCode ?? ""+ backRecord?.StockCode ?? ""+ backRecord?.OrgCode ?? ""); op.Remark += "\r\n" + "仓位:" + srcSubStock; } sList.Add(op); From ed42cc20f82aeb38b3f34824903aa1f62016d7f2 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Wed, 20 Mar 2024 14:58:23 +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.Repositories/ChangeBoxRecordRepositories.cs | 8 ++++---- src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs index b33205b0..60d7e12f 100644 --- a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs @@ -149,9 +149,9 @@ namespace WMS.Web.Repositories query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%")); if (!string.IsNullOrEmpty(dto.DestBox)) query = query.Where(w => EF.Functions.Like(w.destBox.BoxBillNo, "%" + dto.DestBox + "%")); - if (dto.SrcSubStockCode != null) + if (!string.IsNullOrEmpty(dto.SrcSubStockCode)) query = query.Where(w => w.changeBox.SrcSubStockCode == dto.SrcSubStockCode); - if (dto.DestSubStockCode != null) + if (!string.IsNullOrEmpty(dto.DestSubStockCode)) query = query.Where(w => w.changeBox.DestSubStockCode == dto.DestSubStockCode); if (dto.CreateBeginDate != null) query = query.Where(w => w.changeBox.CreateTime >= dto.CreateBeginDate); @@ -170,8 +170,8 @@ namespace WMS.Web.Repositories SerialNumbers = string.Join(",", s.changeBox.SerialNumbers), SrcBox = s.srcBox.BoxBillNo, DestBox = s.destBox.BoxBillNo, - Qty=s.changeBox.Qty, - DestBoxOrg= _singleDataService.GetSingleData(SingleAction.Orgs, companyId, s.changeBox.DestBoxOrgCode), + Qty = s.changeBox.Qty, + DestBoxOrg = _singleDataService.GetSingleData(SingleAction.Orgs, companyId, s.changeBox.DestBoxOrgCode), SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.changeBox.SrcSubStockCode + s.changeBox.SrcStockCode + s.changeBox.SrcBoxOrgCode), DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.changeBox.DestSubStockCode + s.changeBox.DestStockCode + s.changeBox.DestBoxOrgCode), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.changeBox.CreatorId), diff --git a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs index e5eba78a..d67f67da 100644 --- a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs @@ -101,7 +101,7 @@ namespace WMS.Web.Repositories _transaction.Commit(); return true; } - catch(Exception ex) + catch (Exception ex) { if (_transaction != null) _transaction.Rollback(); @@ -160,9 +160,9 @@ namespace WMS.Web.Repositories .OrderByDescending(o => o.moveBox.Id) .Where(adv => 1 == 1); - if (dto.SrcSubStockCode != null) + if (!string.IsNullOrEmpty(dto.SrcSubStockCode)) query = query.Where(w => w.moveBox.SrcSubStockCode == dto.SrcSubStockCode); - if (dto.DestSubStockCode != null) + if (!string.IsNullOrEmpty(dto.DestSubStockCode)) query = query.Where(w => w.moveBox.DestSubStockCode == dto.DestSubStockCode); if (!string.IsNullOrEmpty(dto.Creator)) query = query.Where(w => ids.Contains(w.moveBox.CreatorId)); From 1d5e922b0265650446ea786de07def253f2b3301 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Wed, 20 Mar 2024 15:03:02 +0800 Subject: [PATCH 3/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/ClientLogController.cs | 6 +++--- src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/WMS.Web.Api/Controllers/ClientLogController.cs b/src/WMS.Web.Api/Controllers/ClientLogController.cs index edda7bcc..e57db9e7 100644 --- a/src/WMS.Web.Api/Controllers/ClientLogController.cs +++ b/src/WMS.Web.Api/Controllers/ClientLogController.cs @@ -38,13 +38,13 @@ namespace WMS.Web.Api.Controllers /// /// 前端记录日志(数组) /// - /// + /// /// [HttpPost] [Route("Logs")] - public Task Logs(List dto) + public Task Logs(List logs) { - _Logger.LogInformation($"前端日志(数组) 时间:{DateTime.Now} 内容:{JsonConvert.SerializeObject(dto)}"); + _Logger.LogInformation($"前端日志(数组) 时间:{DateTime.Now} 内容:{JsonConvert.SerializeObject(logs)}"); return Task.FromResult(Result.ReSuccess()); } } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 58d9c22f..f19909ea 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -101,11 +101,11 @@ - + 前端记录日志(数组) - +