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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
FanLian
2023-07-21 14:54:49 +08:00
parent 8ac457c339 3dbfb15ac3
commit 6e328db737
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CollocationSchemeOutput.cs
View File

@@ -70,7 +70,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Outputs
/// <summary>
/// 齐套明细Json
/// </summary>
public string CollocationSchemeDsJson { get; set; }
public string CollocationSchemeDsJson { get; set; }=string.Empty;
[JsonIgnore]
public List<WmsCollocationSchemeD>? list { get; set; }
}

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

@@ -25,6 +25,7 @@ using Mapster;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.CodeAnalysis;
using NPOI.HPSF;
using NPOI.OpenXmlFormats.Wordprocessing;
using Polly.Timeout;
using Senparc.Weixin.Work.AdvancedAPIs.OaDataOpen;
@@ -187,6 +188,7 @@ namespace Tnb.WarehouseMgr
//任务链属性处理内部函数
async Task _taskChainAttrHandle(List<WmsDistaskH> items, List<WmsPretaskH> areaPreTasks, int moveNum)
{
var groupCode = await _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE);
await Task.Run(() =>
{
if (moveNum == 1 || (moveNum > areaPreTasks.Count && areaPreTasks.Count == 1))
@@ -194,19 +196,34 @@ namespace Tnb.WarehouseMgr
items.ForEach(x =>
{
x.is_chain = 0;
});
items[^items.Count].groups = $"{groupCode}-1";
}
else if ((moveNum > areaPreTasks.Count && areaPreTasks.Count > 1) || moveNum < areaPreTasks.Count)
{
items.ForEach(x => x.is_chain = 1);
//items[0].chain_type = "1";
//for (int i = 0; i < items.Count; i++)
//{
// if (i == 0 || i == items.Count - 1) continue;
// items[i].chain_type = "2";
//}
//items[^1].chain_type = "3";
var mod = items.Count % moveNum > 0 ? items.Count / moveNum + 1 : items.Count / moveNum;
int start = 0, end = moveNum;
var arrary = items.ToArray();
var itemsCount = items.Count;
for (int i = 1; i <= mod; i++)
{
if (start >= itemsCount) break;
var subArray = arrary[start..end];
for (int j = 0, arrLen = subArray.Length; j < arrLen; j++)
{
subArray[j].groups = $"{groupCode}-{i}";
}
start = end;
if ((end + moveNum) >= arrary.Length)
{
end = arrary.Length;
}
else
{
end = end + moveNum;
}
}
}
});
@@ -234,12 +251,13 @@ namespace Tnb.WarehouseMgr
{
var moveNum = itGroup.First().move_num;
var items = itGroup.Adapt<List<WmsDistaskH>>();
items.ForEach(x =>
for (int i = 0, cnt = items.Count; i < cnt; i++)
{
x.id = SnowflakeIdHelper.NextId();
x.status = WmsWareHouseConst.TASK_BILL_STATUS_DZX_ID;
x.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE).GetAwaiter().GetResult();
});
var num = i + 1;
items[i].id = SnowflakeIdHelper.NextId();
items[i].status = WmsWareHouseConst.TASK_BILL_STATUS_DZX_ID;
items[i].bill_code = await _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE);
}
if (moveNum == 1)
{