WMS 库房业务,生成任务,任务执行
This commit is contained in:
@@ -1,10 +1,12 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Dynamic;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Aop.Api.Domain;
|
||||
using Aspose.Cells.Drawing;
|
||||
using Dm;
|
||||
using JNPF.Common.Contracts;
|
||||
@@ -15,6 +17,7 @@ using JNPF.DependencyInjection;
|
||||
using JNPF.DynamicApiController;
|
||||
using JNPF.Extras.CollectiveOAuth.Config;
|
||||
using JNPF.FriendlyException;
|
||||
using JNPF.Systems.Entitys.Dto.Module;
|
||||
using JNPF.Systems.Interfaces.System;
|
||||
using Mapster;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
@@ -30,6 +33,7 @@ using Tnb.Common.Utils;
|
||||
using Tnb.WarehouseMgr.Entities;
|
||||
using Tnb.WarehouseMgr.Entities.Consts;
|
||||
using Tnb.WarehouseMgr.Entities.Dto;
|
||||
using Tnb.WarehouseMgr.Entities.Dto.Inputs;
|
||||
using Tnb.WarehouseMgr.Entities.Enums;
|
||||
using Tnb.WarehouseMgr.Interfaces;
|
||||
|
||||
@@ -211,6 +215,165 @@ namespace Tnb.WarehouseMgr
|
||||
{
|
||||
return Task.FromResult<dynamic>(true);
|
||||
}
|
||||
/// <summary>
|
||||
/// 生成任务执行
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task GenTaskExecute()
|
||||
{
|
||||
//任务链属性处理内部函数
|
||||
async Task _taskChainAttrHandle(List<WmsDistaskH> items, List<WmsPretaskH> areaPreTasks, int moveNum)
|
||||
{
|
||||
if (moveNum == 1 || (moveNum > areaPreTasks.Count && areaPreTasks.Count == 1))
|
||||
{
|
||||
items.ForEach(x =>
|
||||
{
|
||||
x.is_chain = 0;
|
||||
x.chain_type = "0";
|
||||
});
|
||||
}
|
||||
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[items.Count - 1].chain_type = "3";
|
||||
}
|
||||
}
|
||||
|
||||
//获取所有未下发的预任务申请
|
||||
var preTasks = await _db.Queryable<WmsPretaskH>().InnerJoin<WmsCarryH>((a, b) => a.startlocation_id == b.location_id)
|
||||
.InnerJoin<WmsAreaH>((a, b, c) => a.area_id == c.id)
|
||||
.Where(a => a.status == WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID)
|
||||
.OrderBy(a => new { priority = SqlFunc.Desc(a.priority), a.bill_code })
|
||||
.Select((a, b, c) => new WmsPretaskH
|
||||
{
|
||||
move_num = c.move_num
|
||||
}, true)
|
||||
.ToListAsync();
|
||||
if (preTasks.Count > 0)
|
||||
{
|
||||
//根据预任务管理区分组,获取到所有分组后的预任务,遍历每个预任务 是否为任务链,通过管理区ID
|
||||
var preTaskGroups = preTasks.GroupBy(g => g.area_code).ToList();
|
||||
List<WmsDistaskH> disTasks = new();
|
||||
foreach (var itGroup in preTaskGroups)
|
||||
{
|
||||
var moveNum = itGroup.First().move_num;
|
||||
var items = itGroup.Adapt<List<WmsDistaskH>>();
|
||||
var areaPreTasks = itGroup.ToList();
|
||||
if (moveNum == 1)
|
||||
{
|
||||
items.ForEach(x =>
|
||||
{
|
||||
x.is_chain = 0;
|
||||
x.chain_type = "0";
|
||||
});
|
||||
}
|
||||
else if (moveNum > 1)
|
||||
{
|
||||
//搬运数量==预任务数,可以生成任务执行,为任务链
|
||||
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);
|
||||
}
|
||||
}
|
||||
disTasks.AddRange(items);
|
||||
}
|
||||
try
|
||||
{
|
||||
await _db.Ado.BeginTranAsync();
|
||||
|
||||
disTasks.ForEach(x => x.id = SnowflakeIdHelper.NextId());
|
||||
var row = await _db.Insertable(disTasks).ExecuteCommandAsync();
|
||||
if (row > 0)
|
||||
{
|
||||
var preTaskIds = preTasks.Select(x => x.id).ToList();
|
||||
row = await _db.Updateable<WmsPretaskH>().SetColumns(it => new WmsPretaskH { status = WmsWareHouseConst.PRETASK_BILL_STATUS_YXF_ID }).Where(it => preTaskIds.Contains(it.id)).ExecuteCommandAsync();
|
||||
}
|
||||
|
||||
await _db.Ado.CommitTranAsync();
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
await _db.Ado.RollbackTranAsync();
|
||||
}
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 任务执行
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task TaskExecute(TaskExecuteUpInput input)
|
||||
{
|
||||
try
|
||||
{
|
||||
await _db.Ado.BeginTranAsync();
|
||||
|
||||
//更任务执行
|
||||
for (int i = 0, cnt = input.disTaskIds.Count; i < cnt; i++)
|
||||
{
|
||||
await _db.Updateable<WmsDistaskH>().SetColumns(it => new WmsDistaskH { status = WmsWareHouseConst.TASK_BILL_STATUS_YXD_ID, device_id = input.EqpIds[i] }).Where(it => input.disTaskIds.Contains(it.id)).ExecuteCommandAsync();
|
||||
}
|
||||
var preTaskIds = await _db.Queryable<WmsDistaskH>().Where(it => input.disTaskIds.Contains(it.id)).Select(it => it.pretask_id).ToListAsync();
|
||||
if (preTaskIds.Count > 0)
|
||||
{
|
||||
//更预任务申请表状态
|
||||
await _db.Updateable<WmsPretaskH>().SetColumns(it => new WmsPretaskH { status = WmsWareHouseConst.PRETASK_BILL_STATUS_START_ID }).Where(it => preTaskIds.Contains(it.id)).ExecuteCommandAsync();
|
||||
}
|
||||
|
||||
await _db.Ado.CommitTranAsync();
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
await _db.Ado.RollbackTranAsync();
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 任务执行取操作返回(后续操作)
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task TaskExecuteAfter()
|
||||
{
|
||||
//更新任务执行表单据状态
|
||||
//清空载具库位数据
|
||||
//清空起始库位,状态改为空闲、锁定状态,未锁定
|
||||
}
|
||||
/// <summary>
|
||||
/// 任务完成
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task TaskComplate()
|
||||
{
|
||||
//更新任务执行表,单据状态为 完成
|
||||
//更新预任务申请表,单据状态为 已完成
|
||||
//更新载具,锁定状态为未锁定,更新载具的库位当前任务的目标库位
|
||||
//更新库位信息,使用状态为 使用,锁定状态为未锁定
|
||||
//更新业务主表的单据状态
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 生成预任务
|
||||
@@ -255,7 +418,7 @@ namespace Tnb.WarehouseMgr
|
||||
/// <param name="pStartId"></param>
|
||||
/// <param name="pEndId"></param>
|
||||
/// <returns></returns>
|
||||
|
||||
[NonAction]
|
||||
public async Task<List<WmsPointH>> PathAlgorithms(string pStartId, string pEndId)
|
||||
{
|
||||
var roads = await _db.Queryable<WmsRoad>().ToListAsync();
|
||||
@@ -264,18 +427,20 @@ namespace Tnb.WarehouseMgr
|
||||
}
|
||||
|
||||
#region PrivateMethods
|
||||
|
||||
private bool isArrivedEpoint = false;
|
||||
private async Task<List<WmsPointH>> LocPathCalcAlgorithms(string pStartId, string pEndId, List<WmsRoad> roads)
|
||||
{
|
||||
var points = await _db.Queryable<WmsPointH>().ToListAsync();
|
||||
List<WmsPointH> results = new();
|
||||
List<WmsRoad> subRoads = new();
|
||||
Dictionary<string, bool> isVisited = roads.Select(x => x.startpoint_id).Distinct().ToDictionary(x => x, x => false);
|
||||
|
||||
List<string> pointIds = new();
|
||||
List<string> codes = new();
|
||||
Dp dp = new();
|
||||
|
||||
dp.DpFunc(roads, subRoads, pointIds, isVisited, pStartId, pEndId);
|
||||
dynamic obj = new ExpandoObject();
|
||||
obj.isArrivedEpoint = false;
|
||||
dp.DpFunc(roads, pointIds, isVisited, pStartId, pEndId, obj);
|
||||
foreach (var pid in pointIds)
|
||||
{
|
||||
var point = points.Find(x => x.id == pid);
|
||||
@@ -284,6 +449,7 @@ namespace Tnb.WarehouseMgr
|
||||
results.Add(point);
|
||||
}
|
||||
}
|
||||
return results;
|
||||
|
||||
#region dijkstra
|
||||
//var points = await _db.Queryable<WmsPointH>().ToListAsync();
|
||||
@@ -348,7 +514,7 @@ namespace Tnb.WarehouseMgr
|
||||
//MatchPoint(results, roads, shortestPathPoints, isVisited, pStartId, pEndId);
|
||||
//results.Add(endObj);
|
||||
#endregion
|
||||
return results;
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// 获取匹配的最短路径节点
|
||||
|
||||
Reference in New Issue
Block a user