diff --git a/src/WMS.Web.Api/Controllers/InStockTaskController.cs b/src/WMS.Web.Api/Controllers/InStockTaskController.cs index 6a8e9dc9..56951d27 100644 --- a/src/WMS.Web.Api/Controllers/InStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/InStockTaskController.cs @@ -187,7 +187,7 @@ namespace WMS.Web.Api.Controllers x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.StockCode == x.StockCode && t.OrgCode == x.OrgCode).Select(x => x.SubStock).ToList(); }); - //排除可入库数量为0的 + //排除待入库数量为0的 var result= list.Where(x => x.WaitSlefQty != 0).ToList(); return ResultList.ReSuccess(result); diff --git a/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs index 48aad4d8..1b0c9bbf 100644 --- a/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs @@ -58,7 +58,7 @@ namespace WMS.Web.Domain.Infrastructure /// /// /// - Task Update(InStock entity, bool isTransaction = true); + Task Update(InStock entity, bool isTransaction = true); /// /// 批量修改 diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs index 785553cc..756f510f 100644 --- a/src/WMS.Web.Domain/Services/InStockService.cs +++ b/src/WMS.Web.Domain/Services/InStockService.cs @@ -794,7 +794,7 @@ namespace WMS.Web.Domain.Services } //最好一条一条执行,否则执行失败 但是金蝶那边又同步成功 就会造成数据比价乱 var isSuccess = await sc_InStockRepositories.Update(entity, true); - if (entity == null) return Result.ReFailure(ResultCodes.DateWriteError); + if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); return Result.ReSuccess(); } diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs index e1c5ca41..eb56191f 100644 --- a/src/WMS.Web.Repositories/InStockRepositories.cs +++ b/src/WMS.Web.Repositories/InStockRepositories.cs @@ -171,7 +171,7 @@ namespace WMS.Web.Repositories /// /// /// - public async Task Update(InStock entity, bool isTransaction = true) + public async Task Update(InStock entity, bool isTransaction = true) { IDbContextTransaction _transaction = null; if (isTransaction) @@ -183,7 +183,7 @@ namespace WMS.Web.Repositories .Include(s => s.ErpDetails) .FirstOrDefaultAsync(f => f.Id == entity.Id); if (model == null) - return null; + return false; _mapper.Map(entity, model); //子集单独映射 _mapper.ToMapList(entity.Details, model.Details); @@ -192,13 +192,13 @@ namespace WMS.Web.Repositories await _context.SaveChangesAsync(); if (_transaction != null) _transaction.Commit(); - return model; + return true; } catch (Exception ex) { if (_transaction != null) _transaction.Rollback(); - return null; + return false; } }