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