diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 36823ee8..f42f8307 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs index 0790da72..ea780719 100644 --- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs +++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs @@ -1,5 +1,7 @@ using AutoMapper; using Microsoft.EntityFrameworkCore.Storage; +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; @@ -30,10 +32,12 @@ namespace WMS.Web.Domain.Services private readonly ISerialNumberService _serialNumberService; private readonly IBoxInventoryService _boxInventoryService; private readonly IBoxInventoryRepositories _boxInventoryRepositories; + private readonly ILogger _logger; public ChangeMoveBoxService(IMapper mapper, ILoginService loginService, IChangeBoxRecordRepositories changeBoxRecordRepositories, IBasicsRepositories basbicsRepositories, IMoveBoxRecordRepositories moveBoxRecordRepositories, IBoxRepositories boxRepositories, - ISerialNumberService serialNumberService, IBoxInventoryService boxInventoryService, IBoxInventoryRepositories boxInventoryRepositories) + ISerialNumberService serialNumberService, IBoxInventoryService boxInventoryService, IBoxInventoryRepositories boxInventoryRepositories, + ILogger logger) { _mapper = mapper; _loginService = loginService; @@ -44,6 +48,7 @@ namespace WMS.Web.Domain.Services _serialNumberService = serialNumberService; _boxInventoryService = boxInventoryService; _boxInventoryRepositories = boxInventoryRepositories; + _logger = logger; } /// /// 改箱保存 @@ -53,6 +58,7 @@ namespace WMS.Web.Domain.Services /// public async Task ChangeBoxSave(List dto, LoginInDto loginInfo, bool isTransaction = false, bool IsInventory = true) { + _logger.LogInformation($"改箱:{JsonConvert.SerializeObject(dto)} 操作人:{loginInfo.UserInfo.StaffId}"); //1.有原箱时 需要判断 物料对应的序列号是否存在 var srcIds = dto.Select(s => s.SrcBoxId).ToList(); var destIds = dto.Select(s => s.DestBoxId).ToList(); @@ -169,6 +175,7 @@ namespace WMS.Web.Domain.Services /// public async Task MoveBoxSave(List dto, bool IsUp, LoginInDto loginInfo) { + _logger.LogInformation($"移箱:{JsonConvert.SerializeObject(dto)} 是否上架:{IsUp} 操作人:{loginInfo.UserInfo.StaffId}"); //1.下架时 需要验证箱是否在库存里 if (!IsUp) { diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs index 69e9a602..f82dfc63 100644 --- a/src/WMS.Web.Domain/Services/OutStockService.cs +++ b/src/WMS.Web.Domain/Services/OutStockService.cs @@ -1,5 +1,7 @@ using AutoMapper; using Microsoft.EntityFrameworkCore.Storage; +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; @@ -38,12 +40,13 @@ namespace WMS.Web.Domain.Services private readonly IBoxInventoryService _boxInventoryService; private readonly IInventoryInOutDetailsService _inventoryInOutDetailsService; private readonly IBoxInventoryRepositories _boxInventoryRepositories; + private readonly ILogger _logger; public OutStockService(IMapper mapper, ILoginService loginService, IBasicsRepositories transactionRepositories, IOutStockRepositories outStockRepositories, IOutStockTaskRepositories outStockTaskRepositories, IOutStockTaskService outStockTaskService, IErpService erpService, ISerialNumberService serialNumberService, IBoxInventoryService boxInventoryService, IInventoryInOutDetailsService inventoryInOutDetailsService, - IBoxInventoryRepositories boxInventoryRepositories) + IBoxInventoryRepositories boxInventoryRepositories, ILogger logger) { _mapper = mapper; _loginService = loginService; @@ -56,6 +59,7 @@ namespace WMS.Web.Domain.Services _boxInventoryService = boxInventoryService; _inventoryInOutDetailsService = inventoryInOutDetailsService; _boxInventoryRepositories = boxInventoryRepositories; + _logger = logger; } /// /// 出库单 @@ -65,6 +69,7 @@ namespace WMS.Web.Domain.Services /// public async Task Save(SaveOutStockRequest dto, LoginInDto loginInfo) { + _logger.LogInformation($"出库:{JsonConvert.SerializeObject(dto)} 操作人:{loginInfo.UserInfo.StaffId}"); var outStockTask = await _outStockTaskRepositories.Get(dto.TaskId); if (outStockTask.Status == OutStockStatus.Already) return Result.ReFailure(ResultCodes.OutStockTaskAlready); @@ -121,7 +126,7 @@ namespace WMS.Web.Domain.Services //循环添加erp同步明细 foreach (var c in res.Data) { - var tErpDetail = tDetail.ErpDetails.FirstOrDefault(f => f.Erp_DetailId==c.erpDetailId); + var tErpDetail = tDetail.ErpDetails.FirstOrDefault(f => f.Erp_DetailId == c.erpDetailId); var oErpDetail = _mapper.Map(tErpDetail); oErpDetail.Qty = c.qty; outd.ErpDetails.Add(oErpDetail); @@ -178,10 +183,10 @@ namespace WMS.Web.Domain.Services var list = await _outStockRepositories.GetEntityList(dto.Ids); foreach (var entity in list) { - if (entity.SuccessSync!=SyncStatus.Fail) continue; - List failList =entity.Details.SelectMany(s=>s.ErpDetails) - .Where(w=> w.SuccessSync== SyncStatus.Fail).GroupBy(g=>g.SourceBillNo) - .Select(s=>s.Key).ToList();//同步失败的来源单号 + if (entity.SuccessSync != SyncStatus.Fail) continue; + List failList = entity.Details.SelectMany(s => s.ErpDetails) + .Where(w => w.SuccessSync == SyncStatus.Fail).GroupBy(g => g.SourceBillNo) + .Select(s => s.Key).ToList();//同步失败的来源单号 //找到单据里需要同步的单据 var sourcNos = entity.Details.SelectMany(s => s.ErpDetails).GroupBy(s => s.SourceBillNo).Select(s => s.Key); foreach (var s in failList) diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index 7ecf41e2..b0928646 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -64,6 +64,7 @@ namespace WMS.Web.Domain.Services /// public async Task Save(List dto, LoginInDto loginInfo) { + _logger.LogInformation($"盘点保存:{JsonConvert.SerializeObject(dto)} 盘点人:{loginInfo.UserInfo.StaffId}" ); List list = _mapper.Map>(dto); foreach (var entity in list) {