18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

接口调整

Browse Source
This commit is contained in:
tongfei
2023-11-06 18:41:42 +08:00
parent 4ec6b69714
commit 85625b5a80
5 changed files with 21 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -1120,66 +1120,16 @@
明细ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest.SupplierId">
<summary>
供应商Id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest.OrgId">
<summary>
组织ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest.StockId">
<summary>
收货仓库
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest.StockCode">
<summary>
收货仓库编码（对应金蝶和单点）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest.FactoryPrice">
<summary>
出厂价（对应金蝶数据）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest.AccruedQty">
<summary>
应入数量（对应金蝶的订单数量-对应物料）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest.DeliveredQty">
<summary>
已交数量（对应金蝶的已交数量-对应物料），目前只有采购订单有
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest.ReceiveQty">
<summary>
收货数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest.RealityQty">
<summary>
实际入库数量（仓库人员现场入库的数量）上架动作
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest.Remark">
<summary>
明细备注
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest.CreateTime">
<summary>
创建时间（erp那边的创建时间）
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest">
<summary>
入库任务-修改请求对象

44
src/WMS.Web.Core/Dto/InStockTask/UpdateInStockTaskDetailsRequest.cs
View File

@@ -13,53 +13,15 @@ namespace WMS.Web.Core.Dto.InStockTask
/// 明细ID
/// </summary>
public override int Id { get; set; } = 0;
/// <summary>
/// 供应商Id
/// </summary>
public int SupplierId { get; set; }
/// <summary>
/// 组织ID
/// </summary>
public int OrgId { get; set; }
/// <summary>
/// 收货仓库
/// </summary>
public int StockId { get; set; }
/// <summary>
/// 收货仓库编码（对应金蝶和单点）
/// </summary>
public string StockCode { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 出厂价（对应金蝶数据）
/// </summary>
public decimal FactoryPrice { get; set; }
/// <summary>
/// 应入数量（对应金蝶的订单数量-对应物料）
/// </summary>
public decimal AccruedQty { get; set; }
/// <summary>
/// 已交数量（对应金蝶的已交数量-对应物料），目前只有采购订单有
/// </summary>
public decimal DeliveredQty { get; set; }
public int MaterialId { get; set; }
/// <summary>
/// 收货数量
/// </summary>
public decimal ReceiveQty { get; set; }
/// <summary>
/// 实际入库数量（仓库人员现场入库的数量）上架动作
/// </summary>
public decimal RealityQty { get; set; }
/// <summary>
/// 明细备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 创建时间（erp那边的创建时间）
/// </summary>
public DateTime CreateTime { get; set; }
}
}

20
src/WMS.Web.Domain/Services/InStockService.cs
View File

@@ -64,16 +64,16 @@ namespace WMS.Web.Domain.Services
/// <returns></returns>
public async Task<Result> 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

2
src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs
View File

@@ -33,7 +33,7 @@ namespace Microsoft.Extensions.DependencyInjection
services.AddHttpContextAccessor();
services.AddScoped<ILoginRepositories, LoginRepositories>();
//services.AddScoped<IBasicsRepositories, BasicsRepositories>();
services.AddScoped<IBoxRepositories, BoxRepositories>();
services.AddTransient<IBoxRepositories, BoxRepositories>();
services.AddTransient<IBasicsRepositories, BasicsRepositories>();
services.AddTransient<IInStockRepositories, InStockRepositories>();

15
src/WMS.Web.Repositories/InStockTaskRepositories.cs
View File

@@ -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;
}
/// <summary>
@@ -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;
}
/// <summary>
@@ -191,7 +189,7 @@ namespace WMS.Web.Repositories
.Where(w => sourceBillNos.Contains(w.SourceBillNo))
.ToListAsync();
return entitys.Clone();
return entitys;
}
/// <summary>
@@ -311,7 +309,7 @@ namespace WMS.Web.Repositories
try
{
List<int> 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;