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

tt

Browse Source
This commit is contained in:
tongfei
2023-11-06 17:53:18 +08:00
parent 7b4f6f82a1
commit 4ec6b69714
5 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -2038,6 +2038,13 @@
<param name="context"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.QuartzJob.OutStockOrderQuartzJob.Execute(Quartz.IJobExecutionContext)">
<summary>
执行方法
</summary>
<param name="context"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Services.BackRecordService">
<summary>
出入库回退上下架：服务接口

6
src/WMS.Web.Domain/Entitys/InstockTask.cs
View File

@@ -54,14 +54,12 @@ namespace WMS.Web.Domain.Entitys
/// <summary>
/// 箱信息集合
/// </summary>
[NotMapped]
public virtual List<InStockTaskBox> Boxs { get; set; }
public List<InStockTaskBox> Boxs { get; set; }
/// <summary>
/// 明细
/// </summary>
[NotMapped]
public virtual List<InStockTaskDetails> Details { get; set; }
public List<InStockTaskDetails> Details { get; set; }
/// <summary>
/// 创建

14
src/WMS.Web.Domain/Mappers/InStockMapper.cs
View File

@@ -16,9 +16,9 @@ namespace WMS.Web.Domain.Mappers
{
public InStockMapper()
{
CreateMap<UpdateInStockTaskRequest, InStockTask>();
//.ForMember(x => x.Boxs, opt => opt.Ignore())
//.ForMember(x => x.Details, opt => opt.Ignore());
CreateMap<UpdateInStockTaskRequest, InStockTask>()
.ForMember(x => x.Boxs, opt => opt.Ignore())
.ForMember(x => x.Details, opt => opt.Ignore());
CreateMap<UpdateInStockTaskDetailsRequest, InStockTaskDetails>();
//.ForMember(x => x.SupplierId, opt => opt.Ignore())
//.ForMember(x => x.OrgId, opt => opt.Ignore())
@@ -31,9 +31,11 @@ namespace WMS.Web.Domain.Mappers
//.ForMember(x => x.Remark, opt => opt.Ignore())
//.ForMember(x => x.CreateTime, opt => opt.Ignore());
CreateMap<UpdateInStockTaskBoxRequest, InStockTaskBox>();
//CreateMap<InStockTask, InStockTask>().ReverseMap();
//CreateMap<InStockTaskDetails, InStockTaskDetails>().ReverseMap();
//CreateMap<InStockTaskBox, InStockTaskBox>().ReverseMap();
CreateMap<InStockTask, InStockTask>()
.ForMember(x => x.Boxs, opt => opt.Ignore())
.ForMember(x => x.Details, opt => opt.Ignore());
CreateMap<InStockTaskDetails, InStockTaskDetails>();
CreateMap<InStockTaskBox, InStockTaskBox>();

26
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, isTransaction);
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, false);
//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();
}
@@ -180,10 +180,10 @@ namespace WMS.Web.Domain.Services
return Result.ReFailure(ResultCodes.DateWriteError);
entity = _mapper.Map(dto, entity);
////子集单独映射
//entity.Boxs = _mapper.ToMapList(dto.Boxs, entity.Boxs);
////子集单独映射
//entity.Details = _mapper.ToMapList(dto.Details, entity.Details);
//子集单独映射
entity.Boxs = _mapper.ToMapList(dto.Boxs, entity.Boxs);
//子集单独映射
entity.Details = _mapper.ToMapList(dto.Details, entity.Details);
if (isReceive)
entity.Receive(staffId);
else

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

@@ -131,8 +131,8 @@ namespace WMS.Web.Repositories
.Include(s => s.Details)
.FirstOrDefaultAsync(f => f.Id == id);
//return entity.Clone();
return entity;
return entity.Clone();
//return entity;
}
/// <summary>
@@ -340,13 +340,16 @@ 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);
if (model == null)
return null;
_mapper.Map(entity, model);
//子集单独映射
_mapper.ToMapList(entity.Boxs, model.Boxs);
//子集单独映射
_mapper.ToMapList(entity.Details, model.Details);
var result = await _context.SaveChangesAsync();
if (_transaction != null)
_transaction.Commit();