接口, 出库,任务下发

This commit is contained in:
zgf committed 2023-09-05 00:47:02 +08:00
1 parent f5423e78fe
commit 5c13b2a85c
38 files changed
+22919 -115

No files matched your search

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
using HHWMS.Web.Models;
@@ -22,31 +23,39 @@ namespace HHWMS.Web
{
var _unitwork = new UnitWork(Wtm);
var task = _unitwork.Find<TaskHeader>(x => x.Status == TaskStatusEnum.待下发)
.Include(x => x.TaskDetails.Where(x => x.Status < TaskStatusEnum.已下发)).FirstDynamic();
var taskList = CreateWCSTask(task, _unitwork);
foreach (var item in taskList)
{
task.ErrorMsg += JsonConvert.SerializeObject(item);
// 调用wcs任务下发接口
try
var task = _unitwork.Find<TaskHeader>(x =>x.Status > TaskStatusEnum.新建 && x.Status <= TaskStatusEnum.已下发)
.Include(x => x.TaskDetails)
.FirstOrDefault();
if (task != null) {
if (task.TaskType == TaskTypeEnum.盘料入库)
{
var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, item).Result.Data;
if (res.Success)
GenTask(task, _unitwork);
}
var taskList = CreateWCSTask(task, _unitwork);
foreach (var item in taskList)
{
task.ErrorMsg += JsonConvert.SerializeObject(item);
// 调用wcs任务下发接口
try
{
task.TaskDetails.Where(x => x.UniqueCode.Equals(item.ObjId)).First().Status = TaskStatusEnum.已下发;
//var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, item).Result.Data;
//if (res.Success)
//{
// task.TaskDetails.Where(x => x.UniqueCode.Equals(item.ObjId)).First().Status = TaskStatusEnum.已下发;
//}
Task.Delay(500);
}
Task.Delay(500);
catch(Exception ex)
{
task.ErrorMsg += ex.Message;
}
if(task.TaskDetails.Count(x => x.Status == TaskStatusEnum.新建) == 0)
{
task.Status = TaskStatusEnum.已下发;
}
_unitwork.Update(task);
}
catch(Exception ex)
{
task.ErrorMsg += ex.Message;
}
if(task.TaskDetails.Count(x => x.Status == TaskStatusEnum.新建) == 0)
{
task.Status = TaskStatusEnum.已下发;
}
_unitwork.Update(task);
}
#region 更新时间
@@ -62,13 +71,68 @@ namespace HHWMS.Web
}
_unitwork.Update<SysJob>(job);
}
Wtm.DoLog("任务下发", ActionLogTypesEnum.Job, "SendWcsJob");
#endregion 更新时间
}
catch { }
return Task.CompletedTask;
}
/// <summary>
/// 生成任务
/// </summary>
public void GenTask(TaskHeader task, UnitWork _unitwork)
{
// 查找符合条件的料盒出库,创建料盒出库任务 length-width, 默认小盘料 找23格的料盒
var details = task.TaskDetails.Where(x => x.Status == TaskStatusEnum.新建
&& string.IsNullOrEmpty(x.ContainerCode));
var count = details.Count();
// 查找可用站台
var station = _unitwork.FindSingle<Location>(x => x.Type.Equals(LocationTypeEnum.堆垛机工位)
&& x.Status != LocationStatus.任务锁);
if (station != null)
{
var container = _unitwork.Find<Location>(x => x.Row == station.Row
&& x.Length == 23
&& (x.Status == LocationStatus.有货 || x.Status == LocationStatus.空容器))
.OrderByDescending(x => x.Length - x.Width).FirstOrDefault();
if(container != null)
{
var newTask = new TaskHeader();
newTask.ZoneCode = "L";
newTask.TaskNo = _unitwork.GetSerialNumber("in", 4);
newTask.TaskType = TaskTypeEnum.盘料盒出库;
newTask.ContainerCode = container.Code;
newTask.FromLocation = container.Code;
newTask.ToLocation = station.Code;
newTask.Status = TaskStatusEnum.待下发;
_unitwork.Add(newTask);
// 更新库位
container.Status = LocationStatus.任务锁;
_unitwork.Update(container);
// 计算 容器可用格
var used = _unitwork.Find<Inventory>(x => x.LocationCode.Equals(container.Code))
.Select(x => int.Parse(x.Lot)).ToArray();
var caseCount = Convert.ToInt32(container.Length);
var caseList = Enumerable.Range(1, caseCount).ToArray();
var canUse = caseList.Except(used).ToArray<int>();
foreach(var item in canUse)
{
var detail = details.FirstOrDefault();
if (detail != null)
{
details.First().Lot = $"{task.FromLocation}-{Convert.ToInt32(container.Length)}";
details.First().ToLocation = item.ToString();
details.First().ContainerCode = container.Code;
}
else
break;
}
_unitwork.Update(task);
}
}
}
/// <summary>
/// 创建WCS任务
/// </summary>
@@ -85,18 +149,20 @@ namespace HHWMS.Web
{
case TaskTypeEnum.盘料盒入库:
case TaskTypeEnum.盘料盒出库:
case TaskTypeEnum.散料盒入库:
case TaskTypeEnum.散料盒出库:
var taskInfo = new TaskInfo();
taskInfo.TaskType = (int)task.TaskType;
taskInfo.TaskId = task.TaskNo;
taskInfo.ObjId = task.ContainerCode;
taskInfo.StartType = ConvertTypeLocation(begin.Length);
taskInfo.StartType = ConvertTypeLocation(begin.Length.ToString());
taskInfo.StartPos = new CoordPos
{
X = begin.Line,
Y = begin.Row,
Z = begin.Layer
};
taskInfo.EndType = ConvertTypeLocation(end.Length);
taskInfo.EndType = ConvertTypeLocation(end.Length.ToString());
taskInfo.EndPos = new CoordPos
{
X = end.Line,
@@ -107,28 +173,33 @@ namespace HHWMS.Web
break;
case TaskTypeEnum.盘料入库:
foreach (var item in task.TaskDetails)
var container = _unitwork.Find<Location>(x => x.Type == LocationTypeEnum.堆垛机工位)
.Select(x => x.ContainerCode).ToList();
foreach (var item in task.TaskDetails.Where(x => x.Status == TaskStatusEnum.待下发))
{
taskInfoList.Add(new TaskInfo
if (container.Any(x => x == item.ContainerCode))
{
TaskId = $"{task.TaskNo}-{item.FromLocation}",
TaskType = (int)task.TaskType,
ObjId = item.UniqueCode,
StartType = ConvertTypeLT(task.ContainerCode),
StartPos = new CoordPos
taskInfoList.Add(new TaskInfo
{
X = begin.Line,
Y = 2,
Z = int.Parse(item.FromLocation)
},
EndType = ConvertTypeLocation(end.Length),
EndPos = new CoordPos
{
X = end.Line,
Y = int.Parse(item.ToLocation),
Z = 2
}
});
TaskId = $"{task.TaskNo}-{item.FromLocation}",
TaskType = (int)task.TaskType,
ObjId = item.UniqueCode,
StartType = ConvertTypeLT(item.Lot.Split('-')[0]),
StartPos = new CoordPos
{
X = begin.Line,
Y = 2,
Z = int.Parse(item.FromLocation)
},
EndType = ConvertTypeLocation(item.Lot.Split('-')[1]),
EndPos = new CoordPos
{
X = end.Line,
Y = int.Parse(item.ToLocation),
Z = 2
}
});
}
}
break;
@@ -140,7 +211,7 @@ namespace HHWMS.Web
TaskId = $"{task.TaskNo}-{item.FromLocation}",
TaskType = (int)task.TaskType,
ObjId = item.UniqueCode,
StartType = ConvertTypeLocation(begin.Length),
StartType = ConvertTypeLocation(item.Lot.Split('-')[0]),
StartPos = new CoordPos
{
X = begin.Line,
@@ -148,7 +219,7 @@ namespace HHWMS.Web
Z = 2
},
EndType = ConvertTypeLT(task.ContainerCode),
EndType = ConvertTypeLT(item.Lot.Split('-')[1]),
EndPos = new CoordPos
{
X = end.Line,
@@ -166,28 +237,32 @@ namespace HHWMS.Web
return taskInfoList;
}
public int ConvertTypeLocation(decimal? length)
public int ConvertTypeLocation(string length)
{
var type = 0;
if (length.HasValue)
if (!string.IsNullOrEmpty(length) )
{
switch ((int)length)
switch (length)
{
case 23:
case "23":
type = (int)ContainerTypeEnum.格料盒23;
break;
case 13:
case "13":
type = (int)ContainerTypeEnum.格料盒13;
break;
case 16:
case "16":
type = (int)ContainerTypeEnum.格料盒16;
break;
case 19:
case "19":
type = (int)ContainerTypeEnum.格料盒19;
break;
default:
type = 0;
break;
}
}
return type;