新增循环测试

This commit is contained in:
zgf committed 2023-08-18 10:26:38 +08:00
1 parent f4505ff18d
commit 028d206936
21 files changed
+619 -50

No files matched your search

@@ -1,15 +1,13 @@
using System;
using System.IO;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Threading.Tasks;
using HHWMS.Web.Models;
using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json;
using Quartz;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
using WalkingTec.Mvvm.Core.Support.Quartz;
using ProtoBuf;
using Newtonsoft.Json;
namespace HHWMS.Web
{
@@ -24,35 +22,31 @@ namespace HHWMS.Web
{
var _unitwork = new UnitWork(Wtm);
var taskList = _unitwork.Find<TaskHeader>(x => x.Status == TaskStatusEnum.新建).Take(10);
var begin = new Location();
var end = new Location();
var locationCodeList = taskList.Select(x => x.FromLocation).Union(taskList.Select(x => x.ToLocation)).ToList();
var locationList = _unitwork.Find<Location>(x => locationCodeList.Contains(x.Code)).ToList(); ;
foreach (var task in taskList)
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)
{
begin = locationList.FirstOrDefault(x => x.Code.Equals(task.FromLocation));
end = locationList.FirstOrDefault(x => x.Code.Equals(task.ToLocation));
var taskInfo = new TaskInfo
task.ErrorMsg += JsonConvert.SerializeObject(item);
// 调用wcs任务下发接口
try
{
TaskId = task.TaskNo,
TaskType = (int)task.TaskType,
ObjId = task.ContainerCode,
StartPos = new CoordPos
var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, item).Result.Data;
if (res.Success)
{
X = begin.Line,
Y = begin.Row,
Z = begin.Layer
},
EndPos = new CoordPos
{
X = end.Line,
Y = end.Row,
Z = end.Layer
task.TaskDetails.Where(x => x.UniqueCode.Equals(item.ObjId)).First().Status = TaskStatusEnum.已下发;
}
};
Task.Delay(500);
}
catch(Exception ex)
{
task.ErrorMsg += ex.Message;
}
_unitwork.Update(task);
}
#region 更新时间
var job = _unitwork.FindSingle<SysJob>(x => x.JobName == context.JobDetail.Key.Name);
if (job != null)
{
@@ -64,10 +58,154 @@ namespace HHWMS.Web
}
_unitwork.Update<SysJob>(job);
}
#endregion
#endregion 更新时间
}
catch { }
return Task.CompletedTask;
}
/// <summary>
/// 创建WCS任务
/// </summary>
public List<TaskInfo> CreateWCSTask(TaskHeader task, UnitWork _unitwork)
{
var taskInfoList = new List<TaskInfo>();
if (task != null)
{
var locationList = _unitwork.Find<Location>(x => task.FromLocation.Equals(x.Code) || task.ToLocation.Equals(x.Code)).ToList();
var begin = locationList.First(x => x.Code.Equals(task.FromLocation));
var end = locationList.First(x => x.Code.Equals(task.ToLocation));
// 根据不同任务类型 创建任务
switch (task.TaskType)
{
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.StartPos = new CoordPos
{
X = begin.Line,
Y = begin.Row,
Z = begin.Layer
};
taskInfo.EndType = ConvertTypeLocation(end.Length);
taskInfo.EndPos = new CoordPos
{
X = end.Line,
Y = end.Row,
Z = end.Layer
};
taskInfoList.Add(taskInfo);
break;
case TaskTypeEnum.盘料入库:
foreach (var item in task.TaskDetails)
{
taskInfoList.Add(new TaskInfo
{
TaskId = $"{task.TaskNo}-{item.FromLocation}",
TaskType = (int)task.TaskType,
ObjId = item.UniqueCode,
StartType = ConvertTypeLT(task.ContainerCode),
StartPos = new CoordPos
{
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
}
});
}
break;
case TaskTypeEnum.盘料出库:
foreach (var item in task.TaskDetails)
{
taskInfoList.Add(new TaskInfo
{
TaskId = $"{task.TaskNo}-{item.FromLocation}",
TaskType = (int)task.TaskType,
ObjId = item.UniqueCode,
StartType = ConvertTypeLocation(begin.Length),
StartPos = new CoordPos
{
X = begin.Line,
Y = int.Parse(item.FromLocation),
Z = 2
},
EndType = ConvertTypeLT(task.ContainerCode),
EndPos = new CoordPos
{
X = end.Line,
Y = 2,
Z = int.Parse(item.ToLocation)
}
});
}
break;
default:
break;
}
}
return taskInfoList;
}
public int ConvertTypeLocation(decimal? length)
{
var type = 0;
if (length.HasValue)
{
switch ((int)length)
{
case 23:
type = (int)ContainerTypeEnum.格料盒23;
break;
case 13:
type = (int)ContainerTypeEnum.格料盒13;
break;
case 16:
type = (int)ContainerTypeEnum.格料盒16;
break;
case 19:
type = (int)ContainerTypeEnum.格料盒19;
break;
}
}
return type;
}
public int ConvertTypeLT(string LiaoTa)
{
var type = 0;
if (!string.IsNullOrEmpty(LiaoTa))
{
switch (LiaoTa)
{
case "L01":
type = (int)LiaoTaTypeEnum.L01;
break;
case "L02":
type = (int)LiaoTaTypeEnum.L02;
break;
}
}
return type;
}
}
}