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

77
WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs
View File

@@ -54,33 +54,38 @@ namespace Tnb.WarehouseMgr
private async Task<dynamic> Create(VisualDevModelDataCrInput input)
{
var row = 1;
if (input == null) throw new ArgumentNullException(nameof(input));
int row = 1;
if (input == null)
{
throw new ArgumentNullException(nameof(input));
}
try
{
await _db.Ado.BeginTranAsync();
if (input.data?.Count > 0)
{
var checkType = input.data[nameof(WmsCheckstockH.checkstock_type)]?.ToString();
string? checkType = input.data[nameof(WmsCheckstockH.checkstock_type)]?.ToString();
if (!checkType.IsNullOrEmpty())
{
var billStatus = new List<string>
List<string> billStatus = new()
{
WmsWareHouseConst.PRETASK_BILL_STATUS_CANCEL_ID,
WmsWareHouseConst.PRETASK_BILL_STATUS_COMPLE_ID,
};
var filter = Expressionable.Create<WmsDistaskH, BasLocation>()
Expression<Func<WmsDistaskH, BasLocation, bool>> filter = Expressionable.Create<WmsDistaskH, BasLocation>()
.And((a, b) => b.wh_id == input.data[nameof(WmsCheckstockH.warehouse_id)].ToString())
.And((a, b) => b.is_type == ((int)EnumLocationType.存储库位).ToString())
.And((a, b) => !billStatus.Contains(a.status))
.ToExpression();
var queryTasks = new List<Task<List<WmsDistaskH>>>();
queryTasks.Add(Task.Run(() => FetchDisTasks((a, b) => a.startlocation_id == b.id, filter)));
queryTasks.Add(Task.Run(() => FetchDisTasks((a, b) => a.endlocation_id == b.id, filter)));
var disTasks = await Task.WhenAll(queryTasks);
List<Task<List<WmsDistaskH>>> queryTasks = new()
{
Task.Run(() => FetchDisTasks((a, b) => a.startlocation_id == b.id, filter)),
Task.Run(() => FetchDisTasks((a, b) => a.endlocation_id == b.id, filter))
};
List<WmsDistaskH>[] disTasks = await Task.WhenAll(queryTasks);
if (disTasks?.Length > 0)
{
throw new AppFriendlyException("该仓库还有未完成的任务，不允许盘点!", 500);
@@ -97,10 +102,10 @@ namespace Tnb.WarehouseMgr
.Select<WmsCarryCode>()
.ToListAsync();
carryCodes ??= Enumerable.Empty<WmsCarryCode>().ToList();
var checkStockDs = carryCodes.Adapt<List<WmsCheckstockD>>();
List<WmsCheckstockD>? checkStockDs = carryCodes.Adapt<List<WmsCheckstockD>>();
var prQtyDic = checkStockDs.GroupBy(g => new { g.carry_id, g.material_id, g.code_batch }).ToDictionary(x => x.Key, x => x.Sum(d => d.codeqty));
foreach (var (k, v) in prQtyDic)
foreach ((object k, decimal v) in prQtyDic)
{
WmsCheckstockD? checkstockD = checkStockDs?.Find(x => string.Equals(k, $"{x.carry_id}{x.material_id}{x.code_batch}"));
if (checkstockD != null)
@@ -112,7 +117,7 @@ namespace Tnb.WarehouseMgr
details.Add(checkstockD);
}
}
await _db.Insertable(details).ExecuteCommandAsync();
_ = await _db.Insertable(details).ExecuteCommandAsync();
break;
case EnumCheckType.物料盘点:
break;
@@ -122,32 +127,36 @@ namespace Tnb.WarehouseMgr
//生成预任务信息
if (details.Count > 0 && carryCodes.Count > 0)
{
var locTypes = new[] { ((int)EnumLocationType.出库库位).ToString(), ((int)EnumLocationType.出入库位).ToString() };
var endLocs = await _db.Queryable<BasLocation>().Where(it => it.wh_id == input.data[nameof(WmsCheckstockH.warehouse_id)].ToString() && locTypes.Contains(it.is_type)).ToArrayAsync();
var randomIndex = new Random().Next(0, endLocs.GetUpperBound(0));
var carrys = await _db.Queryable<WmsCarryH>().Where(it => carryCodes.Select(x => x.carry_id).Distinct().Contains(it.id)).ToListAsync();
var curDetails = details.DistinctBy(x => x.carry_id).ToList();
var curCarryCodes = carryCodes.FindAll(x => curDetails.Select(d => d.carry_id).Contains(x.carry_id));
string[] locTypes = new[] { ((int)EnumLocationType.出库库位).ToString(), ((int)EnumLocationType.出入库位).ToString() };
BasLocation[] endLocs = await _db.Queryable<BasLocation>().Where(it => it.wh_id == input.data[nameof(WmsCheckstockH.warehouse_id)].ToString() && locTypes.Contains(it.is_type)).ToArrayAsync();
int randomIndex = new Random().Next(0, endLocs.GetUpperBound(0));
List<WmsCarryH> carrys = await _db.Queryable<WmsCarryH>().Where(it => carryCodes.Select(x => x.carry_id).Distinct().Contains(it.id)).ToListAsync();
List<WmsCheckstockD> curDetails = details.DistinctBy(x => x.carry_id).ToList();
List<WmsCarryCode> curCarryCodes = carryCodes.FindAll(x => curDetails.Select(d => d.carry_id).Contains(x.carry_id));
if (curCarryCodes.Count > 0)
{
List<WmsPretaskH> preTasks = new();
List<string> locIds = new();
foreach (var item in carrys)
foreach (WmsCarryH item in carrys)
{
WmsPointH? sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == item.location_id);
WmsPointH? ePoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == endLocs[randomIndex].id);
if (sPoint != null && ePoint != null)
{
var points = await _warehouseService.PathAlgorithms(sPoint.id, ePoint.id);
List<WmsPointH> points = await _warehouseService.PathAlgorithms(sPoint.id, ePoint.id);
if (points.Count <= 2)
{
throw new AppFriendlyException("该路径不存在", 500);
}
if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500);
if (points?.Count > 0)
{
locIds.AddRange(points.Select(x => x.location_id).ToList()!);
var curPreTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it =>
List<WmsPretaskH> curPreTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it =>
{
var sPoint = it.FirstOrDefault();
var ePoint = it.LastOrDefault();
WmsPointH? sPoint = it.FirstOrDefault();
WmsPointH? ePoint = it.LastOrDefault();
WmsPretaskH preTask = new()
{
@@ -182,10 +191,10 @@ namespace Tnb.WarehouseMgr
}
}
List<WmsPretaskCode> pretaskCodes = new();
foreach (var pt in preTasks)
foreach (WmsPretaskH pt in preTasks)
{
var partCodes = carryCodes.FindAll(x => x.carry_id == pt.carry_id).Distinct().ToList();
var curPreTaskCodes = partCodes.Adapt<List<WmsPretaskCode>>();
List<WmsCarryCode> partCodes = carryCodes.FindAll(x => x.carry_id == pt.carry_id).Distinct().ToList();
List<WmsPretaskCode> curPreTaskCodes = partCodes.Adapt<List<WmsPretaskCode>>();
curPreTaskCodes.ForEach(x =>
{
x.id = SnowflakeIdHelper.NextId();
@@ -194,13 +203,15 @@ namespace Tnb.WarehouseMgr
});
pretaskCodes.AddRange(curPreTaskCodes);
}
var isOk = await _warehouseService.GenPreTask(preTasks, pretaskCodes);
bool isOk = await _warehouseService.GenPreTask(preTasks, pretaskCodes);
if (isOk)
{
await _db.Updateable<WmsCheckstockH>().SetColumns(it => it.status == ((int)EnumCheckStatus.盘点中).ToString()).ExecuteCommandAsync();
GenPreTaskUpInput genPreTaskAfterUpInput = new();
genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList();
genPreTaskAfterUpInput.LocationIds = new HashSet<string>(locIds).ToList();
_ = await _db.Updateable<WmsCheckstockH>().SetColumns(it => it.status == ((int)EnumCheckStatus.盘点中).ToString()).ExecuteCommandAsync();
GenPreTaskUpInput genPreTaskAfterUpInput = new()
{
CarryIds = preTasks.Select(x => x.carry_id).ToList(),
LocationIds = new HashSet<string>(locIds).ToList()
};
await _warehouseService.GenInStockTaskHandleAfter(genPreTaskAfterUpInput, it => new WmsCarryH { is_lock = 1 }, it => new BasLocation { is_lock = 1 });
}
}