wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

执行代码清理，修复warning

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:59:12 +08:00
parent c6b8dfc861
commit 1dbb17f103
118 changed files with 5046 additions and 4111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
WarehouseMgr/Tnb.WarehouseMgr/WmsStockReportService.cs
View File

@@ -29,7 +29,7 @@ namespace Tnb.WarehouseMgr
private async Task<dynamic> GetListAsync(VisualDevModelListQueryInput input)
{
var items = await _db.Queryable<WmsCarryCode>().InnerJoin<BasMaterial>((a, b) => a.material_id == b.id)
List<WmsStockReportH> items = await _db.Queryable<WmsCarryCode>().InnerJoin<BasMaterial>((a, b) => a.material_id == b.id)
.InnerJoin<BasMaterialSendWarehouse>((a, b, c) => b.id == c.material_id)
.InnerJoin<WmsCarryH>((a, b, c, d) => a.carry_id == d.id)
.InnerJoin<BasLocation>((a, b, c, d, e) => d.location_id == e.id)
@@ -42,27 +42,29 @@ namespace Tnb.WarehouseMgr
create_id = a.create_id,
}, true)
.ToListAsync();
var carryCodes = await _db.Queryable<WmsCarryCode>().ToListAsync();
List<WmsCarryCode> carryCodes = await _db.Queryable<WmsCarryCode>().ToListAsync();
var storeMap = items.DistinctBy(x => new { x.warehouse_id, x.material_id }).ToDictionary(x => new { x.warehouse_id, x.material_id }, x => x);
var result = items.GroupBy(g => new { g.warehouse_id, g.material_id }).Select(itGroup =>
IEnumerable<WmsStockReportH> result = items.GroupBy(g => new { g.warehouse_id, g.material_id }).Select(itGroup =>
{
storeMap.TryGetValue(itGroup.Key, out var report);
WmsStockReportH stockReport = new();
stockReport.material_code = report?.material_code ?? "";
stockReport.mater_name = report?.mater_name ?? "";
stockReport.existing_stock_qty = itGroup.Sum(d => d.codeqty);
stockReport.max_stock = report?.max_stock ?? 0;
stockReport.safe_stock = report?.safe_stock ?? 0;
stockReport.min_stock = report?.min_stock ?? 0;
stockReport.storage_valid_day = items.Find(t => t.material_id == itGroup.Key.material_id)?.storage_valid_day;
stockReport.early_warn_day = items.Find(t => t.material_id == itGroup.Key.material_id)?.early_warn_day;
stockReport.create_id = _userManager.UserId;
stockReport.create_time = DateTime.Now;
_ = storeMap.TryGetValue(itGroup.Key, out WmsStockReportH? report);
WmsStockReportH stockReport = new()
{
material_code = report?.material_code ?? "",
mater_name = report?.mater_name ?? "",
existing_stock_qty = itGroup.Sum(d => d.codeqty),
max_stock = report?.max_stock ?? 0,
safe_stock = report?.safe_stock ?? 0,
min_stock = report?.min_stock ?? 0,
storage_valid_day = items.Find(t => t.material_id == itGroup.Key.material_id)?.storage_valid_day,
early_warn_day = items.Find(t => t.material_id == itGroup.Key.material_id)?.early_warn_day,
create_id = _userManager.UserId,
create_time = DateTime.Now
};
if (stockReport.storage_valid_day.HasValue)
{
decimal expired_warning_qty = 0;
foreach (var item in itGroup)
foreach (WmsStockReportH? item in itGroup)
{
if (DateTime.Now.Subtract(item.create_time.Value).TotalDays >= (item.storage_valid_day - item.early_warn_day))
{
@@ -71,7 +73,7 @@ namespace Tnb.WarehouseMgr
}
stockReport.expired_warning_qty = expired_warning_qty;
}
var curCarryCodes = carryCodes.FindAll(x => x.warehouse_id == itGroup.Key.warehouse_id && x.material_id == itGroup.Key.material_id);
List<WmsCarryCode> curCarryCodes = carryCodes.FindAll(x => x.warehouse_id == itGroup.Key.warehouse_id && x.material_id == itGroup.Key.material_id);
stockReport.Details = curCarryCodes.Adapt<List<WmsStockReportCode>>();
stockReport.Details.ForEach(x =>
{
@@ -82,7 +84,7 @@ namespace Tnb.WarehouseMgr
});
var pages = result.Skip((input.currentPage - 1) * input.pageSize).Take(input.pageSize).ToList();
List<WmsStockReportH> pages = result.Skip((input.currentPage - 1) * input.pageSize).Take(input.pageSize).ToList();
SqlSugarPagedList<WmsStockReportH> pagedList = new()
{
list = pages,