diff --git a/src/WMS.Web.Domain/Services/BackRecordService.cs b/src/WMS.Web.Domain/Services/BackRecordService.cs index 0da71e04..a57e2a97 100644 --- a/src/WMS.Web.Domain/Services/BackRecordService.cs +++ b/src/WMS.Web.Domain/Services/BackRecordService.cs @@ -66,6 +66,10 @@ namespace WMS.Web.Domain.Services /// public async Task BackShelf(BackRecordOnOffRequest dto, BackRecordType type, LoginInDto loginInfo) { + if (type == BackRecordType.InstockOff) + _logger.LogInformation($"回退下架:{JsonConvert.SerializeObject(dto)} 操作人:{loginInfo.UserInfo.StaffId + loginInfo.UserInfo.Nickname}"); + else + _logger.LogInformation($"回退上架:{JsonConvert.SerializeObject(dto)} 操作人:{loginInfo.UserInfo.StaffId + loginInfo.UserInfo.Nickname}"); IDbContextTransaction _transaction = _basicsRepositories.GetTransaction(); bool isRollback = false; bool isTransaction = false; diff --git a/src/WMS.Web.Domain/Services/BoxInventoryService.cs b/src/WMS.Web.Domain/Services/BoxInventoryService.cs index 419ae5dc..9d260a05 100644 --- a/src/WMS.Web.Domain/Services/BoxInventoryService.cs +++ b/src/WMS.Web.Domain/Services/BoxInventoryService.cs @@ -56,6 +56,7 @@ namespace WMS.Web.Domain.Services /// public async Task GenerateChangeBox(List dtoDatas, bool isTransaction) { + _logger.LogInformation("改箱-箱库存变更:" + JsonConvert.SerializeObject(dtoDatas)); //1.判断来源数据是否存在 if (dtoDatas == null || dtoDatas.Count == 0) return Result.ReFailure(ResultCodes.InventoryNoSourceError); @@ -150,7 +151,7 @@ namespace WMS.Web.Domain.Services /// public async Task GenerateMoveBox(List dtoDatas, bool isTransaction) { - _logger.LogInformation("移箱-箱库存变更1:" + JsonConvert.SerializeObject(dtoDatas)); + _logger.LogInformation("移箱-箱库存变更:" + JsonConvert.SerializeObject(dtoDatas)); //1.判断来源数据是否存在 if (dtoDatas == null || dtoDatas.Count == 0) return Result.ReFailure(ResultCodes.InventoryNoSourceError); @@ -229,6 +230,7 @@ namespace WMS.Web.Domain.Services /// public async Task GenerateBackBox(BackRecord dtoData, bool isTransaction) { + _logger.LogInformation("入库回退上下架-箱库存的变更:" + JsonConvert.SerializeObject(dtoData)); //1.判断来源数据是否存在 if (dtoData == null) return Result.ReFailure(ResultCodes.InventoryNoSourceError); @@ -301,6 +303,7 @@ namespace WMS.Web.Domain.Services /// public async Task GenerateTakeBox(List dtoDatas, List serNubBoxDto, bool isTransaction) { + _logger.LogInformation("盘点单-箱库存的变更:" + JsonConvert.SerializeObject(dtoDatas)); //1.判断来源数据是否存在 if (dtoDatas == null || dtoDatas.Count == 0) return Result.ReFailure(ResultCodes.InventoryNoSourceError); @@ -409,6 +412,7 @@ namespace WMS.Web.Domain.Services /// public async Task GenerateInStockBox(InStock dtoData, bool isTransaction) { + _logger.LogInformation("入库单-箱库存的变更:" + JsonConvert.SerializeObject(dtoData)); //1.判断来源数据是否存在 if (dtoData == null) return Result.ReFailure(ResultCodes.InventoryNoSourceError); @@ -481,6 +485,7 @@ namespace WMS.Web.Domain.Services /// public async Task GenerateOutStockBox(OutStock dtoData, bool isTransaction) { + _logger.LogInformation("出库单-箱库存的变更:" + JsonConvert.SerializeObject(dtoData)); //1.判断来源数据是否存在 if (dtoData == null) return Result.ReFailure(ResultCodes.InventoryNoSourceError); diff --git a/src/WMS.Web.Domain/Services/BoxMarkService.cs b/src/WMS.Web.Domain/Services/BoxMarkService.cs index a8f51070..5fc2e431 100644 --- a/src/WMS.Web.Domain/Services/BoxMarkService.cs +++ b/src/WMS.Web.Domain/Services/BoxMarkService.cs @@ -1,4 +1,6 @@ using AutoMapper; +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; @@ -23,11 +25,13 @@ namespace WMS.Web.Domain.Services private readonly IMapper _mapper; public readonly IBasicsRepositories _transactionRepositories; private readonly IBoxMarkRepositories _boxMarkRepositories; - public BoxMarkService(IMapper mapper, + private readonly ILogger _logger; + public BoxMarkService(IMapper mapper, ILogger logger, IBasicsRepositories transactionRepositories, IBoxMarkRepositories boxMarkRepositories) { _mapper = mapper; + _logger = logger; _transactionRepositories = transactionRepositories; _boxMarkRepositories = boxMarkRepositories; } @@ -40,6 +44,7 @@ namespace WMS.Web.Domain.Services /// public async Task> Generate(GenerateBoxMarkDto dto, LoginInDto loginInfo) { + _logger.LogInformation($"箱唛生成:{JsonConvert.SerializeObject(dto)} 操作人:{loginInfo.UserInfo.StaffId + loginInfo.UserInfo.Nickname}"); //1.获取最新的箱唛信息 //var entity_new = await _boxMarkRepositories.GetBy(); var billNo_new = await _boxMarkRepositories.GetLastBillNo(); diff --git a/src/WMS.Web.Domain/Services/InStockTaskBoxService.cs b/src/WMS.Web.Domain/Services/InStockTaskBoxService.cs index 564b0efb..17058422 100644 --- a/src/WMS.Web.Domain/Services/InStockTaskBoxService.cs +++ b/src/WMS.Web.Domain/Services/InStockTaskBoxService.cs @@ -1,4 +1,5 @@ -using System; +using Microsoft.Extensions.Logging; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -17,8 +18,10 @@ namespace WMS.Web.Domain.Services { private readonly IInStockTaskBoxRepositories _inStockTaskBoxRepositories; private readonly IBoxInventoryRepositories _boxInventoryRepositories; - public InStockTaskBoxService(IInStockTaskBoxRepositories inStockTaskBoxRepositories, IBoxInventoryRepositories boxInventoryRepositories) + private readonly ILogger _logger; + public InStockTaskBoxService(IInStockTaskBoxRepositories inStockTaskBoxRepositories, IBoxInventoryRepositories boxInventoryRepositories, ILogger logger) { + _logger = logger; _inStockTaskBoxRepositories = inStockTaskBoxRepositories; _boxInventoryRepositories = boxInventoryRepositories; } diff --git a/src/WMS.Web.Domain/Services/Public/LoginService.cs b/src/WMS.Web.Domain/Services/Public/LoginService.cs index 6a3ffeec..0d4fb389 100644 --- a/src/WMS.Web.Domain/Services/Public/LoginService.cs +++ b/src/WMS.Web.Domain/Services/Public/LoginService.cs @@ -387,10 +387,10 @@ namespace WMS.Web.Domain.Services.Public var token = await CreateToken(loginInfo.UserInfo, _loginDto, Token); r.TokenInfo = token; loginInfo.TokenInfo = token; - _logger.LogInformation("RefreshToken:我在刷新登录:刷新后的过期时间-1>" + token.Expired.ToString()); + //_logger.LogInformation("RefreshToken:我在刷新登录:刷新后的过期时间-1>" + token.Expired.ToString()); var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//用于正式 _redisClientService.SetStringKey($"wms_login_{token.Token}", loginInfo, ops_login_time); - _logger.LogInformation("RefreshToken:我在刷新登录:刷新后的过期时间-小时->" + ops_login_time.Hours); + //_logger.LogInformation("RefreshToken:我在刷新登录:刷新后的过期时间-小时->" + ops_login_time.Hours); return Result.ReSuccess(r); } else