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

优化接口

Browse Source
This commit is contained in:
tongfei
2024-03-19 16:29:28 +08:00
parent de45986d95
commit 70a1022a43
6 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6350,6 +6350,11 @@
仓库：编码与组织编码结合
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.Single.SingleAction.SubStocksJoinOrgCode">
<summary>
仓库：编码与组织编码结合
</summary>
</member>
<member name="T:WMS.Web.Domain.Values.Single.SingleControllerType">
<summary>
单点-控制器枚举

1
src/WMS.Web.Domain/Services/Public/SingleDataService.cs
View File

@@ -246,6 +246,7 @@ namespace WMS.Web.Domain.Services.Public
}
if (!dic.ContainsKey(code)) return "";
var name = dic[code];
return dic[code];
}
catch (Exception ex)

8
src/WMS.Web.Domain/Values/Single/SingleAction.cs
View File

@@ -110,7 +110,13 @@ namespace WMS.Web.Domain.Values.Single
/// 仓库：编码与组织编码结合
/// </summary>
[EnumRemark("仓库")]
StocksJoinOrgCode=20
StocksJoinOrgCode=20,
/// <summary>
/// 仓库：编码与组织编码结合
/// </summary>
[EnumRemark("仓位与仓库与组织")]
SubStocksJoinOrgCode
}
}

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

@@ -120,7 +120,7 @@ namespace WMS.Web.Repositories
Qty = s.detail.Qty,
Org= _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgCode),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.order.StockCode + s.order.OrgCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.order.SubStockCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.order.SubStockCode + s.order.StockCode + s.order.OrgCode),
SerialNumbers = (string.Join(",", s.detail.SerialNumbers)).TrimEnd(','),
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();

4
src/WMS.Web.Repositories/BoxInventoryRepositories.cs
View File

@@ -122,8 +122,8 @@ namespace WMS.Web.Repositories
MaterialNumber = s.detail.MaterialNumber,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialNumber),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.order.StockCode+s.order.OrgCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.order.SubStockCode),
SerialNumbers=(string.Join(",",s.detail.SerialNumbers)).TrimEnd(','),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.order.SubStockCode + s.order.StockCode + s.order.OrgCode),
SerialNumbers =(string.Join(",",s.detail.SerialNumbers)).TrimEnd(','),
Org = _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgCode),
Qty = s.detail.Qty,
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();

5
src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
View File

@@ -103,8 +103,7 @@ namespace WMS.Web.Repositories
query = query.Where(w => w.SubStockCode == dto.SubStockCode);
if (dto.Qty.HasValue)
query = query.Where(w => w.Qty == dto.Qty);
query = query.Where(w => w.Qty == dto.Qty);
int total = await query.CountAsync();
@@ -117,7 +116,7 @@ namespace WMS.Web.Repositories
Org= _erpBasicDataExtendService.GetOrgName(orgs, s.OrgCode),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.StockCode + s.OrgCode),
Qty = s.Qty,
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.SubStockCode),
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.SubStockCode + s.StockCode + s.OrgCode),
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialNumber),
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();