diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 9c1d7bca..9b58d10f 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -918,6 +918,11 @@ 操作时间 + + + 创建 + + wms移箱记录 @@ -2081,6 +2086,11 @@ 公司Id + + + 员工ID + + 批量添加 diff --git a/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs b/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs index 5a4eb51b..0dfc6d4d 100644 --- a/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs +++ b/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs @@ -70,5 +70,14 @@ namespace WMS.Web.Domain.Entitys /// 操作时间 /// public DateTime CreateTime { get; set; } + + /// + /// 创建 + /// + public void Create(int staffId) + { + this.CreatorId = staffId; + this.CreateTime = DateTime.Now; + } } } diff --git a/src/WMS.Web.Domain/Infrastructure/ILoginRepositories.cs b/src/WMS.Web.Domain/Infrastructure/ILoginRepositories.cs index 73540862..75004e24 100644 --- a/src/WMS.Web.Domain/Infrastructure/ILoginRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/ILoginRepositories.cs @@ -10,5 +10,10 @@ namespace WMS.Web.Domain.Infrastructure /// 公司Id /// int CompanyId { get; set; } + + /// + /// 员工ID + /// + int StaffId { get; set; } } } diff --git a/src/WMS.Web.Domain/Services/InventoryInOutDetailsService.cs b/src/WMS.Web.Domain/Services/InventoryInOutDetailsService.cs index 5e5fe10d..7895dac2 100644 --- a/src/WMS.Web.Domain/Services/InventoryInOutDetailsService.cs +++ b/src/WMS.Web.Domain/Services/InventoryInOutDetailsService.cs @@ -9,6 +9,8 @@ using WMS.Web.Core.Internal.Results; using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Infrastructure; using WMS.Web.Domain.IService; +using WMS.Web.Domain.IService.Public; +using WMS.Web.Domain.Services.Public; using WMS.Web.Domain.Values; namespace WMS.Web.Domain.Services @@ -19,16 +21,19 @@ namespace WMS.Web.Domain.Services public class InventoryInOutDetailsService: IInventoryInOutDetailsService { private readonly IMapper _mapper; + private readonly ILoginRepositories _loginRepositories; private readonly IBoxRepositories _boxRepositories; private readonly ISerialNumbersRepositories _serialNumbersRepositories; private readonly IInventoryDetailsRepositories _inventoryDetailsRepositories; private readonly IInventoryInOutDetailsRepositories _inventoryInOutDetailsRepositories; public InventoryInOutDetailsService(IMapper mapper, IBoxRepositories boxRepositories, + ILoginRepositories loginRepositories, ISerialNumbersRepositories serialNumbersRepositories, IInventoryDetailsRepositories inventoryDetailsRepositories, IInventoryInOutDetailsRepositories inventoryInOutDetailsRepositories) { _mapper = mapper; + _loginRepositories = loginRepositories; _boxRepositories = boxRepositories; _inventoryDetailsRepositories = inventoryDetailsRepositories; _serialNumbersRepositories = serialNumbersRepositories; @@ -43,6 +48,7 @@ namespace WMS.Web.Domain.Services /// public async Task GenerateInOrOutDetails(List dtos,bool isTransaction) { + //找到物料对应的即时库存明细 var orgCodes = dtos.Select(x => x.OrgCode).ToList(); var materialIds = dtos.Select(x => x.MaterialId).ToList(); @@ -66,6 +72,7 @@ namespace WMS.Web.Domain.Services //2.2组装物料收发明细实体 var entity = _mapper.Map(dto); entity.SurplusQty = currentDetail == null ? 0 : currentDetail.Qty; + entity.Create(_loginRepositories.StaffId); add_entitys.Add(entity); } diff --git a/src/WMS.Web.Repositories/LoginRepositories.cs b/src/WMS.Web.Repositories/LoginRepositories.cs index b4c761d6..121b38ef 100644 --- a/src/WMS.Web.Repositories/LoginRepositories.cs +++ b/src/WMS.Web.Repositories/LoginRepositories.cs @@ -15,6 +15,7 @@ namespace WMS.Web.Repositories public class LoginRepositories:ILoginRepositories { public int CompanyId { get; set; } = 0; + public int StaffId { get; set; } = 0; private readonly RedisClientService _redisClientService; public LoginRepositories(ILogger logger, IHttpContextAccessor httpContextAccessor, RedisClientService redisClientService) { @@ -29,12 +30,14 @@ namespace WMS.Web.Repositories if (string.IsNullOrEmpty(token)) { this.CompanyId = 0; + this.StaffId = 0; return; } _redisClientService = redisClientService; var logininfo = _redisClientService.GetStringKey($"wms_login_{token}"); this.CompanyId = logininfo == null ? 0 : logininfo.UserInfo.CompanyId; + this.StaffId = logininfo == null ? 0 : logininfo.UserInfo.StaffId; } catch (Exception) {