新增循环测试
This commit is contained in:
parent
f4505ff18d
commit
028d206936
@ -1,6 +1,9 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
using AutoMapper;
|
using AutoMapper;
|
||||||
using HHWMS.Web.Models;
|
using HHWMS.Web.Models;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
using WalkingTec.Mvvm.Core;
|
using WalkingTec.Mvvm.Core;
|
||||||
|
|
||||||
namespace HHWMS.Web
|
namespace HHWMS.Web
|
||||||
@ -135,6 +138,134 @@ namespace HHWMS.Web
|
|||||||
[HttpPost]
|
[HttpPost]
|
||||||
public IActionResult Test(TaskResponse response)
|
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();
|
return ApiResult();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,6 +5,7 @@ using WalkingTec.Mvvm.Core;
|
|||||||
using WalkingTec.Mvvm.Mvc;
|
using WalkingTec.Mvvm.Mvc;
|
||||||
using WalkingTec.Mvvm.Core.Extensions;
|
using WalkingTec.Mvvm.Core.Extensions;
|
||||||
using HHWMS.Web;
|
using HHWMS.Web;
|
||||||
|
using HHWMS.Web.Models;
|
||||||
|
|
||||||
namespace HHWMS.Web.Controllers
|
namespace HHWMS.Web.Controllers
|
||||||
{
|
{
|
||||||
|
|||||||
48
HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs
Normal file
48
HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs
Normal file
@ -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()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
111
HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml
Normal file
111
HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml
Normal file
@ -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;
|
||||||
using System.IO;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Security.Cryptography;
|
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using HHWMS.Web.Models;
|
using HHWMS.Web.Models;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Newtonsoft.Json;
|
||||||
using Quartz;
|
using Quartz;
|
||||||
using WalkingTec.Mvvm.Core;
|
using WalkingTec.Mvvm.Core;
|
||||||
using WalkingTec.Mvvm.Core.Extensions;
|
|
||||||
using WalkingTec.Mvvm.Core.Support.Quartz;
|
using WalkingTec.Mvvm.Core.Support.Quartz;
|
||||||
using ProtoBuf;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
|
|
||||||
namespace HHWMS.Web
|
namespace HHWMS.Web
|
||||||
{
|
{
|
||||||
@ -24,35 +22,31 @@ namespace HHWMS.Web
|
|||||||
{
|
{
|
||||||
var _unitwork = new UnitWork(Wtm);
|
var _unitwork = new UnitWork(Wtm);
|
||||||
|
|
||||||
var taskList = _unitwork.Find<TaskHeader>(x => x.Status == TaskStatusEnum.新建).Take(10);
|
var task = _unitwork.Find<TaskHeader>(x => x.Status == TaskStatusEnum.待下发)
|
||||||
var begin = new Location();
|
.Include(x => x.TaskDetails.Where(x => x.Status < TaskStatusEnum.已下发)).FirstDynamic();
|
||||||
var end = new Location();
|
var taskList = CreateWCSTask(task, _unitwork);
|
||||||
var locationCodeList = taskList.Select(x => x.FromLocation).Union(taskList.Select(x => x.ToLocation)).ToList();
|
foreach (var item in taskList)
|
||||||
var locationList = _unitwork.Find<Location>(x => locationCodeList.Contains(x.Code)).ToList(); ;
|
|
||||||
foreach (var task in taskList)
|
|
||||||
{
|
{
|
||||||
begin = locationList.FirstOrDefault(x => x.Code.Equals(task.FromLocation));
|
task.ErrorMsg += JsonConvert.SerializeObject(item);
|
||||||
end = locationList.FirstOrDefault(x => x.Code.Equals(task.ToLocation));
|
// 调用wcs任务下发接口
|
||||||
var taskInfo = new TaskInfo
|
try
|
||||||
{
|
{
|
||||||
TaskId = task.TaskNo,
|
var res = Wtm.CallAPI<ApiJsonResult<dynamic>>("WCS", "TaskAssign", HttpMethodEnum.POST, item).Result.Data;
|
||||||
TaskType = (int)task.TaskType,
|
if (res.Success)
|
||||||
ObjId = task.ContainerCode,
|
|
||||||
StartPos = new CoordPos
|
|
||||||
{
|
{
|
||||||
X = begin.Line,
|
task.TaskDetails.Where(x => x.UniqueCode.Equals(item.ObjId)).First().Status = TaskStatusEnum.已下发;
|
||||||
Y = begin.Row,
|
|
||||||
Z = begin.Layer
|
|
||||||
},
|
|
||||||
EndPos = new CoordPos
|
|
||||||
{
|
|
||||||
X = end.Line,
|
|
||||||
Y = end.Row,
|
|
||||||
Z = end.Layer
|
|
||||||
}
|
}
|
||||||
};
|
Task.Delay(500);
|
||||||
|
}
|
||||||
|
catch(Exception ex)
|
||||||
|
{
|
||||||
|
task.ErrorMsg += ex.Message;
|
||||||
|
}
|
||||||
|
_unitwork.Update(task);
|
||||||
}
|
}
|
||||||
|
|
||||||
#region 更新时间
|
#region 更新时间
|
||||||
|
|
||||||
var job = _unitwork.FindSingle<SysJob>(x => x.JobName == context.JobDetail.Key.Name);
|
var job = _unitwork.FindSingle<SysJob>(x => x.JobName == context.JobDetail.Key.Name);
|
||||||
if (job != null)
|
if (job != null)
|
||||||
{
|
{
|
||||||
@ -64,10 +58,154 @@ namespace HHWMS.Web
|
|||||||
}
|
}
|
||||||
_unitwork.Update<SysJob>(job);
|
_unitwork.Update<SysJob>(job);
|
||||||
}
|
}
|
||||||
#endregion
|
|
||||||
|
#endregion 更新时间
|
||||||
}
|
}
|
||||||
catch { }
|
catch { }
|
||||||
return Task.CompletedTask;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -23,7 +23,7 @@ namespace HHWMS.Web.Controllers
|
|||||||
[AllRights]
|
[AllRights]
|
||||||
public IActionResult Index(string redirect)
|
public IActionResult Index(string redirect)
|
||||||
{
|
{
|
||||||
ViewData["title"] = "WTM";
|
ViewData["title"] = "WMS";
|
||||||
return View();
|
return View();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -47,7 +47,7 @@ namespace HHWMS.Web.Models
|
|||||||
/// 盘料出库
|
/// 盘料出库
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Display(Name = "TaskType.POut")]
|
[Display(Name = "TaskType.POut")]
|
||||||
盘料出库 = 3
|
盘料出库 = 4
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -58,6 +58,9 @@ namespace HHWMS.Web.Models
|
|||||||
[Display(Name = "TaskStatusEnum.0")]
|
[Display(Name = "TaskStatusEnum.0")]
|
||||||
新建 = 0,
|
新建 = 0,
|
||||||
|
|
||||||
|
[Display(Name = "TaskStatusEnum.1")]
|
||||||
|
待下发 = 1,
|
||||||
|
|
||||||
[Display(Name = "TaskStatusEnum.5")]
|
[Display(Name = "TaskStatusEnum.5")]
|
||||||
已下发 = 5,
|
已下发 = 5,
|
||||||
|
|
||||||
@ -86,6 +89,21 @@ namespace HHWMS.Web.Models
|
|||||||
盘点锁 = 2,
|
盘点锁 = 2,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 容器类型
|
||||||
|
/// </summary>
|
||||||
|
public enum ContainerTypeEnum : int
|
||||||
|
{
|
||||||
|
//// 11:23格料盒; 12:13格料盒; 13:16格料盒; 14:19格料盒
|
||||||
|
格料盒23 = 11,
|
||||||
|
|
||||||
|
格料盒13 = 12,
|
||||||
|
|
||||||
|
格料盒16 = 13,
|
||||||
|
|
||||||
|
格料盒19 = 14,
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 容器状态
|
/// 容器状态
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -238,4 +256,14 @@ namespace HHWMS.Web.Models
|
|||||||
public const string 任务中 = "lock";
|
public const string 任务中 = "lock";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 料塔类型
|
||||||
|
/// </summary>
|
||||||
|
public enum LiaoTaTypeEnum : int
|
||||||
|
{
|
||||||
|
// 1: 20层料塔类型1; 2:16层料塔类型1; 3:20层料塔类型2 4:16层料塔类型2
|
||||||
|
L01 = 1,
|
||||||
|
L02 = 2
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -67,7 +67,7 @@ namespace HHWMS.Web.Models
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 响应结果 100:任务完成, 99:任务失败
|
/// 响应结果 100:任务完成, 99:任务失败
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int Resut { get; set; }
|
public int Result { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@ -1031,6 +1031,9 @@
|
|||||||
</data>
|
</data>
|
||||||
<data name="TaskStatusEnum.0" xml:space="preserve">
|
<data name="TaskStatusEnum.0" xml:space="preserve">
|
||||||
<value>新建</value>
|
<value>新建</value>
|
||||||
|
</data>
|
||||||
|
<data name="TaskStatusEnum.1" xml:space="preserve">
|
||||||
|
<value>待下发</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="TaskStatusEnum.5" xml:space="preserve">
|
<data name="TaskStatusEnum.5" xml:space="preserve">
|
||||||
<value>已下发</value>
|
<value>已下发</value>
|
||||||
|
|||||||
@ -27,11 +27,11 @@
|
|||||||
<i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
|
<i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="layui-nav-item layui-hide-xs" lay-unselect>
|
@*<li class="layui-nav-item layui-hide-xs" lay-unselect>
|
||||||
<a href="https://wtmdoc.walkingtec.cn" target="_blank" title="@Model.Localizer["Sys.WtmDoc"]">
|
<a href="https://wtmdoc.walkingtec.cn" target="_blank" title="@Model.Localizer["Sys.WtmDoc"]">
|
||||||
<i class="layui-icon layui-icon-website"></i>
|
<i class="layui-icon layui-icon-website"></i>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>*@
|
||||||
<li class="layui-nav-item" lay-unselect>
|
<li class="layui-nav-item" lay-unselect>
|
||||||
<a href="javascript:;" layadmin-event="refresh" title="@Model.Localizer["Sys.Refresh"]">
|
<a href="javascript:;" layadmin-event="refresh" title="@Model.Localizer["Sys.Refresh"]">
|
||||||
<i class="layui-icon layui-icon-refresh-3"></i>
|
<i class="layui-icon layui-icon-refresh-3"></i>
|
||||||
@ -40,11 +40,11 @@
|
|||||||
</ul>
|
</ul>
|
||||||
<ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
|
<ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
|
||||||
|
|
||||||
<li class="layui-nav-item layui-hide-xs" lay-unselect>
|
@*<li class="layui-nav-item layui-hide-xs" lay-unselect>
|
||||||
<a href="javascript:;" layadmin-event="theme">
|
<a href="javascript:;" layadmin-event="theme">
|
||||||
<i class="layui-icon layui-icon-theme"></i>
|
<i class="layui-icon layui-icon-theme"></i>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>*@
|
||||||
<li class="layui-nav-item layui-hide-xs" lay-unselect>
|
<li class="layui-nav-item layui-hide-xs" lay-unselect>
|
||||||
<a href="javascript:;" layadmin-event="fullscreen">
|
<a href="javascript:;" layadmin-event="fullscreen">
|
||||||
<i class="layui-icon layui-icon-screen-full"></i>
|
<i class="layui-icon layui-icon-screen-full"></i>
|
||||||
@ -124,7 +124,7 @@
|
|||||||
lay-done="layui.element.render('nav', 'layadmin-system-side-menu');layui.event.call(this, layui.setter.MOD_NAME, 'hash({*})', layui.router());" id="TPL_layout">
|
lay-done="layui.element.render('nav', 'layadmin-system-side-menu');layui.event.call(this, layui.setter.MOD_NAME, 'hash({*})', layui.router());" id="TPL_layout">
|
||||||
|
|
||||||
<div class="layui-logo" lay-href="">
|
<div class="layui-logo" lay-href="">
|
||||||
<span><img src="~/layuiadmin/style/res/logo.png" style="margin-right:5px" />{{ layui.setter.name || 'layuiAdmin' }}</span>
|
<span>{{ layui.setter.name || 'layuiAdmin' }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
|
<ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
<script src="/layui/layui.js"></script>
|
<script src="/layui/layui.js"></script>
|
||||||
<script src="/_js/framework_layui.js?time=@DateTime.Now.Ticks"></script>
|
<script src="/_js/framework_layui.js?time=@DateTime.Now.Ticks"></script>
|
||||||
<link rel="stylesheet" href="~/sitecss/logincss.css">
|
<link rel="stylesheet" href="~/sitecss/logincss.css">
|
||||||
<title>HHWMS</title>
|
<title>WMS</title>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
layui.use('layer');
|
layui.use('layer');
|
||||||
</script>
|
</script>
|
||||||
@ -29,11 +29,12 @@
|
|||||||
<body>
|
<body>
|
||||||
<div class="loginBody app-login-back-@bgnumber" style="flex: 1 1 auto !important; ">
|
<div class="loginBody app-login-back-@bgnumber" style="flex: 1 1 auto !important; ">
|
||||||
<header class="login-header">
|
<header class="login-header">
|
||||||
<img src="/images/logo.png" alt="" height="48">
|
@*<img src="/images/logo.png" alt="" height="48">*@
|
||||||
|
<h1>WMS仓储管理系统</h1>
|
||||||
</header>
|
</header>
|
||||||
<div class="login-content">
|
<div class="login-content">
|
||||||
<div class="login-form">
|
<div class="login-form">
|
||||||
<h1>HHWMS</h1>
|
<h1>WMS</h1>
|
||||||
<br />
|
<br />
|
||||||
<form action="/Login/Login" method="post">
|
<form action="/Login/Login" method="post">
|
||||||
<input type="hidden" name="Redirect" value="@Model.Redirect">
|
<input type="hidden" name="Redirect" value="@Model.Redirect">
|
||||||
@ -67,12 +68,12 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<p style="
|
@* <p style="
|
||||||
font-size: 24px;
|
font-size: 24px;
|
||||||
font-family: system-ui;
|
font-family: system-ui;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
margin-bottom: 1%;
|
margin-bottom: 1%;
|
||||||
">© 2022 华恒工程技术中心有限公司</p>
|
">© 2022 华恒工程技术中心有限公司</p>*@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -105,7 +105,7 @@
|
|||||||
"Address": "https://api.github.com"
|
"Address": "https://api.github.com"
|
||||||
},
|
},
|
||||||
"WCS": {
|
"WCS": {
|
||||||
"Address": "http://localhost:5003/api/IWMS/"
|
"Address": "http://192.168.10.101:1111/api/WcsWebApi/"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"AppSettings": {
|
"AppSettings": {
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.2 KiB |
@ -19,7 +19,7 @@ layui.define(['laytpl', 'layer', 'element', 'util'], function (exports) {
|
|||||||
, pageTabs: $.cookie("pagemode") === 'Tab' //是否开启页面选项卡功能。单页版不推荐开启
|
, pageTabs: $.cookie("pagemode") === 'Tab' //是否开启页面选项卡功能。单页版不推荐开启
|
||||||
|
|
||||||
|
|
||||||
, name: 'HHWMS'
|
, name: 'WMS'
|
||||||
, tableName: 'layuiAdmin' //本地存储表名
|
, tableName: 'layuiAdmin' //本地存储表名
|
||||||
, MOD_NAME: '_wtm' //模块事件名
|
, MOD_NAME: '_wtm' //模块事件名
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
BIN
HHWMS.Web/wwwroot/layuiadmin/style/res/logo.png
Normal file
BIN
HHWMS.Web/wwwroot/layuiadmin/style/res/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
@ -1,11 +1,11 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<Import Project=".\version.props" />
|
<Import Project=".\version.props" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Product>HHWMS</Product>
|
<Product>WMS</Product>
|
||||||
<PackageId>$(ProjectName)</PackageId>
|
<PackageId>$(ProjectName)</PackageId>
|
||||||
<Authors>ZGF</Authors>
|
<Authors>ZGF</Authors>
|
||||||
<Company>HuaHengWeld.com</Company>
|
<Company>WeiHaiSoftWare.com</Company>
|
||||||
<Copyright>Copyright © HuaHengWeld 2022</Copyright>
|
<Copyright>Copyright © WeiHaiSoftWare 2023</Copyright>
|
||||||
<IncludeSource>false</IncludeSource>
|
<IncludeSource>false</IncludeSource>
|
||||||
<MinClientVersion>4.1.0</MinClientVersion>
|
<MinClientVersion>4.1.0</MinClientVersion>
|
||||||
<IncludeContentInPack>true</IncludeContentInPack>
|
<IncludeContentInPack>true</IncludeContentInPack>
|
||||||
|
|||||||
@ -864,11 +864,11 @@ params string[] groupcode)
|
|||||||
Logger?.Log<ActionLog>(ll, new EventId(), log, null, (a, b) =>
|
Logger?.Log<ActionLog>(ll, new EventId(), log, null, (a, b) =>
|
||||||
{
|
{
|
||||||
return $@"
|
return $@"
|
||||||
===WTM Log===
|
===WMS Log===
|
||||||
内容:{a.Remark}
|
内容:{a.Remark}
|
||||||
地址:{a.ActionUrl}
|
地址:{a.ActionUrl}
|
||||||
时间:{a.ActionTime}
|
时间:{a.ActionTime}
|
||||||
===WTM Log===
|
===WMS Log===
|
||||||
";
|
";
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user