diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsCarryService.cs b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsCarryService.cs
index f51fba77..d8e1515f 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsCarryService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsCarryService.cs
@@ -13,6 +13,6 @@ namespace Tnb.WarehouseMgr.Interfaces
///
///
///
- Task UpdateNullCarry(WmsCarryH carryObj, Func> parallelUpdate=null, [CallerMemberName] string original = "");
+ Task UpdateNullCarry(WmsCarryH carryObj, Func> updateTask=null, [CallerMemberName] string original = "");
}
}
\ No newline at end of file
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 02249c8a..c502c66a 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -200,7 +200,7 @@ namespace Tnb.WarehouseMgr
items[0].groups = groupCode;
items[0].bill_code = $"{groupCode}-1";
}
- else if ((moveNum > areaPreTasks.Count && areaPreTasks.Count > 1) || moveNum < areaPreTasks.Count)
+ else if ((moveNum >= areaPreTasks.Count && areaPreTasks.Count > 1) || moveNum < areaPreTasks.Count)
{
items.ForEach(x => x.is_chain = 1);
var itemsCount = items.Count;
@@ -253,40 +253,11 @@ namespace Tnb.WarehouseMgr
{
items[i].id = SnowflakeIdHelper.NextId();
items[i].status = WmsWareHouseConst.TASK_BILL_STATUS_DZX_ID;
- //items[i].groups = await _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE);
}
-
- if (moveNum == 1)
- {
- items.ForEach(x =>
- {
- x.is_chain = 0;
- //x.chain_type = "3";
- });
- }
- else if (moveNum > 1)
+ if (moveNum >= 1)
{
var areaPreTasks = itGroup.ToList();
- //搬运数量==预任务数,可以生成任务执行,为任务链
- if (moveNum == areaPreTasks.Count)
- {
- await _taskChainAttrHandle(items, areaPreTasks, moveNum);
- }
- else if (moveNum > areaPreTasks.Count && areaPreTasks.Count == 1) //搬运数量>预任务数,且预任务数等于1,不是任务链,预任务数据平替到任务执行
- {
- await _taskChainAttrHandle(items, areaPreTasks, moveNum);
- }
- else if (moveNum > areaPreTasks.Count && areaPreTasks.Count > 1) //搬运数量>预任务数,且预任务数大于1,可以执行时,可以生成任务执行,为任务链
- {
- await _taskChainAttrHandle(items, areaPreTasks, moveNum);
- }
- else if (false) //搬运数量>预任务数,且预任务数大于1,不可以执行时,先空着
- {
- }
- else if (moveNum < areaPreTasks.Count) //搬运数量<预任务数, 按照预任务先后顺序,生成对应搬运数量的任务组
- {
- await _taskChainAttrHandle(items, areaPreTasks, moveNum);
- }
+ await _taskChainAttrHandle(items, areaPreTasks, moveNum);
}
if (preTaskCodes?.Count > 0)
{
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs
index 408acddb..5aa85612 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs
@@ -156,7 +156,7 @@ namespace Tnb.WarehouseMgr
}
[NonAction]
- public async Task UpdateNullCarry(WmsCarryH carryObj, Func> parallelUpdate = null, [CallerMemberName] string original = "")
+ public async Task UpdateNullCarry(WmsCarryH carryObj, Func> updateTask = null, [CallerMemberName] string original = "")
{
var row = 1;
try
@@ -173,9 +173,9 @@ namespace Tnb.WarehouseMgr
carryObj.collocation_scheme_code = null;
carryObj.source_id = null;
carryObj.source_code = null;
- if (parallelUpdate != null)
+ if (updateTask != null)
{
- parallelUpdate(carryObj);
+ updateTask(carryObj);
}
else
{