新增循环测试

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

+131
View File
@@ -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();
}
}
@@ -5,6 +5,7 @@ using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Mvc;
using WalkingTec.Mvvm.Core.Extensions;
using HHWMS.Web;
using HHWMS.Web.Models;
namespace HHWMS.Web.Controllers
{
@@ -0,0 +1,48 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Mvc;
using WalkingTec.Mvvm.Core.Extensions;
using HHWMS.Web;
using HHWMS.Web.Models;
namespace HHWMS.Web.Controllers
{
[Area("receipt")]
[ActionDescription("入库单操作")]
public partial class ReceiptInController : BaseController
{
private readonly IUnitWork _unitwork;
public ReceiptInController(IUnitWork unitwork)
{
_unitwork = unitwork;
}
#region Search
[ActionDescription("Sys.Search")]
public ActionResult Index()
{
var vm = Wtm.CreateVM<ReceiptInListVM>();
return PartialView(vm);
}
[ActionDescription("Sys.Search")]
[HttpPost]
public string Search(ReceiptInSearcher searcher)
{
var vm = Wtm.CreateVM<ReceiptInListVM>(passInit: true);
if (ModelState.IsValid)
{
vm.Searcher = searcher;
return vm.GetJson(false);
}
else
{
return vm.GetError();
}
}
#endregion
}
}
@@ -0,0 +1,22 @@
using System.Collections.Generic;
using System.Linq;
using HHWMS.Web.Models;
using WalkingTec.Mvvm.Core;
using Z.EntityFramework.Plus;
namespace HHWMS.Web
{
public partial class ReceiptInVM : BaseCRUDVM<ReceiptHeader>
{
public ReceiptDetailListVM2 Details = new ReceiptDetailListVM2();
public ReceiptInVM()
{
}
protected override void InitVM()
{
Details.CopyContext(this);
Details.Searcher.ReceiptHeaderId = Entity.ID;
}
}
}
@@ -0,0 +1,57 @@
using System.Collections.Generic;
using System.Linq;
using HHWMS.Web.Models;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
namespace HHWMS.Web
{
public partial class ReceiptInListVM : BasePagedListVM<ReceiptHeader_View, ReceiptInSearcher>
{
public ReceiptDetailListVM2 Details { get; set; } = new ReceiptDetailListVM2();
public List<ComboSelectListItem> Codes { get; set; }
protected override void InitVM()
{
Details.CopyContext(this);
Codes = DC.Set<ReceiptHeader>().Select(x => new ComboSelectListItem
{
Text = x.Code,
Value = x.Code
}).ToList();
}
protected override List<GridAction> InitGridAction()
{
return new List<GridAction>();
/*{
this.MakeStandardAction("ReceiptHeader", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptHeader", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptHeader", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptHeader", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptHeader", GridActionStandardTypesEnum.BatchEdit, Localizer["Sys.BatchEdit"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptHeader", GridActionStandardTypesEnum.BatchDelete, Localizer["Sys.BatchDelete"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptHeader", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "receipt", dialogWidth: 800),
this.MakeStandardAction("ReceiptHeader", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "receipt"),
};*/
}
protected override IEnumerable<IGridColumn<ReceiptHeader_View>> InitGridHeader()
{
return new List<GridColumn<ReceiptHeader_View>>{
this.MakeGridHeader(x => x.Code)
};
}
public override IOrderedQueryable<ReceiptHeader_View> GetSearchQuery()
{
var query = DC.Set<ReceiptHeader>()
.CheckContain(Searcher.Code, x => x.Code)
.Select(x => new ReceiptHeader_View
{
ID = x.ID,
Code = x.Code
})
.OrderBy(x => x.ID);
return query;
}
}
}
@@ -0,0 +1,29 @@
using System;
using System.ComponentModel.DataAnnotations;
using HHWMS.Web.Models;
using WalkingTec.Mvvm.Core;
namespace HHWMS.Web
{
public partial class ReceiptInSearcher : BaseSearcher
{
[Display(Name = "Inventory.SourceCode")]
public String SourceCode { get; set; }
[Display(Name = "Inventory.ReceiptCode")]
public String Code { get; set; }
[Display(Name = "Inventory.BillType")]
public String BillType { get; set; }
[Display(Name = "Receipt.FirstStatus")]
public ReceiptStatusEnum? FirstStatus { get; set; }
[Display(Name = "Receipt.LastStatus")]
public ReceiptStatusEnum? LastStatus { get; set; }
protected override void InitVM()
{
}
}
}
@@ -0,0 +1,111 @@
@model HHWMS.Web.ReceiptInListVM
@inject IStringLocalizer<Program> Localizer;
<div class="layui-bg-gray" style="padding: 16px;">
<div class="layui-row layui-col-space15">
<div class="layui-col-md6">
<div class="layui-card">
<div class="layui-card-body">
<table class="layui-hide" id="ID-table-demo-data"></table>
</div>
</div>
</div>
<div class="layui-col-md6">
<div class="layui-card">
<div class="layui-card-body">
<wt:grid vm="@Model" id="header" url="/receipt/ReceiptHeader/Search" limit="7"
hidden-checkbox="true"
need-show-filter="false"
need-show-print="false"
/>
</div>
</div>
</div>
</div>
</div>
<script>
layui.use('table', function(){
var table = layui.table;
// 已知数据渲染
var inst = table.render({
elem: '#ID-table-demo-data'
,cols: [[ //标题栏
{field: 'id', title: 'ID', width: 80, sort: true}
,{field: 'username', title: '用户', width: 120}
,{field: 'sign', title: '签名', minWidth: 160}
,{field: 'sex', title: '性别', width: 80}
,{field: 'city', title: '城市', width: 100}
,{field: 'experience', title: '积分', width: 80, sort: true}
]]
,data: [{ // 赋值已知数据
"id": "10001"
,"username": "张三1"
,"sex": "男"
,"city": "浙江杭州"
,"sign": "人生恰似一场修行"
,"experience": "116"
}, {
"id": "10002"
,"username": "张三2"
,"sex": "男"
,"city": "浙江杭州"
,"sign": "人生恰似一场修行"
,"experience": "12"
,"LAY_CHECKED": true
}, {
"id": "10003"
,"username": "张三3"
,"sex": "男"
,"city": "浙江杭州"
,"sign": "人生恰似一场修行"
,"experience": "65"
}, {
"id": "10004"
,"username": "张三4"
,"sex": "男"
,"city": "浙江杭州"
,"sign": "人生恰似一场修行"
,"experience": "777"
}, {
"id": "10005"
,"username": "张三5"
,"sex": "男"
,"city": "浙江杭州"
,"sign": "人生恰似一场修行"
,"experience": "86"
}, {
"id": "10006"
,"username": "张三6"
,"sex": "男"
,"city": "浙江杭州"
,"sign": "人生恰似一场修行"
,"experience": "12"
}, {
"id": "10007"
,"username": "张三7"
,"sex": "男"
,"city": "浙江杭州"
,"sign": "人生恰似一场修行"
,"experience": "16"
}, {
"id": "10008"
,"username": "张三8"
,"sex": "男"
,"city": "浙江杭州"
,"sign": "人生恰似一场修行"
,"experience": "106"
}]
//,skin: 'line' // 表格风格
//,even: true
, height: 'full-200'
,page: false // 是否显示分页
});
});
table.render({
elem:"header"
, height: 'full-200'
, page: false // 是否显示分页
})
</script>
@@ -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;
}
}
}