diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index db3242a3..1619210c 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -1120,66 +1120,16 @@ 明细ID - - - 供应商Id - - - - - 组织ID - - - - - 收货仓库 - - - - - 收货仓库编码（对应金蝶和单点） - - 物料ID - - - 出厂价（对应金蝶数据） - - - - - 应入数量（对应金蝶的订单数量-对应物料） - - - - - 已交数量（对应金蝶的已交数量-对应物料），目前只有采购订单有 - - 收货数量 - - - 实际入库数量（仓库人员现场入库的数量）上架动作 - - - - - 明细备注 - - - - - 创建时间（erp那边的创建时间） - - 入库任务-修改请求对象 diff --git a/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskDetailsRequest.cs b/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskDetailsRequest.cs index f8ce406c..49f78525 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskDetailsRequest.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskDetailsRequest.cs @@ -13,53 +13,15 @@ namespace WMS.Web.Core.Dto.InStockTask /// 明细ID /// public override int Id { get; set; } = 0; - /// - /// 供应商Id - /// - public int SupplierId { get; set; } - /// - /// 组织ID - /// - public int OrgId { get; set; } - /// - /// 收货仓库 - /// - public int StockId { get; set; } - /// - /// 收货仓库编码（对应金蝶和单点） - /// - public string StockCode { get; set; } + /// /// 物料ID /// - public int MaterialId { get; set; } - /// - /// 出厂价（对应金蝶数据） - /// - public decimal FactoryPrice { get; set; } - /// - /// 应入数量（对应金蝶的订单数量-对应物料） - /// - public decimal AccruedQty { get; set; } - /// - /// 已交数量（对应金蝶的已交数量-对应物料），目前只有采购订单有 - /// - public decimal DeliveredQty { get; set; } + public int MaterialId { get; set; } /// /// 收货数量 /// public decimal ReceiveQty { get; set; } - /// - /// 实际入库数量（仓库人员现场入库的数量）上架动作 - /// - public decimal RealityQty { get; set; } - /// - /// 明细备注 - /// - public string Remark { get; set; } - /// - /// 创建时间（erp那边的创建时间） - /// - public DateTime CreateTime { get; set; } + } } diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index 9202a8c3..b2380b20 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -64,16 +64,16 @@ namespace WMS.Web.Domain.Services /// public async Task Receive(UpdateInStockTaskRequest dto, LoginInDto loginInfo) { - //IDbContextTransaction _transaction = _basicsRepositories.GetTransaction(); - //bool isRollback = false; - //bool isTransaction = false; - var result = await this.Update(dto, loginInfo.UserInfo.StaffId,true, false); - //if (!result.IsSuccess) isRollback = true; + IDbContextTransaction _transaction = _basicsRepositories.GetTransaction(); + bool isRollback = false; + bool isTransaction = false; + var result = await this.Update(dto, loginInfo.UserInfo.StaffId,true, isTransaction); + if (!result.IsSuccess) isRollback = true; - ////提交事务 - //var isSuccess = _basicsRepositories.CommitTransaction(isRollback, _transaction); - //if (!isSuccess) - // return Result.ReFailure(ResultCodes.DateWriteError); + //提交事务 + var isSuccess = _basicsRepositories.CommitTransaction(isRollback, _transaction); + if (!isSuccess) + return Result.ReFailure(ResultCodes.DateWriteError); return Result.ReSuccess(); } @@ -188,7 +188,7 @@ namespace WMS.Web.Domain.Services entity.Receive(staffId); else entity.Shelf(staffId); - var result = _inStockTaskRepositories.Update(entity, isTransaction); + var result =await _inStockTaskRepositories.Update(entity, isTransaction); if (result != null) return Result.ReSuccess(); else diff --git a/src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs b/src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs index a4847dce..30fe3703 100644 --- a/src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs +++ b/src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs @@ -33,7 +33,7 @@ namespace Microsoft.Extensions.DependencyInjection services.AddHttpContextAccessor(); services.AddScoped(); //services.AddScoped(); - services.AddScoped(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index 4a766b5e..62c6cee3 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -130,9 +130,7 @@ namespace WMS.Web.Repositories .Include(x=>x.Boxs) .Include(s => s.Details) .FirstOrDefaultAsync(f => f.Id == id); - - return entity.Clone(); - //return entity; + return entity; } /// @@ -147,7 +145,7 @@ namespace WMS.Web.Repositories .Include(s => s.Details) .Where(w => w.Boxs.Where(b => b.BoxBillNo == boxBillNo).Count() > 0).FirstOrDefaultAsync(); - return entity.Clone(); + return entity; } @@ -176,7 +174,7 @@ namespace WMS.Web.Repositories .Include(s => s.Details) .Where(f => ids.Contains(f.Id)) .ToListAsync(); - return entitys.Clone(); + return entitys; } /// @@ -191,7 +189,7 @@ namespace WMS.Web.Repositories .Where(w => sourceBillNos.Contains(w.SourceBillNo)) .ToListAsync(); - return entitys.Clone(); + return entitys; } /// @@ -311,7 +309,7 @@ namespace WMS.Web.Repositories try { List list = entitys.Select(s => s.Id).ToList(); - var res = await _context.InStockTask.Include(x=>x.Boxs).Include(x => x.Details).Where(f => list.Contains(f.Id)).ToListAsync(); + var res = await _context.InStockTask.AsNoTracking().Include(x=>x.Boxs).Include(x => x.Details).Where(f => list.Contains(f.Id)).ToListAsync(); _mapper.ToMapList(entitys, res); await _context.SaveChangesAsync(); if (_transaction != null) @@ -340,6 +338,7 @@ namespace WMS.Web.Repositories try { var model = await _context.InStockTask + .AsNoTracking() .Include(s=>s.Boxs) .Include(s => s.Details) .FirstOrDefaultAsync(f => f.Id == entity.Id); @@ -350,7 +349,7 @@ namespace WMS.Web.Repositories _mapper.ToMapList(entity.Boxs, model.Boxs); //子集单独映射 _mapper.ToMapList(entity.Details, model.Details); - var result = await _context.SaveChangesAsync(); + await _context.SaveChangesAsync(); if (_transaction != null) _transaction.Commit(); return model;