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

调整结构

Browse Source
This commit is contained in:
18942506660
2023-11-11 13:44:56 +08:00
parent 27dac5680d
commit 54e09cb273
9 changed files with 210 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,14 +32,17 @@ namespace WMS.Web.Api.Controllers
private readonly IBoxRepositories _boxRepositories;
private readonly IErpService _erpService;
private readonly ISingleDataService _singleDataService;
private readonly ISerialNumbersRepositories _serialNumbersRepositories;
public SysConfigController(ILoginService loginService, IBasicsRepositories basicsRepositories,
IBoxRepositories boxRepositories, IErpService erpService, ISingleDataService singleDataService)
IBoxRepositories boxRepositories, IErpService erpService, ISingleDataService singleDataService,
ISerialNumbersRepositories serialNumbersRepositories)
{
_loginService = loginService;
_basicsRepositories = basicsRepositories;
_boxRepositories = boxRepositories;
_erpService = erpService;
_singleDataService = singleDataService;
_serialNumbersRepositories = serialNumbersRepositories;
}
/// <summary>
@@ -254,5 +257,23 @@ namespace WMS.Web.Api.Controllers
return ResultList<BoxResponse>.ReSuccess(res);
}
/// <summary>
/// 根据序列号搜索信息-PDA
/// </summary>
/// <param name="serialNumber">必填</param>
/// <returns></returns>
[HttpGet]
[Route("GetSerialNumber/{serialNumber}")]
public async Task<Result<SerialNumbersResponse>> GetSerialNumbers([FromRoute] string serialNumber)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result<SerialNumbersResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber);
return Result<SerialNumbersResponse>.ReSuccess(res);
}
}
}

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

@@ -366,6 +366,13 @@
<param name="boxBillNos">必填</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSerialNumbers(System.String)">
<summary>
根据序列号搜索信息-PDA
</summary>
<param name="serialNumber">必填</param>
<returns></returns>
</member>
<member name="T:WMS.Web.Api.Controllers.TakeStockController">
<summary>
盘点单

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

@@ -2665,17 +2665,17 @@
明细
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.SerialNumber">
<member name="P:WMS.Web.Core.Dto.OpsSerialNumbersResponse.SerialNumber">
<summary>
序列号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.BarCreateTime">
<member name="P:WMS.Web.Core.Dto.OpsSerialNumbersResponse.BarCreateTime">
<summary>
序列号生成时间
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.BarCereateUser">
<member name="P:WMS.Web.Core.Dto.OpsSerialNumbersResponse.BarCereateUser">
<summary>
序列号生成用户
</summary>
@@ -3120,6 +3120,36 @@
每页条数 不传默认每页10 条
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.SerialNumbersResponse">
<summary>
序列号信息
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.SerialNumber">
<summary>
序列号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbersResponse.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.SingleData.NameRequest">
<summary>
名称请求对象

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

@@ -1087,6 +1087,16 @@
创建时间(老ops过来)
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.SerialNumbers.OutStockBillNo">
<summary>
出库单号
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.SerialNumbers.InStockBillNo">
<summary>
入库单号/采购单号
</summary>
</member>
<member name="T:WMS.Web.Domain.Entitys.TakeStock">
<summary>
wms盘点单
@@ -1589,6 +1599,12 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.ISerialNumbersRepositories.GetEntityList(System.Collections.Generic.List{System.String})">
查询实体集合
</member>
<member name="M:WMS.Web.Domain.Infrastructure.ISerialNumbersRepositories.EditEntityList(System.Collections.Generic.List{WMS.Web.Domain.Entitys.SerialNumbers},System.Boolean)">
修改实体集合
</member>
<member name="M:WMS.Web.Domain.Infrastructure.ITakeStockRepositories.AddRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.TakeStock},System.Boolean)">
<summary>
批量添加

4
src/WMS.Web.Core/Dto/OpsBoxResponse.cs
View File

@@ -51,7 +51,7 @@ namespace WMS.Web.Core.Dto
[JsonProperty("BoxReturnDetails")]
public List<OpsBoxDetailsResponse> Details { get; set; } = new List<OpsBoxDetailsResponse>();
}
public class SerialNumbersResponse
public class OpsSerialNumbersResponse
{
/// <summary>
/// 序列号
@@ -85,6 +85,6 @@ namespace WMS.Web.Core.Dto
/// 序列号集
/// </summary>
[JsonProperty("SerialNumbers")]
public List<SerialNumbersResponse> SerialNumbers { get; set; } = new List<SerialNumbersResponse>();
public List<OpsSerialNumbersResponse> SerialNumbers { get; set; } = new List<OpsSerialNumbersResponse>();
}
}

33
src/WMS.Web.Core/Dto/SerialNumbersResponse.cs Normal file
View File

@@ -0,0 +1,33 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto
{
/// <summary>
/// 序列号信息
/// </summary>
public class SerialNumbersResponse
{
/// <summary>
/// 序列号
/// </summary>
public string SerialNumber { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 物料名称
/// </summary>
public string MaterialName { get; set; }
/// <summary>
/// 物料编码
/// </summary>
public string MaterialNumber { get; set; }
/// <summary>
/// 物料规格型号
/// </summary>
public string Specifications { get; set; }
}
}

10
src/WMS.Web.Domain/Entitys/SerialNumbers.cs
View File

@@ -58,5 +58,15 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
[Column("CreateTime")]
public DateTime CreateTime { get; set; } = DateTime.Now;
/// <summary>
/// 出库单号
/// </summary>
[Column("OutStockBillNo")]
public string OutStockBillNo { get; set; }
/// <summary>
/// 入库单号/采购单号
///</summary>
[Column("InStockBillNo")]
public string InStockBillNo { get; set; }
}
}

7
src/WMS.Web.Domain/Infrastructure/ISerialNumbersRepositories.cs
View File

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto;
using WMS.Web.Domain.Entitys;
namespace WMS.Web.Domain.Infrastructure
@@ -18,5 +19,11 @@ namespace WMS.Web.Domain.Infrastructure
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<bool> AddRange(List<SerialNumbers> entitys, bool isTransaction = true);
//根据序列号模糊搜索信息
Task<SerialNumbersResponse> GetSerialNumber(string serialNumber);
/// 查询实体集合
Task<List<SerialNumbers>> GetEntityList(List<string> serialNumbers);
/// 修改实体集合
Task<bool> EditEntityList(List<SerialNumbers> entitys, bool isTransaction = true);
}
}

82
src/WMS.Web.Repositories/SerialNumbersRepositories.cs
View File

@@ -1,11 +1,17 @@
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;
using WMS.Web.Core.Help;
using WMS.Web.Domain.Entitys;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Mappers;
using WMS.Web.Repositories.Configuration;
namespace WMS.Web.Repositories
@@ -13,17 +19,22 @@ namespace WMS.Web.Repositories
/// <summary>
/// 序列号
/// </summary>
public class SerialNumbersRepositories: ISerialNumbersRepositories
public class SerialNumbersRepositories : ISerialNumbersRepositories
{
private readonly IMapper _mapper;
private readonly IServiceProvider _serviceProvider;
private readonly RepositoryDbContext _context;
private readonly IErpService _erpService;
private readonly IErpBasicDataExtendService _erpBasicDataExtendService;
public SerialNumbersRepositories(RepositoryDbContext context, IMapper mapper, IServiceProvider serviceProvider)
public SerialNumbersRepositories(RepositoryDbContext context, IMapper mapper,
IServiceProvider serviceProvider, IErpService erpService, IErpBasicDataExtendService erpBasicDataExtendService)
{
_context = context;
_mapper = mapper;
_serviceProvider = serviceProvider;
_erpService = erpService;
_erpBasicDataExtendService = erpBasicDataExtendService;
}
public async Task<bool> AddRange(List<SerialNumbers> entitys, bool isTransaction = true)
@@ -49,5 +60,72 @@ namespace WMS.Web.Repositories
return false;
}
}
/// <summary>
/// 批量修改
/// </summary>
/// <param name="entitys"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<bool> EditEntityList(List<SerialNumbers> entitys, bool isTransaction = true)
{
IDbContextTransaction _transaction = null;
if (isTransaction)
_transaction = _context.Database.BeginTransaction();
try
{
List<int> list = entitys.Select(s => s.Id).ToList();
var res = await _context.SerialNumbers
.Where(f => list.Contains(f.Id)).ToListAsync();
_mapper.ToMapList(entitys, res);
await _context.SaveChangesAsync();
if (_transaction != null)
_transaction.Commit();
}
catch (Exception ex)
{
if (_transaction != null)
_transaction.Rollback();
return false;
}
return true;
}
/// <summary>
/// 根据序列号查询
/// </summary>
/// <param name="serialNumbers"></param>
/// <returns></returns>
public async Task<List<SerialNumbers>> GetEntityList(List<string> serialNumbers)
{
var res = await _context.SerialNumbers
.Where(f => serialNumbers.Contains(f.SerialNumber))
.ToListAsync();
return res.Clone();
}
/// <summary>
/// 根据序列号
/// </summary>
/// <param name="serialNumbers"></param>
/// <returns></returns>
public async Task<SerialNumbersResponse> GetSerialNumber(string serialNumber)
{
SerialNumbersResponse response = new SerialNumbersResponse();
var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess)
return response;
var materials = materials_result.Data.ToList();
var entity = await _context.SerialNumbers.FirstOrDefaultAsync(w => serialNumber.Equals(w.SerialNumber));
response.SerialNumber = entity.SerialNumber;
response.MaterialId = entity.MaterialId;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.MaterialId);
response.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, entity.MaterialId);
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.MaterialId);
return new SerialNumbersResponse();
}
}
}