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-10-30 15:52:58 +08:00
parent e4c46444d1
commit f2e6ef430d
21 changed files with 767 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,12 @@ namespace WMS.Web.Domain.Entitys
/// ID
/// </summary>
public int Id { get; set; }
/// <summary>
/// 任务单ID
/// </summary>
public int TaskId { get; set; }
/// <summary>
/// 单据编号
/// </summary>

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

@@ -38,13 +38,13 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
public DateTime ReceiveTime { get; set; }
/// <summary>
/// 操作人（上架人）
/// 上架人
/// </summary>
public int OperatorId { get; set; }
public int ShelferId { get; set; }
/// <summary>
/// 操作时间（入库时间）
/// 入库时间(上架时间)
/// </summary>
public DateTime OperateTime { get; set; }
public DateTime ShelfTime { get; set; }
/// <summary>
/// 明细
@@ -76,5 +76,25 @@ namespace WMS.Web.Domain.Entitys
this.BillNo = "RKRW" + needStr + newId.ToString();
}
}
/// <summary>
/// 收货
/// </summary>
/// <param name="creatorId"></param>
public void Receive(int creatorId)
{
this.ReceiverId = creatorId;
this.ReceiveTime = DateTime.Now;
}
/// <summary>
/// 上架
/// </summary>
/// <param name="creatorId"></param>
public void Shelf(int creatorId)
{
this.ShelferId = creatorId;
this.ShelfTime = DateTime.Now;
}
}
}

53
src/WMS.Web.Domain/IService/IInStockService.cs
View File

@@ -4,6 +4,7 @@ using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.InStock;
using WMS.Web.Core.Dto.InStockTask;
using WMS.Web.Core.Dto.Login;
using WMS.Web.Core.Internal.Results;
@@ -14,13 +15,6 @@ namespace WMS.Web.Domain.IService
/// </summary>
public interface IInStockService
{
/// <summary>
/// 保存
/// </summary>
/// <param name="dto"></param>
/// <param name="loginInfo"></param>
/// <returns></returns>
Task<Result> Save(List<SaveInStockRequest> dto, LoginInDto loginInfo);
/// <summary>
/// 同步金蝶
@@ -28,5 +22,50 @@ namespace WMS.Web.Domain.IService
/// <param name="dto"></param>
/// <returns></returns>
Task<Result> Sync(OperateRequest dto);
/// <summary>
/// 收货
/// </summary>
/// <param name="dto"></param>
/// <param name="loginInfo"></param>
/// <returns></returns>
Task<Result> Receive(UpdateInStockTaskRequest dto, LoginInDto loginInfo);
/// <summary>
/// 上架
/// </summary>
/// <param name="instock"></param>
/// <param name="loginInfo"></param>
/// <returns></returns>
Task<Result> Shelf(SaveInStockRequest instock, LoginInDto loginInfo);
/// <summary>
/// 保存-出库单
/// </summary>
/// <param name="dto"></param>
/// <param name="staffId"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<Result> Save(SaveInStockRequest dto, int staffId, bool isTransaction = true);
/// <summary>
/// 修改-入库任务信息
/// </summary>
/// <param name="dto"></param>
/// <param name="staffId"></param>
/// <param name="isReceive"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<Result> Update(UpdateInStockTaskRequest dto, int staffId, bool isReceive, bool isTransaction = true);
/// <summary>
/// 批量修改-入库任务信息
/// </summary>
/// <param name="ids"></param>
/// <param name="staffId"></param>
/// <param name="isReceive"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<Result> UpdateRange(List<int> ids, int staffId, bool isReceive, bool isTransaction = true);
}
}

14
src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.cs
View File

@@ -20,6 +20,20 @@ namespace WMS.Web.Domain.Infrastructure
/// <returns></returns>
Task<ResultPagedList<InStockTaskQueryResponse>> GetPagedList(InStockTaskQueryRequest dto);
/// <summary>
/// 详情
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
Task<InStockTask> Get(int id);
/// <summary>
/// 列表
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
Task<List<InStockTask>> GetList(List<int> ids);
/// <summary>
/// 批量添加
/// </summary>

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

@@ -2,10 +2,12 @@
using Microsoft.EntityFrameworkCore.Storage;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.InStock;
using WMS.Web.Core.Dto.InStockTask;
using WMS.Web.Core.Dto.Login;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys;
@@ -19,7 +21,7 @@ namespace WMS.Web.Domain.Services
/// <summary>
/// 入库单服务
/// </summary>
public class InStockService: IInStockService
public class InStockService : IInStockService
{
private readonly IMapper _mapper;
private readonly ILoginService _loginService;
@@ -37,35 +39,7 @@ namespace WMS.Web.Domain.Services
_inStockTaskRepositories = inStockTaskRepositories;
}
/// <summary>
/// 出库单
/// </summary>
/// <param name="dto"></param>
/// <param name="loginInfo"></param>
/// <returns></returns>
public async Task<Result> Save(List<SaveInStockRequest> dto, LoginInDto loginInfo)
{
var entity = new InStock();
entity.Details = _mapper.Map<List<InStockDetails>>(dto);
entity.Create(loginInfo.UserInfo.StaffId);
//需要填写序列号
//需要修改库存
//需要同步金蝶
IDbContextTransaction _transaction = _transactionRepositories.GetTransaction();
bool isRollback = false;
bool isSuccess = true;
entity = await _inStockRepositories.Add(entity, true);
if (entity == null) isRollback = true;
//提交事务
isSuccess = _transactionRepositories.CommitTransaction(isRollback, _transaction);
if (!isSuccess)
return Result.ReFailure(ResultCodes.DateWriteError);
return Result.ReSuccess();
}
/// <summary>
/// 同步金蝶
@@ -78,5 +52,139 @@ namespace WMS.Web.Domain.Services
return Task.FromResult(Result.ReSuccess());
}
/// <summary>
/// 收货
/// </summary>
/// <param name="dto"></param>
/// <param name="loginInfo"></param>
/// <returns></returns>
public async Task<Result> Receive(UpdateInStockTaskRequest dto, LoginInDto loginInfo)
{
IDbContextTransaction _transaction = _transactionRepositories.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 = _transactionRepositories.CommitTransaction(isRollback, _transaction);
if (!isSuccess)
return Result.ReFailure(ResultCodes.DateWriteError);
return Result.ReSuccess();
}
/// <summary>
/// 上架
/// </summary>
/// <param name="instock"></param>
/// <param name="loginInfo"></param>
/// <returns></returns>
public async Task<Result> Shelf(SaveInStockRequest instock, LoginInDto loginInfo)
{
IDbContextTransaction _transaction = _transactionRepositories.GetTransaction();
bool isRollback = false;
bool isTransaction = false;
//1.添加入库单：（同步金蝶在save方法里面进行）
var save_result = await this.Save(instock, loginInfo.UserInfo.StaffId, isTransaction);
if (!save_result.IsSuccess) isRollback = true;
{
//2.修改入库任务单
var ids = new List<int>();
ids.Add(instock.TaskId);
var result = await this.UpdateRange(ids, loginInfo.UserInfo.StaffId, false, isTransaction);
if (!result.IsSuccess) isRollback = true;
}
//提交事务
var isSuccess = _transactionRepositories.CommitTransaction(isRollback, _transaction);
if (!isSuccess)
return Result.ReFailure(ResultCodes.DateWriteError);
return Result.ReSuccess();
}
/// <summary>
/// 保存-出库单
/// </summary>
/// <param name="dto"></param>
/// <param name="staffId"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<Result> Save(SaveInStockRequest dto, int staffId, bool isTransaction = true)
{
var entity = new InStock();
entity.Type = (InstockType)dto.Type;
entity.TaskId = dto.TaskId;
entity.Details = _mapper.Map<List<InStockDetails>>(dto.Details);
entity.Create(staffId);
//需要填写序列号
//需要修改库存
//需要同步金蝶
entity = await _inStockRepositories.Add(entity, isTransaction);
if (entity != null)
return Result.ReSuccess();
else
return Result.ReFailure(ResultCodes.DateWriteError);
}
/// <summary>
/// 修改-入库任务信息
/// </summary>
/// <param name="dto"></param>
/// <param name="staffId"></param>
/// <param name="isReceive"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<Result> Update(UpdateInStockTaskRequest dto, int staffId,bool isReceive, bool isTransaction = true)
{
var entity = await _inStockTaskRepositories.Get(dto.Id);
if (entity == null)
return Result.ReFailure(ResultCodes.DateWriteError);
entity = _mapper.Map(dto, entity);
if (isReceive)
entity.Receive(staffId);
else
entity.Shelf(staffId);
var result = _inStockTaskRepositories.Update(entity, isTransaction);
if (result != null)
return Result.ReSuccess();
else
return Result.ReFailure(ResultCodes.DateWriteError);
}
/// <summary>
/// 批量修改-入库任务信息
/// </summary>
/// <param name="ids"></param>
/// <param name="staffId"></param>
/// <param name="isReceive"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<Result> UpdateRange(List<int> ids, int staffId, bool isReceive, bool isTransaction = true)
{
var entitys = await _inStockTaskRepositories.GetList(ids);
if (entitys == null || entitys.Count==0)
return Result.ReFailure(ResultCodes.DateWriteError);
foreach (var item in entitys)
{
if (isReceive)
item.Receive(staffId);
else
item.Shelf(staffId);
}
var isSuccess = await _inStockTaskRepositories.UpdateRange(entitys, isTransaction);
if (isSuccess)
return Result.ReSuccess();
else
return Result.ReFailure(ResultCodes.DateWriteError);
}
}
}