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-12-13 14:36:16 +08:00
parent 4ac5a2eb25
commit f8d50b7b35
6 changed files with 7 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,16 +140,6 @@
数量 数量
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.BackRecord.SaveBackRecordDetailsRequest.StockCode">
<summary>
仓库code
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecord.SaveBackRecordDetailsRequest.SubStockId">
<summary>
仓位ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.BackRecord.SaveBackRecordDetailsRequest.SerialNumbers"> <member name="P:WMS.Web.Core.Dto.BackRecord.SaveBackRecordDetailsRequest.SerialNumbers">
<summary> <summary>
序列号集 序列号集

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

@@ -100,21 +100,6 @@
数量 数量
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Domain.Entitys.BackRecordDetails.OrgCode">
<summary>
组织编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.BackRecordDetails.StockCode">
<summary>
仓库code
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.BackRecordDetails.SubStockId">
<summary>
仓位ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.BackRecordDetails.SerialNumbers"> <member name="P:WMS.Web.Domain.Entitys.BackRecordDetails.SerialNumbers">
<summary> <summary>
序列号集 序列号集

12
src/WMS.Web.Domain/Entitys/BackRecordDetails.cs
View File

@@ -32,18 +32,6 @@ namespace WMS.Web.Domain.Entitys
/// 数量 /// 数量
/// </summary> /// </summary>
public decimal Qty { get; set; } public decimal Qty { get; set; }
/// <summary>
/// 组织编码
/// </summary>
public string OrgCode { get; set; }
/// <summary>
/// 仓库code
/// </summary>
public string StockCode { get; set; }
/// <summary>
/// 仓位ID
/// </summary>
public int SubStockId { get; set; }
/// <summary> /// <summary>
/// 序列号集 /// 序列号集

4
src/WMS.Web.Domain/Services/BoxInventoryService.cs
View File

@@ -266,8 +266,8 @@ namespace WMS.Web.Domain.Services
{ {
var inventoryInOutDet = _inventoryInOutDetailsService.GenerateDto( var inventoryInOutDet = _inventoryInOutDetailsService.GenerateDto(
item.BoxId, item.MaterialId, item.BoxId, item.MaterialId,
item.OrgCode, item.StockCode, dtoData.OrgCode, dtoData.StockCode,
item.SubStockId, OrderType.Back, dtoData.SubStockId, OrderType.Back,
dtoData.BillNo, item.Qty, (dtoData.Type == BackRecordType.InstockOff ? InventoryInOutType.Out : InventoryInOutType.In)); dtoData.BillNo, item.Qty, (dtoData.Type == BackRecordType.InstockOff ? InventoryInOutType.Out : InventoryInOutType.In));
InventoryInOutDetailsGenerateDtoList.Add(inventoryInOutDet); InventoryInOutDetailsGenerateDtoList.Add(inventoryInOutDet);
} }

2
src/WMS.Web.Domain/Services/SerialNumberService.cs
View File

@@ -407,7 +407,7 @@ namespace WMS.Web.Domain.Services
}; };
if (backRecord.Type == BackRecordType.OutstockOn) if (backRecord.Type == BackRecordType.OutstockOn)
{ {
var subStockId = detail?.SubStockId ?? 0; var subStockId = backRecord?.SubStockId ?? 0;
var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, subStockId); var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, subStockId);
op.Remark += "\r\n" + "仓位:" + srcSubStock; op.Remark += "\r\n" + "仓位:" + srcSubStock;
} }

8
src/WMS.Web.Repositories/BackRecordRepositories.cs
View File

@@ -86,7 +86,7 @@ namespace WMS.Web.Repositories
.Where(adv => 1 == 1); .Where(adv => 1 == 1);
if (dto.SubStockId.HasValue) if (dto.SubStockId.HasValue)
query = query.Where(w => w.detail.SubStockId == dto.SubStockId.Value); query = query.Where(w => w.order.SubStockId == dto.SubStockId.Value);
if(dto.Type.HasValue) if(dto.Type.HasValue)
query = query.Where(w => (int)w.order.Type == dto.Type.Value); query = query.Where(w => (int)w.order.Type == dto.Type.Value);
@@ -113,9 +113,9 @@ namespace WMS.Web.Repositories
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
Qty = s.detail.Qty, Qty = s.detail.Qty,
Org= _erpBasicDataExtendService.GetOrgName(orgs, s.detail.OrgCode), Org= _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgCode),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode + s.detail.OrgCode), Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode + s.order.OrgCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.detail.SubStockId), SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.order.SubStockId),
SerialNumbers = JsonConvert.SerializeObject(s.detail.SerialNumbers), SerialNumbers = JsonConvert.SerializeObject(s.detail.SerialNumbers),
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();