新增循环测试
This commit is contained in:
1 parent
f4505ff18d
commit
028d206936
21 files changed
+619
-50
No files matched your search
@@ -1,6 +1,9 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using AutoMapper;
|
||||
using HHWMS.Web.Models;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
|
||||
namespace HHWMS.Web
|
||||
@@ -135,6 +138,134 @@ namespace HHWMS.Web
|
||||
[HttpPost]
|
||||
public IActionResult Test(TaskResponse response)
|
||||
{
|
||||
var taskno = response.TaskId.Split("-")[0];
|
||||
//wcs 任务反馈
|
||||
var task = _unitwork.Find<TaskHeader>(x => x.TaskNo.Equals(taskno) && x.Status != TaskStatusEnum.完成).Include(x => x.TaskDetails).FirstOrDefault();
|
||||
|
||||
if (task != null)
|
||||
{
|
||||
if (task.Status != TaskStatusEnum.完成 && response.Result == (int)TaskStatusEnum.完成)
|
||||
{
|
||||
var newTask = new TaskHeader
|
||||
{
|
||||
TaskDetails = new List<TaskDetail>()
|
||||
};
|
||||
var tasktolocatioin = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.ToLocation));
|
||||
var taskfromlocatioin = _unitwork.FindSingle<Location>(x => x.Code.Equals(task.FromLocation));
|
||||
switch (task.TaskType)
|
||||
{
|
||||
case TaskTypeEnum.料盒入库:
|
||||
// 更新库位
|
||||
// 起始库位为空
|
||||
// 目标库位为有货
|
||||
// 更新库存
|
||||
task.Status = TaskStatusEnum.完成;
|
||||
// 测试 创建料盒出库任务
|
||||
newTask.ZoneCode = "L";
|
||||
newTask.TaskNo = _unitwork.GetSerialNumber("out", 4);
|
||||
newTask.TaskType = TaskTypeEnum.料盒出库;
|
||||
newTask.ContainerCode = task.FromLocation;
|
||||
newTask.FromLocation = task.ToLocation;
|
||||
newTask.ToLocation = task.FromLocation;
|
||||
newTask.Status = TaskStatusEnum.待下发;
|
||||
//newTask.Station = task.Station;
|
||||
_unitwork.Add(newTask);
|
||||
break;
|
||||
case TaskTypeEnum.料盒出库:
|
||||
// 更新库位
|
||||
// 起始库位为空
|
||||
// 目标库位为有货
|
||||
// 更新库存
|
||||
task.Status = TaskStatusEnum.完成;
|
||||
// 料盒出库是为了入,还是为了出 1是出,2是入
|
||||
/*if (task.Station == "1")
|
||||
{
|
||||
|
||||
}
|
||||
else if (task.Station == "2")
|
||||
{
|
||||
|
||||
}*/
|
||||
// 测试 创建盘料出库任务
|
||||
var locationList = _unitwork.Find<Location>(x => x.Row == tasktolocatioin.Row && "T,G2".Contains(x.Type)).ToList();
|
||||
newTask.ZoneCode = "L";
|
||||
newTask.TaskNo = _unitwork.GetSerialNumber("pout", 4);
|
||||
newTask.TaskType = TaskTypeEnum.盘料出库;
|
||||
newTask.ContainerCode = "L01";
|
||||
newTask.FromLocation = locationList.First(x => x.Type.Equals("G2")).Code;
|
||||
newTask.ToLocation = "L01";
|
||||
newTask.Status = TaskStatusEnum.待下发;
|
||||
for (int i = 1; i <= 10; i++)
|
||||
{
|
||||
newTask.TaskDetails.Add(new TaskDetail
|
||||
{
|
||||
UniqueCode = $"{newTask.TaskNo}-{i}",
|
||||
FromLocation = i.ToString(),
|
||||
ToLocation = i.ToString(),
|
||||
Status = TaskStatusEnum.新建
|
||||
});
|
||||
}
|
||||
_unitwork.Add(newTask);
|
||||
break;
|
||||
case TaskTypeEnum.盘料入库:
|
||||
var ll = response.TaskId.Split("-")[1];
|
||||
task.TaskDetails.First(x => x.FromLocation == ll).Status = TaskStatusEnum.完成;
|
||||
// 查询料塔 是否还有已下发,未完成的盘料入库任务 有不操作,没有 创建料盒入库任务
|
||||
if (!task.TaskDetails.Any(x => x.Status < TaskStatusEnum.完成))
|
||||
{
|
||||
task.Status = TaskStatusEnum.完成;
|
||||
// 测试 创建料盒入库任务
|
||||
var fromL = _unitwork.FindSingle<Location>(x => x.Row.Equals(tasktolocatioin.Row) && x.Type == "G1");
|
||||
newTask.ZoneCode = "L";
|
||||
newTask.TaskNo = _unitwork.GetSerialNumber("in", 4);
|
||||
newTask.TaskType = TaskTypeEnum.料盒入库;
|
||||
newTask.ContainerCode = fromL.Code;
|
||||
newTask.FromLocation = fromL.Code;
|
||||
newTask.ToLocation = "L01-01-19-01";
|
||||
newTask.Status = TaskStatusEnum.待下发;
|
||||
//newTask.Station = task.Station;
|
||||
_unitwork.Add(newTask);
|
||||
|
||||
}
|
||||
|
||||
break;
|
||||
case TaskTypeEnum.盘料出库:
|
||||
var lll = response.TaskId.Split("-")[1];
|
||||
task.TaskDetails.First(x => x.FromLocation == lll).Status = TaskStatusEnum.完成;
|
||||
// 查询工位 是否还有已下发,未完成的盘料出库任务 有不操作,没有 创建料盒入库任务
|
||||
if (!task.TaskDetails.Any(x => x.Status < TaskStatusEnum.完成))
|
||||
{
|
||||
task.Status = TaskStatusEnum.完成;
|
||||
// 测试 创建盘料入库任务
|
||||
var locationList1 = _unitwork.Find<Location>(x => x.Row == tasktolocatioin.Row && "T,G2".Contains(x.Type)).ToList();
|
||||
newTask.ZoneCode = "L";
|
||||
newTask.TaskNo = _unitwork.GetSerialNumber("pin", 4);
|
||||
newTask.TaskType = TaskTypeEnum.盘料入库;
|
||||
newTask.ContainerCode = locationList1.First(x => x.Type.Equals("T")).Code;
|
||||
newTask.FromLocation = tasktolocatioin.Code;
|
||||
newTask.ToLocation = taskfromlocatioin.Code;
|
||||
newTask.Status = TaskStatusEnum.待下发;
|
||||
for (int i = 1; i <= 10; i++)
|
||||
{
|
||||
newTask.TaskDetails.Add(new TaskDetail
|
||||
{
|
||||
UniqueCode = $"{newTask.TaskNo}-{i}",
|
||||
FromLocation = i.ToString(),
|
||||
ToLocation = i.ToString(),
|
||||
Status = TaskStatusEnum.新建
|
||||
});
|
||||
}
|
||||
_unitwork.Add(newTask);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
_unitwork.Update(task);
|
||||
}
|
||||
}
|
||||
|
||||
return ApiResult();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user