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
2024-03-05 11:30:32 +08:00
parent 43a052bc80 898eb35a28
commit 1fc005248d
7 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
View File

Binary file not shown.

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

@@ -432,18 +432,19 @@ namespace WMS.Web.Api.Controllers
/// <summary>
/// 根据序列号或规格型号,物料编码搜索物料信息-PDA
/// </summary>
/// <param name="serialNumber">序列号或规格型号或无聊编码</param>
/// <param name="serialNumber">序列号或规格型号或物料编码</param>
/// <param name="orgCode">组织编码</param>
/// <returns></returns>
[HttpGet]
[Route("GetMaterial")]
public async Task<Result<MaterialResponse>> GetMaterial([FromQuery] string serialNumber)
public async Task<Result<MaterialResponse>> GetMaterial([FromQuery] string serialNumber, [FromQuery] string orgCode = null)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result<MaterialResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
_logger.LogInformation($"请求序列号信息:{serialNumber}");
var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber);
var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode);
if (res == null) return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
return Result<MaterialResponse>.ReSuccess(res);

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

@@ -565,11 +565,12 @@
<param name="boxBillNo">必填</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetMaterial(System.String)">
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetMaterial(System.String,System.String)">
<summary>
根据序列号或规格型号,物料编码搜索物料信息-PDA
</summary>
<param name="serialNumber">序列号或规格型号或无聊编码</param>
<param name="serialNumber">序列号或规格型号或物料编码</param>
<param name="orgCode">组织编码</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetMaterialList(System.String)">

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

@@ -128,9 +128,8 @@ namespace WMS.Web.Domain.Entitys
});
}
else
{
d.Qty = qty;
}
d.Qty = d.Qty + qty;
return Result.ReSuccess();
}
/// <summary>

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

@@ -21,7 +21,7 @@ namespace WMS.Web.Domain.Infrastructure
/// <returns></returns>
Task<bool> AddRange(List<SerialNumbers> entitys, bool isTransaction = true);
//根据序列号模糊搜索信息
Task<MaterialResponse> GetSerialNumber(string serialNumber);
Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode);
//根据序列号搜索信息
Task<SerialNumbersResponse> Get(string serialNumber);
/// 查询实体集合

1
src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
View File

@@ -320,7 +320,6 @@ namespace WMS.Web.Domain.Services
/// <returns></returns>
public async Task<Result> ChangeBox_BackRecord(BackRecord backRecord, LoginInDto loginInfo, bool isTransaction = true)
{
return Result.ReSuccess();
if (backRecord.Method == InventoryInOutMethod.Box) return Result.ReSuccess();
List<SaveChangeBoxRecordRequest> dtoList = new List<SaveChangeBoxRecordRequest>();
var boxIds = backRecord.Details.Select(s => s.BoxId).Distinct().ToList();

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

@@ -178,7 +178,7 @@ namespace WMS.Web.Repositories
/// </summary>
/// <param name="serialNumbers"></param>
/// <returns></returns>
public async Task<MaterialResponse> GetSerialNumber(string serialNumber)
public async Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode)
{
MaterialResponse response = new MaterialResponse();
var materials_result = await _erpService.BillQueryForMaterial();
@@ -186,7 +186,10 @@ namespace WMS.Web.Repositories
return response;
var materials = materials_result.Data.ToList();
var material = materials.FirstOrDefault(f => f.Specifications.Equals(serialNumber)|| f.MaterialNumber.Equals(serialNumber));
var m = materials.Where(f => (f.Specifications.Equals(serialNumber) || f.MaterialNumber.Equals(serialNumber)));
if (!string.IsNullOrEmpty(orgCode))
m = m.Where(w => w.OrgId.Equals(orgCode));
var material = m.FirstOrDefault();
if (material != null)
{
response.MaterialId = material.MaterialId;
@@ -196,7 +199,7 @@ namespace WMS.Web.Repositories
return response;
}
var entity = await _context.SerialNumbers
.GroupJoin(_context.BoxInventory.Include(x=>x.Details), serial => serial.BoxId, boxInventory => boxInventory.BoxId, (serial, boxInventory) => new { serial, boxInventory })
.GroupJoin(_context.BoxInventory.Include(x => x.Details), serial => serial.BoxId, boxInventory => boxInventory.BoxId, (serial, boxInventory) => new { serial, boxInventory })
.SelectMany(x => x.boxInventory.DefaultIfEmpty(), (p, boxInventory) => new { p.serial, boxInventory })
.GroupJoin(_context.Box, s => s.serial.BoxId, box => box.Id, (s, box) => new { s.serial, s.boxInventory, box })
.SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.serial, p.boxInventory, box })