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

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-10-26 17:49:01 +08:00
parent 5ab9b50308 526e18a129
commit 3263403748
18 changed files with 477 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs
View File

@@ -8,7 +8,9 @@ using System.Threading.Tasks;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.ChangeBoxRecord;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Values;
@@ -24,11 +26,13 @@ namespace WMS.Web.Api.Controllers
private readonly IMapper _mapper;
private readonly ILoginService _loginService;
private readonly IChangeBoxRecordRepositories _repositories;
public ChangeBoxRecordController(IMapper mapper, ILoginService loginService, IChangeBoxRecordRepositories repositories)
private readonly IChangeMoveBoxService _changeMoveBoxService;
public ChangeBoxRecordController(IMapper mapper, ILoginService loginService, IChangeBoxRecordRepositories repositories, IChangeMoveBoxService changeMoveBoxService)
{
_mapper = mapper;
_loginService = loginService;
_repositories = repositories;
_changeMoveBoxService = changeMoveBoxService;
}
/// <summary>
/// 列表
@@ -44,8 +48,23 @@ namespace WMS.Web.Api.Controllers
return ResultPagedList<ChangeBoxRecordQueryInfoResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var (list, count) = await _repositories.GetListAsync(dto);
var result = ResultPagedList<ChangeBoxRecordQueryInfoResponse>.ReSuccess(list,count);
var result = ResultPagedList<ChangeBoxRecordQueryInfoResponse>.ReSuccess(list, count);
return result;
}
/// <summary>
/// 保存
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("Save")]
public async Task<Result> Save(SaveChangeBoxRecordRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result.ReFailure(ResultCodes.Token_Invalid_Error);
return await _changeMoveBoxService.Save(dto, loginInfo);
}
}
}

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

@@ -16,6 +16,13 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.ChangeBoxRecordController.Save(WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest)">
<summary>
保存
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Api.Controllers.LoginController">
<summary>
登录接口

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

@@ -130,6 +130,101 @@
操作时间 结束
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse">
<summary>
改箱列表
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.Stock">
<summary>
仓库
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.SerialNumber">
<summary>
序列号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.SrcBox">
<summary>
原箱子
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.DestBox">
<summary>
目标箱子
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.SrcSubStock">
<summary>
原仓位
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.DestSubStock">
<summary>
目标仓位
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.Creator">
<summary>
操作人
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryInfoResponse.CreateTime">
<summary>
操作时间
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest">
<summary>
保存改箱
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest.StockId">
<summary>
仓库Id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest.SrcBoxId">
<summary>
原箱子ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest.DestBoxId">
<summary>
目标箱子ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest.SrcSubStockId">
<summary>
原仓位ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest.DestSubStockId">
<summary>
目标仓位ID
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpBillQueryDto">
<summary>
ERP：单据查询-dto

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

@@ -149,6 +149,16 @@
物料ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.StockId">
<summary>
仓库Id
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.SerialNumber">
<summary>
序列号
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.ChangeBoxRecord.SrcBoxId">
<summary>
原箱子ID
@@ -179,6 +189,12 @@
操作时间
</summary>
</member>
<member name="M:WMS.Web.Domain.Entitys.ChangeBoxRecord.Create(System.Int32)">
<summary>
创建
</summary>
<param name="creatorId"></param>
</member>
<member name="T:WMS.Web.Domain.Entitys.InStock">
<summary>
wms入库单
@@ -764,11 +780,6 @@
单据头Id
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStockDetails.Seq">
<summary>
序号
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.TakeStockDetails.MaterialId">
<summary>
物料ID
@@ -819,6 +830,11 @@
wms入库单-仓储接口
</summary>
</member>
<member name="T:WMS.Web.Domain.IService.IChangeMoveBoxService">
<summary>
改箱 移箱服务
</summary>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForPurchaseInStock">
<summary>
erp:单据查询-采购入库单
@@ -1011,6 +1027,11 @@
mapper映射
</summary>
</member>
<member name="T:WMS.Web.Domain.Mappers.ChangeBoxRecordMapper">
<summary>
改箱
</summary>
</member>
<member name="T:WMS.Web.Domain.Mappers.MapperList">
<summary>
集合映射
@@ -1117,6 +1138,9 @@
私钥
</summary>
</member>
<member name="T:WMS.Web.Domain.Services.ChangeMoveBoxService">
改箱 移箱服务
</member>
<member name="T:WMS.Web.Domain.Services.Public.ErpService">
<summary>
erp数据交互服务
@@ -1715,6 +1739,11 @@
无效
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.ResultCodes.DateWriteError">
<summary>
数据操作失败
</summary>
</member>
<member name="T:WMS.Web.Domain.Values.Single.SingleAction">
<summary>
对接单点的接口方法-枚举

6
src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs
View File

@@ -20,15 +20,15 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord
/// <summary>
/// 仓库
/// </summary>
public int StockId { get; set; }
public int? StockId { get; set; }
/// <summary>
/// 原仓位ID
/// </summary>
public int SrcSubStockId { get; set; }
public int? SrcSubStockId { get; set; }
/// <summary>
/// 现仓位ID
/// </summary>
public int DestSubStockId { get; set; }
public int? DestSubStockId { get; set; }
/// <summary>
/// 操作人
/// </summary>

48
src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs
View File

@@ -4,8 +4,54 @@ using System.Text;
namespace WMS.Web.Core.Dto.ChangeBoxRecord
{
/// <summary>
/// 改箱列表
/// </summary>
public class ChangeBoxRecordQueryInfoResponse
{
/// <summary>
/// 物料名称
/// </summary>
public string MaterialName { get; set; }
/// <summary>
/// 物料编码
/// </summary>
public string MaterialNumber { get; set; }
/// <summary>
/// 物料规格型号
/// </summary>
public string Specifications { get; set; }
/// <summary>
/// 仓库
/// </summary>
public string Stock { get; set; }
/// <summary>
/// 序列号
/// </summary>
public string SerialNumber { get; set; }
/// <summary>
/// 原箱子
/// </summary>
public string SrcBox { get; set; }
/// <summary>
/// 目标箱子
/// </summary>
public string DestBox { get; set; }
/// <summary>
/// 原仓位
/// </summary>
public string SrcSubStock { get; set; }
/// <summary>
/// 目标仓位
/// </summary>
public string DestSubStock { get; set; }
/// <summary>
/// 操作人
/// </summary>
public string Creator { get; set; }
/// <summary>
/// 操作时间
/// </summary>
public DateTime CreateTime { get; set; } = DateTime.Now;
}
}

44
src/WMS.Web.Core/Dto/ChangeBoxRecord/SaveChangeBoxRecordRequest.cs Normal file
View File

@@ -0,0 +1,44 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text;
namespace WMS.Web.Core.Dto.ChangeBoxRecord
{
/// <summary>
/// 保存改箱
/// </summary>
public class SaveChangeBoxRecordRequest
{
/// <summary>
/// 物料ID
/// </summary>
[Required(ErrorMessage = "物料不能为空")]
public int MaterialId { get; set; }
/// <summary>
/// 仓库Id
/// </summary>
[Required(ErrorMessage = "仓库不能为空")]
public int StockId { get; set; }
/// <summary>
/// 原箱子ID
/// </summary>
[Required(ErrorMessage = "原箱子不能为空")]
public int SrcBoxId { get; set; }
/// <summary>
/// 目标箱子ID
/// </summary>
[Required(ErrorMessage = "目标箱子不能为空")]
public int DestBoxId { get; set; }
/// <summary>
/// 原仓位ID
/// </summary>
[Required(ErrorMessage = "原仓位不能为空")]
public int SrcSubStockId { get; set; }
/// <summary>
/// 目标仓位ID
/// </summary>
[Required(ErrorMessage = "目标仓位不能为空")]
public int DestSubStockId { get; set; }
}
}

19
src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs
View File

@@ -25,6 +25,16 @@ namespace WMS.Web.Domain.Entitys
[Column("MaterialId")]
public int MaterialId { get; set; }
/// <summary>
/// 仓库Id
/// </summary>
[Column("StockId")]
public int StockId { get; set; }
/// <summary>
/// 序列号
/// </summary>
[Column("SerialNumber")]
public string SerialNumber { get; set; }
/// <summary>
/// 原箱子ID
/// </summary>
[Column("SrcBoxId")]
@@ -54,5 +64,14 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
[Column("CreateTime")]
public DateTime CreateTime { get; set; } = DateTime.Now;
/// <summary>
/// 创建
/// </summary>
/// <param name="creatorId"></param>
public void Create(int creatorId)
{
this.CreatorId = creatorId;
this.CreateTime = DateTime.Now;
}
}
}

5
src/WMS.Web.Domain/Entitys/TakeStockDetails.cs
View File

@@ -31,11 +31,6 @@ namespace WMS.Web.Domain.Entitys
[Column("BoxId")]
public int BoxId { get; set; }
/// <summary>
/// 序号
/// </summary>
[Column("Seq")]
public int Seq { get; set; }
/// <summary>
/// 物料ID
/// </summary>
[Column("MaterialId")]

20
src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs Normal file
View File

@@ -0,0 +1,20 @@

using System;
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto.ChangeBoxRecord;
using WMS.Web.Core.Dto.Login;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Services;
namespace WMS.Web.Domain.IService
{
/// <summary>
/// 改箱 移箱服务
/// </summary>
public interface IChangeMoveBoxService
{
Task<Result> Save(SaveChangeBoxRecordRequest dto, LoginInDto loginInfo);
}
}

22
src/WMS.Web.Domain/Infrastructure/ITransactionRepositories.cs Normal file
View File

@@ -0,0 +1,22 @@
using Microsoft.EntityFrameworkCore.Storage;
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Domain.Infrastructure
{
public interface ITransactionRepositories
{
/// <summary>
/// 获取事务 用来处理即时库存
/// </summary>
/// <returns></returns>
IDbContextTransaction GetTransaction();
/// <summary>
/// 获取事务 用来处理即时库存
/// </summary>
/// <returns></returns>
bool CommitTransaction(bool isRollback, IDbContextTransaction transaction);
}
}

20
src/WMS.Web.Domain/Mappers/ChangeBoxRecordMapper.cs Normal file
View File

@@ -0,0 +1,20 @@
using AutoMapper;
using System;
using System.Collections.Generic;
using System.Text;
using WMS.Web.Core.Dto.ChangeBoxRecord;
using WMS.Web.Domain.Entitys;
namespace WMS.Web.Domain.Mappers
{
/// <summary>
/// 改箱
/// </summary>
public class ChangeBoxRecordMapper : Profile
{
public ChangeBoxRecordMapper()
{
CreateMap<SaveChangeBoxRecordRequest, ChangeBoxRecord>();
}
}
}

56
src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs Normal file
View File

@@ -0,0 +1,56 @@
using AutoMapper;
using Microsoft.EntityFrameworkCore.Storage;
using System;
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto.ChangeBoxRecord;
using WMS.Web.Core.Dto.Login;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Values;
namespace WMS.Web.Domain.Services
{
///改箱 移箱服务
public class ChangeMoveBoxService : IChangeMoveBoxService
{
private readonly IMapper _mapper;
private readonly ILoginService _loginService;
private readonly IChangeBoxRecordRepositories _changeBoxRecordRepositories;
public readonly ITransactionRepositories _transactionRepositories;
public ChangeMoveBoxService(IMapper mapper, ILoginService loginService,
IChangeBoxRecordRepositories changeBoxRecordRepositories, ITransactionRepositories transactionRepositories)
{
_mapper = mapper;
_loginService = loginService;
_changeBoxRecordRepositories = changeBoxRecordRepositories;
_transactionRepositories = transactionRepositories;
}
public async Task<Result> Save(SaveChangeBoxRecordRequest dto, LoginInDto loginInfo)
{
var entity = _mapper.Map<ChangeBoxRecord>(dto);
entity.Create(loginInfo.UserInfo.StaffId);
//需要填写序列号
//需要修改库存
IDbContextTransaction _transaction = _transactionRepositories.GetTransaction();
bool isRollback = false;
bool isSuccess = true;
entity = await _changeBoxRecordRepositories.Add(entity, true);
if (entity == null) isRollback = true;
//提交事务
isSuccess = _transactionRepositories.CommitTransaction(isRollback, _transaction);
if (!isSuccess)
return Result.ReFailure(ResultCodes.DateWriteError);
return Result.ReSuccess();
}
}
}

4
src/WMS.Web.Domain/Values/ResultCodes.cs
View File

@@ -16,5 +16,9 @@ namespace WMS.Web.Domain.Values
/// 无效
/// </summary>
public static ValueTuple<int, string> Token_Invalid_Error = (401, "验证Token无效，请重新登录");
/// <summary>
/// 数据操作失败
/// </summary>
public static ValueTuple<int, string> DateWriteError = (40004, "数据操作失败");
}
}

33
src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
View File

@@ -1,7 +1,9 @@
using AutoMapper;
using Microsoft.EntityFrameworkCore;
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;
@@ -64,9 +66,36 @@ namespace WMS.Web.Repositories
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
public Task<(List<ChangeBoxRecordQueryInfoResponse> list, int total)> GetListAsync(ChangeBoxRecordQueryRequest dto)
public async Task<(List<ChangeBoxRecordQueryInfoResponse> list, int total)> GetListAsync(ChangeBoxRecordQueryRequest dto)
{
throw new NotImplementedException();
var query = _context.ChangeBoxRecord
.OrderByDescending(o => o.Id)
.Where(adv => 1 == 1);
if (dto.CreateBeginDate != null)
query = query.Where(w => w.CreateTime >= dto.CreateBeginDate);
if (dto.CreateEndDate != null)
query = query.Where(w => w.CreateTime <= dto.CreateEndDate);
//组装
int total = await query.CountAsync();
var list = await query.Select(s => new ChangeBoxRecordQueryInfoResponse()
{
#region dto组装
MaterialName = "",
MaterialNumber = "",
Specifications = "",
Stock = "",
SerialNumber = "",
SrcBox = "",
DestBox = "",
SrcSubStock = "",
DestSubStock = "",
Creator = "",
CreateTime =s.CreateTime
#endregion
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
return (list, total);
}
}
}

5
src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs
View File

@@ -9,9 +9,11 @@ using System.Collections.Generic;
using System.IO;
using System.Text;
using WMS.Web.Core.Help;
using WMS.Web.Domain.IService;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Mappers;
using WMS.Web.Domain.Options;
using WMS.Web.Domain.Services;
using WMS.Web.Domain.Services.Public;
namespace WMS.Web.Repositories.DependencyInjection
@@ -185,6 +187,9 @@ namespace WMS.Web.Repositories.DependencyInjection
Services.AddTransient<IHttpClientService, HttpClientService>();
Services.AddTransient<ISingleDataService, SingleDataService>();
Services.AddTransient<IErpService, ErpService>();
Services.AddTransient<IChangeMoveBoxService, ChangeMoveBoxService>();
}
}
}

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

@@ -32,6 +32,8 @@ namespace Microsoft.Extensions.DependencyInjection
{
services.AddHttpContextAccessor();
services.AddTransient<ITransactionRepositories, TransactionRepositories>();
services.AddTransient<IInStockRepositories, InStockRepositories>();
services.AddTransient<IChangeBoxRecordRepositories, ChangeBoxRecordRepositories>();

47
src/WMS.Web.Repositories/TransactionRepositories.cs Normal file
View File

@@ -0,0 +1,47 @@
using Microsoft.EntityFrameworkCore.Storage;
using System;
using System.Collections.Generic;
using System.Text;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Repositories.Configuration;
namespace WMS.Web.Repositories
{
public class TransactionRepositories: ITransactionRepositories
{
private RepositoryDbContext _context;
public TransactionRepositories(RepositoryDbContext context)
{
_context = context;
}
public IDbContextTransaction GetTransaction()
{
return _context.Database.BeginTransaction();
}
public bool CommitTransaction(bool isRollback, IDbContextTransaction transaction)
{
try
{
if (transaction == null)
return true;
if (isRollback)
{
transaction.Rollback();
return false;
}
transaction.Commit();
}
catch (Exception ex)
{
transaction.Rollback();
return false;
}
return true;
}
}
}