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-11-24 17:31:13 +08:00
parent 28081602e4 ef7f017088
commit 060a0dd22d
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3286,6 +3286,11 @@
序列号信息 序列号信息
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.BoxId">
<summary>
箱Id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.SerialNumber"> <member name="P:WMS.Web.Core.Dto.MaterialResponse.SerialNumber">
<summary> <summary>
序列号 序列号

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

@@ -9,6 +9,10 @@ namespace WMS.Web.Core.Dto
/// </summary> /// </summary>
public class MaterialResponse public class MaterialResponse
{ {
/// <summary>
/// 箱Id
/// </summary>
public int BoxId { get; set; }
/// <summary> /// <summary>
/// 序列号 /// 序列号
/// </summary> /// </summary>

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

@@ -145,10 +145,10 @@ namespace WMS.Web.Repositories
query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%")); query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%"));
if (!string.IsNullOrEmpty(dto.DestBox)) if (!string.IsNullOrEmpty(dto.DestBox))
query = query.Where(w => EF.Functions.Like(w.destBox.BoxBillNo, "%" + dto.DestBox + "%")); query = query.Where(w => EF.Functions.Like(w.destBox.BoxBillNo, "%" + dto.DestBox + "%"));
//if (dto.SrcSubStockId != null) if (dto.SrcSubStockId != null)
// query = query.Where(w => w.changeBox.SrcSubStockId == dto.SrcSubStockId); query = query.Where(w => w.changeBox.SrcSubStockId == dto.SrcSubStockId);
//if (dto.DestSubStockId != null) if (dto.DestSubStockId != null)
// query = query.Where(w => w.changeBox.DestSubStockId == dto.DestSubStockId); query = query.Where(w => w.changeBox.DestSubStockId == dto.DestSubStockId);
if (dto.CreateBeginDate != null) if (dto.CreateBeginDate != null)
query = query.Where(w => w.changeBox.CreateTime >= dto.CreateBeginDate); query = query.Where(w => w.changeBox.CreateTime >= dto.CreateBeginDate);
if (dto.CreateEndDate != null) if (dto.CreateEndDate != null)
@@ -163,11 +163,11 @@ namespace WMS.Web.Repositories
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.changeBox.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.changeBox.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.changeBox.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.changeBox.MaterialId),
//Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.changeBox.StockId), //Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.changeBox.StockId),
SerialNumbers = JsonConvert.SerializeObject(s.changeBox.SerialNumbers), SerialNumbers = string.Join(",", s.changeBox.SerialNumbers),
SrcBox = s.srcBox.BoxBillNo, SrcBox = s.srcBox.BoxBillNo,
DestBox = s.destBox.BoxBillNo, DestBox = s.destBox.BoxBillNo,
//SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.changeBox.SrcSubStockId), SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.changeBox.SrcSubStockId),
//DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.changeBox.DestSubStockId), DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.changeBox.DestSubStockId),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.changeBox.CreatorId), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.changeBox.CreatorId),
CreateTime = s.changeBox.CreateTime.DateToStringSeconds() CreateTime = s.changeBox.CreateTime.DateToStringSeconds()
#endregion #endregion

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

@@ -151,6 +151,7 @@ namespace WMS.Web.Repositories
} }
var entity = await _context.SerialNumbers.FirstOrDefaultAsync(w => serialNumber.Equals(w.SerialNumber)); var entity = await _context.SerialNumbers.FirstOrDefaultAsync(w => serialNumber.Equals(w.SerialNumber));
if (entity == null) return null; if (entity == null) return null;
response.BoxId = entity.BoxId;
response.SerialNumber = entity.SerialNumber; response.SerialNumber = entity.SerialNumber;
response.MaterialId = entity.MaterialId; response.MaterialId = entity.MaterialId;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.MaterialId); response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.MaterialId);