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

去集合最后一个元素样例提交

Browse Source
This commit is contained in:
alex
2023-06-20 10:11:43 +08:00
parent c57e3137d6
commit 337707f006
3 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -281,7 +281,6 @@ namespace Tnb.WarehouseMgr
{ {
x.status = WmsWareHouseConst.TASK_BILL_STATUS_DZX_ID; x.status = WmsWareHouseConst.TASK_BILL_STATUS_DZX_ID;
x.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE).GetAwaiter().GetResult(); x.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE).GetAwaiter().GetResult();
x.is_sign = 1;
}); });
var areaPreTasks = itGroup.ToList(); var areaPreTasks = itGroup.ToList();
if (moveNum == 1) if (moveNum == 1)

29
WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
View File

@@ -61,21 +61,23 @@ namespace Tnb.WarehouseMgr
if (outStockDList?.Count > 0) if (outStockDList?.Count > 0)
{ {
List<WmsCarryMat> carryMats = new(); List<WmsCarryMat> carryMats = new();
List<WmsCarryCode> carryCodes = new();
foreach (var os in outStockDList) foreach (var os in outStockDList)
{ {
var carryCodes = await _db.Queryable<WmsCarryH>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.carry_id) var carryCodesPart = await _db.Queryable<WmsCarryH>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.carry_id)
.Where((a, b) => b.material_id == os.material_id && b.code_batch == os.code_batch && a.is_lock == 0 && .Where((a, b) => b.material_id == os.material_id && b.code_batch == os.code_batch && a.is_lock == 0 &&
!string.IsNullOrEmpty(a.location_id) && a.status == (int)EnumCarryStatus.占用) !string.IsNullOrEmpty(a.location_id) && a.status == (int)EnumCarryStatus.占用)
.Select<WmsCarryCode>() .Select<WmsCarryCode>()
.ToListAsync(); .ToListAsync();
if (carryCodes?.Count > 0) if (carryCodesPart?.Count > 0)
{ {
carryCodes.AddRange(carryCodesPart);
var codeQty = carryCodes.Sum(x => x.codeqty); var codeQty = carryCodes.Sum(x => x.codeqty);
if (codeQty < os.pr_qty) if (codeQty < os.pr_qty)
{ {
throw new AppFriendlyException($"需要出库[{os.pr_qty}],实际库存{codeQty},数量不足", 500); throw new AppFriendlyException($"需要出库[{os.pr_qty}],实际库存{codeQty},数量不足", 500);
} }
var partCarryMats = carryCodes.Adapt<List<WmsCarryMat>>(); var partCarryMats = carryCodesPart.Adapt<List<WmsCarryMat>>();
partCarryMats.ForEach(x => partCarryMats.ForEach(x =>
{ {
x.need_qty = (int)os.pr_qty; x.need_qty = (int)os.pr_qty;
@@ -96,7 +98,26 @@ namespace Tnb.WarehouseMgr
}) })
.ToList(); .ToList();
await _db.Insertable(carryMats).ExecuteCommandAsync(); await _db.Insertable(carryMats).ExecuteCommandAsync();
var dic = carryMats.ToDictionary(x => x.id, x => x.real_qty);
var allOutIds = new List<string>();
var sortingOutIds = new List<string>();
foreach (var pair in dic)
{
var codes = carryCodes.FindAll(x => x.carry_id == pair.Key);
if (codes?.Count > 0)
{
if (pair.Value == codes.Sum(d => d.codeqty))
{
allOutIds.Add(pair.Key);
}
else
{
sortingOutIds.Add(pair.Key);
}
}
}
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.全部出).ToString() }).Where(it => allOutIds.Contains(it.id)).ExecuteCommandAsync();
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.分拣出).ToString() }).Where(it => sortingOutIds.Contains(it.id)).ExecuteCommandAsync();
} }
} }
} }

5
WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs
View File

@@ -85,6 +85,7 @@ namespace Tnb.WarehouseMgr
//根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序） //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序）
if (points?.Count > 0) if (points?.Count > 0)
{ {
if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500); if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500);
var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it => var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it =>
{ {
@@ -113,7 +114,9 @@ namespace Tnb.WarehouseMgr
preTask.create_time = DateTime.Now; preTask.create_time = DateTime.Now;
return preTask; return preTask;
}).ToList(); }).ToList();
var isOk = await _wareHouseService.GenPreTask(preTasks,null);
//preTasks[^1].is_sign =1; 修改最后一个元素的是否签收值
var isOk = await _wareHouseService.GenPreTask(preTasks, null);
if (isOk) if (isOk)
{ {
var preTaskUpInput = new GenPreTaskUpInput(); var preTaskUpInput = new GenPreTaskUpInput();