diff --git a/HHWMS.Web/Areas/Agv/Controllers/AgvTaskController.cs b/HHWMS.Web/Areas/Agv/Controllers/AgvTaskController.cs new file mode 100644 index 0000000..c3829f2 --- /dev/null +++ b/HHWMS.Web/Areas/Agv/Controllers/AgvTaskController.cs @@ -0,0 +1,358 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json; +using System.Threading.Tasks; +using HHWMS.Web.Models; +using HHWMS.Web.Models.Agv; +using HHWMS.Web.Services.Agv; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; +using WalkingTec.Mvvm.Mvc; + +namespace HHWMS.Web.Controllers +{ + /// + /// AGV 平库任务手动下发页(方案 9.1 页面路径) + /// 页面参数与 Receive 接单接口保持一致,共用 AgvTaskService.CreateTaskAsync 同一套创建逻辑 + /// + [Area("agv")] + [ActionDescription("AGV任务")] + public partial class AgvTaskController : BaseController + { + private readonly IUnitWork _unitWork; + private readonly AgvTaskService _taskService; + + public AgvTaskController(IUnitWork unitWork, AgvTaskService taskService) + { + _unitWork = unitWork; + _taskService = taskService; + } + + /// + /// 任务号请求参数(下发/取消/重试完成共用) + /// 普通 Controller 的简单类型参数不会从 JSON body 绑定,必须用 [FromBody] 对象接收 + /// + public class TaskNoRequest + { + public string TaskNo { get; set; } + } + + /// + /// 任务列表 + 手动下发页(WTM 标准 searchpanel + grid,风格与场景配置页统一) + /// + [ActionDescription("Sys.Search")] + public ActionResult Index() + { + var vm = Wtm.CreateVM(); + return PartialView(vm); + } + + /// + /// WTM grid 数据源(多条件查询,由 AgvTaskListVM 统一处理) + /// + [ActionDescription("Sys.Search")] + [HttpPost] + public string Search(AgvTaskSearcher searcher) + { + var vm = Wtm.CreateVM(passInit: true); + if (ModelState.IsValid) + { + vm.Searcher = searcher; + return vm.GetJson(false); + } + else + { + return vm.GetError(); + } + } + + /// + /// 手动下发表单页(Dialog 内 Vue 渲染,提交走下方 POST Create) + /// 必须传入 AgvTaskListVM 类型 model,与 Create.cshtml 的 @model 保持一致, + /// 否则 WTM 无参 PartialView() 会注入 BaseVM 导致视图类型不匹配异常 + /// 场景选项由服务端直接查库(AgvTaskSceneConfig)注入页面,前端不再依赖异步接口加载 + /// + [ActionDescription("Sys.Create")] + public ActionResult Create() + { + var vm = Wtm.CreateVM(); + // 与 GetScenes 同一套查库逻辑:直接读取场景配置表全量数据 + var scenes = DC.Set() + .AsNoTracking() + .OrderBy(x => x.AgvTaskType) + .Select(x => new { value = x.SourceTaskType, label = string.IsNullOrWhiteSpace(x.SceneName) ? x.SourceTaskType : x.SceneName }) + .ToList(); + ViewBag.ScenesJson = JsonSerializer.Serialize(scenes); + return PartialView(vm); + } + + /// + /// 场景配置下拉(公开访问,绕过模块权限校验) + /// 展示 AgvTaskSceneConfig.SceneName,内部传 SourceTaskType + /// + [HttpPost] + [Public] + public IActionResult GetScenes() + { + // 走原生 SQL 直捞,绕过 UnitWork 可能的数据权限过滤 + var sql = @"SELECT * FROM AgvTaskSceneConfig ORDER BY AgvTaskType"; + var scenes = DC.Set() + .FromSqlRaw(sql) + .AsNoTracking() + .ToList() + .Select(x => new + { + value = x.SourceTaskType, + label = string.IsNullOrWhiteSpace(x.SceneName) ? x.SourceTaskType : x.SceneName + }) + .ToList(); + return Json(new { Code = 200, Data = scenes }); + } + + /// + /// AGV 点位下拉(起点/终点强制校验,Type=P 且未停用) + /// + [HttpPost] + public IActionResult GetPoints() + { + var points = _unitWork.Find(x => x.Type == LocationTypeEnum.P && !x.IsStop).ToList(); + var zoneIds = points.Where(p => p.ZoneId != 0).Select(p => p.ZoneId).Distinct().ToList(); + var zoneFloors = zoneIds.Count > 0 + ? _unitWork.Find(z => zoneIds.Contains(z.ID)) + .ToDictionary(z => z.ID, z => z.Floor) + : new Dictionary(); + var data = points.OrderBy(p => p.Code) + .Select(p => new + { + value = p.Code, + label = p.Code, + floor = zoneFloors.TryGetValue(p.ZoneId, out var f) ? f : (int?)null + }) + .ToList(); + return Json(new { Code = 200, Data = data }); + } + + /// + /// 物料搜索(SKU 非强制,带明细则需本地存在/ERP补建) + /// + [HttpPost] + public IActionResult GetMaterials(string keyword) + { + var query = _unitWork.Find(m => string.IsNullOrWhiteSpace(keyword) + || m.MaterialCode.Contains(keyword) + || m.MaterialName.Contains(keyword)); + var materials = query.OrderBy(m => m.MaterialCode) + .Take(15) + .Select(m => new + { + MaterialCode = m.MaterialCode, + MaterialName = m.MaterialName, + MaterialSpec = m.MaterialSpec, + MaterialUnit = m.MaterialUnit + }) + .ToList(); + return Json(new { Code = 200, Data = materials }); + } + + /// + /// 手动下发创建:参数与 Receive 接单接口一致(起点/终点/任务场景必填,容器/明细可选) + /// + [HttpPost] + public async Task Create([FromBody] AgvReceiveRequest request) + { + try + { + if (request == null) + { + return Json(new { Code = 400, Msg = "请求体为空" }); + } + var task = await _taskService.CreateTaskAsync(request); + return Json(new { Code = 200, Msg = $"任务[{task.TaskNo}]创建成功" }); + } + catch (AgvBizException ex) + { + return Json(new { Code = 400, Msg = ex.Message }); + } + catch (Exception ex) + { + return Json(new { Code = 500, Msg = $"创建失败: {ex.Message}" }); + } + } + + /// + /// 任务列表查询参数(多条件:任务号/起终点/容器/来源模糊,状态精确) + /// + public class GetTasksRequest + { + public string TaskNo { get; set; } + public string FromLocation { get; set; } + public string ToLocation { get; set; } + public string ContainerCode { get; set; } + public string SourceSystem { get; set; } + public int? AgvStatus { get; set; } + /// 页码(从 1 开始,默认 1) + public int Page { get; set; } + /// 每页条数(默认 10) + public int Size { get; set; } + } + + /// + /// 任务列表(多条件模糊查询 + 分页,供原生表格页面直调) + /// + [HttpPost] + public IActionResult GetTasks([FromBody] GetTasksRequest request) + { + var page = request != null && request.Page > 0 ? request.Page : 1; + var size = request != null && request.Size > 0 ? request.Size : 10; + var query = _unitWork.Find(x => x.CreateTime != null); + if (request != null) + { + if (!string.IsNullOrWhiteSpace(request.TaskNo)) + { + query = query.Where(x => x.TaskNo.Contains(request.TaskNo.Trim())); + } + if (!string.IsNullOrWhiteSpace(request.FromLocation)) + { + query = query.Where(x => x.FromLocation.Contains(request.FromLocation.Trim())); + } + if (!string.IsNullOrWhiteSpace(request.ToLocation)) + { + query = query.Where(x => x.ToLocation.Contains(request.ToLocation.Trim())); + } + if (!string.IsNullOrWhiteSpace(request.ContainerCode)) + { + query = query.Where(x => x.ContainerCode.Contains(request.ContainerCode.Trim())); + } + if (!string.IsNullOrWhiteSpace(request.SourceSystem)) + { + query = query.Where(x => x.SourceSystem == request.SourceSystem.Trim()); + } + if (request.AgvStatus.HasValue) + { + query = query.Where(x => (int)x.AgvStatus == request.AgvStatus.Value); + } + } + var total = query.Count(); + var tasks = query + .OrderByDescending(x => x.CreateTime) + .Skip((page - 1) * size) + .Take(size) + .Select(x => new + { + TaskNo = x.TaskNo, + // 输出数字状态(0/5/10/90/95/99/100),前端按数字映射中文并判断按钮可用性 + AgvStatus = x.AgvStatus == null ? 0 : (int)x.AgvStatus, + // 状态中文名(枚举成员名即中文:新建/已下发/...),前端直接展示,零解析成本 + AgvStatusName = x.AgvStatus.ToString(), + // 任务场景名:按 AgvTaskType 关联场景配置表(未配置则留空) + SceneName = x.AgvTaskType == null ? "" : + DC.Set() + .Where(c => c.AgvTaskType == x.AgvTaskType) + .Select(c => c.SceneName) + .FirstOrDefault() ?? "", + FromLocation = x.FromLocation, + ToLocation = x.ToLocation, + ContainerCode = x.ContainerCode, + SourceSystem = x.SourceSystem, + ErrorMsg = x.ErrorMsg, + CreateTime = x.CreateTime + }) + .ToList(); + return Json(new { Code = 200, Data = new { List = tasks, Total = total, Page = page, Size = size } }); + } + + /// + /// 来源系统下拉(已有任务的 SourceSystem 去重列表) + /// + [HttpPost] + public IActionResult GetSourceSystems() + { + var list = _unitWork.Find(x => x.SourceSystem != null && x.SourceSystem != "") + .Select(x => x.SourceSystem) + .Distinct() + .ToList(); + return Json(new { Code = 200, Data = list }); + } + + /// + /// 下发任务(仅新建/异常可下发) + /// + [HttpPost] + public async Task Dispatch([FromBody] TaskNoRequest request) + { + var taskNo = request?.TaskNo; + if (string.IsNullOrWhiteSpace(taskNo)) + { + return Json(new { Code = 400, Msg = "任务号不能为空" }); + } + try + { + await _taskService.DispatchTaskAsync(taskNo); + return Json(new { Code = 200, Msg = $"任务[{taskNo}]已下发" }); + } + catch (AgvBizException ex) + { + return Json(new { Code = 400, Msg = ex.Message }); + } + catch (Exception ex) + { + return Json(new { Code = 500, Msg = $"下发失败: {ex.Message}" }); + } + } + + /// + /// 取消任务(仅新建/已下发/执行中可取消) + /// + [HttpPost] + public async Task Cancel([FromBody] TaskNoRequest request) + { + var taskNo = request?.TaskNo; + if (string.IsNullOrWhiteSpace(taskNo)) + { + return Json(new { Code = 400, Msg = "任务号不能为空" }); + } + try + { + await _taskService.CancelTaskAsync(taskNo); + return Json(new { Code = 200, Msg = $"任务[{taskNo}]已取消" }); + } + catch (AgvBizException ex) + { + return Json(new { Code = 400, Msg = ex.Message }); + } + catch (Exception ex) + { + return Json(new { Code = 500, Msg = $"取消失败: {ex.Message}" }); + } + } + + /// + /// 重试完成联动(仅完成联动失败(99)可重试) + /// + [HttpPost] + public async Task RetryFinish([FromBody] TaskNoRequest request) + { + var taskNo = request?.TaskNo; + if (string.IsNullOrWhiteSpace(taskNo)) + { + return Json(new { Code = 400, Msg = "任务号不能为空" }); + } + try + { + await _taskService.RetryFinishLinkAsync(taskNo); + return Json(new { Code = 200, Msg = $"任务[{taskNo}]联动重试成功" }); + } + catch (AgvBizException ex) + { + return Json(new { Code = 400, Msg = ex.Message }); + } + catch (Exception ex) + { + return Json(new { Code = 500, Msg = $"联动重试失败: {ex.Message}" }); + } + } + } +} diff --git a/HHWMS.Web/Areas/Agv/Controllers/AgvTaskLogController.cs b/HHWMS.Web/Areas/Agv/Controllers/AgvTaskLogController.cs new file mode 100644 index 0000000..ccee120 --- /dev/null +++ b/HHWMS.Web/Areas/Agv/Controllers/AgvTaskLogController.cs @@ -0,0 +1,53 @@ +using Microsoft.AspNetCore.Mvc; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; +using WalkingTec.Mvvm.Mvc; + +namespace HHWMS.Web.Controllers +{ + /// + /// AGV 任务日志页(只读:状态变更 + 报文留痕,来源 AgvTaskLog 表) + /// + [Area("agv")] + [ActionDescription("AGV日志")] + public partial class AgvTaskLogController : BaseController + { + #region Search + + [ActionDescription("Sys.Search")] + public ActionResult Index() + { + var vm = Wtm.CreateVM(); + return PartialView(vm); + } + + [ActionDescription("Sys.Search")] + [HttpPost] + public string Search(AgvTaskLogSearcher searcher) + { + var vm = Wtm.CreateVM(passInit: true); + if (ModelState.IsValid) + { + vm.Searcher = searcher; + return vm.GetJson(false); + } + else + { + return vm.GetError(); + } + } + + #endregion Search + + #region Details + + [ActionDescription("Sys.Details")] + public ActionResult Details(string id) + { + var vm = Wtm.CreateVM(id); + return PartialView(vm); + } + + #endregion Details + } +} diff --git a/HHWMS.Web/Areas/Agv/Controllers/AgvTaskSceneConfigController.cs b/HHWMS.Web/Areas/Agv/Controllers/AgvTaskSceneConfigController.cs new file mode 100644 index 0000000..3d5925b --- /dev/null +++ b/HHWMS.Web/Areas/Agv/Controllers/AgvTaskSceneConfigController.cs @@ -0,0 +1,151 @@ +using HHWMS.Web.Models.Agv; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; +using WalkingTec.Mvvm.Mvc; + +namespace HHWMS.Web.Controllers +{ + /// + /// AGV 任务场景配置管理页(映射上游任务类型 → AGV 场景,方案 5.6) + /// + [Area("agv")] + [ActionDescription("AGV场景配置")] + public partial class AgvTaskSceneConfigController : BaseController + { + #region Search + + [ActionDescription("Sys.Search")] + public ActionResult Index() + { + var vm = Wtm.CreateVM(); + return PartialView(vm); + } + + [ActionDescription("Sys.Search")] + [HttpPost] + public string Search(AgvTaskSceneConfigSearcher searcher) + { + var vm = Wtm.CreateVM(passInit: true); + if (ModelState.IsValid) + { + vm.Searcher = searcher; + return vm.GetJson(false); + } + else + { + return vm.GetError(); + } + } + + #endregion Search + + #region Create + + [ActionDescription("Sys.Create")] + public ActionResult Create() + { + var vm = Wtm.CreateVM(); + return PartialView(vm); + } + + [HttpPost] + [ActionDescription("Sys.Create")] + public ActionResult Create(AgvTaskSceneConfigVM vm) + { + if (!ModelState.IsValid) + { + return PartialView(vm); + } + else + { + vm.DoAdd(); + if (!ModelState.IsValid) + { + vm.DoReInit(); + return PartialView(vm); + } + else + { + return FFResult().CloseDialog().RefreshGrid(); + } + } + } + + #endregion Create + + #region Edit + + [ActionDescription("Sys.Edit")] + public ActionResult Edit(string id) + { + var vm = Wtm.CreateVM(id); + return PartialView(vm); + } + + [ActionDescription("Sys.Edit")] + [HttpPost] + [ValidateFormItemOnly] + public ActionResult Edit(AgvTaskSceneConfigVM vm) + { + if (!ModelState.IsValid) + { + return PartialView(vm); + } + else + { + vm.DoEdit(); + if (!ModelState.IsValid) + { + vm.DoReInit(); + return PartialView(vm); + } + else + { + return FFResult().CloseDialog().RefreshGridRow(vm.Entity.ID); + } + } + } + + #endregion Edit + + #region Delete + + [ActionDescription("Sys.Delete")] + public ActionResult Delete(string id) + { + var vm = Wtm.CreateVM(id); + return PartialView(vm); + } + + [ActionDescription("Sys.Delete")] + [HttpPost] + public ActionResult Delete(string id, IFormCollection nouse) + { + var vm = Wtm.CreateVM(id); + vm.DoDelete(); + if (!ModelState.IsValid) + { + return PartialView(vm); + } + else + { + return FFResult().CloseDialog().RefreshGrid(); + } + } + + #endregion Delete + + #region Details + + [ActionDescription("Sys.Details")] + public ActionResult Details(string id) + { + var vm = Wtm.CreateVM(id); + return PartialView(vm); + } + + #endregion Details + } +} diff --git a/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskLogVMs/AgvTaskLogListVM.cs b/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskLogVMs/AgvTaskLogListVM.cs new file mode 100644 index 0000000..045e593 --- /dev/null +++ b/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskLogVMs/AgvTaskLogListVM.cs @@ -0,0 +1,79 @@ +using System.Collections.Generic; +using System.Linq; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; +using HHWMS.Web.Models.Agv; + +namespace HHWMS.Web +{ + /// + /// AGV 任务日志列表(只读:状态变更 + 报文留痕,来源 AgvTaskLog 表) + /// + public partial class AgvTaskLogListVM : BasePagedListVM + { + protected override List InitGridAction() + { + return new List + { + this.MakeStandardAction("AgvTaskLog", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "agv", dialogWidth: 900), + }; + } + + protected override IEnumerable> InitGridHeader() + { + return new List> + { + this.MakeGridHeader(x => x.TaskNo).SetWidth(170), + this.MakeGridHeader(x => x.OrderId).SetWidth(170), + this.MakeGridHeader(x => x.FromStatus).SetWidth(90), + this.MakeGridHeader(x => x.ToStatus).SetWidth(90), + this.MakeGridHeader(x => x.Event).SetWidth(110), + this.MakeGridHeader(x => x.Direction).SetWidth(80), + this.MakeGridHeader(x => x.EventTime).SetWidth(150), + this.MakeGridHeader(x => x.DurationMs).SetWidth(90), + this.MakeGridHeader(x => x.Operator).SetWidth(90), + this.MakeGridHeader(x => x.RequestJson).SetWidth(180), + this.MakeGridHeader(x => x.ResponseJson).SetWidth(180), + this.MakeGridHeader(x => x.Remark), + this.MakeGridHeader(x => x.CreateTime).SetWidth(150), + this.MakeGridHeaderAction(width: 100) + }; + } + + public override IOrderedQueryable GetSearchQuery() + { + var query = DC.Set() + .CheckContain(Searcher.TaskNo, x => x.TaskNo) + .CheckEqual(Searcher.Direction, x => x.Direction) + .CheckContain(Searcher.Event, x => x.Event) + .CheckContain(Searcher.RequestJson, x => x.RequestJson) + .CheckContain(Searcher.ResponseJson, x => x.ResponseJson) + .Select(x => new AgvTaskLog_View + { + ID = x.ID, + TaskNo = x.TaskNo, + OrderId = x.OrderId, + FromStatus = x.FromStatus, + ToStatus = x.ToStatus, + Event = x.Event, + Direction = x.Direction, + EventTime = x.EventTime, + DurationMs = x.DurationMs, + Operator = x.Operator, + RequestJson = x.RequestJson, + ResponseJson = x.ResponseJson, + Remark = x.Remark, + CreateTime = x.CreateTime + }) + .OrderByDescending(x => x.CreateTime); + return query; + } + } + + /// + /// 任务日志列表行视图 + /// + public class AgvTaskLog_View : AgvTaskLog + { + } +} diff --git a/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskLogVMs/AgvTaskLogSearcher.cs b/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskLogVMs/AgvTaskLogSearcher.cs new file mode 100644 index 0000000..655aab7 --- /dev/null +++ b/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskLogVMs/AgvTaskLogSearcher.cs @@ -0,0 +1,28 @@ +using System.ComponentModel.DataAnnotations; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web +{ + /// + /// AGV 任务日志搜索条件(只读日志页) + /// + public partial class AgvTaskLogSearcher : BaseSearcher + { + [Display(Name = "AGV.TaskNo")] + public string TaskNo { get; set; } + + [Display(Name = "AGV.Direction")] + public string Direction { get; set; } + + [Display(Name = "AGV.Event")] + public string Event { get; set; } + + /// 请求体(模糊查询) + [Display(Name = "AGV.RequestJson")] + public string RequestJson { get; set; } + + /// 响应体(模糊查询) + [Display(Name = "AGV.ResponseJson")] + public string ResponseJson { get; set; } + } +} diff --git a/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskLogVMs/AgvTaskLogVM.cs b/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskLogVMs/AgvTaskLogVM.cs new file mode 100644 index 0000000..e883a8f --- /dev/null +++ b/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskLogVMs/AgvTaskLogVM.cs @@ -0,0 +1,12 @@ +using WalkingTec.Mvvm.Core; +using HHWMS.Web.Models.Agv; + +namespace HHWMS.Web +{ + /// + /// AGV 任务日志详情(查看请求/响应报文) + /// + public partial class AgvTaskLogVM : BaseCRUDVM + { + } +} diff --git a/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskSceneConfigVMs/AgvTaskSceneConfigListVM.cs b/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskSceneConfigVMs/AgvTaskSceneConfigListVM.cs new file mode 100644 index 0000000..790a0c8 --- /dev/null +++ b/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskSceneConfigVMs/AgvTaskSceneConfigListVM.cs @@ -0,0 +1,69 @@ +using System.Collections.Generic; +using System.Linq; +using System.ComponentModel.DataAnnotations; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; +using HHWMS.Web.Models.Agv; + +namespace HHWMS.Web +{ + /// + /// AGV 任务场景配置列表(方案 5.6:映射上游任务类型 → AGV 场景) + /// + public partial class AgvTaskSceneConfigListVM : BasePagedListVM + { + protected override List InitGridAction() + { + return new List + { + this.MakeStandardAction("AgvTaskSceneConfig", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"], "agv", dialogWidth: 800), + this.MakeStandardAction("AgvTaskSceneConfig", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "agv", dialogWidth: 800), + this.MakeStandardAction("AgvTaskSceneConfig", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "agv", dialogWidth: 800), + this.MakeStandardAction("AgvTaskSceneConfig", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "agv", dialogWidth: 800), + }; + } + + protected override IEnumerable> InitGridHeader() + { + return new List> + { + this.MakeGridHeader(x => x.SourceTaskType).SetWidth(150), + this.MakeGridHeader(x => x.AgvTaskType).SetWidth(130), + this.MakeGridHeader(x => x.SceneId).SetWidth(150), + this.MakeGridHeader(x => x.SceneName).SetWidth(180), + this.MakeGridHeader(x => x.BinTaskLoad).SetWidth(100), + this.MakeGridHeader(x => x.BinTaskUnload).SetWidth(100), + this.MakeGridHeader(x => x.Remark), + this.MakeGridHeaderAction(width: 200) + }; + } + + public override IOrderedQueryable GetSearchQuery() + { + var query = DC.Set() + .CheckContain(Searcher.SourceTaskType, x => x.SourceTaskType) + .CheckEqual(Searcher.AgvTaskType, x => x.AgvTaskType) + .CheckContain(Searcher.SceneId, x => x.SceneId) + .Select(x => new AgvTaskSceneConfig_View + { + ID = x.ID, + SourceTaskType = x.SourceTaskType, + AgvTaskType = x.AgvTaskType, + SceneId = x.SceneId, + SceneName = x.SceneName, + BinTaskLoad = x.BinTaskLoad, + BinTaskUnload = x.BinTaskUnload, + Remark = x.Remark + }) + .OrderByDescending(x => x.ID); + return query; + } + } + + /// + /// 场景配置列表行视图 + /// + public class AgvTaskSceneConfig_View : AgvTaskSceneConfig + { + } +} diff --git a/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskSceneConfigVMs/AgvTaskSceneConfigSearcher.cs b/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskSceneConfigVMs/AgvTaskSceneConfigSearcher.cs new file mode 100644 index 0000000..480c178 --- /dev/null +++ b/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskSceneConfigVMs/AgvTaskSceneConfigSearcher.cs @@ -0,0 +1,22 @@ +using System.ComponentModel.DataAnnotations; +using WalkingTec.Mvvm.Core; +using HHWMS.Web.Models; +using HHWMS.Web.Models.Agv; + +namespace HHWMS.Web +{ + /// + /// AGV 任务场景配置搜索条件 + /// + public partial class AgvTaskSceneConfigSearcher : BaseSearcher + { + [Display(Name = "AGV.SourceTaskType")] + public string SourceTaskType { get; set; } + + [Display(Name = "AGV.AgvTaskType")] + public AgvTaskTypeEnum? AgvTaskType { get; set; } + + [Display(Name = "AGV.SceneId")] + public string SceneId { get; set; } + } +} diff --git a/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskSceneConfigVMs/AgvTaskSceneConfigVM.cs b/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskSceneConfigVMs/AgvTaskSceneConfigVM.cs new file mode 100644 index 0000000..cb98a90 --- /dev/null +++ b/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskSceneConfigVMs/AgvTaskSceneConfigVM.cs @@ -0,0 +1,12 @@ +using WalkingTec.Mvvm.Core; +using HHWMS.Web.Models.Agv; + +namespace HHWMS.Web +{ + /// + /// AGV 任务场景配置表单 + /// + public partial class AgvTaskSceneConfigVM : BaseCRUDVM + { + } +} diff --git a/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskVMs/AgvTaskListVM.cs b/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskVMs/AgvTaskListVM.cs new file mode 100644 index 0000000..4a39aef --- /dev/null +++ b/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskVMs/AgvTaskListVM.cs @@ -0,0 +1,119 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; +using HHWMS.Web.Models; +using HHWMS.Web.Models.Agv; + +namespace HHWMS.Web +{ + /// + /// AGV 平库任务列表(WTM 标准 ListVM,供 wt:searchpanel + wt:grid 渲染,风格与场景配置/日志页统一) + /// 操作列按任务状态渲染 下发/取消/重试完成 行内按钮,点击调用 Index 页全局 JS(axios 调后端接口后刷新 grid) + /// + public partial class AgvTaskListVM : BasePagedListVM + { + protected override List InitGridAction() + { + return new List + { + // 工具栏「下发任务」按钮:Dialog 打开 Create 表单页(功能与原页面弹窗一致,仅行内显示关闭) + this.MakeStandardAction("AgvTask", GridActionStandardTypesEnum.Create, "下发任务", "agv", dialogWidth: 800).SetShowInRow(false) + }; + } + + protected override IEnumerable> InitGridHeader() + { + return new List> + { + this.MakeGridHeader(x => x.TaskNo).SetWidth(170), + // 任务场景列:关联 AgvTaskSceneConfig 取场景名称,便于人工识别业务类型 + this.MakeGridHeader(x => x.SceneName).SetWidth(110), + this.MakeGridHeader(x => x.AgvStatusName).SetWidth(100), + this.MakeGridHeader(x => x.FromLocation).SetWidth(110), + this.MakeGridHeader(x => x.ToLocation).SetWidth(110), + this.MakeGridHeader(x => x.ContainerCode).SetWidth(160), + this.MakeGridHeader(x => x.SourceSystem).SetWidth(100), + this.MakeGridHeader(x => x.ErrorMsg).SetWidth(200), + this.MakeGridHeader(x => x.CreateTime).SetWidth(160), + // 操作列:按状态渲染文字链接(新建/异常→下发;新建/已下发/执行中→取消;完成联动失败→重试完成) + // 还原为最初始的纯 文字链接(仅 href + onclick 两个属性),链接间隔 5px 由页面 CSS 控制 + this.MakeGridHeader(x => x.Operation).SetWidth(120).SetFormat((a, b) => + { + var st = (int)(a.AgvStatus ?? 0); + var btns = new List(); + if (st == 0 || st == 90) + { + btns.Add($"下发"); + } + if (st == 0 || st == 5 || st == 10) + { + btns.Add($"取消"); + } + if (st == 99) + { + btns.Add($"重试完成"); + } + if (btns.Count == 0) + { + return "-"; + } + return string.Join("", btns); + }) + }; + } + + public override IOrderedQueryable GetSearchQuery() + { + var query = DC.Set() + .CheckContain(Searcher.TaskNo, x => x.TaskNo) + .CheckContain(Searcher.FromLocation, x => x.FromLocation) + .CheckContain(Searcher.ToLocation, x => x.ToLocation) + .CheckContain(Searcher.ContainerCode, x => x.ContainerCode) + .CheckEqual(Searcher.SourceSystem, x => x.SourceSystem) + .CheckEqual(Searcher.AgvStatus, x => x.AgvStatus) + .Select(x => new AgvTask_View + { + ID = x.ID, + TaskNo = x.TaskNo, + AgvStatus = x.AgvStatus, + // 状态中文名(枚举成员名即中文:新建/已下发/执行中/异常/取消/完成联动失败/完成) + AgvStatusName = x.AgvStatus == null ? "" : x.AgvStatus.ToString(), + // 任务场景名:按 AgvTaskType 关联场景配置表(AgvTask 仅存枚举,未配置则留空) + SceneName = x.AgvTaskType == null ? "" : + DC.Set() + .Where(c => c.AgvTaskType == x.AgvTaskType) + .Select(c => c.SceneName) + .FirstOrDefault() ?? "", + FromLocation = x.FromLocation, + ToLocation = x.ToLocation, + ContainerCode = x.ContainerCode, + SourceSystem = x.SourceSystem, + ErrorMsg = x.ErrorMsg, + CreateTime = x.CreateTime + }) + .OrderByDescending(x => x.CreateTime); + return query; + } + } + + /// + /// AGV 任务列表行视图(SceneName 任务场景名 + AgvStatusName 中文状态 + Operation 虚拟操作列) + /// + public class AgvTask_View : AgvTask + { + /// 任务场景名(由 AgvTaskSceneConfig 按 AgvTaskType 映射) + [Display(Name = "任务场景")] + public string SceneName { get; set; } + + /// 状态中文名(新建/已下发/执行中/异常/取消/完成联动失败/完成) + [Display(Name = "AGV.AgvStatus")] + public string AgvStatusName { get; set; } + + /// 操作列(SetFormat 服务端渲染行内按钮) + [Display(Name = "操作")] + public string Operation { get; set; } + } +} diff --git a/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskVMs/AgvTaskSearcher.cs b/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskVMs/AgvTaskSearcher.cs new file mode 100644 index 0000000..fedd1de --- /dev/null +++ b/HHWMS.Web/Areas/Agv/ViewModels/AgvTaskVMs/AgvTaskSearcher.cs @@ -0,0 +1,44 @@ +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using WalkingTec.Mvvm.Core; +using HHWMS.Web.Models; + +namespace HHWMS.Web +{ + /// + /// AGV 平库任务搜索条件(任务列表页:任务号/起终点/容器模糊,来源/状态精确) + /// + public partial class AgvTaskSearcher : BaseSearcher + { + /// 来源系统下拉选项(WMS / THIRD_PARTY) + public List AllSourceSystems { get; set; } + + [Display(Name = "AGV.TaskNo")] + public string TaskNo { get; set; } + + [Display(Name = "AGV.FromLocation")] + public string FromLocation { get; set; } + + [Display(Name = "AGV.ToLocation")] + public string ToLocation { get; set; } + + [Display(Name = "AGV.ContainerCode")] + public string ContainerCode { get; set; } + + [Display(Name = "AGV.SourceSystem")] + public string SourceSystem { get; set; } + + [Display(Name = "AGV.AgvStatus")] + public AgvTaskStatusEnum? AgvStatus { get; set; } + + protected override void InitVM() + { + // 来源系统固定枚举下拉 + AllSourceSystems = new List + { + new ComboSelectListItem { Value = "WMS", Text = "WMS" }, + new ComboSelectListItem { Value = "THIRD_PARTY", Text = "THIRD_PARTY" } + }; + } + } +} diff --git a/HHWMS.Web/Areas/Agv/Views/AgvTask/Create.cshtml b/HHWMS.Web/Areas/Agv/Views/AgvTask/Create.cshtml new file mode 100644 index 0000000..3a27027 --- /dev/null +++ b/HHWMS.Web/Areas/Agv/Views/AgvTask/Create.cshtml @@ -0,0 +1,225 @@ +@model HHWMS.Web.AgvTaskListVM +@inject IStringLocalizer Localizer; + +@* 手动下发 AGV 任务表单(由列表页 grid 工具栏「下发任务」按钮以 Dialog 打开) *@ + +
+
+ + + + + + + + + + + + + + + + + +
+ 未添加物料,按空容器业务处理 +
+
+ +
+ 物料编码 + 数量 + 批次 + 操作 +
+ +
+
+ +
+
+ +
+
+ +
+
+ 删除 +
+
+
+ + 添加物料 +
+ + + 创建任务 + 重置 + + +
+
+
+ + diff --git a/HHWMS.Web/Areas/Agv/Views/AgvTask/Index.cshtml b/HHWMS.Web/Areas/Agv/Views/AgvTask/Index.cshtml new file mode 100644 index 0000000..8f24a52 --- /dev/null +++ b/HHWMS.Web/Areas/Agv/Views/AgvTask/Index.cshtml @@ -0,0 +1,225 @@ +@model HHWMS.Web.AgvTaskListVM +@inject IStringLocalizer Localizer; + +@* AGV 平库任务列表:原生 HTML 表格渲染,完全避开 WTM grid / layui table 渲染链路的异常问题 + 查询、分页、行内 下发/取消/重试完成 均由本页 JS 直调后端接口实现 *@ +
+ +
+
+
+
+
+
+
+
+
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + +
任务号任务场景状态起点终点容器号来源系统错误信息创建时间操作
加载中...
+ + +
+ 共 0 条 + 每页 + + + 第 1 页 + +
+
+ + + + diff --git a/HHWMS.Web/Areas/Agv/Views/AgvTaskLog/Details.cshtml b/HHWMS.Web/Areas/Agv/Views/AgvTaskLog/Details.cshtml new file mode 100644 index 0000000..8f61901 --- /dev/null +++ b/HHWMS.Web/Areas/Agv/Views/AgvTaskLog/Details.cshtml @@ -0,0 +1,22 @@ +@model HHWMS.Web.AgvTaskLogVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Agv/Views/AgvTaskLog/Index.cshtml b/HHWMS.Web/Areas/Agv/Views/AgvTaskLog/Index.cshtml new file mode 100644 index 0000000..099ff59 --- /dev/null +++ b/HHWMS.Web/Areas/Agv/Views/AgvTaskLog/Index.cshtml @@ -0,0 +1,13 @@ +@model HHWMS.Web.AgvTaskLogListVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Agv/Views/AgvTaskSceneConfig/Create.cshtml b/HHWMS.Web/Areas/Agv/Views/AgvTaskSceneConfig/Create.cshtml new file mode 100644 index 0000000..fa4b834 --- /dev/null +++ b/HHWMS.Web/Areas/Agv/Views/AgvTaskSceneConfig/Create.cshtml @@ -0,0 +1,18 @@ +@model HHWMS.Web.AgvTaskSceneConfigVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Agv/Views/AgvTaskSceneConfig/Delete.cshtml b/HHWMS.Web/Areas/Agv/Views/AgvTaskSceneConfig/Delete.cshtml new file mode 100644 index 0000000..f53c0c6 --- /dev/null +++ b/HHWMS.Web/Areas/Agv/Views/AgvTaskSceneConfig/Delete.cshtml @@ -0,0 +1,20 @@ +@model HHWMS.Web.AgvTaskSceneConfigVM +@inject IStringLocalizer Localizer; + + + @Localizer["Sys.DeleteConfirm"] + + + + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Agv/Views/AgvTaskSceneConfig/Details.cshtml b/HHWMS.Web/Areas/Agv/Views/AgvTaskSceneConfig/Details.cshtml new file mode 100644 index 0000000..12450b9 --- /dev/null +++ b/HHWMS.Web/Areas/Agv/Views/AgvTaskSceneConfig/Details.cshtml @@ -0,0 +1,17 @@ +@model HHWMS.Web.AgvTaskSceneConfigVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Agv/Views/AgvTaskSceneConfig/Edit.cshtml b/HHWMS.Web/Areas/Agv/Views/AgvTaskSceneConfig/Edit.cshtml new file mode 100644 index 0000000..849559f --- /dev/null +++ b/HHWMS.Web/Areas/Agv/Views/AgvTaskSceneConfig/Edit.cshtml @@ -0,0 +1,19 @@ +@model HHWMS.Web.AgvTaskSceneConfigVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Agv/Views/AgvTaskSceneConfig/Index.cshtml b/HHWMS.Web/Areas/Agv/Views/AgvTaskSceneConfig/Index.cshtml new file mode 100644 index 0000000..5098659 --- /dev/null +++ b/HHWMS.Web/Areas/Agv/Views/AgvTaskSceneConfig/Index.cshtml @@ -0,0 +1,11 @@ +@model HHWMS.Web.AgvTaskSceneConfigListVM +@inject IStringLocalizer Localizer; + + + + + + + + + diff --git a/HHWMS.Web/Areas/Api/AgvController.cs b/HHWMS.Web/Areas/Api/AgvController.cs new file mode 100644 index 0000000..08a2916 --- /dev/null +++ b/HHWMS.Web/Areas/Api/AgvController.cs @@ -0,0 +1,93 @@ +using System; +using System.Threading.Tasks; +using HHWMS.Web.Models.Agv; +using HHWMS.Web.Services.Agv; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Options; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Controllers +{ + /// + /// AGV 平库任务对外接口(方案 4.2) + /// 调用方向:AGV 调度系统 / 上游系统 → WMS + /// 接口:Receive(接单)、Callback(状态回调) + /// 鉴权:本期暂不实施,保持 Public 公开访问(AppKey/AppSecret 预留待后续启用) + /// + [Public] + [ActionDescription("AGV接口")] + [ApiController] + [Route("api/[controller]/[action]"), ApiExplorerSettings(GroupName = "User")] + public class AgvController : ApiController + { + private readonly AgvTaskService _taskService; + private readonly AgvOption _option; + + public AgvController(AgvTaskService taskService, IOptions option) + { + _taskService = taskService; + _option = option.Value; + } + + /// + /// 接单:创建 AGV 任务(幂等 + 8 项校验 + LS 临时容器 + SKU 可选补建 + 接单落库即锁) + /// 参数与手动下任务页面保持一致 + /// + [HttpPost] + public async Task Receive(AgvReceiveRequest request) + { + try + { + if (!_option.Enabled) + { + return ApiResultError("AGV 模块已停用"); + } + // API 入口:来源系统未传则默认 THIRD_PARTY(页面手动下发走 Service 默认 WMS) + if (string.IsNullOrWhiteSpace(request.SourceSystem)) + { + request.SourceSystem = "THIRD_PARTY"; + } + var task = await _taskService.CreateTaskAsync(request); + return ApiResult(new + { + TaskNo = task.TaskNo, + ContainerCode = task.ContainerCode, + AgvStatus = task.AgvStatus?.ToString() + }); + } + catch (AgvBizException ex) + { + return ApiResultError($"接单失败: {ex.Message}"); + } + catch (Exception ex) + { + return ApiResultError($"接单异常: {ex.Message}"); + } + } + + /// + /// 状态回调:AGV 事件 → 状态机单调推进(Accepted/ArrivedLoad/Loaded/ArrivedUnload/Unloaded/Error/Cancel) + /// + [HttpPost] + public async Task Callback(AgvCallbackRequest request) + { + try + { + if (!_option.Enabled) + { + return ApiResultError("AGV 模块已停用"); + } + await _taskService.HandleCallbackAsync(request); + return ApiResult(null); + } + catch (AgvBizException ex) + { + return ApiResultError($"回调处理失败: {ex.Message}"); + } + catch (Exception ex) + { + return ApiResultError($"回调处理异常: {ex.Message}"); + } + } + } +} diff --git a/HHWMS.Web/Areas/Api/IDataController.cs b/HHWMS.Web/Areas/Api/IDataController.cs index bfc3d83..37c94bb 100644 --- a/HHWMS.Web/Areas/Api/IDataController.cs +++ b/HHWMS.Web/Areas/Api/IDataController.cs @@ -172,10 +172,10 @@ namespace HHWMS.Web var data = new List(); var locations = Wtm.DC.Set() .AsEnumerable() - .GroupBy(x => x.ContainerStatus).ToList() + .GroupBy(x => x.ContainerStatus ?? LocationStatus.空仓位).ToList() .Select(x => new { status = statusMap.TryGetValue(x.Key, out var chineseName) ? chineseName - : x.Key.ToString(), count = x.Count() }); + : x.Key, count = x.Count() }); foreach (var item in locations) { data.Add(new ChartData @@ -227,12 +227,13 @@ namespace HHWMS.Web foreach (var loc in group) { - statusMap.TryGetValue(loc.ContainerStatus, out var statusInfo); + var statusKey = loc.ContainerStatus ?? LocationStatus.空仓位; + statusMap.TryGetValue(statusKey, out var statusInfo); heatmap.Points.Add(new HeatmapPointDto { Line = loc.Line, Layer = loc.Layer, - Status = statusInfo.name ?? loc.ContainerStatus ?? "未知", + Status = statusInfo.name ?? statusKey, Color = statusInfo.color ?? "#909399", ContainerCode = loc.ContainerCode, LocationCode = loc.Code diff --git a/HHWMS.Web/Areas/Configs/Controllers/MaterialController.cs b/HHWMS.Web/Areas/Configs/Controllers/MaterialController.cs index 12fd00d..4d87689 100644 --- a/HHWMS.Web/Areas/Configs/Controllers/MaterialController.cs +++ b/HHWMS.Web/Areas/Configs/Controllers/MaterialController.cs @@ -2,11 +2,13 @@ using Microsoft.AspNetCore.Mvc; using System; using System.Linq; +using System.Threading.Tasks; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Mvc; using WalkingTec.Mvvm.Core.Extensions; using HHWMS.Web; using HHWMS.Web.Models; +using HHWMS.Web.Services.Erp; namespace HHWMS.Web.Controllers { @@ -15,10 +17,12 @@ namespace HHWMS.Web.Controllers public partial class MaterialController : BaseController { private readonly IUnitWork _unitWork; + private readonly ErpMaterialService _erpMaterialService; - public MaterialController(IUnitWork unitWork) + public MaterialController(IUnitWork unitWork, ErpMaterialService erpMaterialService) { _unitWork = unitWork; + _erpMaterialService = erpMaterialService; } #region Search @@ -31,18 +35,20 @@ namespace HHWMS.Web.Controllers [ActionDescription("Sys.Search")] [HttpPost] - public string Search(MaterialSearcher searcher) + public async Task Search(MaterialSearcher searcher) { + if (!ModelState.IsValid) + { + return Wtm.CreateVM(passInit: true).GetError(); + } + + // 先查本地物料表,查不到再调 ERP 回写:物料编码→InvCode,图号→InvDefine1 + await _erpMaterialService.EnsureByCodeAsync(searcher.MaterialCode); + await _erpMaterialService.EnsureByTypeAsync(searcher.MaterialType); + var vm = Wtm.CreateVM(passInit: true); - if (ModelState.IsValid) - { - vm.Searcher = searcher; - return vm.GetJson(false); - } - else - { - return vm.GetError(); - } + vm.Searcher = searcher; + return vm.GetJson(false); } #endregion diff --git a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs index a4e4a1b..2058143 100644 --- a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs +++ b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs @@ -51,6 +51,10 @@ namespace HHWMS.Web public override void DoAdd() { base.DoAdd(); + // 单个新增库位时,库位状态默认空仓位(ContainerStatus = "empty") + Entity.ContainerStatus = LocationStatus.空仓位; + Entity.Status = LocationStatusEnum.未锁; + Entity.IsStop = false; } public override void DoEdit(bool updateAllFields = false) diff --git a/HHWMS.Web/Areas/Configs/Views/Material/Index.cshtml b/HHWMS.Web/Areas/Configs/Views/Material/Index.cshtml index f69a4d5..9d76afe 100644 --- a/HHWMS.Web/Areas/Configs/Views/Material/Index.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Material/Index.cshtml @@ -35,4 +35,4 @@ printData = []; } - \ No newline at end of file + diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs index b89f597..08bf72c 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryVM.cs @@ -88,7 +88,8 @@ namespace HHWMS.Web var success = await CallAddOtherOut( inventory.MaterialCode, inventory.Qty ?? 0, - inventory.CreateBy); + inventory.CreateBy, + inventory.ZoneId); inventory.UploadErpFlag = success ? 1 : 0; return success; } @@ -106,8 +107,9 @@ namespace HHWMS.Web WorkerCode = inventory.CreateBy, // 工人编码(创建人) Maker = unitWork.FindSingle(x => x.ITCode == inventory.CreateBy).Name, // 制单人(校验员) - Type = inventory.ZoneId == 1027 ? 1: 2, - WhCode = inventory.ZoneId == 1027 ? "xb": "cp", + // 上报库区取值统一走 AgvErpWhTypeEnum 枚举(5.4.1),后期改枚举即可 + Type = AgvErpWhTypeEnumExtensions.FromZoneId(inventory.ZoneId).GetErpType(), + WhCode = AgvErpWhTypeEnumExtensions.FromZoneId(inventory.ZoneId).GetWhCode(), }, Details = new List() }; @@ -172,7 +174,8 @@ namespace HHWMS.Web var success = await CallAddOtherOut( transaction.MaterialCode, transaction.Qty ?? 0, - transaction.CreateBy); + transaction.CreateBy, + zoneCode: transaction.ZoneCode); transaction.UploadErpFlag = success ? 1 : 0; return success; } @@ -189,18 +192,28 @@ namespace HHWMS.Web } } - private async Task CallAddOtherOut(string materialCode, decimal qty, string createBy) + /// + /// 补传 ERP 其他出库(AddOtherOut)。 + /// zoneId:库存场景按库区ID解析(ProcessErpFinishIn 出库分支); + /// zoneCode:流水场景按库区编码解析(ProcessErpOtherOut / AddOtherOutJob 补传)。 + /// + private async Task CallAddOtherOut(string materialCode, decimal qty, string createBy, + int? zoneId = null, string zoneCode = null) { var maker = unitWork.FindSingle(x => x.ITCode == createBy)?.Name ?? createBy ?? "WMS"; + // 上报库区取值统一走 AgvErpWhTypeEnum 枚举(5.4.1),后期改枚举即可 + var whType = zoneId.HasValue + ? AgvErpWhTypeEnumExtensions.FromZoneId(zoneId.Value) + : AgvErpWhTypeEnumExtensions.FromZoneCode(zoneCode); var request = new AddOtherOutRequest { Main = new AddOtherOutMain { ErpCode = "003", OutCode = unitWork.GetSerialNumber("CK"), - WhCode = "xb", + WhCode = whType.GetWhCode(), Maker = maker }, Details = new List diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs index 64bd657..00654e3 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs @@ -55,21 +55,48 @@ namespace HHWMS.Web.Controllers return Json(new { Code = 200, Data = new object[] { } }); } - // 尝试调用接口获取物料 + keyword = keyword.Trim(); + + // 先查本地物料表:物料编码或图号模糊匹配(名称也一起匹配),和标准入库页面一致 + var dbMaterials = _unitWork.Find(m => m.MaterialCode.Contains(keyword) + || m.MaterialType.Contains(keyword) + || m.MaterialName.Contains(keyword)) + .Select(m => new + { + MaterialCode = m.MaterialCode, + MaterialName = m.MaterialName, + MaterialSpec = m.MaterialSpec, + MaterialUnit = m.MaterialUnit, + MaterialType = m.MaterialType, + SupplierCode = m.SupplierCode + }) + .Take(15) + .ToList(); + // 本地查到就返回,不再因为图号为空丢弃记录 + if (dbMaterials.Count > 0) + { + return Json(new { Code = 200, Data = dbMaterials }); + } + + // 本地没有则调 ERP LoadInventory(按物料编码 InvCode 查询)并自动建档 try { var request = new LoadInventoryRequest { ErpCode = "003", - InvDefine1 = keyword, + InvCode = keyword, Size = 15, Page = 1 }; + Wtm.DoLog($"ERP物料查询: 入库页面搜索触发", ActionLogTypesEnum.Normal, + "物料", $"keyword={keyword}, ErpCode=003"); var apiResult = await Wtm.CallAPI("ERP", "LoadInventory", HttpMethodEnum.POST, request,3); - if (apiResult?.Data != null && apiResult.Data.Code == 0) + // ERP 有数据才用 ERP 结果;返回成功但 0 条时继续往下走本地兜底,避免页面变成空列表 + if (apiResult?.Data != null && apiResult.Data.Code == 0 + && apiResult.Data.Data != null && apiResult.Data.Data.Count > 0) { var materialsList = new List(); var oldMaterials = new List(); @@ -81,6 +108,9 @@ namespace HHWMS.Web.Controllers .Select(x => x.InvCode) .ToList(); + Wtm.DoLog($"ERP物料查询: ERP返回{apiResult.Data.Data.Count}条", ActionLogTypesEnum.Normal, + "物料", $"keyword={keyword}, codes=[{string.Join(",", invCodes)}]"); + // 一次性查询本地数据库中已存在的物料(优化性能,避免循环中多次查询) var existingMaterials = _unitWork.Find(m => invCodes.Contains(m.MaterialCode)) .ToList(); @@ -155,36 +185,28 @@ namespace HHWMS.Web.Controllers _unitWork.BatchAdd(newMaterials); _unitWork.BatchUpdate(oldMaterials); + Wtm.DoLog($"ERP物料查询: 本地同步完成", ActionLogTypesEnum.Normal, + "物料", $"keyword={keyword}, 新增={newMaterials.Count}, 更新={oldMaterials.Count}"); + // 返回物料列表到前端 return Json(new { Code = 200, Data = materialsList }); } + else + { + Wtm.DoLog($"ERP物料查询: ERP返回异常", ActionLogTypesEnum.Normal, + "物料", $"keyword={keyword}, Code={apiResult?.Data?.Code}, Msg={apiResult?.Data?.Msg}"); + } } catch (System.Exception apiEx) { // 接口调用失败,记录日志 - Wtm.DoLog("获取ERP物料数据", ActionLogTypesEnum.Normal, "SearchMaterials", - request: $"接口调用失败,改用本地数据库查询:{apiEx.Message}", - result: "接口调用失败,改用本地数据库查询"); + Wtm.DoLog($"ERP物料查询: 接口调用失败", ActionLogTypesEnum.Normal, "物料", + request: $"keyword={keyword}, 改用本地数据库查询", + result: apiEx.Message); } - // 接口连接失败或返回错误,从本地数据库查询 - var localMaterials = _unitWork.Find - (m => m.MaterialCode.Contains(keyword) - || m.MaterialName.Contains(keyword) - || m.MaterialType.Contains(keyword)) - .Select(m => new - { - MaterialCode = m.MaterialCode, - MaterialName = m.MaterialName, - MaterialSpec = m.MaterialSpec, - MaterialUnit = m.MaterialUnit, - MaterialType = m.MaterialType, - SupplierCode = m.SupplierCode - }) - .Take(15) - .ToList(); - - return Json(new { Code = 200, Data = localMaterials }); + // ERP 返回成功但没有数据,或调用失败:直接返回本地已查到的记录(本地有数据时不能给页面返回空) + return Json(new { Code = 200, Data = dbMaterials }); } catch (System.Exception ex) { @@ -211,51 +233,43 @@ namespace HHWMS.Web.Controllers } /// - /// 获取物料的工序列表 + /// 获取工序列表:默认展示全部工序配置 + /// 具体使用哪道工序由生产订单决定,物料工序表在查到订单后再按订单内容更新 /// - /// - /// [HttpPost] - public IActionResult GetProcessesByMaterial(string materialCode) + public IActionResult GetProcessesByMaterial() { try { - if (string.IsNullOrWhiteSpace(materialCode)) + var configs = LoadAllProcessConfigs(); + return Json(new { - return Json(new { Code = 200, Data = new object[] { } }); - } - - var processes = _unitWork.Find(x => x.MaterialCode == materialCode && x.IsActive) - .OrderBy(x => x.ProcessOrder) - .Select(x => new + Code = 200, + Data = configs.Select(x => new { value = x.ID.ToString(), - label = x.ProcessName, - processCode = x.ProcessCode, - processName = x.ProcessName - }) - .ToList(); - if (processes.Count == 0) - { - processes = _unitWork.Find(x => x.ID > 0) - .OrderBy(x => x.Code) - .Select(x => new - { - value = x.ID.ToString(), - label = x.Name, - processCode = x.Code, - processName = x.Name - }) - .ToList(); - } - return Json(new { Code = 200, Data = processes }); + label = x.Name, + processCode = x.Code, + processName = x.Name + }).ToList() + }); } catch (Exception ex) { - return Json(new { Code = 500, Msg = $"获取物料工序失败:{ex.Message}" }); + return Json(new { Code = 500, Msg = $"获取工序列表失败:{ex.Message}" }); } } + /// + /// 查询全部工序配置 + /// + private List LoadAllProcessConfigs() + { + return _unitWork.Find(x => x.ID > 0) + .OrderBy(x => x.Code) + .ToList(); + } + /// /// 获取物料的单据信息 /// @@ -329,6 +343,12 @@ namespace HHWMS.Web.Controllers return Json(new { Code = 500, Msg = "物料不存在" }); } + // 生产单号必填:入库时必须选择由订单列表带出的生产单号 + if (string.IsNullOrWhiteSpace(model.SourceCode)) + { + return Json(new { Code = 500, Msg = "请选择生产单号" }); + } + if (material.Qty == null || material.Qty <= 0) { return Json(new { Code = 500, Msg = "物料毛重没有设置,请设置后再执行入库" }); @@ -348,33 +368,39 @@ namespace HHWMS.Web.Controllers var materialProcessList = _unitWork.Find(m => m.MaterialCode == material.MaterialCode); - var materialProcess = _unitWork.FindSingle(m => m.ID == model.ProcessId); - if (materialProcess == null) + // 页面工序下拉来自工序配置表(ProcessConfig),优先按工序编码取,编码为空时退回按 ID 取 + ProcessConfig currentProcessConfig = null; + if (!string.IsNullOrWhiteSpace(model.ProcessCode)) { - return Json(new { Code = 500, Msg = "未找到此物料工序配置" }); + currentProcessConfig = _unitWork.FindSingle(x => x.Code == model.ProcessCode); + } + if (currentProcessConfig == null) + { + currentProcessConfig = _unitWork.FindSingle(x => x.ID == model.ProcessId); + } + if (currentProcessConfig == null) + { + return Json(new { Code = 500, Msg = "未找到所选工序配置,请重新选择工序" }); } - // 下一道工序 - var nextProcess = materialProcessList - // 筛选同一物料 - .Where(p => p.MaterialCode == material.MaterialCode) - // 筛选顺序大于当前工序的工序 - .Where(p => p.ProcessOrder > materialProcess.ProcessOrder) - // 按工序顺序升序排列(取最小的一个,即下一道) - .OrderBy(p => p.ProcessOrder) - // 取第一个(下一道工序) - .FirstOrDefault(); - if (nextProcess == null) - { - // 没有下一道工序的话,默认下一道工序为99 - nextProcess = new MaterialProcess() - { - ProcessCode = "99" - }; - } - // 从字典查询工序对应的区域 + // 当前工序在物料工序表中的记录(用于定位下一道工序),没有则视为最后一道 + var currentMaterialProcess = materialProcessList + .FirstOrDefault(p => p.ProcessCode == currentProcessConfig.Code); + + // 下一道工序:物料工序表中顺序大于当前工序的最小一条;不存在则默认 99(工序结束) + var nextProcess = currentMaterialProcess == null + ? null + : materialProcessList + // 筛选顺序大于当前工序的工序 + .Where(p => p.ProcessOrder > currentMaterialProcess.ProcessOrder) + // 按工序顺序升序排列(取最小的一个,即下一道) + .OrderBy(p => p.ProcessOrder) + // 取第一个(下一道工序) + .FirstOrDefault(); + + // 从字典查询下一道工序对应的区域 var nextProcessConfig = _unitWork.FindSingle(x => - x.Code == nextProcess.ProcessCode); + x.Code == (nextProcess == null ? "99" : nextProcess.ProcessCode)); var zoneName = nextProcessConfig?.Zone; if (string.IsNullOrEmpty(zoneName)) @@ -431,8 +457,8 @@ namespace HHWMS.Web.Controllers SourceCode = model.BillCode,//客户订单号 ProduceCode = model.OrderId, // 单号 ReceiptDetailId = model.SourceCode, // erpdetailid 回传使用 - BatchCode = materialProcess.ProcessCode, //erp回传使用 批次编码 - Batch = materialProcess.ProcessName, + BatchCode = currentProcessConfig.Code, //erp回传使用 批次编码 + Batch = currentProcessConfig.Name, Lot = nextProcessConfig?.Name, Status = model.IsQualified ? "合格" : "不合格", TaskStatus = InventoryTaskStatusEnum.Locked, @@ -693,6 +719,8 @@ namespace HHWMS.Web.Controllers public string OrderId { get; set; } public string OperatorId { get; set; } public int ProcessId { get; set; } + /// 工序编码(页面工序下拉来自工序配置表 ProcessConfig) + public string ProcessCode { get; set; } public string ProcessName { get; set; } public int Type { get; set; } public int Qty { get; set; } diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs index 440337e..26a0c8d 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderVM.cs @@ -95,18 +95,24 @@ namespace HHWMS.Web } else { + // 框架调用ERP失败时备注只记 send,这里补一条带请求参数和错误原因的日志,便于排查 + var errMsg = apiResult?.Data?.Msg ?? apiResult?.ErrorMsg ?? "未获取到订单数据"; + Wtm.DoLog($"ERP接口返回失败:{errMsg}", ActionLogTypesEnum.Exception, "ERP", "MOWorkAPI", + request: $"ErpCode=003, MoCode={receiptCode ?? "(空)"}, InvCode={vm.Entity?.MaterialCode ?? "(空)"}, InvDefine1={vm.Entity?.MaterialType ?? "(空)"}, StepCode={vm.Entity?.Batch ?? "(空)"}, Size=100, Page=1", + result: errMsg); + return new ApiJsonResult>() { Success = false, - Msg = apiResult?.Data?.Msg ?? apiResult?.ErrorMsg ?? "未获取到订单数据" + Msg = errMsg }; } } catch (Exception ex) { - Wtm.DoLog("获取ERP订单数据", ActionLogTypesEnum.Normal, "GetReceiptDetails", - request: $"入库单号:{receiptCode}", - result: $"错误:{ex.Message}"); + Wtm.DoLog($"获取ERP订单数据异常:{ex.Message}", ActionLogTypesEnum.Normal, "GetReceiptDetails", + request: $"入库单号:{receiptCode ?? "(空)"},物料:{vm?.Entity?.MaterialCode ?? "(空)"},图号:{vm?.Entity?.MaterialType ?? "(空)"},批次:{vm?.Entity?.Batch ?? "(空)"}", + result: ex.ToString()); return new ApiJsonResult>() { Success = false, @@ -115,6 +121,59 @@ namespace HHWMS.Web } } + /// + /// 从 ERP 生产订单中获取工序路线并保存到物料工序表(只写工序,不创建入库单/明细) + /// + /// 物料编码(存货编码) + public async Task SyncMaterialProcessFromErp(string materialCode) + { + try + { + var request = new LoadMoDetailListRequest + { + ErpCode = "003", + InvCode = materialCode, + StepCode = "32", + Size = 100, + Page = 1 + }; + + var apiResult = await Wtm.CallAPI("ERP", "MOWorkAPI", HttpMethodEnum.POST, request, 5); + + if (apiResult?.Data == null || apiResult.Data.Code != 0 || apiResult.Data.Data == null) + { + Wtm.DoLog($"同步物料工序失败:{apiResult?.Data?.Msg ?? apiResult?.ErrorMsg ?? "ERP未返回订单数据"}", + ActionLogTypesEnum.Exception, "ERP", "MOWorkAPI", + request: $"物料:{materialCode}, ErpCode=003, InvCode={materialCode}, StepCode=32, Size=100, Page=1", + result: apiResult?.Data?.Msg ?? apiResult?.ErrorMsg ?? "ERP未返回订单数据"); + return; + } + + // 同一物料只按订单中的工序路线保存一次 + var items = apiResult.Data.Data + .Where(x => !string.IsNullOrWhiteSpace(x.InvCode) + && x.ProcessRoute != null && x.ProcessRoute.Count > 0) + .GroupBy(x => x.InvCode) + .Select(g => g.First()) + .ToList(); + + foreach (var item in items) + { + await SaveProcessRoute(_unitwork, item.InvCode, item.ProcessRoute); + } + + Wtm.DoLog("同步物料工序", ActionLogTypesEnum.Normal, "SyncMaterialProcess", + request: $"物料:{materialCode}", + result: $"从ERP订单同步工序,涉及物料 {items.Count} 个"); + } + catch (Exception ex) + { + Wtm.DoLog($"同步物料工序异常:{ex.Message}", ActionLogTypesEnum.Exception, "ERP", "MOWorkAPI", + request: $"物料:{materialCode}, ErpCode=003, InvCode={materialCode}, StepCode=32, Size=100, Page=1", + result: ex.ToString()); + } + } + /// /// 处理订单数据并保存到本地数据库(照搬 LoadErpOrderJob) /// @@ -340,6 +399,12 @@ namespace HHWMS.Web /// private async Task SaveProcessRoute(IUnitWork unitWork, string materialCode, List processRoute) { + // 防御:物料编码为空会插入违规数据,工序路线为空会误删该物料已有工序 + if (string.IsNullOrWhiteSpace(materialCode) || processRoute == null || processRoute.Count == 0) + { + return; + } + // 查询已存在的工序路线 var existingProcesses = unitWork.Find(p => p.MaterialCode == materialCode).ToList(); diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml index 7eb7e88..660816a 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml @@ -168,9 +168,9 @@ type: [ { required: true, message: '请选择托盘类型', trigger: ['change', 'blur'] } ], - //sourceCode: [ - //{ required: true, message: '请选择生产单据', trigger: ['change', 'blur'] } - //], + sourceCode: [ + { required: true, message: '请选择生产单号', trigger: ['change', 'blur'] } + ], //billCode: [ //{ required: true, message: '请输入客户单据', trigger: ['change', 'blur'] } //], @@ -246,37 +246,27 @@ }); } - // 根据物料加载工序列表 - const loadProcessesByMaterial = (materialCode) => { - if (!materialCode) { - form.processId = ''; - processOptions.value = []; - return; - } + // 加载工序列表:默认展示全部工序,选完工序再由生产订单决定用哪道 + const loadProcesses = () => { processOptions.value = []; $.ajax({ type: "post", dataType: "json", - data: { materialCode: materialCode }, url: "/receipt/ReceiptIn/GetProcessesByMaterial", success: (json) => { if (json.Code == 200) { - - const newOptions = json.Data.map(item => ({ + processOptions.value = (json.Data || []).map(item => ({ ...item, value: item.value, label: `${item.processCode} - ${item.processName}` })); - // 使用新数组赋值,强制组件重新渲染 - processOptions.value = [...newOptions]; - } else { - Message.error(json.Msg || '加载物料工序失败'); + Message.error(json.Msg || '加载工序列表失败'); processOptions.value = []; } }, error: (xhr, status, error) => { - Message.error('加载物料工序失败:' + error); + Message.error('加载工序列表失败:' + error); processOptions.value = []; } }); @@ -300,15 +290,24 @@ const searchMaterials = (keyword) => { axios.get(`/receipt/ReceiptIn/SearchMaterials?keyword=${encodeURIComponent(keyword)}`) - .then(function (json) { - if (json.data.Code == 200) { - materialOptions.value = json.data.Data.map(item => ({ + .then(function (response) { + // axios 返回的是响应对象,接口数据在 response.data 里 + const json = response.data; + if (json.Code == 200) { + materialOptions.value = (json.Data || []).map(item => ({ ...item, value: item.MaterialCode, label: `${item.MaterialCode} - ${item.MaterialType} - ${item.MaterialName}` })); + + // 扫描/输入完整物料编码时,自动带出图号并加载工序 + const exactCode = (form.materialCode || '').trim(); + const exactItem = materialOptions.value.find(item => item.MaterialCode === exactCode); + if (exactItem) { + handleMaterialSelect(exactItem.value, null); + } } else { - Message.error(json.data.Msg); + Message.error(json.Msg || '获取物料列表失败'); materialOptions.value = []; } }) @@ -324,7 +323,7 @@ if (selectedMaterial) { form.materialCode = selectedMaterial.MaterialCode; form.name = selectedMaterial.MaterialType; - // 选择物料后加载相关工序 + // 选择物料后重新加载全部工序(工序由后续的生产订单决定) // 先清空当前工序选择,避免显示旧数据 form.processId = ''; form.processName = ''; @@ -335,9 +334,9 @@ processOptions.value = []; orderOptions.value = []; - // 延迟加载新工序,确保先清空再加载 + // 延迟加载工序,确保先清空再加载 nextTick(() => { - loadProcessesByMaterial(selectedMaterial.MaterialCode); + loadProcesses(); }); } }; @@ -345,7 +344,7 @@ // 扫描物料码 const scanMaterial = () => { if (!form.materialCode) return; - loadProcessesByMaterial(form.materialCode); + loadProcesses(); }; // 提交表单 @@ -498,6 +497,8 @@ loadTrayTypes(); loadOperators(); + // 页面加载即展示全部工序,不依赖物料工序配置 + loadProcesses(); }); const operatorOptions = ref([]); @@ -543,7 +544,7 @@ operatorIdRef, operatorInfoRef, focusNext, - loadProcessesByMaterial, + loadProcesses, processSelect, orderSelect, trayTypeOptions, diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderBatchVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderBatchVM.cs index b77f0a3..2c4b12b 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderBatchVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderBatchVM.cs @@ -1,3 +1,4 @@ +using System.Linq; using HHWMS.Web.Models; using WalkingTec.Mvvm.Core; @@ -10,6 +11,31 @@ namespace HHWMS.Web ListVM = new ShipmentHeaderListVM(); LinkedVM = new ShipmentHeader_BatchEdit(); } + + /// + /// 批量删除:先删除所选出库单的明细,再删除表头,避免残留明细导致后续单据下发报错 + /// + public override bool DoBatchDelete() + { + var headerIds = (Ids ?? new string[0]) + .Select(x => int.TryParse(x, out var id) ? id : -1) + .Where(x => x > 0) + .ToList(); + + if (headerIds.Count > 0) + { + var details = DC.Set() + .Where(x => headerIds.Contains(x.HeaderId)) + .ToList(); + if (details.Count > 0) + { + DC.Set().RemoveRange(details); + } + } + + // base.DoBatchDelete 内部会统一 SaveChanges,明细与表头一并删除 + return base.DoBatchDelete(); + } } /// diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderListVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderListVM.cs index 3aa30a0..c847555 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderListVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderListVM.cs @@ -18,9 +18,10 @@ namespace HHWMS.Web { return new List { - this.MakeAction("ShipmentHeader", "GetShipmentDetails", "获取ERP发货通知单", "", - GridActionParameterTypesEnum.NoId, "shipment") - .SetSize(500, 260), + // 暂时不需要“获取ERP发货通知单”,按钮先注释掉 + //this.MakeAction("ShipmentHeader", "GetShipmentDetails", "获取ERP发货通知单", "", + // GridActionParameterTypesEnum.NoId, "shipment") + // .SetSize(500, 260), this.MakeAction("ShipmentHeader", "Allocate", "分配/下发", "", GridActionParameterTypesEnum.SingleId, "shipment") .SetSize(1250, 820) @@ -75,6 +76,7 @@ namespace HHWMS.Web .CheckContain(Searcher.Code, x => x.Code) .CheckContain(Searcher.BillType, x => x.BillType) .CheckEqual(Searcher.FirstStatus, x => x.FirstStatus) + .CheckContain(Searcher.Remark, x => x.Remark) .Select(x => new ShipmentHeader_View { ID = x.ID, diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderSearcher.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderSearcher.cs index d1f0c45..4c011e0 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderSearcher.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderSearcher.cs @@ -22,6 +22,10 @@ namespace HHWMS.Web [Display(Name = "Receipt.LastStatus")] public ShipStatusEnum? LastStatus { get; set; } + /// 备注(模糊查询) + [Display(Name = "_Admin.Remark")] + public String Remark { get; set; } + protected override void InitVM() { } diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderVM.cs index 71161fd..901f278 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderVM.cs @@ -47,6 +47,13 @@ namespace HHWMS.Web public override void DoDelete() { + // 先删除该出库单下的明细,避免表头删除后残留明细导致后续单据下发报错 + var details = DC.Set().Where(x => x.HeaderId == Entity.ID).ToList(); + if (details.Count > 0) + { + DC.Set().RemoveRange(details); + } + // base.DoDelete 内部会统一 SaveChanges,明细与表头一并删除 base.DoDelete(); } } diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Index.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Index.cshtml index 9b87401..353e950 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Index.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Index.cshtml @@ -3,10 +3,11 @@ -@* *@ + + @* *@ diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/AgvTaskArchiveJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/AgvTaskArchiveJob.cs new file mode 100644 index 0000000..6f4aaf2 --- /dev/null +++ b/HHWMS.Web/Areas/System/Controllers/jobs/AgvTaskArchiveJob.cs @@ -0,0 +1,168 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using HHWMS.Web.Models; +using HHWMS.Web.Models.Agv; +using Quartz; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; +using WalkingTec.Mvvm.Core.Support.Quartz; + +namespace HHWMS.Web +{ + /// + /// AGV 任务归档 Job(方案 5.5 / 9.6,每日执行): + /// 1) AgvTask 超 1 个月终态任务(99/95/100)先镜像备份到 AgvTaskHistory,再从主表物理清除; + /// 2) AgvTaskLog 超 6 个月日志镜像备份到 AgvTaskLogHistory 后清除。 + /// 事务包裹防重复归档;每批限量处理,失败回滚下次重跑天然重试。 + /// + [PersistJobDataAfterExecution] + [DisallowConcurrentExecution] + public class AgvTaskArchiveJob : WtmJob + { + public override async Task Execute(IJobExecutionContext context) + { + try + { + var unitWork = new UnitWork(Wtm); + var now = DateTime.Now; + const int batchSize = 200; + + await ArchiveTasksAsync(unitWork, now, batchSize); + await ArchiveLogsAsync(unitWork, now, batchSize); + + // 更新 SysJob 触发时间 + var job = unitWork.FindSingle(x => x.JobName == context.JobDetail.Key.Name); + if (job != null) + { + job.LastFireTime = TimeZoneInfo.ConvertTimeFromUtc( + context.FireTimeUtc.DateTime, + TimeZoneInfo.Local); + if (context.NextFireTimeUtc != null) + { + job.NextFireTime = TimeZoneInfo.ConvertTimeFromUtc( + context.NextFireTimeUtc.Value.DateTime, + TimeZoneInfo.Local); + } + unitWork.Update(job); + } + } + catch (Exception ex) + { + Wtm.DoLog("AGV任务归档失败", ActionLogTypesEnum.Job, + "AgvTaskArchiveJob", request: "error", result: ex.Message); + } + } + + /// + /// 任务归档:超 1 个月终态任务镜像到 AgvTaskHistory 后物理删除主表记录 + /// + private async Task ArchiveTasksAsync(UnitWork unitWork, DateTime now, int batchSize) + { + var tasks = unitWork.Find(x => + x.CreateTime != null + && x.CreateTime < now.AddMonths(-1) + && (x.AgvStatus == AgvTaskStatusEnum.完成 + || x.AgvStatus == AgvTaskStatusEnum.取消 + || x.AgvStatus == AgvTaskStatusEnum.完成联动失败)) + .OrderBy(x => x.CreateTime) + .Take(batchSize) + .ToList(); + if (tasks.Count == 0) + { + return; + } + + using (var transaction = Wtm.DC.BeginTransaction()) + { + try + { + var histories = tasks.Select(t => new AgvTaskHistory + { + TaskNo = t.TaskNo, + SourceCode = t.SourceCode, + SourceSystem = t.SourceSystem, + AgvTaskType = t.AgvTaskType, + FromLocation = t.FromLocation, + ToLocation = t.ToLocation, + FromFloor = t.FromFloor, + ToFloor = t.ToFloor, + ContainerCode = t.ContainerCode, + Priority = t.Priority, + AgvStatus = t.AgvStatus, + AgvCarNo = t.AgvCarNo, + ErrorMsg = t.ErrorMsg, + BillType = t.BillType, + Details = t.Details, + ArchivedAt = now, + CreateTime = t.CreateTime, + CreateBy = t.CreateBy, + UpdateTime = t.UpdateTime, + UpdateBy = t.UpdateBy + }).ToList(); + unitWork.BatchAdd(histories); + unitWork.BatchDelete(tasks); + await transaction.CommitAsync(); + } + catch + { + await transaction.RollbackAsync(); + throw; + } + } + } + + /// + /// 日志归档:超 6 个月日志镜像到 AgvTaskLogHistory 后物理删除 + /// + private async Task ArchiveLogsAsync(UnitWork unitWork, DateTime now, int batchSize) + { + var logs = unitWork.Find(x => + x.CreateTime != null + && x.CreateTime < now.AddMonths(-6)) + .OrderBy(x => x.CreateTime) + .Take(batchSize) + .ToList(); + if (logs.Count == 0) + { + return; + } + + using (var transaction = Wtm.DC.BeginTransaction()) + { + try + { + var histories = logs.Select(l => new AgvTaskLogHistory + { + TaskNo = l.TaskNo, + OrderId = l.OrderId, + FromStatus = l.FromStatus, + ToStatus = l.ToStatus, + Event = l.Event, + Direction = l.Direction, + EventTime = l.EventTime, + SourceIp = l.SourceIp, + DurationMs = l.DurationMs, + RequestJson = l.RequestJson, + ResponseJson = l.ResponseJson, + Operator = l.Operator, + Remark = l.Remark, + ArchivedAt = now, + CreateTime = l.CreateTime, + CreateBy = l.CreateBy, + UpdateTime = l.UpdateTime, + UpdateBy = l.UpdateBy + }).ToList(); + unitWork.BatchAdd(histories); + unitWork.BatchDelete(logs); + await transaction.CommitAsync(); + } + catch + { + await transaction.RollbackAsync(); + throw; + } + } + } + } +} diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/AgvTaskDispatchJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/AgvTaskDispatchJob.cs new file mode 100644 index 0000000..cae8635 --- /dev/null +++ b/HHWMS.Web/Areas/System/Controllers/jobs/AgvTaskDispatchJob.cs @@ -0,0 +1,173 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using HHWMS.Web.Models; +using HHWMS.Web.Models.Agv; +using HHWMS.Web.Services.Agv; +using Microsoft.Extensions.DependencyInjection; +using Quartz; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; +using WalkingTec.Mvvm.Core.Support.Quartz; +namespace HHWMS.Web +{ + /// + /// AGV 定时下发 Job:周期扫描 新建(0)/异常(90) 任务自动下发。 + /// 启停方式:在【系统管理→定时任务】页面新增本条记录,Cron 建议 0 */2 * * * ?(每 2 分钟)。 + /// 依赖 DispatchTaskAsync 内部的 FOR UPDATE 行锁 + 状态校验,天然防并发/防重复下发。 + /// 日志双通道:Console 直写控制台(现场直跑 exe 可直接观察是否触发),Wtm.DoLog 写 ActionLogs 表。 + /// + [PersistJobDataAfterExecution] + [DisallowConcurrentExecution] + public class AgvTaskDispatchJob : WtmJob + { + // 无参构造 —— WtmJob 反射创建 Job 实例必须有无参构造 + public AgvTaskDispatchJob() { } + + public override async Task Execute(IJobExecutionContext context) + { + // 每次触发必输出心跳行:用于区分「调度没触发」和「触发了但没任务」 + WriteLog($"Job触发,计划时间 {Fmt(context.ScheduledFireTimeUtc)},下次触发 {Fmt(context.NextFireTimeUtc)}"); + try + { + var sp = context.JobDetail.JobDataMap.Get("Sp") as IServiceProvider; + if (sp == null) + { + WriteLog("错误:未能从 JobDataMap 获取 IServiceProvider"); + DoJobLog("AGV定时下发Job异常", "error", "未能从 JobDataMap 获取 IServiceProvider"); + return; + } + // AgvTaskService 为 Scoped 服务,root provider 直接解析会抛 + // Cannot resolve scoped service(ValidateScopes),必须创建独立作用域 + using (var scope = sp.CreateScope()) + { + var service = scope.ServiceProvider.GetService(typeof(AgvTaskService)) as AgvTaskService; + if (service == null) + { + WriteLog("错误:DI 容器中未注册 AgvTaskService"); + DoJobLog("AGV定时下发Job异常", "error", "DI 容器中未注册 AgvTaskService"); + return; + } + WriteLog("依赖解析成功:IServiceScope / AgvTaskService 均可用"); + await DispatchBatch(context, service); + } + } + catch (Exception ex) + { + // 输出完整异常堆栈到控制台,避免只有 Message 无法定位 + WriteLog($"Job执行异常:{ex}"); + DoJobLog("AGV定时下发Job异常", "error", ex.Message); + } + } + + /// + /// 扫描待下发任务并逐条下发,输出每条结果与汇总 + /// + private async Task DispatchBatch(IJobExecutionContext context, AgvTaskService service) + { + var unitWork = new UnitWork(Wtm); + const int batchSize = 20; + + var tasks = unitWork.Find(x => + x.AgvStatus == AgvTaskStatusEnum.新建 + || x.AgvStatus == AgvTaskStatusEnum.异常) + .OrderByDescending(x => x.Priority) + .ThenBy(x => x.CreateTime) + .Take(batchSize) + .ToList(); + + WriteLog($"扫描完成:待下发任务 {tasks.Count} 条(状态=新建/异常,批量上限 {batchSize})" + + (tasks.Count > 0 ? ",任务号:" + string.Join(",", tasks.Select(t => t.TaskNo)) : "")); + + if (tasks.Count == 0) + { + UpdateJobFireTime(unitWork, context); + return; + } + + int success = 0, fail = 0; + foreach (var task in tasks) + { + try + { + await service.DispatchTaskAsync(task.TaskNo); + success++; + WriteLog($"下发成功:{task.TaskNo}"); + } + catch (Exception ex) + { + fail++; + WriteLog($"下发失败:{task.TaskNo},原因:{ex.Message}"); + DoJobLog($"AGV定时下发失败:{task.TaskNo}", task.TaskNo, ex.Message); + } + } + + WriteLog($"本轮执行结束:共 {tasks.Count} 条,成功 {success},失败 {fail}"); + if (success > 0 || fail > 0) + { + DoJobLog("AGV定时下发", $"batch={tasks.Count}", $"ok={success},fail={fail}"); + } + + UpdateJobFireTime(unitWork, context); + } + + /// + /// 更新 SysJob 上 LastFireTime / NextFireTime;内部异常仅记日志,不影响下发主流程 + /// + private static void UpdateJobFireTime(UnitWork unitWork, IJobExecutionContext context) + { + try + { + var job = unitWork.FindSingle(x => x.JobName == context.JobDetail.Key.Name); + if (job == null) + { + WriteLog($"提示:SysJob 表中未找到 JobName={context.JobDetail.Key.Name} 的记录,LastFireTime 未更新"); + return; + } + job.LastFireTime = TimeZoneInfo.ConvertTimeFromUtc( + context.FireTimeUtc.DateTime, TimeZoneInfo.Local); + if (context.NextFireTimeUtc != null) + { + job.NextFireTime = TimeZoneInfo.ConvertTimeFromUtc( + context.NextFireTimeUtc.Value.DateTime, TimeZoneInfo.Local); + } + unitWork.Update(job); + } + catch (Exception ex) + { + WriteLog($"更新 LastFireTime 失败(不影响下发):{ex.Message}"); + } + } + + /// + /// 写 ActionLogs 日志;Wtm 不可用时静默跳过(控制台日志已兜底) + /// + private void DoJobLog(string title, string request, string result) + { + try + { + Wtm.DoLog(title, ActionLogTypesEnum.Job, "AgvTaskDispatchJob", request: request, result: result); + } + catch + { + // Wtm 为 null 等场景忽略,控制台日志已兜底 + } + } + + /// + /// 控制台直出日志(带时间戳),用于确认 Job 是否真实触发 + /// + private static void WriteLog(string message) + { + Console.WriteLine($"[{DateTime.Now:yyyy-MM-dd HH:mm:ss}] [AgvTaskDispatchJob] {message}"); + } + + /// + /// 可空时间格式化(本地时间),空值显示 - + /// + private static string Fmt(DateTimeOffset? time) + { + return time.HasValue ? time.Value.LocalDateTime.ToString("yyyy-MM-dd HH:mm:ss") : "-"; + } + } +} diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/AgvTaskRetryFinishJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/AgvTaskRetryFinishJob.cs new file mode 100644 index 0000000..a60877e --- /dev/null +++ b/HHWMS.Web/Areas/System/Controllers/jobs/AgvTaskRetryFinishJob.cs @@ -0,0 +1,168 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using HHWMS.Web.Models; +using HHWMS.Web.Models.Agv; +using HHWMS.Web.Services.Agv; +using Microsoft.Extensions.DependencyInjection; +using Quartz; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; +using WalkingTec.Mvvm.Core.Support.Quartz; + +namespace HHWMS.Web +{ + /// + /// AGV 完成联动失败自动重试 Job:周期扫描 99(完成联动失败)任务自动重试完成联动。 + /// 启停方式:在【系统管理→定时任务】页面新增本条记录,Cron 建议 0 */5 * * * ?(每 5 分钟)。 + /// 注意:完成联动失败时库存/流水/容器/库位已回滚,ERP 报工可能已成功,重试时 ERP 侧需保证幂等性。 + /// 日志双通道:Console 直写控制台,Wtm.DoLog 写 ActionLogs 表。 + /// + [PersistJobDataAfterExecution] + [DisallowConcurrentExecution] + public class AgvTaskRetryFinishJob : WtmJob + { + // 无参构造 —— WtmJob 反射创建 Job 实例必须有无参构造 + public AgvTaskRetryFinishJob() { } + + public override async Task Execute(IJobExecutionContext context) + { + WriteLog($"Job触发,计划时间 {Fmt(context.ScheduledFireTimeUtc)},下次触发 {Fmt(context.NextFireTimeUtc)}"); + try + { + var sp = context.JobDetail.JobDataMap.Get("Sp") as IServiceProvider; + if (sp == null) + { + WriteLog("错误:未能从 JobDataMap 获取 IServiceProvider"); + DoJobLog("AGV完成联动重试Job异常", "error", "未能从 JobDataMap 获取 IServiceProvider"); + return; + } + using (var scope = sp.CreateScope()) + { + var service = scope.ServiceProvider.GetService(typeof(AgvTaskService)) as AgvTaskService; + if (service == null) + { + WriteLog("错误:DI 容器中未注册 AgvTaskService"); + DoJobLog("AGV完成联动重试Job异常", "error", "DI 容器中未注册 AgvTaskService"); + return; + } + WriteLog("依赖解析成功:IServiceScope / AgvTaskService 均可用"); + await RetryBatch(context, service); + } + } + catch (Exception ex) + { + WriteLog($"Job执行异常:{ex}"); + DoJobLog("AGV完成联动重试Job异常", "error", ex.Message); + } + } + + /// + /// 扫描完成联动失败任务并逐条重试完成联动,输出每条结果与汇总 + /// + private async Task RetryBatch(IJobExecutionContext context, AgvTaskService service) + { + var unitWork = new UnitWork(Wtm); + const int batchSize = 20; + + var tasks = unitWork.Find(x => x.AgvStatus == AgvTaskStatusEnum.完成联动失败) + .OrderByDescending(x => x.Priority) + .ThenBy(x => x.CreateTime) + .Take(batchSize) + .ToList(); + + WriteLog($"扫描完成:待重试完成联动任务 {tasks.Count} 条(状态=完成联动失败99,批量上限 {batchSize})" + + (tasks.Count > 0 ? ",任务号:" + string.Join(",", tasks.Select(t => t.TaskNo)) : "")); + + if (tasks.Count == 0) + { + UpdateJobFireTime(unitWork, context); + return; + } + + int success = 0, fail = 0; + foreach (var task in tasks) + { + try + { + await service.RetryFinishLinkAsync(task.TaskNo); + success++; + WriteLog($"重试完成联动成功:{task.TaskNo}"); + } + catch (Exception ex) + { + fail++; + WriteLog($"重试完成联动失败:{task.TaskNo},原因:{ex.Message}"); + DoJobLog($"AGV重试完成联动失败:{task.TaskNo}", task.TaskNo, ex.Message); + } + } + + WriteLog($"本轮执行结束:共 {tasks.Count} 条,成功 {success},失败 {fail}"); + if (success > 0 || fail > 0) + { + DoJobLog("AGV完成联动重试", $"batch={tasks.Count}", $"ok={success},fail={fail}"); + } + + UpdateJobFireTime(unitWork, context); + } + + /// + /// 更新 SysJob 上 LastFireTime / NextFireTime;内部异常仅记日志,不影响主流程 + /// + private static void UpdateJobFireTime(UnitWork unitWork, IJobExecutionContext context) + { + try + { + var job = unitWork.FindSingle(x => x.JobName == context.JobDetail.Key.Name); + if (job == null) + { + WriteLog($"提示:SysJob 表中未找到 JobName={context.JobDetail.Key.Name} 的记录,LastFireTime 未更新"); + return; + } + job.LastFireTime = TimeZoneInfo.ConvertTimeFromUtc( + context.FireTimeUtc.DateTime, TimeZoneInfo.Local); + if (context.NextFireTimeUtc != null) + { + job.NextFireTime = TimeZoneInfo.ConvertTimeFromUtc( + context.NextFireTimeUtc.Value.DateTime, TimeZoneInfo.Local); + } + unitWork.Update(job); + } + catch (Exception ex) + { + WriteLog($"更新 LastFireTime 失败(不影响重试):{ex.Message}"); + } + } + + /// + /// 写 ActionLogs 日志;Wtm 不可用时静默跳过 + /// + private void DoJobLog(string title, string request, string result) + { + try + { + Wtm.DoLog(title, ActionLogTypesEnum.Job, "AgvTaskRetryFinishJob", request: request, result: result); + } + catch + { + // Wtm 为 null 等场景忽略,控制台日志已兜底 + } + } + + /// + /// 控制台直出日志(带时间戳) + /// + private static void WriteLog(string message) + { + Console.WriteLine($"[{DateTime.Now:yyyy-MM-dd HH:mm:ss}] [AgvTaskRetryFinishJob] {message}"); + } + + /// + /// 可空时间格式化(本地时间),空值显示 - + /// + private static string Fmt(DateTimeOffset? time) + { + return time.HasValue ? time.Value.LocalDateTime.ToString("yyyy-MM-dd HH:mm:ss") : "-"; + } + } +} diff --git a/HHWMS.Web/Areas/System/ViewModels/SysJobVMs/SysJobListVM.cs b/HHWMS.Web/Areas/System/ViewModels/SysJobVMs/SysJobListVM.cs index b346628..9e7746a 100644 --- a/HHWMS.Web/Areas/System/ViewModels/SysJobVMs/SysJobListVM.cs +++ b/HHWMS.Web/Areas/System/ViewModels/SysJobVMs/SysJobListVM.cs @@ -32,7 +32,9 @@ namespace HHWMS.Web this.MakeGridHeader(x => x.JobName) .SetFormat((entity,v) => { - return AllJob.FirstOrDefault(x => x.Value.ToString() == entity.JobName).Text; + // null 保护:数据库里的 JobName 在 AllJob 里找不到匹配时返回原名,不抛空指针 + var match = AllJob.FirstOrDefault(x => x.Value.ToString() == entity.JobName); + return match?.Text ?? entity.JobName ?? "-"; }), this.MakeGridHeader(x => x.JobGroup).SetHide(), this.MakeGridHeader(x => x.MethodName), diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/ActionLogVMs/ActionLogListVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/ActionLogVMs/ActionLogListVM.cs index 691ec6e..9e51414 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/ActionLogVMs/ActionLogListVM.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/ActionLogVMs/ActionLogListVM.cs @@ -69,6 +69,7 @@ namespace WalkingTec.Mvvm.Mvc.Admin.ViewModels.ActionLogVMs { var query = DC.Set() .CheckContain(Searcher.ITCode, x=>x.ITCode) + .CheckContain(Searcher.ModuleName, x=>x.ModuleName) .CheckContain(Searcher.ActionUrl, x=>x.ActionUrl) .CheckContain(Searcher.LogType, x=>x.LogType) .CheckContain(Searcher.IP, x=>x.IP) diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/ActionLogVMs/ActionLogSearcher.cs b/HHWMS.Web/Areas/_Admin/ViewModels/ActionLogVMs/ActionLogSearcher.cs index c762fea..f784d61 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/ActionLogVMs/ActionLogSearcher.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/ActionLogVMs/ActionLogSearcher.cs @@ -12,6 +12,10 @@ namespace WalkingTec.Mvvm.Mvc.Admin.ViewModels.ActionLogVMs [Display(Name = "_Admin.Account")] public string ITCode { get; set; } + /// 模块名称(模糊匹配,用于按业务模块筛选日志,如「物料」、「AGV」、「mes」) + [Display(Name = "模块")] + public string ModuleName { get; set; } + [Display(Name = "Url")] public string ActionUrl { get; set; } diff --git a/HHWMS.Web/Areas/_Admin/Views/ActionLog/Index.cshtml b/HHWMS.Web/Areas/_Admin/Views/ActionLog/Index.cshtml index 3ba5457..c2ee23d 100644 --- a/HHWMS.Web/Areas/_Admin/Views/ActionLog/Index.cshtml +++ b/HHWMS.Web/Areas/_Admin/Views/ActionLog/Index.cshtml @@ -4,13 +4,16 @@ + + + + + - - diff --git a/HHWMS.Web/Controllers/HomeController.cs b/HHWMS.Web/Controllers/HomeController.cs index 9084c9c..eddd4fc 100644 --- a/HHWMS.Web/Controllers/HomeController.cs +++ b/HHWMS.Web/Controllers/HomeController.cs @@ -152,10 +152,10 @@ namespace HHWMS.Web.Controllers var locations = Wtm.DC.Set() .DPWhere(Wtm,x => x.ZoneId) .AsEnumerable() - .GroupBy(x => x.ContainerStatus).ToList() + .GroupBy(x => x.ContainerStatus ?? LocationStatus.空仓位).ToList() .Select(x => new { status = statusMap.TryGetValue(x.Key, out var chineseName) ? chineseName - : x.Key.ToString(), count = x.Count() }); + : x.Key, count = x.Count() }); foreach (var item in locations) { data.Add(new ChartData diff --git a/HHWMS.Web/DataContext.cs b/HHWMS.Web/DataContext.cs index 32e8a45..d17a6c0 100644 --- a/HHWMS.Web/DataContext.cs +++ b/HHWMS.Web/DataContext.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; using HHWMS.Web.Models; +using HHWMS.Web.Models.Agv; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Design; using WalkingTec.Mvvm.Core; @@ -58,6 +59,11 @@ namespace HHWMS.Web public DbSet LocationZones { get; set; } public DbSet Customers { get; set; } public DbSet ProcessConfigs { get; set; } + public DbSet AgvTasks { get; set; } + public DbSet AgvTaskHistories { get; set; } + public DbSet AgvTaskLogs { get; set; } + public DbSet AgvTaskLogHistories { get; set; } + public DbSet AgvTaskSceneConfigs { get; set; } public override async Task DataInit(object allModules, bool IsSpa) { var state = await base.DataInit(allModules, IsSpa); diff --git a/HHWMS.Web/Models/Agv/AgvOption.cs b/HHWMS.Web/Models/Agv/AgvOption.cs new file mode 100644 index 0000000..edd88af --- /dev/null +++ b/HHWMS.Web/Models/Agv/AgvOption.cs @@ -0,0 +1,51 @@ +using System; + +namespace HHWMS.Web.Models.Agv +{ + /// + /// AGV 平库任务配置项(对应 appsettings.json 顶层 AgvOption 节点) + /// 参考《平库AGV方案流程(AGV自调度版).md》10.5 + /// + public class AgvOption + { + /// + /// 模块总开关:false 时接单/回调接口统一拒绝并提示(灰度/紧急停用,不影响立库) + /// + public bool Enabled { get; set; } = true; + + /// + /// Mock 模式:不联网、直接返回约定成功报文,开发/联调用(无 AGV 可用) + /// + public bool MockEnabled { get; set; } = true; + + /// + /// 对外调用超时(秒),默认 15s + /// + public int CallTimeoutSeconds { get; set; } = 15; + + /// + /// 锁持有告警阈值(分钟):超时任务页面标红,由人工决定取消/继续等待 + /// + public int LockTimeoutMinutes { get; set; } = 60; + + /// + /// 超时监控阈值(分钟):超时监控 Job 周期扫描的判定线 + /// + public int TimeoutMonitorMinutes { get; set; } = 30; + + /// + /// 对账 Job 开关(默认关闭;开启后周期扫描已下发/执行中超时任务并查询 AGV 状态) + /// + public bool ReconcileEnabled { get; set; } = false; + + /// + /// 对账周期(分钟) + /// + public int ReconcileMinutes { get; set; } = 10; + + /// + /// AGV 联动写库存的系统账号(必须是真实存在的 FrameworkUser.ITCode,见方案 8.3) + /// + public string SysUser { get; set; } = "system"; + } +} diff --git a/HHWMS.Web/Models/Agv/AgvTask.cs b/HHWMS.Web/Models/Agv/AgvTask.cs new file mode 100644 index 0000000..83f6d8f --- /dev/null +++ b/HHWMS.Web/Models/Agv/AgvTask.cs @@ -0,0 +1,123 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Models.Agv +{ + /// + /// AGV 平库任务(独立表,与立库 TaskHeader 完全隔离) + /// 对应《平库AGV方案流程(AGV自调度版).md》5.1 / 10.2 DDL + /// + [Index(nameof(TaskNo), IsUnique = true)] + [Index(nameof(AgvStatus))] + [Table("AgvTask")] + public class AgvTask : BasePoco + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public new int ID { get; set; } + + /// + /// WMS 任务号(= 上游 sourceCode 或自生成 AGV+日期+序号),全局唯一 + /// + [Display(Name = "AGV.TaskNo", Description = "WMS任务号")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + [Required(ErrorMessage = "Validate.{0}required")] + public string TaskNo { get; set; } + + /// + /// 上游任务号(与 SourceSystem 组合做幂等去重) + /// + [Display(Name = "AGV.SourceCode", Description = "上游任务号")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string SourceCode { get; set; } + + /// + /// 上游来源系统标识(如 MES、WMS_CP) + /// + [Display(Name = "AGV.SourceSystem", Description = "上游来源系统标识")] + [StringLength(20, ErrorMessage = "Validate.{0}stringmax{1}")] + public string SourceSystem { get; set; } + + /// + /// AGV 业务类型(AgvTaskTypeEnum 1~6),由任务场景配置映射 + /// + [Display(Name = "AGV.AgvTaskType", Description = "AGV业务类型")] + public AgvTaskTypeEnum? AgvTaskType { get; set; } + + /// + /// 起点库位编码(AGV 点位,强制校验) + /// + [Display(Name = "AGV.FromLocation", Description = "起点库位编码")] + [StringLength(64, ErrorMessage = "Validate.{0}stringmax{1}")] + public string FromLocation { get; set; } + + /// + /// 终点库位编码(AGV 点位,强制校验) + /// + [Display(Name = "AGV.ToLocation", Description = "终点库位编码")] + [StringLength(64, ErrorMessage = "Validate.{0}stringmax{1}")] + public string ToLocation { get; set; } + + /// + /// 起点楼层(取自 LocationZone.Floor,可空;仅记录/展示,不做强校验) + /// + [Display(Name = "AGV.FromFloor", Description = "起点楼层")] + public int? FromFloor { get; set; } + + /// + /// 终点楼层(同上) + /// + [Display(Name = "AGV.ToFloor", Description = "终点楼层")] + public int? ToFloor { get; set; } + + /// + /// 容器号(接单/页面非强制,不给则自动生成 LS 临时容器) + /// + [Display(Name = "AGV.ContainerCode", Description = "容器号")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string ContainerCode { get; set; } + + /// + /// 优先级(数值越大越优先,默认 0) + /// + [Display(Name = "AGV.Priority", Description = "优先级")] + public int? Priority { get; set; } + + /// + /// AGV 任务状态(AgvTaskStatusEnum,状态机单调推进) + /// + [Display(Name = "AGV.AgvStatus", Description = "AGV任务状态")] + public AgvTaskStatusEnum? AgvStatus { get; set; } + + /// + /// AGV 小车编号(回调回传,仅展示/排查用) + /// + [Display(Name = "AGV.AgvCarNo", Description = "AGV小车编号")] + [StringLength(20, ErrorMessage = "Validate.{0}stringmax{1}")] + public string AgvCarNo { get; set; } + + /// + /// 失败/异常/取消原因与完成联动失败原因 + /// + [Display(Name = "AGV.ErrorMsg", Description = "错误信息")] + [StringLength(255, ErrorMessage = "Validate.{0}stringmax{1}")] + public string ErrorMsg { get; set; } + + /// + /// 流水类型(AgvBillTypeEnum:In_AGV/Out_AGV/Move_AGV) + /// + [Display(Name = "AGV.BillType", Description = "流水类型")] + [StringLength(20, ErrorMessage = "Validate.{0}stringmax{1}")] + public string BillType { get; set; } + + /// + /// 物料明细(JSON,SKU,非强制;缺明细则按空容器业务处理) + /// + [Display(Name = "AGV.Details", Description = "物料明细(JSON)")] + public string Details { get; set; } + } +} diff --git a/HHWMS.Web/Models/Agv/AgvTaskHistory.cs b/HHWMS.Web/Models/Agv/AgvTaskHistory.cs new file mode 100644 index 0000000..fd62f7a --- /dev/null +++ b/HHWMS.Web/Models/Agv/AgvTaskHistory.cs @@ -0,0 +1,82 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Models.Agv +{ + /// + /// AGV 任务归档镜像(超 1 个月终态任务备份于此,再由 AgvTaskArchiveJob 清理主表) + /// 对应《平库AGV方案流程(AGV自调度版).md》10.2 DDL 第 5 段 + /// + [Index(nameof(TaskNo))] + [Index(nameof(CreateTime))] + [Table("AgvTaskHistory")] + public class AgvTaskHistory : BasePoco + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public new int ID { get; set; } + + [Display(Name = "AGV.TaskNo", Description = "WMS任务号")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string TaskNo { get; set; } + + [Display(Name = "AGV.SourceCode", Description = "上游任务号")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string SourceCode { get; set; } + + [Display(Name = "AGV.SourceSystem", Description = "上游来源系统标识")] + [StringLength(20, ErrorMessage = "Validate.{0}stringmax{1}")] + public string SourceSystem { get; set; } + + [Display(Name = "AGV.AgvTaskType", Description = "AGV业务类型")] + public AgvTaskTypeEnum? AgvTaskType { get; set; } + + [Display(Name = "AGV.FromLocation", Description = "起点库位编码")] + [StringLength(64, ErrorMessage = "Validate.{0}stringmax{1}")] + public string FromLocation { get; set; } + + [Display(Name = "AGV.ToLocation", Description = "终点库位编码")] + [StringLength(64, ErrorMessage = "Validate.{0}stringmax{1}")] + public string ToLocation { get; set; } + + [Display(Name = "AGV.FromFloor", Description = "起点楼层")] + public int? FromFloor { get; set; } + + [Display(Name = "AGV.ToFloor", Description = "终点楼层")] + public int? ToFloor { get; set; } + + [Display(Name = "AGV.ContainerCode", Description = "容器号")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string ContainerCode { get; set; } + + [Display(Name = "AGV.Priority", Description = "优先级")] + public int? Priority { get; set; } + + [Display(Name = "AGV.AgvStatus", Description = "归档前任务状态")] + public AgvTaskStatusEnum? AgvStatus { get; set; } + + [Display(Name = "AGV.AgvCarNo", Description = "AGV小车编号")] + [StringLength(20, ErrorMessage = "Validate.{0}stringmax{1}")] + public string AgvCarNo { get; set; } + + [Display(Name = "AGV.ErrorMsg", Description = "错误信息")] + [StringLength(255, ErrorMessage = "Validate.{0}stringmax{1}")] + public string ErrorMsg { get; set; } + + [Display(Name = "AGV.BillType", Description = "流水类型")] + [StringLength(20, ErrorMessage = "Validate.{0}stringmax{1}")] + public string BillType { get; set; } + + [Display(Name = "AGV.Details", Description = "物料明细(JSON)")] + public string Details { get; set; } + + /// + /// 归档时间 + /// + [Display(Name = "AGV.ArchivedAt", Description = "归档时间")] + public DateTime? ArchivedAt { get; set; } + } +} diff --git a/HHWMS.Web/Models/Agv/AgvTaskLog.cs b/HHWMS.Web/Models/Agv/AgvTaskLog.cs new file mode 100644 index 0000000..3dfbc36 --- /dev/null +++ b/HHWMS.Web/Models/Agv/AgvTaskLog.cs @@ -0,0 +1,109 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Models.Agv +{ + /// + /// AGV 任务状态与报文日志(每次状态变更/关键动作写一条) + /// 对应《平库AGV方案流程(AGV自调度版).md》9.6 / 10.2 DDL 第 4 段 + /// + [Index(nameof(TaskNo), nameof(CreateTime))] + [Index(nameof(OrderId))] + [Table("AgvTaskLog")] + public class AgvTaskLog : BasePoco + { + // 必须声明 public new int ID,否则 EF 会用 BasePoco 的 Guid 主键 + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public new int ID { get; set; } + + /// + /// WMS 任务号 + /// + [Display(Name = "AGV.TaskNo", Description = "WMS任务号")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + [Required(ErrorMessage = "Validate.{0}required")] + public string TaskNo { get; set; } + + /// + /// AGV 返回运单号(与 TaskNo 一致,原值留痕) + /// + [Display(Name = "AGV.OrderId", Description = "AGV运单号")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string OrderId { get; set; } + + /// + /// 变更前状态 + /// + [Display(Name = "AGV.FromStatus", Description = "变更前状态")] + public AgvTaskStatusEnum? FromStatus { get; set; } + + /// + /// 变更后状态 + /// + [Display(Name = "AGV.ToStatus", Description = "变更后状态")] + public AgvTaskStatusEnum? ToStatus { get; set; } + + /// + /// 回调事件(如 Loaded/Unloaded/Exception/Canceled) + /// + [Display(Name = "AGV.Event", Description = "回调事件")] + [StringLength(30, ErrorMessage = "Validate.{0}stringmax{1}")] + public string Event { get; set; } + + /// + /// 方向:down=下发,up=回调 + /// + [Display(Name = "AGV.Direction", Description = "方向(down/up)")] + [StringLength(10, ErrorMessage = "Validate.{0}stringmax{1}")] + public string Direction { get; set; } + + /// + /// 事件发生时间 + /// + [Display(Name = "AGV.EventTime", Description = "事件发生时间")] + public DateTime? EventTime { get; set; } + + /// + /// 来源 IP + /// + [Display(Name = "AGV.SourceIp", Description = "来源IP")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string SourceIp { get; set; } + + /// + /// 耗时(毫秒) + /// + [Display(Name = "AGV.DurationMs", Description = "耗时(毫秒)")] + public int? DurationMs { get; set; } + + /// + /// 请求报文 + /// + [Display(Name = "AGV.RequestJson", Description = "请求报文")] + public string RequestJson { get; set; } + + /// + /// 响应报文 + /// + [Display(Name = "AGV.ResponseJson", Description = "响应报文")] + public string ResponseJson { get; set; } + + /// + /// 操作人(AGV 回调记 AGV) + /// + [Display(Name = "AGV.Operator", Description = "操作人")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string Operator { get; set; } + + /// + /// 备注/异常信息 + /// + [Display(Name = "AGV.Remark", Description = "备注")] + [StringLength(500, ErrorMessage = "Validate.{0}stringmax{1}")] + public string Remark { get; set; } + } +} diff --git a/HHWMS.Web/Models/Agv/AgvTaskLogHistory.cs b/HHWMS.Web/Models/Agv/AgvTaskLogHistory.cs new file mode 100644 index 0000000..093e6bc --- /dev/null +++ b/HHWMS.Web/Models/Agv/AgvTaskLogHistory.cs @@ -0,0 +1,73 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Models.Agv +{ + /// + /// AGV 任务日志归档镜像(超 6 个月日志备份于此,再由 AgvTaskArchiveJob 清理主表) + /// 对应《平库AGV方案流程(AGV自调度版).md》10.2 DDL 第 6 段 + /// + [Index(nameof(TaskNo), nameof(CreateTime))] + [Table("AgvTaskLogHistory")] + public class AgvTaskLogHistory : BasePoco + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public new int ID { get; set; } + + [Display(Name = "AGV.TaskNo", Description = "WMS任务号")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string TaskNo { get; set; } + + [Display(Name = "AGV.OrderId", Description = "AGV运单号")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string OrderId { get; set; } + + [Display(Name = "AGV.FromStatus", Description = "变更前状态")] + public AgvTaskStatusEnum? FromStatus { get; set; } + + [Display(Name = "AGV.ToStatus", Description = "变更后状态")] + public AgvTaskStatusEnum? ToStatus { get; set; } + + [Display(Name = "AGV.Event", Description = "回调事件")] + [StringLength(30, ErrorMessage = "Validate.{0}stringmax{1}")] + public string Event { get; set; } + + [Display(Name = "AGV.Direction", Description = "方向(down/up)")] + [StringLength(10, ErrorMessage = "Validate.{0}stringmax{1}")] + public string Direction { get; set; } + + [Display(Name = "AGV.EventTime", Description = "事件发生时间")] + public DateTime? EventTime { get; set; } + + [Display(Name = "AGV.SourceIp", Description = "来源IP")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string SourceIp { get; set; } + + [Display(Name = "AGV.DurationMs", Description = "耗时(毫秒)")] + public int? DurationMs { get; set; } + + [Display(Name = "AGV.RequestJson", Description = "请求报文")] + public string RequestJson { get; set; } + + [Display(Name = "AGV.ResponseJson", Description = "响应报文")] + public string ResponseJson { get; set; } + + [Display(Name = "AGV.Operator", Description = "操作人")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string Operator { get; set; } + + [Display(Name = "AGV.Remark", Description = "备注")] + [StringLength(500, ErrorMessage = "Validate.{0}stringmax{1}")] + public string Remark { get; set; } + + /// + /// 归档时间 + /// + [Display(Name = "AGV.ArchivedAt", Description = "归档时间")] + public DateTime? ArchivedAt { get; set; } + } +} diff --git a/HHWMS.Web/Models/Agv/AgvTaskSceneConfig.cs b/HHWMS.Web/Models/Agv/AgvTaskSceneConfig.cs new file mode 100644 index 0000000..21d0478 --- /dev/null +++ b/HHWMS.Web/Models/Agv/AgvTaskSceneConfig.cs @@ -0,0 +1,71 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Models.Agv +{ + /// + /// AGV 任务场景配置:映射"客户(甲方/MES)字符串任务类型 -> AGV 场景" + /// 对应《平库AGV方案流程(AGV自调度版).md》5.6 / 10.2 DDL 第 3 段 + /// + [Index(nameof(SourceTaskType), IsUnique = true)] + [Table("AgvTaskSceneConfig")] + public class AgvTaskSceneConfig : BasePoco + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public new int ID { get; set; } + + /// + /// 上游字符串任务类型(映射主键,如 RAW_IN) + /// + [Display(Name = "AGV.SourceTaskType", Description = "上游任务类型(映射主键)")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + [Required(ErrorMessage = "Validate.{0}required")] + public string SourceTaskType { get; set; } + + /// + /// 内部业务类型(AgvTaskTypeEnum 1~6,必填) + /// + [Display(Name = "AGV.AgvTaskType", Description = "内部业务类型")] + public AgvTaskTypeEnum AgvTaskType { get; set; } + + /// + /// AGV 场景 ID(不写死,现场调整只改配置) + /// + [Display(Name = "AGV.SceneId", Description = "AGV场景ID")] + [StringLength(64, ErrorMessage = "Validate.{0}stringmax{1}")] + [Required(ErrorMessage = "Validate.{0}required")] + public string SceneId { get; set; } + + /// + /// AGV 场景名称 + /// + [Display(Name = "AGV.SceneName", Description = "AGV场景名称")] + [StringLength(64, ErrorMessage = "Validate.{0}stringmax{1}")] + public string SceneName { get; set; } + + /// + /// 取货动作名(默认 Load) + /// + [Display(Name = "AGV.BinTaskLoad", Description = "取货动作名")] + [StringLength(32, ErrorMessage = "Validate.{0}stringmax{1}")] + public string BinTaskLoad { get; set; } + + /// + /// 放货动作名(默认 Unload) + /// + [Display(Name = "AGV.BinTaskUnload", Description = "放货动作名")] + [StringLength(32, ErrorMessage = "Validate.{0}stringmax{1}")] + public string BinTaskUnload { get; set; } + + /// + /// 备注 + /// + [Display(Name = "AGV.Remark", Description = "备注")] + [StringLength(255, ErrorMessage = "Validate.{0}stringmax{1}")] + public string Remark { get; set; } + } +} diff --git a/HHWMS.Web/Models/Configs/Location.cs b/HHWMS.Web/Models/Configs/Location.cs index e96ca9a..f688bf4 100644 --- a/HHWMS.Web/Models/Configs/Location.cs +++ b/HHWMS.Web/Models/Configs/Location.cs @@ -8,6 +8,12 @@ namespace HHWMS.Web.Models; [Table("Location")] public class Location : BasePoco { + public Location() + { + // 默认空仓位,库位初始化时不给状态时兜底 + ContainerStatus = LocationStatus.空仓位; + } + [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public new int ID { get; set; } diff --git a/HHWMS.Web/Models/Configs/LocationZone.cs b/HHWMS.Web/Models/Configs/LocationZone.cs index 8e2a1f0..119a961 100644 --- a/HHWMS.Web/Models/Configs/LocationZone.cs +++ b/HHWMS.Web/Models/Configs/LocationZone.cs @@ -19,5 +19,11 @@ namespace HHWMS.Web.Models [Display(Name = "Location.ZoneName", Description = "名称")] [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] public string Name { get; set; } + + /// + /// 库区所在楼层(可选;AGV 任务 FromFloor/ToFloor 的取值来源,WMS 不做强校验) + /// + [Display(Name = "Location.Floor", Description = "库区楼层")] + public int? Floor { get; set; } } } diff --git a/HHWMS.Web/Models/Enum/WMSEnum.cs b/HHWMS.Web/Models/Enum/WMSEnum.cs index 3a795b1..6fd42de 100644 --- a/HHWMS.Web/Models/Enum/WMSEnum.cs +++ b/HHWMS.Web/Models/Enum/WMSEnum.cs @@ -345,7 +345,13 @@ namespace HHWMS.Web.Models /// 线边库位 /// [Display(Name = "LocationTypeEnum.X")] - X = 2 + X = 2, + + /// + /// 平库AGV点位(缓存区/工位/提升机入口) + /// + [Display(Name = "LocationTypeEnum.P")] + P = 3 } public enum LocationStatusEnum : short { @@ -362,4 +368,224 @@ namespace HHWMS.Web.Models Inner = 1, } #endregion + + #region AGV 平库任务 + + /// + /// AGV 业务类型(对应《平库AGV方案流程》5.4) + /// + public enum AgvTaskTypeEnum : short + { + /// + /// 原材料入库(1F月台 → 货架区) + /// + [Display(Name = "AgvTaskTypeEnum.1")] + 原材料入库 = 1, + + /// + /// 原料空托需求(空托区/货架区 → 月台缓存区) + /// + [Display(Name = "AgvTaskTypeEnum.2")] + 原料空托需求 = 2, + + /// + /// 原料满托出库(货架区 → 混料上料点,同楼层点到点) + /// + [Display(Name = "AgvTaskTypeEnum.3")] + 原料满托出库 = 3, + + /// + /// 混料满桶上线(1F除湿房缓存区 → 2F需求工位) + /// + [Display(Name = "AgvTaskTypeEnum.4")] + 混料满桶上线 = 4, + + /// + /// 空桶缓存(2F平台工位 → 1F除湿房缓存区) + /// + [Display(Name = "AgvTaskTypeEnum.5")] + 空桶缓存 = 5, + + /// + /// 辅材缓存(1F月台缓存区 → 2F辅材缓存区) + /// + [Display(Name = "AgvTaskTypeEnum.6")] + 辅材缓存 = 6 + } + + /// + /// AGV 任务状态(与 TaskStatusEnum 独立,状态机单调推进,见方案 6.1/6.2) + /// + public enum AgvTaskStatusEnum : short + { + /// + /// 新建 + /// + [Display(Name = "AgvTaskStatusEnum.0")] + 新建 = 0, + + /// + /// 已下发 + /// + [Display(Name = "AgvTaskStatusEnum.5")] + 已下发 = 5, + + /// + /// 执行中 + /// + [Display(Name = "AgvTaskStatusEnum.10")] + 执行中 = 10, + + /// + /// 异常 + /// + [Display(Name = "AgvTaskStatusEnum.90")] + 异常 = 90, + + /// + /// 取消 + /// + [Display(Name = "AgvTaskStatusEnum.95")] + 取消 = 95, + + /// + /// 完成联动失败(联动事务失败,页面可重试,见方案 9.4) + /// + [Display(Name = "AgvTaskStatusEnum.99")] + 完成联动失败 = 99, + + /// + /// 完成 + /// + [Display(Name = "AgvTaskStatusEnum.100")] + 完成 = 100 + } + + /// + /// AGV 流水类型(对应方案 15.3-1:ERP 回传通道区分) + /// + public enum AgvBillTypeEnum : short + { + /// + /// AGV 入库(ERP 走 FinishIn 报工) + /// + [Display(Name = "AgvBillTypeEnum.In_AGV")] + In_AGV = 1, + + /// + /// AGV 出库(ERP 走 AddOtherOut,不上报 FinishIn) + /// + [Display(Name = "AgvBillTypeEnum.Out_AGV")] + Out_AGV = 2, + + /// + /// AGV 移库(纯库内转移,不回传 ERP) + /// + [Display(Name = "AgvBillTypeEnum.Move_AGV")] + Move_AGV = 3 + } + + /// + /// ERP 上报库区映射枚举(方案 5.4.1) + /// 决策(2026-10-20):ERP 上报的 WhCode/Type 不放数据库,统一用本枚举承载; + /// 后期要改上报取值 → 只改本枚举成员及下方扩展方法即可,不动数据库、不动字典。 + /// + public enum AgvErpWhTypeEnum + { + /// + /// 线边库:WhCode="xb"、Type=1(沿用立库现状) + /// + [Display(Name = "线边库")] + 线边库 = 1, + + /// + /// 成品库:WhCode="cp"、Type=2(沿用立库现状) + /// + [Display(Name = "成品库")] + 成品库 = 2, + + /// + /// 平库原料:WhCode/Type 待 ERP 确认后填入(方案 15.3-2) + /// + [Display(Name = "平库原料")] + 平库原料 = 3 + } + + /// + /// AgvErpWhTypeEnum 扩展方法:上报取值集中在下方,改取值只改这里 + /// + public static class AgvErpWhTypeEnumExtensions + { + /// + /// 按库区 ID 解析上报库区枚举(用于入库报工/出库回传的 WhCode/Type 取值)。 + /// 现状:1027 线边库,其余成品库;平库库区 ZoneId 确定后在此补充分支归入平库原料。 + /// + public static AgvErpWhTypeEnum FromZoneId(int zoneId) => zoneId switch + { + 1027 => AgvErpWhTypeEnum.线边库, + // 平库库区 ZoneId 确认后在此追加分支,如: 10xx => AgvErpWhTypeEnum.平库原料 + _ => AgvErpWhTypeEnum.成品库 + }; + + /// + /// 按库区编码字符串解析上报库区枚举(用于出库流水回传,流水无 ZoneId 只有 ZoneCode)。 + /// 平库库区 ZoneCode 确定后在此补充分支。 + /// + public static AgvErpWhTypeEnum FromZoneCode(string zoneCode) + { + if (string.IsNullOrWhiteSpace(zoneCode)) + { + return AgvErpWhTypeEnum.线边库; // 无库区信息时保持现状 xb,避免既有出库回传行为回归 + } + return zoneCode.Trim().ToUpper() switch + { + "XB" => AgvErpWhTypeEnum.线边库, + "CP" => AgvErpWhTypeEnum.成品库, + // 平库库区 ZoneCode 确认后在此追加分支 + _ => AgvErpWhTypeEnum.线边库 + }; + } + + /// + /// 获取 ERP 上报仓库编码 WhCode + /// + public static string GetWhCode(this AgvErpWhTypeEnum e) => e switch + { + AgvErpWhTypeEnum.线边库 => "xb", + AgvErpWhTypeEnum.成品库 => "cp", + // 平库原料:待 ERP 确认后替换,当前暂回退成品库 + _ => "cp" + }; + + /// + /// 获取 ERP 上报类型 Type(命名 GetErpType 避免与 object.GetType 冲突) + /// + public static int GetErpType(this AgvErpWhTypeEnum e) => e switch + { + AgvErpWhTypeEnum.线边库 => 1, + AgvErpWhTypeEnum.成品库 => 2, + // 平库原料:待 ERP 确认后替换,当前暂回退成品库 + _ => 2 + }; + } + + /// + /// AgvTaskTypeEnum 扩展方法:任务类型 → 流水类型映射(方案 15.3-1) + /// 入库类(1/5/6)→ In_AGV;出库类(2/3/4)→ Out_AGV + /// + public static class AgvTaskTypeEnumExtensions + { + /// + /// 获取对应 AGV 流水类型(任务落库时写入 AgvTask.BillType) + /// + public static AgvBillTypeEnum ToBillType(this AgvTaskTypeEnum e) => e switch + { + AgvTaskTypeEnum.原材料入库 => AgvBillTypeEnum.In_AGV, + AgvTaskTypeEnum.空桶缓存 => AgvBillTypeEnum.In_AGV, + AgvTaskTypeEnum.辅材缓存 => AgvBillTypeEnum.In_AGV, + _ => AgvBillTypeEnum.Out_AGV + }; + } + + #endregion } diff --git a/HHWMS.Web/Program.cs b/HHWMS.Web/Program.cs index d68cd62..cee8609 100644 --- a/HHWMS.Web/Program.cs +++ b/HHWMS.Web/Program.cs @@ -14,6 +14,8 @@ using WalkingTec.Mvvm.Mvc; using HHWMS.Web.Support; using HHWMS.Web; using HHWMS.Web.Models; +using HHWMS.Web.Models.Agv; +using HHWMS.Web.Services.Agv; using Microsoft.CodeAnalysis; using Quartz; using SoapCore; @@ -63,6 +65,10 @@ builder.Services.AddSoapCore(); builder.Services.AddScoped(typeof(IUnitWork), typeof(UnitWork)); builder.Services.AddScoped(); +builder.Services.Configure(builder.Configuration.GetSection("AgvOption")); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); builder.Services.AddSignalR() diff --git a/HHWMS.Web/Resources/Program.zh.resx b/HHWMS.Web/Resources/Program.zh.resx index e47e0a9..f1c8010 100644 --- a/HHWMS.Web/Resources/Program.zh.resx +++ b/HHWMS.Web/Resources/Program.zh.resx @@ -1419,6 +1419,9 @@ 线边库 + + 平库 + 空仓位 @@ -1503,4 +1506,156 @@ 备用 + + + + WMS任务号 + + + 上游任务号 + + + 上游来源系统 + + + AGV业务类型 + + + 起点库位 + + + 终点库位 + + + 起点楼层 + + + 终点楼层 + + + 容器号 + + + 优先级 + + + AGV任务状态 + + + AGV小车编号 + + + 错误信息 + + + 流水类型 + + + 物料明细 + + + AGV运单号 + + + 变更前状态 + + + 变更后状态 + + + 回调事件 + + + 方向 + + + 事件时间 + + + 来源IP + + + 耗时(毫秒) + + + 请求报文 + + + 响应报文 + + + 操作人 + + + 备注 + + + 归档时间 + + + 上游任务类型 + + + AGV场景ID + + + AGV场景名称 + + + 取货动作名 + + + 放货动作名 + + + 库区楼层 + + + 原材料入库 + + + 原料空托需求 + + + 原料满托出库 + + + 混料满桶上线 + + + 空桶缓存 + + + 辅材缓存 + + + 新建 + + + 已下发 + + + 执行中 + + + 异常 + + + 取消 + + + 完成联动失败 + + + 完成 + + + AGV入库 + + + AGV出库 + + + AGV移库 + diff --git a/HHWMS.Web/Services/Agv/AgvApiClient.cs b/HHWMS.Web/Services/Agv/AgvApiClient.cs new file mode 100644 index 0000000..ea0fd61 --- /dev/null +++ b/HHWMS.Web/Services/Agv/AgvApiClient.cs @@ -0,0 +1,237 @@ +using System; +using System.Diagnostics; +using System.Threading.Tasks; +using HHWMS.Web.Models; +using HHWMS.Web.Models.Agv; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; +using Newtonsoft.Json; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Services.Agv +{ + /// + /// AGV 工具类:封装与 AGV 调度系统的全部 HTTP 通信(方案 11.5) + /// 职责:显式超时、报文留痕(AgvTaskLog)、响应统一解析、失败抛业务异常 + /// + public class AgvApiClient + { + private readonly AgvOption _option; + private readonly WTMContext _wtm; + private readonly IUnitWork _unitWork; + private readonly ILogger _logger; + + public AgvApiClient(IOptions option, WTMContext wtm, IUnitWork unitWork, ILogger logger) + { + _option = option.Value; + _wtm = wtm; + _unitWork = unitWork; + _logger = logger; + } + + /// + /// 下发:创建运单(方案 11.2)。成功返回 orderId(=TaskNo);失败抛异常 + /// + public async Task CreateOrderAsync(AgvCreateOrderRequest request, string taskNo) + { + // Mock 模式:不联网,直接返回约定成功报文 + if (_option.MockEnabled) + { + WriteLog(taskNo, "down", "create", request, new AgvApiResponse + { + Code = "0", + Msg = "mock success", + Data = new AgvCreateOrderResult { OrderId = taskNo, ExternalId = request.ExternalId } + }, 0, null); + return new AgvCreateOrderResult { OrderId = taskNo, ExternalId = request.ExternalId }; + } + + var sw = Stopwatch.StartNew(); + try + { + var result = await _wtm.CallAPI>( + "AGV", "api/fleet/orders/create", HttpMethodEnum.POST, request, _option.CallTimeoutSeconds); + sw.Stop(); + WriteLog(taskNo, "down", "create", request, result, sw.ElapsedMilliseconds, null); + if (result?.Data == null || result.Data.Code != "0" || result.Data.Data == null) + { + throw new Exception($"AGV下发失败: {result?.Data?.Msg ?? result?.ErrorMsg ?? "无响应"}"); + } + return result.Data.Data; + } + catch (Exception ex) + { + _logger.LogError(ex, "AGV下发任务[{taskNo}]异常", taskNo); + throw; + } + } + + /// + /// 取消运单(方案 11.6)。sceneId 与 orderId 均必填,orderId 即 TaskNo;厂商侧幂等 + /// + public async Task CancelOrderAsync(string sceneId, string orderId) + { + var request = new AgvCancelOrderRequest { SceneId = sceneId, OrderId = orderId }; + if (_option.MockEnabled) + { + WriteLog(orderId, "down", "cancel", request, new AgvApiResponse + { + Code = "0", + Msg = "mock success" + }, 0, null); + return; + } + + var sw = Stopwatch.StartNew(); + try + { + var result = await _wtm.CallAPI>( + "AGV", "api/fleet/orders/cancel", HttpMethodEnum.POST, request, _option.CallTimeoutSeconds); + sw.Stop(); + WriteLog(orderId, "down", "cancel", request, result, sw.ElapsedMilliseconds, null); + if (result?.Data == null || result.Data.Code != "0") + { + throw new Exception($"AGV取消失败: {result?.Data?.Msg ?? result?.ErrorMsg ?? "无响应"}"); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "AGV取消任务[{orderId}]异常", orderId); + throw; + } + } + + /// + /// 查询运单状态(11.3 查询式兜底用;接口待厂商确认,Mock 直接返回执行中) + /// + public async Task QueryOrderAsync(string sceneId, string orderId) + { + if (_option.MockEnabled) + { + return new AgvOrderStatusResult { OrderId = orderId, Status = "Running" }; + } + + var request = new AgvCancelOrderRequest { SceneId = sceneId, OrderId = orderId }; + var sw = Stopwatch.StartNew(); + try + { + var result = await _wtm.CallAPI>( + "AGV", "api/fleet/orders/status", HttpMethodEnum.POST, request, _option.CallTimeoutSeconds); + sw.Stop(); + WriteLog(orderId, "down", "query", request, result, sw.ElapsedMilliseconds, null); + if (result?.Data == null || result.Data.Code != "0" || result.Data.Data == null) + { + throw new Exception($"AGV查询失败: {result?.Data?.Msg ?? result?.ErrorMsg ?? "无响应"}"); + } + return result.Data.Data; + } + catch (Exception ex) + { + _logger.LogError(ex, "AGV查询任务[{orderId}]异常", orderId); + throw; + } + } + + /// + /// 报文留痕:原始请求/响应 JSON + 耗时统一写入 AgvTaskLog + /// + private void WriteLog(string taskNo, string direction, string @event, + object request, object response, long durationMs, string remark) + { + try + { + var log = new AgvTaskLog + { + TaskNo = taskNo, + OrderId = taskNo, + Direction = direction, + Event = @event, + DurationMs = (int)durationMs, + RequestJson = request == null ? null : JsonConvert.SerializeObject(request), + ResponseJson = response == null ? null : JsonConvert.SerializeObject(response), + Operator = "AGV", + Remark = remark, + CreateTime = DateTime.Now, + CreateBy = "AGV" + }; + _unitWork.Add(log); + } + catch (Exception ex) + { + // 留痕失败不能阻断主流程,仅记录日志 + _logger.LogWarning(ex, "AGV报文留痕失败 taskNo={taskNo}", taskNo); + } + } + } + + /// + /// AGV 接口统一响应包装(code 非 "0" 即失败,msg 为失败原因) + /// + public class AgvApiResponse + { + public string Code { get; set; } + public string Msg { get; set; } + public T Data { get; set; } + } + + /// + /// 下发创建运单请求(方案 11.2 报文) + /// + public class AgvCreateOrderRequest + { + public string Id { get; set; } + public string SceneId { get; set; } + public string SceneName { get; set; } + public string ExternalId { get; set; } + public int? Priority { get; set; } + public string ContainerId { get; set; } + public bool StepFixed { get; set; } = true; + public System.Collections.Generic.List Steps { get; set; } + } + + /// + /// 下发步骤(起点取货 Load / 终点放货 Unload) + /// + public class AgvOrderStep + { + public string Location { get; set; } + public AgvStepRbkArgs RbkArgs { get; set; } + public bool ForLoad { get; set; } + public bool ForUnload { get; set; } + } + + /// + /// 步骤动作参数(binTask 取货/放货动作名) + /// + public class AgvStepRbkArgs + { + public string BinTask { get; set; } + } + + /// + /// 下发成功响应(orderId = TaskNo,无需落库,仅日志留痕) + /// + public class AgvCreateOrderResult + { + public string OrderId { get; set; } + public string ExternalId { get; set; } + } + + /// + /// 取消/查询请求(sceneId 与 orderId 均必填) + /// + public class AgvCancelOrderRequest + { + public string SceneId { get; set; } + public string OrderId { get; set; } + } + + /// + /// 运单状态查询结果(11.3 查询式兜底用;字段待厂商确认) + /// + public class AgvOrderStatusResult + { + public string OrderId { get; set; } + public string Status { get; set; } + } +} diff --git a/HHWMS.Web/Services/Agv/AgvDtos.cs b/HHWMS.Web/Services/Agv/AgvDtos.cs new file mode 100644 index 0000000..61cee69 --- /dev/null +++ b/HHWMS.Web/Services/Agv/AgvDtos.cs @@ -0,0 +1,103 @@ +using System; +using System.Collections.Generic; + +namespace HHWMS.Web.Services.Agv +{ + /// + /// AGV 接单请求 DTO(方案 11.1;与手动下发页面参数保持一致) + /// + public class AgvReceiveRequest + { + /// 上游任务号(可选;非空则作为 TaskNo,且按 SourceCode+SourceSystem 幂等) + public string SourceCode { get; set; } + + /// 上游来源系统标识(必填) + public string SourceSystem { get; set; } + + /// 上游任务类型(必填;字符串类型按场景配置 SourceTaskType 匹配,数字枚举 1~6 按 AgvTaskType 兼容) + public string TaskType { get; set; } + + /// 起点库位编码(必填,AGV 点位) + public string FromLocation { get; set; } + + /// 终点库位编码(必填,AGV 点位) + public string ToLocation { get; set; } + + /// 容器号(可选;不给则自动生成 LS 临时容器) + public string ContainerCode { get; set; } + + /// 优先级(可选;默认 0,越大越优先) + public int? Priority { get; set; } + + /// 起点楼层(可选;WMS 不做楼层管控,仅接收不校验) + public int? FromFloor { get; set; } + + /// 终点楼层(可选;WMS 不做楼层管控,仅接收不校验) + public int? ToFloor { get; set; } + + /// 物料明细(可选;缺 SKU 按空容器业务处理) + public List Details { get; set; } + } + + /// + /// 接单物料明细(SKU,可不用但不能没有) + /// + public class AgvReceiveDetail + { + /// 物料编码(本地不存在时调 ERP LoadInventory 补建) + public string MaterialCode { get; set; } + + /// 数量 + public decimal? Qty { get; set; } + + /// 批次(入库报工 FinishIn 的 StepCode 来源,可空) + public string Batch { get; set; } + + /// ERP 生产订单明细 ID(可空;入库报工 FinishIn 的 MoDetailId 来源) + public string ErpDetailId { get; set; } + } + + /// + /// AGV 回调请求 DTO(方案 11.3) + /// + public class AgvCallbackRequest + { + /// WMS 任务号(=AGV 侧 orderId,必填) + public string TaskNo { get; set; } + + /// 事件(Accepted/ArrivedLoad/Loaded/ArrivedUnload/Unloaded/Error/Cancel,必填) + public string Event { get; set; } + + /// 事件发生时间 + public DateTime? EventTime { get; set; } + + /// 容器号(与任务比对,不一致告警) + public string ContainerCode { get; set; } + + /// 实际卸货库位(Unloaded 必填,完成联动以该值落位) + public string ActualLocation { get; set; } + + /// AGV 小车编号(可选) + public string AgvCarNo { get; set; } + + /// 错误码(异常/取消时) + public string ErrorCode { get; set; } + + /// 错误信息(异常/取消时) + public string ErrorMsg { get; set; } + } + + /// + /// AGV 业务异常(带错误码,Controller 层转 ApiResultError) + /// + public class AgvBizException : Exception + { + /// 错误码:param/notfound/status/lock/error + public string ErrorCode { get; } + + public AgvBizException(string errorCode, string message) : base(message) + { + ErrorCode = errorCode; + } + } +} diff --git a/HHWMS.Web/Services/Agv/AgvTaskService.cs b/HHWMS.Web/Services/Agv/AgvTaskService.cs new file mode 100644 index 0000000..ec01ae2 --- /dev/null +++ b/HHWMS.Web/Services/Agv/AgvTaskService.cs @@ -0,0 +1,1008 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using AutoMapper; +using HHWMS.Web; +using HHWMS.Web.Models; +using HHWMS.Web.Models.Agv; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Options; +using Newtonsoft.Json; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; + +namespace HHWMS.Web.Services.Agv +{ + /// + /// AGV 平库任务核心服务(方案 4.1) + /// 负责:接单(幂等+校验+锁)、下发、取消、回调状态推进、完成联动(9.4)、联动失败重试 + /// + public class AgvTaskService + { + private readonly IUnitWork _unitWork; + private readonly WTMContext _wtm; + private readonly AgvApiClient _agvClient; + private readonly IMapper _mapper; + private readonly AgvOption _option; + + public AgvTaskService(IUnitWork unitWork, WTMContext wtm, AgvApiClient agvClient, + IMapper mapper, IOptions option) + { + _unitWork = unitWork; + _wtm = wtm; + _agvClient = agvClient; + _mapper = mapper; + _option = option.Value; + } + + #region 接单 + + /// + /// 接单:幂等 + 校验 + LS临时容器 + SKU可选补建 + 接单落库即锁(方案 9.1/9.2) + /// SourceSystem 为空时默认 "WMS"(页面手动下发;API 入口会先覆盖成 "THIRD_PARTY") + /// + public async Task CreateTaskAsync(AgvReceiveRequest dto) + { + // SourceSystem 非必填:空则默认 WMS(API 入口会先处理成 THIRD_PARTY) + if (string.IsNullOrWhiteSpace(dto.SourceSystem)) + { + dto.SourceSystem = "WMS"; + } + + ValidateReceiveRequest(dto); + + // 任务类型/场景映射(2) + var scene = ResolveSceneConfig(dto.TaskType); + var taskType = scene.AgvTaskType; + + // 幂等(9.1.2) + var exists = FindBySource(dto.SourceCode, dto.SourceSystem); + if (exists != null) + { + CheckIdempotent(exists, dto, taskType); + return exists; + } + + // 点位有效性(3)+ 楼层取值(7/8,仅取值不校验) + var fromLoc = ValidateFromLocation(dto.FromLocation); + var toLoc = ValidateToLocation(dto.ToLocation); + var (fromFloor, toFloor) = ResolveFloors(fromLoc, toLoc); + + // 容器号(9.1.1): + // 不给:起点有容器用起点的,没有则生成 LS 临时容器; + // 给 :起点有容器则必须一致,否则报错;起点无容器则用输入的。 + string containerCode; + if (string.IsNullOrWhiteSpace(dto.ContainerCode)) + { + containerCode = string.IsNullOrWhiteSpace(fromLoc.ContainerCode) + ? "LS" + _unitWork.GetSerialNumber("AGV", 8).Substring(3) + : fromLoc.ContainerCode; + } + else + { + containerCode = dto.ContainerCode.Trim(); + } + + // 源场景一致性(4)+ 锁定冲突(5/6) + ValidateContainerAndLocks(fromLoc, toLoc, containerCode); + + // SKU 可选:带明细则校验并补建物料 + var details = dto.Details?.Where(x => !string.IsNullOrWhiteSpace(x.MaterialCode)).ToList(); + if (details != null && details.Count > 0) + { + await EnsureMaterialsAsync(details); + } + + var priority = dto.Priority ?? 0; + var taskNo = string.IsNullOrWhiteSpace(dto.SourceCode) + ? _unitWork.GetSerialNumber("AGV", 8) + : dto.SourceCode.Trim(); + + var task = new AgvTask + { + TaskNo = taskNo, + SourceCode = string.IsNullOrWhiteSpace(dto.SourceCode) ? null : dto.SourceCode.Trim(), + SourceSystem = dto.SourceSystem.Trim(), + AgvTaskType = taskType, + FromLocation = fromLoc.Code, + ToLocation = toLoc.Code, + FromFloor = fromFloor, + ToFloor = toFloor, + ContainerCode = containerCode, + Priority = priority, + AgvStatus = AgvTaskStatusEnum.新建, + BillType = taskType.ToBillType().ToString(), + Details = details == null ? null : JsonConvert.SerializeObject(details), + CreateBy = _wtm.LoginUserInfo?.ITCode ?? _option.SysUser + }; + + // 接单落库 + 锁定(同一事务,方案 9.2 方案 A) + using (var transaction = _wtm.DC.BeginTransaction()) + { + try + { + _unitWork.Add(task); + LockResources(task, fromLoc, toLoc, details); + WriteAgvLog(taskNo, null, AgvTaskStatusEnum.新建, "Receive", "up", null, + "接单落库并锁定"); + await transaction.CommitAsync(); + } + catch (AgvBizException) + { + // LockResources 的锁定冲突保持原错误码(lock)返回,不再包装 + await transaction.RollbackAsync(); + throw; + } + catch (Exception ex) + { + await transaction.RollbackAsync(); + throw new AgvBizException("error", $"接单落库失败: {ex.Message}"); + } + } + return task; + } + + /// + /// 校验请求必填项(1):taskType/fromLocation/toLocation 必填(sourceSystem 非必填,Service 层已兜底) + /// + private static void ValidateReceiveRequest(AgvReceiveRequest dto) + { + if (dto == null) + { + throw new AgvBizException("param", "请求参数无效"); + } + if (string.IsNullOrWhiteSpace(dto.TaskType)) + { + throw new AgvBizException("param", "任务类型 taskType 必填"); + } + if (string.IsNullOrWhiteSpace(dto.FromLocation) || string.IsNullOrWhiteSpace(dto.ToLocation)) + { + throw new AgvBizException("param", "起点/终点库位必填"); + } + if (dto.FromLocation == dto.ToLocation) + { + throw new AgvBizException("param", "起点与终点不能相同"); + } + } + + /// + /// 解析任务场景配置(2):字符串类型按 SourceTaskType 匹配,数字枚举 1~6 按 AgvTaskType 兼容 + /// + private AgvTaskSceneConfig ResolveSceneConfig(string taskType) + { + var scene = _unitWork.FindSingle(x => x.SourceTaskType == taskType.Trim()); + if (scene != null) + { + return scene; + } + if (int.TryParse(taskType.Trim(), out var typeValue) && + Enum.IsDefined(typeof(AgvTaskTypeEnum), typeValue)) + { + scene = _unitWork.FindSingle( + x => x.AgvTaskType == (AgvTaskTypeEnum)typeValue); + } + if (scene == null) + { + throw new AgvBizException("param", $"未配置 AGV 任务类型/场景: {taskType}"); + } + return scene; + } + + /// + /// 幂等检查(9.1.2):同键不同内容拒绝 + /// + private static void CheckIdempotent(AgvTask exists, AgvReceiveRequest dto, AgvTaskTypeEnum taskType) + { + var contentDirty = exists.FromLocation != dto.FromLocation + || exists.ToLocation != dto.ToLocation + || exists.AgvTaskType != taskType + || (!string.IsNullOrWhiteSpace(dto.ContainerCode) && exists.ContainerCode != dto.ContainerCode.Trim()); + if (contentDirty) + { + throw new AgvBizException("status", $"任务[{exists.TaskNo}]已存在且内容不一致,拒绝重复接单"); + } + } + + /// + /// 校验起点点位(3):存在、Type=P、非禁用 + /// + private Location ValidateFromLocation(string code) + { + return ValidatePoint(code, "起点"); + } + + /// + /// 校验终点点位(3):存在、Type=P、非禁用、目标位未锁定 + /// + private Location ValidateToLocation(string code) + { + return ValidatePoint(code, "终点"); + } + + /// + /// 点位通用校验(3):库位必须存在、类型为平库AGV点位(P)、未停用 + /// + private Location ValidatePoint(string code, string name) + { + var location = _unitWork.FindSingle(x => x.Code == code.Trim()); + if (location == null) + { + throw new AgvBizException("param", $"{name}库位[{code}]不存在"); + } + if (location.Type != LocationTypeEnum.P) + { + throw new AgvBizException("param", $"{name}库位[{code}]不是AGV点位(Type=P)"); + } + if (location.IsStop) + { + throw new AgvBizException("param", $"{name}库位[{code}]已停用"); + } + return location; + } + + /// + /// 楼层取值(7/8):仅从库区读取 Floor 作为业务记录字段,返回给任务保存。 + /// 平库现场虽有两层,但 WMS 不按楼层做管控,取不到楼层返回 null 并继续执行,不做任何强校验。 + /// + private (int? FromFloor, int? ToFloor) ResolveFloors(Location fromLoc, Location toLoc) + { + var fromZone = _unitWork.FindSingle(x => x.ID == fromLoc.ZoneId); + var toZone = _unitWork.FindSingle(x => x.ID == toLoc.ZoneId); + return (fromZone?.Floor, toZone?.Floor); + } + + /// + /// 源场景一致性(4)+ 锁定冲突(5/6):接单前校验,冲突拒绝 + /// + private void ValidateContainerAndLocks(Location fromLoc, Location toLoc, string containerCode) + { + // 源库位容器一致性(4):起点有容器时必须与输入一致,否则报错 + if (!string.IsNullOrWhiteSpace(fromLoc.ContainerCode) && fromLoc.ContainerCode != containerCode) + { + throw new AgvBizException("lock", $"输入的容器[{containerCode}]和起点[{fromLoc.Code}]当前绑定的容器[{fromLoc.ContainerCode}]不一致"); + } + + // 锁定冲突(6) + if (fromLoc.Status == LocationStatusEnum.锁定) + { + throw new AgvBizException("lock", $"源库位[{fromLoc.Code}]已被锁定"); + } + if (toLoc.Status == LocationStatusEnum.锁定) + { + throw new AgvBizException("lock", $"目标库位[{toLoc.Code}]已被锁定"); + } + if (toLoc.ContainerStatus == LocationStatus.有货) + { + throw new AgvBizException("lock", $"目标库位[{toLoc.Code}]已有货"); + } + + // 容器锁定冲突(6) + var container = _unitWork.FindSingle(x => x.Code == containerCode); + if (container != null && container.IsLock != ContainerLockEnum.未锁) + { + throw new AgvBizException("lock", $"容器[{containerCode}]已被锁定"); + } + } + + /// + /// 带 SKU 的接单必须保证物料本地存在:不存在则调 ERP LoadInventory 补建,补不到拒绝(9.1) + /// 日志全链路记录:入参物料、本地已有、缺哪些、ERP 请求/响应、补建结果、失败原因, + /// 现场排查"为什么某物料没同步"时可直接在「操作日志」页按模块=物料 筛选 + /// + private async Task EnsureMaterialsAsync(List details) + { + var codes = details.Select(x => x.MaterialCode).Distinct().ToList(); + var existing = _unitWork.Find(m => codes.Contains(m.MaterialCode)) + .Select(m => m.MaterialCode) + .ToHashSet(); + var missing = codes.Where(c => !existing.Contains(c)).ToList(); + + _wtm.DoLog($"ERP物料查询: AGV接单带SKU{codes.Count}个", ActionLogTypesEnum.Normal, + "物料", $"all=[{string.Join(",", codes)}], existing=[{string.Join(",", existing)}], missing=[{string.Join(",", missing)}]"); + + if (missing.Count == 0) + { + return; + } + + var request = new LoadInventoryRequest { ErpCode = "003", InvDefine1 = string.Join(",", missing), Size = 50, Page = 1 }; + try + { + _wtm.DoLog($"ERP物料查询: 调用ERP LoadInventory", ActionLogTypesEnum.Normal, + "物料", $"missing=[{string.Join(",", missing)}], ErpCode=003"); + var apiResult = await _wtm.CallAPI("ERP", "LoadInventory", + HttpMethodEnum.POST, request, _option.CallTimeoutSeconds); + if (apiResult?.Data?.Data == null || apiResult.Data.Code != 0) + { + var errMsg = $"ERP返回异常: Code={apiResult?.Data?.Code}, Msg={apiResult?.Data?.Msg}, ErrorMsg={apiResult?.ErrorMsg}"; + _wtm.DoLog($"ERP物料查询: ERP查询失败", ActionLogTypesEnum.Normal, "物料", result: errMsg); + throw new AgvBizException("param", $"ERP 物料查询失败: {apiResult?.Data?.Msg ?? apiResult?.ErrorMsg}"); + } + var items = apiResult.Data.Data.Where(x => missing.Contains(x.InvCode)).ToList(); + var notFound = missing.Except(items.Select(x => x.InvCode)).ToList(); + _wtm.DoLog($"ERP物料查询: ERP返回结果", ActionLogTypesEnum.Normal, "物料", + result: $"ERP返回{apiResult.Data.Data.Count}条, 匹配缺失{items.Count}条, 未找到=[{string.Join(",", notFound)}]"); + if (items.Count != missing.Count) + { + _wtm.DoLog($"ERP物料查询: ERP不存在", ActionLogTypesEnum.Normal, "物料", + result: $"notFound=[{string.Join(",", notFound)}]"); + throw new AgvBizException("param", $"ERP 物料不存在: {string.Join(",", notFound)}"); + } + var newMaterials = items.Select(item => new Material + { + MaterialCode = item.InvCode, + MaterialName = item.InvName, + MaterialSpec = item.InvStd, + MaterialUnit = item.UnitName, + MaterialType = item.InvDefine1, + SupplierCode = item.InvDefine4, + Qty = 0, + CreateBy = _wtm.LoginUserInfo?.ITCode ?? _option.SysUser, + CreateTime = DateTime.Now + }).ToList(); + _unitWork.BatchAdd(newMaterials); + _wtm.DoLog($"ERP物料查询: 补建成功{newMaterials.Count}个", ActionLogTypesEnum.Normal, "物料", + result: $"codes=[{string.Join(",", newMaterials.Select(m => m.MaterialCode))}]"); + } + catch (AgvBizException) + { + throw; + } + catch (Exception ex) + { + _wtm.DoLog($"ERP物料查询: 补建异常", ActionLogTypesEnum.Normal, "物料", result: ex.ToString()); + throw new AgvBizException("error", $"物料补建失败: {ex.Message}"); + } + } + + /// + /// 按 SourceCode+SourceSystem 查已存在任务(幂等) + /// + private AgvTask FindBySource(string sourceCode, string sourceSystem) + { + if (string.IsNullOrWhiteSpace(sourceCode)) + { + return null; + } + return _unitWork.FindSingle(x => + x.SourceCode == sourceCode.Trim() && x.SourceSystem == sourceSystem.Trim()); + } + + /// + /// 接单落库即锁:源容器 + 源库位 + 目标库位 + 对应 Inventory(9.2 方案 A) + /// 库位/容器用条件更新(WHERE 当前未锁)兜底并发:两个接单同时抢同一资源时, + /// 后到的影响行数为 0 抛锁定冲突回滚,消除"先校验后加锁"的竞态窗口 + /// + private void LockResources(AgvTask task, Location fromLoc, Location toLoc, + List details) + { + var containerStatus = details != null && details.Count > 0 ? ContainerStatus.有 : ContainerStatus.空; + + // 源容器锁定(LS 临时容器无 Container 档案时跳过;ContainerLockEnum:未锁=0、任务锁=1) + var container = _unitWork.FindSingle(x => x.Code == task.ContainerCode); + if (container != null) + { + var rows = _wtm.DC.Database.ExecuteSqlRaw( + "UPDATE `Container` SET `IsLock` = 1, `Status` = {1} WHERE `Code` = {0} AND `IsLock` = 0", + task.ContainerCode, containerStatus); + if (rows == 0) + { + throw new AgvBizException("lock", $"容器[{task.ContainerCode}]已被锁定"); + } + } + + // 源库位与目标库位锁定(条件更新,LocationStatusEnum:未锁=0、锁定=1) + var fromRows = _wtm.DC.Database.ExecuteSqlRaw( + "UPDATE `Location` SET `Status` = 1, `ContainerCode` = {1}, `Version` = {2} WHERE `Code` = {0} AND `Status` = 0", + fromLoc.Code, task.ContainerCode, Guid.NewGuid()); + if (fromRows == 0) + { + throw new AgvBizException("lock", $"源库位[{fromLoc.Code}]已被锁定"); + } + + var toRows = _wtm.DC.Database.ExecuteSqlRaw( + "UPDATE `Location` SET `Status` = 1, `ContainerCode` = {1}, `Version` = {2} WHERE `Code` = {0} AND `Status` = 0", + toLoc.Code, task.ContainerCode, Guid.NewGuid()); + if (toRows == 0) + { + throw new AgvBizException("lock", $"目标库位[{toLoc.Code}]已被锁定"); + } + + // 有货业务锁定对应库存 + var inventories = _unitWork.Find(x => x.ContainerCode == task.ContainerCode).ToList(); + foreach (var inv in inventories) + { + inv.TaskStatus = InventoryTaskStatusEnum.Locked; + _unitWork.Update(inv); + } + } + + #endregion + + #region 下发 / 取消 + + /// + /// 下发任务:组两步报文(起点取货+终点放货)调 AGV 创建运单(6.3/11.2) + /// 成功→已下发(5);失败→保持新建(0)+ErrorMsg,页面可重试。 + /// 状态推进用条件更新(仅 新建0/异常90 可推进为 已下发5): + /// 页面与定时 Job 并发下发时后到者影响行数为 0,不会重复推进状态(厂商侧按 TaskNo 幂等) + /// + public async Task DispatchTaskAsync(string taskNo) + { + var task = GetTaskForUpdate(taskNo); + if (task == null) + { + throw new AgvBizException("notfound", $"任务[{taskNo}]不存在"); + } + if (task.AgvStatus != AgvTaskStatusEnum.新建 && task.AgvStatus != AgvTaskStatusEnum.异常) + { + throw new AgvBizException("status", $"任务[{taskNo}]当前状态[{task.AgvStatus}]不可下发"); + } + + var scene = _unitWork.FindSingle(x => x.AgvTaskType == task.AgvTaskType); + if (scene == null) + { + throw new AgvBizException("param", $"任务[{taskNo}]未配置 AGV 场景"); + } + + var fromStatus = task.AgvStatus; + var request = BuildCreateOrderRequest(task, scene); + try + { + var result = await _agvClient.CreateOrderAsync(request, task.TaskNo); + var rows = await _wtm.DC.Database.ExecuteSqlRawAsync( + "UPDATE `AgvTask` SET `AgvStatus` = 5, `ErrorMsg` = NULL WHERE `TaskNo` = {0} AND `AgvStatus` IN (0, 90)", + taskNo); + if (rows == 0) + { + WriteAgvLog(task.TaskNo, fromStatus, fromStatus, "Dispatch", "down", null, + $"下发成功但状态已被并发处理,跳过状态更新 orderId={result?.OrderId}"); + } + else + { + WriteAgvLog(task.TaskNo, fromStatus, AgvTaskStatusEnum.已下发, "Dispatch", "down", + result?.OrderId, $"下发成功 orderId={result?.OrderId}"); + } + } + catch (Exception ex) + { + var msg = $"下发失败: {ex.Message}"; + await _wtm.DC.Database.ExecuteSqlRawAsync( + "UPDATE `AgvTask` SET `ErrorMsg` = {1} WHERE `TaskNo` = {0} AND `AgvStatus` IN (0, 90)", + taskNo, msg); + WriteAgvLog(task.TaskNo, fromStatus, fromStatus, "Dispatch", "down", null, msg); + throw new AgvBizException("error", msg); + } + } + + /// + /// 构造下发报文(11.2):只发"起点取货(Load)+终点放货(Unload)"两步 + /// + private static AgvCreateOrderRequest BuildCreateOrderRequest(AgvTask task, AgvTaskSceneConfig scene) + { + return new AgvCreateOrderRequest + { + Id = task.TaskNo, + SceneId = scene.SceneId, + SceneName = scene.SceneName, + ExternalId = task.SourceCode, + Priority = task.Priority ?? 0, + ContainerId = task.ContainerCode, + StepFixed = true, + Steps = new List + { + new AgvOrderStep + { + Location = task.FromLocation, + RbkArgs = new AgvStepRbkArgs { BinTask = string.IsNullOrWhiteSpace(scene.BinTaskLoad) ? "Load" : scene.BinTaskLoad }, + ForLoad = true, + ForUnload = false + }, + new AgvOrderStep + { + Location = task.ToLocation, + RbkArgs = new AgvStepRbkArgs { BinTask = string.IsNullOrWhiteSpace(scene.BinTaskUnload) ? "Unload" : scene.BinTaskUnload }, + ForLoad = false, + ForUnload = true + } + } + }; + } + + /// + /// 取消任务(人工/页面):仅 新建/已下发/执行中/完成联动失败 允许;先调 AGV 取消接口再释放锁(9.3)。 + /// 99(完成联动失败)表示 AGV 已实际卸货完成,不再调 AGV 取消,仅本地释放锁。 + /// 事务内行锁复核:防止 AGV 取消调用期间并发回调已推进终态(如已完成联动并释放锁) + /// + public async Task CancelTaskAsync(string taskNo) + { + var task = GetTaskForUpdate(taskNo); + if (task == null) + { + throw new AgvBizException("notfound", $"任务[{taskNo}]不存在"); + } + var allowed = task.AgvStatus == AgvTaskStatusEnum.新建 + || task.AgvStatus == AgvTaskStatusEnum.已下发 + || task.AgvStatus == AgvTaskStatusEnum.执行中 + || task.AgvStatus == AgvTaskStatusEnum.完成联动失败; + if (!allowed) + { + throw new AgvBizException("status", $"任务[{taskNo}]当前状态[{task.AgvStatus}]不可取消"); + } + + // 已下发/执行中先通知 AGV 取消(失败阻断);99 无需通知(AGV 侧已完成) + if (task.AgvStatus == AgvTaskStatusEnum.已下发 || task.AgvStatus == AgvTaskStatusEnum.执行中) + { + var scene = _unitWork.FindSingle(x => x.AgvTaskType == task.AgvTaskType); + if (scene != null) + { + await _agvClient.CancelOrderAsync(scene.SceneId, task.TaskNo); + } + } + + using (var transaction = _wtm.DC.BeginTransaction()) + { + try + { + // 行锁复核:AGV 取消调用期间并发回调可能已推进终态,此时不再重复取消 + var locked = GetTaskForUpdateInTx(taskNo); + if (locked == null) + { + throw new AgvBizException("notfound", $"任务[{taskNo}]不存在"); + } + var stillAllowed = locked.AgvStatus == AgvTaskStatusEnum.新建 + || locked.AgvStatus == AgvTaskStatusEnum.已下发 + || locked.AgvStatus == AgvTaskStatusEnum.执行中 + || locked.AgvStatus == AgvTaskStatusEnum.完成联动失败; + if (!stillAllowed) + { + WriteAgvLog(locked.TaskNo, locked.AgvStatus, locked.AgvStatus, "Cancel", "down", null, + $"取消时任务已到终态[{locked.AgvStatus}],跳过取消"); + await transaction.CommitAsync(); + return; + } + var fromStatus = locked.AgvStatus; + ReleaseLocks(locked); + locked.AgvStatus = AgvTaskStatusEnum.取消; + _unitWork.Update(locked); + WriteAgvLog(locked.TaskNo, fromStatus, AgvTaskStatusEnum.取消, "Cancel", "down", null, "人工/页面取消"); + await transaction.CommitAsync(); + } + catch (Exception ex) + { + await transaction.RollbackAsync(); + throw new AgvBizException("error", $"取消任务失败: {ex.Message}"); + } + } + } + + /// + /// 释放锁(9.3 与锁定口径相反):容器/源库位/目标库位/库存回滚为未锁 + /// + private void ReleaseLocks(AgvTask task) + { + var container = _unitWork.FindSingle(x => x.Code == task.ContainerCode); + if (container != null) + { + container.IsLock = ContainerLockEnum.未锁; + _unitWork.Update(container); + } + + var fromLoc = _unitWork.FindSingle(x => x.Code == task.FromLocation); + if (fromLoc != null) + { + fromLoc.Status = LocationStatusEnum.未锁; + fromLoc.Version = Guid.NewGuid(); + _unitWork.Update(fromLoc); + } + + var toLoc = _unitWork.FindSingle(x => x.Code == task.ToLocation); + if (toLoc != null) + { + toLoc.Status = LocationStatusEnum.未锁; + toLoc.ContainerCode = string.IsNullOrWhiteSpace(toLoc.ContainerCode) || toLoc.ContainerCode == task.ContainerCode + ? null : toLoc.ContainerCode; + toLoc.ContainerStatus = string.IsNullOrWhiteSpace(toLoc.ContainerCode) ? LocationStatus.空仓位 : toLoc.ContainerStatus; + toLoc.Version = Guid.NewGuid(); + _unitWork.Update(toLoc); + } + + var inventories = _unitWork.Find(x => x.ContainerCode == task.ContainerCode).ToList(); + foreach (var inv in inventories) + { + inv.TaskStatus = InventoryTaskStatusEnum.Idle; + _unitWork.Update(inv); + } + } + + #endregion + + #region 回调 / 完成联动 + + /// + /// 处理 AGV 回调(6.2 状态机单调推进):Unloaded 触发完成联动;Cancel 释放锁;其余仅留痕推进 + /// + public async Task HandleCallbackAsync(AgvCallbackRequest dto) + { + if (dto == null || string.IsNullOrWhiteSpace(dto.TaskNo) || string.IsNullOrWhiteSpace(dto.Event)) + { + throw new AgvBizException("param", "回调参数无效"); + } + + var task = GetTaskForUpdate(dto.TaskNo); + if (task == null) + { + throw new AgvBizException("notfound", $"任务[{dto.TaskNo}]不存在"); + } + + // 终态任务收到任何事件:返回成功但标注已处理(规则1) + if (task.AgvStatus == AgvTaskStatusEnum.完成 + || task.AgvStatus == AgvTaskStatusEnum.取消 + || task.AgvStatus == AgvTaskStatusEnum.完成联动失败) + { + WriteAgvLog(task.TaskNo, task.AgvStatus, task.AgvStatus, dto.Event, "up", null, + "终态收到事件,仅留痕"); + return; + } + + switch (dto.Event) + { + case "Accepted": + Advance(task, AgvTaskStatusEnum.执行中, dto, "AGV已接单"); + break; + case "ArrivedLoad": + case "Loaded": + case "ArrivedUnload": + Advance(task, AgvTaskStatusEnum.执行中, dto, $"回调事件[{dto.Event}]"); + break; + case "Unloaded": + await CompleteTaskAsync(task, dto); + break; + case "Error": + { + var fromStatus = task.AgvStatus; + task.AgvStatus = AgvTaskStatusEnum.异常; + task.ErrorMsg = $"{dto.ErrorCode} {dto.ErrorMsg}".Trim(); + task.AgvCarNo = dto.AgvCarNo; + _unitWork.Update(task); + WriteAgvLog(task.TaskNo, fromStatus, AgvTaskStatusEnum.异常, dto.Event, "up", null, task.ErrorMsg); + } + break; + case "Cancel": + using (var transaction = _wtm.DC.BeginTransaction()) + { + try + { + // 行锁复核:并发 Unloaded 可能已完成联动并释放锁,此时不再重复释放/覆盖状态 + var locked = GetTaskForUpdateInTx(task.TaskNo); + if (locked == null) + { + throw new AgvBizException("notfound", $"任务[{dto.TaskNo}]不存在"); + } + if (locked.AgvStatus == AgvTaskStatusEnum.完成 + || locked.AgvStatus == AgvTaskStatusEnum.取消 + || locked.AgvStatus == AgvTaskStatusEnum.完成联动失败) + { + WriteAgvLog(locked.TaskNo, locked.AgvStatus, locked.AgvStatus, dto.Event, "up", null, + "回调取消时任务已终态,仅留痕"); + await transaction.CommitAsync(); + break; + } + var fromStatus = locked.AgvStatus; + ReleaseLocks(locked); + locked.AgvStatus = AgvTaskStatusEnum.取消; + locked.ErrorMsg = dto.ErrorMsg; + _unitWork.Update(locked); + WriteAgvLog(locked.TaskNo, fromStatus, AgvTaskStatusEnum.取消, dto.Event, "up", null, "AGV回调取消"); + await transaction.CommitAsync(); + } + catch (Exception ex) + { + await transaction.RollbackAsync(); + throw new AgvBizException("error", $"AGV 回调取消失败: {ex.Message}"); + } + } + break; + default: + throw new AgvBizException("param", $"未知回调事件: {dto.Event}"); + } + } + + /// + /// 状态推进(规则3):用 FOR UPDATE 行锁保证原子性,迟到/乱序事件不回退状态 + /// + private void Advance(AgvTask task, AgvTaskStatusEnum target, AgvCallbackRequest dto, string remark) + { + // 单调推进:目标值必须大于当前值;等于则仅留痕 + if (task.AgvStatus == target) + { + WriteAgvLog(task.TaskNo, task.AgvStatus, task.AgvStatus, dto.Event, "up", null, remark + "(状态不变)"); + return; + } + if (task.AgvStatus != null && task.AgvStatus.Value >= target) + { + WriteAgvLog(task.TaskNo, task.AgvStatus, task.AgvStatus, dto.Event, "up", null, + $"迟到/乱序事件,不回退状态(当前[{task.AgvStatus}],目标[{target}])"); + return; + } + + var fromStatus = task.AgvStatus; + task.AgvStatus = target; + task.AgvCarNo = dto.AgvCarNo; + _unitWork.Update(task); + WriteAgvLog(task.TaskNo, fromStatus, target, dto.Event, "up", null, remark); + } + + /// + /// 完成联动(9.4):事务内更新库存/容器/库位 + 生成流水 + ERP 通道置位 + /// 成功→完成(100);失败→完成联动失败(99) 且可重试 + /// + private async Task CompleteTaskAsync(AgvTask task, AgvCallbackRequest dto) + { + // 仅已下发/执行中可完成(6.2 Unloaded 前置) + if (task.AgvStatus != AgvTaskStatusEnum.已下发 && task.AgvStatus != AgvTaskStatusEnum.执行中) + { + WriteAgvLog(task.TaskNo, task.AgvStatus, task.AgvStatus, dto.Event, "up", null, + $"状态[{task.AgvStatus}]不可执行完成联动"); + return; + } + + var actualLocation = string.IsNullOrWhiteSpace(dto.ActualLocation) ? task.ToLocation : dto.ActualLocation.Trim(); + using (var transaction = _wtm.DC.BeginTransaction()) + { + try + { + await ExecuteCompleteLinkAsync(task, actualLocation, dto.AgvCarNo); + task.AgvStatus = AgvTaskStatusEnum.完成; + task.AgvCarNo = dto.AgvCarNo; + task.ErrorMsg = null; + _unitWork.Update(task); + WriteAgvLog(task.TaskNo, AgvTaskStatusEnum.执行中, AgvTaskStatusEnum.完成, dto.Event, "up", null, + $"完成联动成功,实际落位[{actualLocation}]"); + await transaction.CommitAsync(); + } + catch (Exception ex) + { + await transaction.RollbackAsync(); + // 联动失败:置 99(终态),页面可重试 + task.AgvStatus = AgvTaskStatusEnum.完成联动失败; + task.ErrorMsg = $"完成联动失败: {ex.Message}"; + _unitWork.Update(task); + WriteAgvLog(task.TaskNo, AgvTaskStatusEnum.执行中, AgvTaskStatusEnum.完成联动失败, dto.Event, "up", null, task.ErrorMsg); + throw new AgvBizException("error", task.ErrorMsg); + } + } + } + + /// + /// 完成联动事务主体(9.4 + 15.3.1):库存只更新不删除、容器/库位解锁、流水、ERP 置位 + /// + private async Task ExecuteCompleteLinkAsync(AgvTask task, string actualLocation, string agvCarNo) + { + var billType = ParseBillType(task.BillType); + var isInbound = billType == AgvBillTypeEnum.In_AGV; + // 是否需 ERP 回传(15.3-1):1 入库报工(FinishIn)、3/4 出库回传(AddOtherOut);2/5/6 不回传 + var reportBack = IsErpReportBack(task.AgvTaskType); + var details = ParseDetails(task.Details); + var sysUser = _wtm.LoginUserInfo?.ITCode ?? _option.SysUser; + // 库存 UploadErpFlag 置位(15.3-1):入库报工类置0走 FinishInJob、不回传类置1; + // 出库类一律置1(出库回传走流水 AddOtherOut 通道,库存不置0,防止被 FinishInJob 误当入库上送) + var invErpFlag = isInbound ? (reportBack ? 0 : 1) : 1; + + // 1. 库存:只更新不删除;带 SKU 且本地无库存时补建 + var inventories = _unitWork.Find(x => x.ContainerCode == task.ContainerCode).ToList(); + if (inventories.Count == 0 && details != null && details.Count > 0) + { + foreach (var d in details) + { + inventories.Add(new Inventory + { + ZoneId = _unitWork.FindSingle(x => x.Code == actualLocation)?.ZoneId ?? 0, + ContainerCode = task.ContainerCode, + LocationCode = actualLocation, + MaterialCode = d.MaterialCode, + Qty = isInbound ? (d.Qty ?? 0) : 0, + TaskQty = d.Qty, + BatchCode = d.Batch, + ReceiptDetailId = d.ErpDetailId, + TaskStatus = InventoryTaskStatusEnum.Idle, + UploadErpFlag = invErpFlag, + CreateBy = sysUser, + CreateTime = DateTime.Now + }); + } + } + foreach (var inv in inventories) + { + inv.LocationCode = actualLocation; + inv.TaskStatus = InventoryTaskStatusEnum.Idle; + inv.UploadErpFlag = inv.UploadErpFlag ?? invErpFlag; + _unitWork.Update(inv); + } + + // 2. 流水:入库 1 条 in / 出库 1 条 out(15.3-1 六类均为 1 条) + if (inventories.Count > 0) + { + // 出库回传流水需携带库区编码,供 AddOtherOutJob 回传时按库区映射 WhCode + var locZoneId = _unitWork.FindSingle(x => x.Code == actualLocation)?.ZoneId; + var zoneCode = locZoneId.HasValue + ? _unitWork.FindSingle(x => x.ID == locZoneId.Value)?.ZoneCode + : null; + foreach (var inv in inventories) + { + var tran = _mapper.Map(inv); + tran.Type = isInbound ? InventoryTranType.入库 : InventoryTranType.出库; + // 出库回传类(3/4)挂 AddOtherOut 置 0 走 AddOtherOutJob;其余用 AGV 自身流水类型且置 1 不回传 + tran.BillType = isInbound ? billType.ToString() + : (reportBack ? InventoryTransaction.ErpOtherOutBillType : billType.ToString()); + tran.UploadErpFlag = isInbound ? 1 : (reportBack ? 0 : 1); + tran.ZoneCode = zoneCode; + tran.CreateTime = DateTime.Now; + _unitWork.Add(tran); + } + } + + // 3. 容器:更新库位 + 解锁 + var container = _unitWork.FindSingle(x => x.Code == task.ContainerCode); + if (container != null) + { + container.LocationCode = actualLocation; + container.IsLock = ContainerLockEnum.未锁; + container.Status = isInbound ? ContainerStatus.有 : ContainerStatus.空; + _unitWork.Update(container); + } + + // 4. 库位:源位清空,目标位落容器,刷新并发版本 + var fromLoc = _unitWork.FindSingle(x => x.Code == task.FromLocation); + if (fromLoc != null) + { + fromLoc.ContainerCode = string.IsNullOrWhiteSpace(fromLoc.ContainerCode) || fromLoc.ContainerCode == task.ContainerCode + ? null : fromLoc.ContainerCode; + fromLoc.Status = LocationStatusEnum.未锁; + fromLoc.ContainerStatus = string.IsNullOrWhiteSpace(fromLoc.ContainerCode) ? LocationStatus.空仓位 : fromLoc.ContainerStatus; + fromLoc.Version = Guid.NewGuid(); + _unitWork.Update(fromLoc); + } + var toLoc = _unitWork.FindSingle(x => x.Code == actualLocation); + if (toLoc != null) + { + toLoc.ContainerCode = task.ContainerCode; + toLoc.Status = LocationStatusEnum.未锁; + toLoc.ContainerStatus = isInbound ? LocationStatus.有货 : LocationStatus.空容器; + toLoc.Version = Guid.NewGuid(); + _unitWork.Update(toLoc); + } + + // 5. ERP 通道:仅入库报工类(业务1)在线报工 FinishIn;出库回传类(3/4)由 AddOtherOutJob 补传;不回传类(2/5/6)跳过 + if (isInbound && reportBack && inventories.Count > 0) + { + var invVM = _wtm.CreateVM(); + foreach (var inv in inventories) + { + await invVM.ProcessErpFinishIn(inv, TaskTypeEnum.入库); + } + } + } + + /// + /// 重试完成联动(99 → 重新执行完成联动) + /// + public async Task RetryFinishLinkAsync(string taskNo) + { + var task = GetTaskForUpdate(taskNo); + if (task == null) + { + throw new AgvBizException("notfound", $"任务[{taskNo}]不存在"); + } + if (task.AgvStatus != AgvTaskStatusEnum.完成联动失败) + { + throw new AgvBizException("status", $"任务[{taskNo}]当前状态[{task.AgvStatus}]不可重试完成联动"); + } + await CompleteTaskAsync(task, new AgvCallbackRequest + { + TaskNo = task.TaskNo, + Event = "Unloaded", + ActualLocation = task.ToLocation, + AgvCarNo = task.AgvCarNo + }); + } + + #endregion + + #region 辅助 + + /// + /// 按 TaskNo 查询任务(FOR UPDATE 行锁,保证并发互斥) + /// + private AgvTask GetTaskForUpdate(string taskNo) + { + return _wtm.DC.Set() + .FromSqlRaw("SELECT * FROM `AgvTask` WHERE `TaskNo` = {0} FOR UPDATE", taskNo) + .AsNoTracking() + .SingleOrDefault(); + } + + /// + /// 事务内复核任务:与 GetTaskForUpdate 同一实现, + /// 区别只是调用时已处于事务中,FOR UPDATE 行锁会保持到事务提交,用于取消/回调的并发复核 + /// + private AgvTask GetTaskForUpdateInTx(string taskNo) + { + return GetTaskForUpdate(taskNo); + } + + /// + /// 解析流水类型 + /// + private static AgvBillTypeEnum ParseBillType(string billType) + { + if (Enum.TryParse(billType, out var result)) + { + return result; + } + return AgvBillTypeEnum.In_AGV; + } + + /// + /// 判断是否需 ERP 回传(15.3-1):1 入库报工(FinishIn)、3/4 出库回传(AddOtherOut);2/5/6 不回传 + /// + private static bool IsErpReportBack(AgvTaskTypeEnum? taskType) + { + return taskType == AgvTaskTypeEnum.原材料入库 + || taskType == AgvTaskTypeEnum.原料满托出库 + || taskType == AgvTaskTypeEnum.混料满桶上线; + } + + /// + /// 解析任务物料明细 JSON + /// + private static List ParseDetails(string details) + { + if (string.IsNullOrWhiteSpace(details)) + { + return null; + } + try + { + return JsonConvert.DeserializeObject>(details); + } + catch + { + return null; + } + } + + /// + /// 写 AGV 任务状态/报文日志(9.6) + /// + private void WriteAgvLog(string taskNo, AgvTaskStatusEnum? fromStatus, AgvTaskStatusEnum? toStatus, + string @event, string direction, string orderId, string remark) + { + try + { + var log = new AgvTaskLog + { + TaskNo = taskNo, + OrderId = orderId, + FromStatus = fromStatus, + ToStatus = toStatus, + Event = @event, + Direction = direction, + Operator = _wtm.LoginUserInfo?.ITCode ?? "AGV", + Remark = remark, + CreateTime = DateTime.Now, + CreateBy = _wtm.LoginUserInfo?.ITCode ?? "AGV" + }; + _unitWork.Add(log); + } + catch (Exception ex) + { + _wtm.DoLog("写 AGV 任务日志失败", ActionLogTypesEnum.Normal, "AgvTaskService", + request: taskNo, result: ex.Message); + } + } + + #endregion + } +} diff --git a/HHWMS.Web/Services/Erp/ErpMaterialService.cs b/HHWMS.Web/Services/Erp/ErpMaterialService.cs new file mode 100644 index 0000000..5ebb63f --- /dev/null +++ b/HHWMS.Web/Services/Erp/ErpMaterialService.cs @@ -0,0 +1,179 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; +using HHWMS.Web.Models; + +namespace HHWMS.Web.Services.Erp +{ + /// + /// 物料查询服务:本地物料表优先,查不到再调用 ERP LoadInventory,并把 ERP 结果回写本地 + /// 物料编码对应 ERP 字段 InvCode,图号对应 ERP 字段 InvDefine1 + /// + public class ErpMaterialService + { + private const string ErpCode = "003"; + private const int ErpSize = 50; + private const int ErpTimeoutSeconds = 15; + + private readonly IUnitWork _unitWork; + private readonly WTMContext _wtm; + + public ErpMaterialService(IUnitWork unitWork, WTMContext wtm) + { + _unitWork = unitWork; + _wtm = wtm; + } + + /// + /// 本地是否有可用物料:物料编码命中且物料编码、图号都不为空/空格(否则视为没查到,需要调 ERP 补全) + /// + public bool ExistsLocalByCode(string keyword) + { + keyword = keyword?.Trim(); + return !string.IsNullOrWhiteSpace(keyword) + && _unitWork.Find(x => x.MaterialCode.Contains(keyword) + && x.MaterialCode != null && x.MaterialCode.Trim() != "" + && x.MaterialType != null && x.MaterialType.Trim() != "") + .Any(); + } + + /// + /// 本地是否有可用物料:图号命中且图号、物料编码都不为空/空格(否则视为没查到,需要调 ERP 补全) + /// + public bool ExistsLocalByType(string keyword) + { + keyword = keyword?.Trim(); + return !string.IsNullOrWhiteSpace(keyword) + && _unitWork.Find(x => x.MaterialType.Contains(keyword) + && x.MaterialType != null && x.MaterialType.Trim() != "" + && x.MaterialCode != null && x.MaterialCode.Trim() != "") + .Any(); + } + + /// + /// 列表搜索前置同步:物料编码本地查不到时才调 ERP(InvCode)并回写,不返回数据,列表随后统一查询 + /// + public async Task EnsureByCodeAsync(string keyword) + { + keyword = keyword?.Trim(); + if (string.IsNullOrWhiteSpace(keyword) || ExistsLocalByCode(keyword)) + { + return; + } + SaveItems(await QueryErpByCodeAsync(keyword)); + } + + /// + /// 列表搜索前置同步:图号本地查不到时才调 ERP(InvDefine1)并回写 + /// + public async Task EnsureByTypeAsync(string keyword) + { + keyword = keyword?.Trim(); + if (string.IsNullOrWhiteSpace(keyword) || ExistsLocalByType(keyword)) + { + return; + } + SaveItems(await QueryErpByTypeAsync(keyword)); + } + + /// 按物料编码调 ERP(InvCode) + private Task> QueryErpByCodeAsync(string keyword) + { + return QueryErpAsync(new LoadInventoryRequest { InvCode = keyword }); + } + + /// 按图号调 ERP(InvDefine1) + private Task> QueryErpByTypeAsync(string keyword) + { + return QueryErpAsync(new LoadInventoryRequest { InvDefine1 = keyword }); + } + + /// 调用 ERP LoadInventory;异常或返回非成功时返回空列表,不影响页面搜索 + private async Task> QueryErpAsync(LoadInventoryRequest request) + { + request.ErpCode = ErpCode; + request.Size = ErpSize; + request.Page = 1; + try + { + var apiResult = await _wtm.CallAPI("ERP", "LoadInventory", + HttpMethodEnum.POST, request, ErpTimeoutSeconds); + var data = apiResult?.Data; + if (data == null || data.Code != 0) + { + _wtm.DoLog("ERP物料查询: 返回异常", ActionLogTypesEnum.Normal, "物料", + request: $"InvCode={request.InvCode}, InvDefine1={request.InvDefine1}", + result: $"Code={data?.Code}, Msg={data?.Msg ?? apiResult?.ErrorMsg}"); + return new List(); + } + + return data.Data?.Where(x => !string.IsNullOrWhiteSpace(x.InvCode)).ToList() + ?? new List(); + } + catch (Exception ex) + { + _wtm.DoLog("ERP物料查询: 调用失败", ActionLogTypesEnum.Normal, "物料", + request: $"InvCode={request.InvCode}, InvDefine1={request.InvDefine1}", + result: ex.Message); + return new List(); + } + } + + /// 将 ERP 物料回写本地:按物料编码更新,没有则新增 + private void SaveItems(List items) + { + if (items == null || items.Count == 0) + { + return; + } + + var codes = items.Select(x => x.InvCode).ToList(); + var existing = _unitWork.Find(x => codes.Contains(x.MaterialCode)).ToList(); + var adds = new List(); + var updates = new List(); + var operatorCode = _wtm.LoginUserInfo?.ITCode ?? "System"; + + foreach (var item in items) + { + var local = existing.FirstOrDefault(x => x.MaterialCode == item.InvCode); + if (local == null) + { + adds.Add(new Material + { + MaterialCode = item.InvCode, + MaterialName = item.InvName, + MaterialSpec = item.InvStd, + MaterialUnit = item.UnitName, + MaterialType = item.InvDefine1, + SupplierCode = item.InvDefine4, + Qty = 0, + CreateTime = DateTime.Now, + CreateBy = operatorCode + }); + continue; + } + + local.MaterialName = item.InvName; + local.MaterialSpec = item.InvStd; + local.MaterialUnit = item.UnitName; + local.MaterialType = item.InvDefine1; + local.SupplierCode = item.InvDefine4; + local.UpdateTime = DateTime.Now; + local.UpdateBy = operatorCode; + updates.Add(local); + } + + if (adds.Count > 0) + { + _unitWork.BatchAdd(adds); + } + if (updates.Count > 0) + { + _unitWork.BatchUpdate(updates); + } + } + } +} diff --git a/HHWMS.Web/WebService/WmsMesService.cs b/HHWMS.Web/WebService/WmsMesService.cs index 50afc58..2a9b406 100644 --- a/HHWMS.Web/WebService/WmsMesService.cs +++ b/HHWMS.Web/WebService/WmsMesService.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; using System.ServiceModel; using System.ServiceModel.Channels; using System.Text; @@ -27,12 +28,30 @@ namespace WebService { try { - _wtm.DoLog("", ActionLogTypesEnum.Normal,"mes", request: materails); + _wtm.DoLog($"MES物料推送: 收到请求", ActionLogTypesEnum.Normal, "物料", request: materails); var data = JsonConvert.DeserializeObject(materails); - // 插入物料信息表 + + // 解析物料数量和编码列表,用于日志 + var items = data?.ISSUEMATERIALS?.ISSUEITEM ?? new List(); + var codes = items.Select(x => x.MATNR).Distinct().ToList(); + _wtm.DoLog($"MES物料推送: 解析完成{items.Count}条", ActionLogTypesEnum.Normal, + "物料", request: $"codes=[{string.Join(",", codes)}]"); + + // 查本地已存在的物料编码 + var existingCodes = _unitwork.Find(m => codes.Contains(m.MaterialCode)) + .Select(m => m.MaterialCode) + .ToHashSet(); + var newCodes = codes.Where(c => !existingCodes.Contains(c)).ToList(); + var skipCodes = codes.Where(c => existingCodes.Contains(c)).ToList(); + var materialList = new List(); - foreach (var item in data.ISSUEMATERIALS.ISSUEITEM) + foreach (var item in items) { + // 已存在的跳过,不重复插入 + if (existingCodes.Contains(item.MATNR)) + { + continue; + } var material = new Material { MaterialCode = item.MATNR, @@ -41,20 +60,30 @@ namespace WebService MaterialUnit = item.ERFME, MaterialSpec = item.ZZXHGG, Batch = item.LICHA, - SupplierCode = item.ZZSCCJ, CreateTime = DateTime.Now, CreateBy = "mes" }; materialList.Add(material); } - _unitwork.BatchAdd(materialList.ToArray()); + + if (materialList.Count > 0) + { + _unitwork.BatchAdd(materialList.ToArray()); + } + + _wtm.DoLog($"MES物料推送: 完成", ActionLogTypesEnum.Normal, + "物料", + request: $"新增={materialList.Count}条, 跳过(已存在)={skipCodes.Count}条", + result: $"new=[{string.Join(",", newCodes)}], skip=[{string.Join(",", skipCodes)}]"); + return new Result(); } - catch(Exception ex) + catch (Exception ex) { - _wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: materails, result: "error"); - return new Result { Status = "N", Message = ex.Message}; + _wtm.DoLog($"MES物料推送: 异常", ActionLogTypesEnum.Normal, "物料", + request: materails, result: ex.ToString()); + return new Result { Status = "N", Message = ex.Message }; } } diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json index 4d9680d..13176b3 100644 --- a/HHWMS.Web/appsettings.json +++ b/HHWMS.Web/appsettings.json @@ -24,16 +24,13 @@ "Connections": [ { "Key": "default", -<<<<<<< Updated upstream - "Value": "Server=127.0.0.1;Port=3306;Database=wms_yongfeng_cp;Uid=root;Password=abc123*;Character Set=utf8mb4;", -======= "Value": "Server=127.0.0.1;Port=3306;Database=wms_yongfeng_cp;Uid=root;Password=123456;Character Set=utf8mb4;", ->>>>>>> Stashed changes "DBType": "mysql" }, + { "Key": "cp", - "Value": "Server=127.0.0.1;Port=3306;Database=wms_yongfeng_cp;Uid=root;Password=abc123*;Character Set=utf8mb4;", + "Value": "Server=127.0.0.1;Port=3306;Database=wms_yongfeng_cp;Uid=root;Password=123456;Character Set=utf8mb4;", "DBType": "mysql" } ], @@ -108,9 +105,22 @@ "Address": "http://127.0.0.1:65534/api/WCS/" }, "ERP": { - "Address": "http://127.0.0.1:4523/m1/1364541-1434451-default/" + "Address": "http://192.168.16.4:8081/Api/" + }, + "AGV": { + "Address": "" } }, + "AgvOption": { + "Enabled": true, //模块总开关 + "MockEnabled": true, //Mock模式:不实际调用AGV,直接返回成功 + "CallTimeoutSeconds": 15, //对外调用超时(秒) + "LockTimeoutMinutes": 60, //锁持有告警阈值(分钟) + "TimeoutMonitorMinutes": 30, //超时监控阈值(分钟) + "ReconcileEnabled": false, //对账Job开关 + "ReconcileMinutes": 10, + "SysUser": "system" //联动写库存系统账号 + }, "AppSettings": { "Key1": "abc", "Key2": "123" diff --git a/sql/01_agv_task_table.sql b/sql/01_agv_task_table.sql new file mode 100644 index 0000000..1e19522 --- /dev/null +++ b/sql/01_agv_task_table.sql @@ -0,0 +1,66 @@ +-- ============================================================= +-- AGV 平库对接 · 01 AgvTask 独立任务表 + 归档镜像表 +-- 依据:《平库AGV方案流程(AGV自调度版).md》10.2 生产 DDL +-- 执行范围:AGV 平库所在数据库(默认连接 wms_yongfeng_cp) +-- 说明: +-- 1) 独立表方案(v2),不复用 TaskHeader/TaskDetail,立库零改动; +-- 2) AgvTask 主表只保留 1 个月以内任务,超期终态先镜像备份到 +-- AgvTaskHistory,再从主表物理删除(见 9.6); +-- 3) 脚本可重复执行(IF NOT EXISTS 兜底)。 +-- ============================================================= + +-- 1) AgvTask 独立任务表 +CREATE TABLE IF NOT EXISTS AgvTask ( + ID INT NOT NULL AUTO_INCREMENT, + TaskNo VARCHAR(50) NOT NULL COMMENT 'WMS任务号(=上游sourceCode或自生成AGV+日期+序号)', + SourceCode VARCHAR(50) NULL COMMENT '上游任务号(去重键)', + SourceSystem VARCHAR(20) NULL COMMENT '上游来源系统标识', + AgvTaskType SMALLINT NULL COMMENT 'AGV业务类型(AgvTaskTypeEnum 1~6)', + FromLocation VARCHAR(64) NOT NULL COMMENT '起点库位编码(AGV点位)', + ToLocation VARCHAR(64) NOT NULL COMMENT '终点库位编码(AGV点位)', + FromFloor INT NULL COMMENT '起点楼层(方案乙确认后删)', + ToFloor INT NULL COMMENT '终点楼层(方案乙确认后删)', + ContainerCode VARCHAR(50) NOT NULL COMMENT '容器号(不给则生成LS临时容器)', + Priority INT NULL DEFAULT 0 COMMENT '优先级(数值越大越优先)', + AgvStatus SMALLINT NULL DEFAULT 0 COMMENT 'AGV任务状态(AgvTaskStatusEnum)', + AgvCarNo VARCHAR(20) NULL COMMENT 'AGV小车编号(回调回传,展示用)', + ErrorMsg VARCHAR(255) NULL COMMENT '失败/异常/取消原因', + BillType VARCHAR(20) NULL COMMENT '流水类型(AgvBillTypeEnum:In_AGV/Out_AGV/Move_AGV)', + Details LONGTEXT NULL COMMENT '物料明细(JSON,SKU,非强制)', + CreateBy VARCHAR(50) NULL, + CreateTime DATETIME NULL, + UpdateBy VARCHAR(50) NULL, + UpdateTime DATETIME NULL, + PRIMARY KEY (ID), + UNIQUE INDEX UX_AgvTask_TaskNo (TaskNo), + UNIQUE INDEX UX_AgvTask_Source (SourceCode, SourceSystem), + INDEX IX_AgvTask_Status (AgvStatus) +) COMMENT='AGV平库任务(独立表)'; + +-- 2) AgvTaskHistory 归档镜像表(字段镜像 AgvTask,追加归档时间) +CREATE TABLE IF NOT EXISTS AgvTaskHistory ( + ID INT NOT NULL AUTO_INCREMENT, + TaskNo VARCHAR(50) NOT NULL COMMENT 'WMS任务号', + SourceCode VARCHAR(50) NULL COMMENT '上游任务号(去重键)', + SourceSystem VARCHAR(20) NULL COMMENT '上游来源系统标识', + AgvTaskType SMALLINT NULL COMMENT 'AGV业务类型(AgvTaskTypeEnum 1~6)', + FromLocation VARCHAR(64) NULL COMMENT '起点库位编码', + ToLocation VARCHAR(64) NULL COMMENT '终点库位编码', + FromFloor INT NULL COMMENT '起点楼层', + ToFloor INT NULL COMMENT '终点楼层', + ContainerCode VARCHAR(50) NULL COMMENT '容器号', + Priority INT NULL DEFAULT 0 COMMENT '优先级', + AgvStatus SMALLINT NULL COMMENT '归档前任务状态', + AgvCarNo VARCHAR(20) NULL COMMENT 'AGV小车编号', + ErrorMsg VARCHAR(255) NULL COMMENT '失败/异常/取消原因', + BillType VARCHAR(20) NULL COMMENT '流水类型(AgvBillTypeEnum)', + Details LONGTEXT NULL COMMENT '物料明细(JSON,SKU)', + ArchivedAt DATETIME NULL COMMENT '归档时间', + CreateBy VARCHAR(50) NULL, + CreateTime DATETIME NULL, + UpdateBy VARCHAR(50) NULL, + UpdateTime DATETIME NULL, + PRIMARY KEY (ID), + INDEX IX_AgvTaskHistory_TaskNo (TaskNo), + INDEX IX_AgvTaskHistory_CreateTime (CreateTime) +) COMMENT='AGV任务归档镜像(超1个月终态任务备份于此)'; diff --git a/sql/02_agv_locationzone_floor.sql b/sql/02_agv_locationzone_floor.sql new file mode 100644 index 0000000..f544fc0 --- /dev/null +++ b/sql/02_agv_locationzone_floor.sql @@ -0,0 +1,31 @@ +-- ============================================================= +-- AGV 平库对接 · 02 LocationZone 新增楼层字段 +-- 依据:《平库AGV方案流程(AGV自调度版).md》5.3 / 10.2 +-- 说明: +-- 1) Floor 用于 AGV 任务 FromFloor/ToFloor 取值与跨楼层方向校验; +-- 2) 若采用 Location.Floor 替代方案,则改为在 Location 上加列; +-- 3) 方案乙(AGV 自判楼层)确认后本脚本可废弃(见 15.7); +-- 4) 脚本可重复执行。 +-- ============================================================= + +-- 新增楼层字段 +SET @col_exists = ( + SELECT COUNT(1) + FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = DATABASE() + AND TABLE_NAME = 'LocationZone' + AND COLUMN_NAME = 'Floor' +); + +SET @ddl = IF( + @col_exists = 0, + 'ALTER TABLE LocationZone ADD COLUMN Floor INT NULL COMMENT ''库区所在楼层''', + 'SELECT 1' +); +PREPARE stmt FROM @ddl; +EXECUTE stmt; +DEALLOCATE PREPARE stmt; + +-- 提示:现场需按实际楼层为各库区补充 Floor 值(示例,请按现场调整) +-- UPDATE LocationZone SET Floor = 1 WHERE ZoneCode = 'CP'; -- 成品库 +-- UPDATE LocationZone SET Floor = 1 WHERE ZoneCode = 'XB'; -- 线边库 diff --git a/sql/03_agv_tasklog.sql b/sql/03_agv_tasklog.sql new file mode 100644 index 0000000..921bef6 --- /dev/null +++ b/sql/03_agv_tasklog.sql @@ -0,0 +1,60 @@ +-- ============================================================= +-- AGV 平库对接 · 03 AgvTaskLog 状态与报文日志表 + 归档镜像表 +-- 依据:《平库AGV方案流程(AGV自调度版).md》9.6 / 10.2 +-- 说明: +-- 1) 每次状态变更/关键动作写一条,页面展示状态时间线; +-- 2) OrderId 为 AGV 返回运单号(与 TaskNo 一致,原值留痕); +-- 3) AgvTaskLog 保留 >= 6 个月,超期先镜像备份到 AgvTaskLogHistory, +-- 再从主表物理删除; +-- 4) 脚本可重复执行。 +-- ============================================================= + +-- 1) AgvTaskLog 新表(实体必须声明 public new int ID,否则 EF 会用 BasePoco 的 Guid 主键) +CREATE TABLE IF NOT EXISTS AgvTaskLog ( + ID INT NOT NULL AUTO_INCREMENT, + TaskNo VARCHAR(50) NOT NULL COMMENT 'WMS任务号', + OrderId VARCHAR(50) NULL COMMENT 'AGV返回运单号(原值留痕,与TaskNo一致)', + FromStatus SMALLINT NULL COMMENT '变更前状态', + ToStatus SMALLINT NULL COMMENT '变更后状态', + Event VARCHAR(30) NULL COMMENT '回调事件', + Direction VARCHAR(10) NULL COMMENT 'down=下发 up=回调', + EventTime DATETIME NULL COMMENT '事件发生时间', + SourceIp VARCHAR(50) NULL COMMENT '来源IP', + DurationMs INT NULL COMMENT '耗时(毫秒)', + RequestJson TEXT NULL COMMENT '请求报文', + ResponseJson TEXT NULL COMMENT '响应报文', + Operator VARCHAR(50) NULL COMMENT '操作人(AGV回调记AGV)', + Remark VARCHAR(500) NULL COMMENT '备注/异常信息', + CreateBy VARCHAR(50) NULL, + CreateTime DATETIME NULL, + UpdateBy VARCHAR(50) NULL, + UpdateTime DATETIME NULL, + PRIMARY KEY (ID), + INDEX IX_AgvTaskLog_TaskNo (TaskNo, CreateTime), + INDEX IX_AgvTaskLog_OrderId (OrderId) +) COMMENT='AGV任务状态与报文日志'; + +-- 2) AgvTaskLogHistory 归档镜像表(字段镜像 AgvTaskLog,追加归档时间) +CREATE TABLE IF NOT EXISTS AgvTaskLogHistory ( + ID INT NOT NULL AUTO_INCREMENT, + TaskNo VARCHAR(50) NOT NULL COMMENT 'WMS任务号', + OrderId VARCHAR(50) NULL COMMENT 'AGV返回运单号', + FromStatus SMALLINT NULL COMMENT '变更前状态', + ToStatus SMALLINT NULL COMMENT '变更后状态', + Event VARCHAR(30) NULL COMMENT '回调事件', + Direction VARCHAR(10) NULL COMMENT 'down=下发 up=回调', + EventTime DATETIME NULL COMMENT '事件发生时间', + SourceIp VARCHAR(50) NULL COMMENT '来源IP', + DurationMs INT NULL COMMENT '耗时(毫秒)', + RequestJson TEXT NULL COMMENT '请求报文', + ResponseJson TEXT NULL COMMENT '响应报文', + Operator VARCHAR(50) NULL COMMENT '操作人(AGV回调记AGV)', + Remark VARCHAR(500) NULL COMMENT '备注/异常信息', + ArchivedAt DATETIME NULL COMMENT '归档时间', + CreateBy VARCHAR(50) NULL, + CreateTime DATETIME NULL, + UpdateBy VARCHAR(50) NULL, + UpdateTime DATETIME NULL, + PRIMARY KEY (ID), + INDEX IX_AgvTaskLogHistory_TaskNo (TaskNo, CreateTime) +) COMMENT='AGV任务日志归档镜像(超6个月日志备份于此)'; diff --git a/sql/04_agv_scene_config.sql b/sql/04_agv_scene_config.sql new file mode 100644 index 0000000..aa14ed0 --- /dev/null +++ b/sql/04_agv_scene_config.sql @@ -0,0 +1,40 @@ +-- ============================================================= +-- AGV 平库对接 · 04 AgvTaskSceneConfig 任务场景配置表 + 初始数据 +-- 依据:《平库AGV方案流程(AGV自调度版).md》5.6 / 10.2 +-- 说明: +-- 1) 映射"客户(甲方/MES)下发的字符串任务类型 -> AGV 场景"; +-- 2) SourceTaskType 为映射主键,WMS 不写死任何场景号, +-- 现场调整场景只改本表,不改代码; +-- 3) SceneId/SceneName 需按厂商(仙工)实际场景配置填写, +-- 下述初始数据为占位值,实施时以现场为准更新; +-- 4) 脚本可重复执行(INSERT IGNORE)。 +-- ============================================================= + +CREATE TABLE IF NOT EXISTS AgvTaskSceneConfig ( + ID INT NOT NULL AUTO_INCREMENT, + SourceTaskType VARCHAR(50) NOT NULL COMMENT '上游字符串任务类型(映射主键)', + AgvTaskType SMALLINT NOT NULL COMMENT '内部业务类型(AgvTaskTypeEnum 1~6, 必填)', + SceneId VARCHAR(64) NOT NULL COMMENT 'AGV场景ID', + SceneName VARCHAR(64) NULL COMMENT 'AGV场景名称', + BinTaskLoad VARCHAR(32) NOT NULL DEFAULT 'Load' COMMENT '取货动作名', + BinTaskUnload VARCHAR(32) NOT NULL DEFAULT 'Unload' COMMENT '放货动作名', + Remark VARCHAR(255) NULL COMMENT '备注', + CreateBy VARCHAR(50) NULL, + CreateTime DATETIME NULL, + UpdateBy VARCHAR(50) NULL, + UpdateTime DATETIME NULL, + PRIMARY KEY (ID), + UNIQUE INDEX UX_AgvTaskSceneConfig_Source (SourceTaskType) +) COMMENT='AGV任务场景配置'; + +-- 六类业务初始数据(SceneId 为占位值,现场按厂商配置更新) +INSERT IGNORE INTO AgvTaskSceneConfig + (SourceTaskType, AgvTaskType, SceneId, SceneName, BinTaskLoad, BinTaskUnload, Remark, + CreateTime, CreateBy) +VALUES + ('RAW_IN', 1, 'SCENE_RAW_IN', '原材料入库', 'Load', 'Unload', '1F月台->货架区', NOW(), 'system'), + ('EMPTY_TRAY_REQ', 2, 'SCENE_EMPTY_TRAY_REQ', '原料空托需求', 'Load', 'Unload', '空托区/货架区->月台缓存区', NOW(), 'system'), + ('RAW_FULL_OUT', 3, 'SCENE_RAW_FULL_OUT', '原料满托出库', 'Load', 'Unload', '货架区->混料上料点(同楼层点到点)', NOW(), 'system'), + ('MIX_BUCKET_UP', 4, 'SCENE_MIX_BUCKET_UP', '混料满桶上线', 'Load', 'Unload', '1F除湿房缓存区->2F需求工位', NOW(), 'system'), + ('EMPTY_BUCKET_DOWN',5, 'SCENE_EMPTY_BUCKET_DOWN','空桶缓存', 'Load', 'Unload', '2F平台工位->1F除湿房缓存区', NOW(), 'system'), + ('AUX_MAT_IN', 6, 'SCENE_AUX_MAT_IN', '辅材缓存', 'Load', 'Unload', '1F月台缓存区->2F辅材缓存区', NOW(), 'system'); diff --git a/sql/05_agv_dml_menu.sql b/sql/05_agv_dml_menu.sql new file mode 100644 index 0000000..60ded63 --- /dev/null +++ b/sql/05_agv_dml_menu.sql @@ -0,0 +1,166 @@ +-- ============================================================= +-- AGV 平库对接 · 05 SysJob + 菜单/权限 DML +-- 依据:《平库AGV方案流程(AGV自调度版).md》10.2 / 9.3 +-- 说明: +-- 1) 不插 SysJob 记录,Job 会被按"每年一次"cron 注册,等于不跑; +-- 2) AgvTimeoutMonitorJob 默认暂停(Status=0),联调通过再启用; +-- AgvTaskArchiveJob 建议启用(Status=1,每日凌晨归档); +-- 3) 菜单/权限参照 sql/20260801_fix_add_sale_out_retry_permission.sql, +-- ClassName 格式:HHWMS.Web.Controllers,Controller名(不带 Area); +-- 4) 脚本可重复执行。 +-- ============================================================= + +-- ------------------------------------------------------------- +-- 1) SysJob:AGV 超时监控(默认暂停) +-- ------------------------------------------------------------- +INSERT INTO `SysJob` + (`JobName`, `JobGroup`, `MethodName`, `MethodParams`, `CronExpression`, + `LastFireTime`, `NextFireTime`, `MisfirePolicy`, `Status`, `Remark`, + `CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`) +SELECT + 'AgvTimeoutMonitorJob', 'AgvTimeoutMonitorJob', NULL, NULL, '0 */10 * * * ?', + NULL, NULL, NULL, 0, 'AGV任务超时监控(下发后N分钟仍非终态告警)', + NOW(), 'system', NULL, NULL +WHERE NOT EXISTS ( + SELECT 1 FROM `SysJob` WHERE `JobName` = 'AgvTimeoutMonitorJob' +); + +-- ------------------------------------------------------------- +-- 2) SysJob:AGV 任务归档(每日凌晨 3:30,主表保留 1 个月) +-- ------------------------------------------------------------- +INSERT INTO `SysJob` + (`JobName`, `JobGroup`, `MethodName`, `MethodParams`, `CronExpression`, + `LastFireTime`, `NextFireTime`, `MisfirePolicy`, `Status`, `Remark`, + `CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`) +SELECT + 'AgvTaskArchiveJob', 'AgvTaskArchiveJob', NULL, NULL, '0 30 3 * * ?', + NULL, NULL, NULL, 1, 'AGV任务归档(超1个月终态任务镜像备份后主表清除)', + NOW(), 'system', NULL, NULL +WHERE NOT EXISTS ( + SELECT 1 FROM `SysJob` WHERE `JobName` = 'AgvTaskArchiveJob' +); + +-- ------------------------------------------------------------- +-- 3) 菜单:AGV 任务页(Area: agv,见 AgvTaskController) +-- ------------------------------------------------------------- +SET @agv_task_page_id = ( + SELECT `ID` FROM `frameworkmenus` + WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskController' + AND (`MethodName` IS NULL OR `MethodName` = '') + ORDER BY `ShowOnMenu` DESC, `DisplayOrder` + LIMIT 1 +); + +INSERT INTO `frameworkmenus` + (`ID`, `PageName`, `ActionName`, `ModuleName`, `FolderOnly`, `IsInherit`, + `ClassName`, `MethodName`, `Domain`, `ShowOnMenu`, `IsPublic`, `DisplayOrder`, + `IsInside`, `TenantAllowed`, `Url`, `Icon`, `ParentId`) +SELECT + UUID(), 'AGV任务', 'AGV任务', NULL, 0, 0, + 'HHWMS.Web.Controllers,AgvTaskController', '', + NULL, 1, 0, 100, 1, 1, '/agv/AgvTask/Index', NULL, NULL +WHERE @agv_task_page_id IS NULL; + +SET @agv_task_page_id = ( + SELECT `ID` FROM `frameworkmenus` + WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskController' + AND (`MethodName` IS NULL OR `MethodName` = '') + ORDER BY `ShowOnMenu` DESC, `DisplayOrder` + LIMIT 1 +); + +-- AGV 任务页动作权限(下发/取消/重试联动) +INSERT INTO `frameworkmenus` + (`ID`, `PageName`, `ActionName`, `ModuleName`, `FolderOnly`, `IsInherit`, + `ClassName`, `MethodName`, `Domain`, `ShowOnMenu`, `IsPublic`, `DisplayOrder`, + `IsInside`, `TenantAllowed`, `Url`, `Icon`, `ParentId`) +SELECT + UUID(), 'AGV任务下发', 'AGV任务下发', `ModuleName`, 0, 0, + `ClassName`, 'Dispatch', `Domain`, 0, 0, + (SELECT COALESCE(MAX(child.`DisplayOrder`), 0) + 1 FROM `frameworkmenus` child + WHERE child.`ParentId` = @agv_task_page_id), + 1, `TenantAllowed`, '/agv/AgvTask/Dispatch', NULL, `ID` +FROM `frameworkmenus` WHERE `ID` = @agv_task_page_id + AND NOT EXISTS (SELECT 1 FROM `frameworkmenus` + WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskController' + AND `MethodName` = 'Dispatch'); + +INSERT INTO `frameworkmenus` + (`ID`, `PageName`, `ActionName`, `ModuleName`, `FolderOnly`, `IsInherit`, + `ClassName`, `MethodName`, `Domain`, `ShowOnMenu`, `IsPublic`, `DisplayOrder`, + `IsInside`, `TenantAllowed`, `Url`, `Icon`, `ParentId`) +SELECT + UUID(), 'AGV任务取消', 'AGV任务取消', `ModuleName`, 0, 0, + `ClassName`, 'Cancel', `Domain`, 0, 0, + (SELECT COALESCE(MAX(child.`DisplayOrder`), 0) + 1 FROM `frameworkmenus` child + WHERE child.`ParentId` = @agv_task_page_id), + 1, `TenantAllowed`, '/agv/AgvTask/Cancel', NULL, `ID` +FROM `frameworkmenus` WHERE `ID` = @agv_task_page_id + AND NOT EXISTS (SELECT 1 FROM `frameworkmenus` + WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskController' + AND `MethodName` = 'Cancel'); + +INSERT INTO `frameworkmenus` + (`ID`, `PageName`, `ActionName`, `ModuleName`, `FolderOnly`, `IsInherit`, + `ClassName`, `MethodName`, `Domain`, `ShowOnMenu`, `IsPublic`, `DisplayOrder`, + `IsInside`, `TenantAllowed`, `Url`, `Icon`, `ParentId`) +SELECT + UUID(), 'AGV重试联动', 'AGV重试联动', `ModuleName`, 0, 0, + `ClassName`, 'RetryFinish', `Domain`, 0, 0, + (SELECT COALESCE(MAX(child.`DisplayOrder`), 0) + 1 FROM `frameworkmenus` child + WHERE child.`ParentId` = @agv_task_page_id), + 1, `TenantAllowed`, '/agv/AgvTask/RetryFinish', NULL, `ID` +FROM `frameworkmenus` WHERE `ID` = @agv_task_page_id + AND NOT EXISTS (SELECT 1 FROM `frameworkmenus` + WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskController' + AND `MethodName` = 'RetryFinish'); + +-- 给已有 AGV 任务页权限的角色授予上述动作权限 +INSERT INTO `functionprivileges` + (`ID`, `RoleCode`, `MenuItemId`, `Allowed`, `TenantCode`, + `CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`) +SELECT + UUID(), page_privilege.`RoleCode`, action_menu.`ID`, 1, page_privilege.`TenantCode`, + NOW(), 'system', NULL, NULL +FROM `frameworkmenus` action_menu +JOIN `functionprivileges` page_privilege + ON page_privilege.`MenuItemId` = @agv_task_page_id AND page_privilege.`Allowed` = 1 +WHERE action_menu.`ClassName` = 'HHWMS.Web.Controllers,AgvTaskController' + AND action_menu.`MethodName` IN ('Dispatch','Cancel','RetryFinish') + AND @agv_task_page_id IS NOT NULL + AND NOT EXISTS ( + SELECT 1 FROM `functionprivileges` existing_privilege + WHERE existing_privilege.`RoleCode` = page_privilege.`RoleCode` + AND existing_privilege.`MenuItemId` = action_menu.`ID` + AND (existing_privilege.`TenantCode` <=> page_privilege.`TenantCode`) + ); + +-- ------------------------------------------------------------- +-- 4) 菜单:AGV 任务场景配置页(Area: agv,见 AgvTaskSceneConfigController) +-- ------------------------------------------------------------- +SET @agv_scene_config_page_id = ( + SELECT `ID` FROM `frameworkmenus` + WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskSceneConfigController' + AND (`MethodName` IS NULL OR `MethodName` = '') + ORDER BY `ShowOnMenu` DESC, `DisplayOrder` + LIMIT 1 +); + +INSERT INTO `frameworkmenus` + (`ID`, `PageName`, `ActionName`, `ModuleName`, `FolderOnly`, `IsInherit`, + `ClassName`, `MethodName`, `Domain`, `ShowOnMenu`, `IsPublic`, `DisplayOrder`, + `IsInside`, `TenantAllowed`, `Url`, `Icon`, `ParentId`) +SELECT + UUID(), 'AGV任务场景配置', 'AGV任务场景配置', NULL, 0, 0, + 'HHWMS.Web.Controllers,AgvTaskSceneConfigController', '', + NULL, 1, 0, 101, 1, 1, '/agv/AgvTaskSceneConfig/Index', NULL, NULL +WHERE @agv_scene_config_page_id IS NULL; + +SELECT + menu.`PageName`, menu.`MethodName`, menu.`Url`, + privilege.`RoleCode`, privilege.`Allowed` +FROM `frameworkmenus` menu +LEFT JOIN `functionprivileges` privilege ON privilege.`MenuItemId` = menu.`ID` +WHERE menu.`ClassName` IN ('HHWMS.Web.Controllers,AgvTaskController', + 'HHWMS.Web.Controllers,AgvTaskSceneConfigController') +ORDER BY menu.`PageName`, menu.`MethodName`, privilege.`RoleCode`; diff --git a/sql/06_agv_tasklog_menu.sql b/sql/06_agv_tasklog_menu.sql new file mode 100644 index 0000000..b757a8d --- /dev/null +++ b/sql/06_agv_tasklog_menu.sql @@ -0,0 +1,80 @@ +-- ============================================================= +-- AGV 平库对接 · 06 AgvTaskLog 日志页 菜单/权限 DML +-- 说明: +-- 1) 日志页为只读(列表+搜索+详情),对应 AgvTaskLogController; +-- 2) 菜单/权限参照 05_agv_dml_menu.sql 的 SceneConfig 插入方式; +-- 3) 脚本可重复执行。 +-- ============================================================= + +-- ------------------------------------------------------------- +-- 1) 菜单:AGV 任务日志页(Area: agv,见 AgvTaskLogController) +-- ------------------------------------------------------------- +SET @agv_tasklog_page_id = ( + SELECT `ID` FROM `frameworkmenus` + WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskLogController' + AND (`MethodName` IS NULL OR `MethodName` = '') + ORDER BY `ShowOnMenu` DESC, `DisplayOrder` + LIMIT 1 +); + +INSERT INTO `frameworkmenus` + (`ID`, `PageName`, `ActionName`, `ModuleName`, `FolderOnly`, `IsInherit`, + `ClassName`, `MethodName`, `Domain`, `ShowOnMenu`, `IsPublic`, `DisplayOrder`, + `IsInside`, `TenantAllowed`, `Url`, `Icon`, `ParentId`) +SELECT + UUID(), 'AGV日志', 'AGV日志', NULL, 0, 0, + 'HHWMS.Web.Controllers,AgvTaskLogController', '', + NULL, 1, 0, 102, 1, 1, '/agv/AgvTaskLog/Index', NULL, NULL +WHERE @agv_tasklog_page_id IS NULL; + +SET @agv_tasklog_page_id = ( + SELECT `ID` FROM `frameworkmenus` + WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskLogController' + AND (`MethodName` IS NULL OR `MethodName` = '') + ORDER BY `ShowOnMenu` DESC, `DisplayOrder` + LIMIT 1 +); + +-- 日志页详情动作权限(查看报文) +INSERT INTO `frameworkmenus` + (`ID`, `PageName`, `ActionName`, `ModuleName`, `FolderOnly`, `IsInherit`, + `ClassName`, `MethodName`, `Domain`, `ShowOnMenu`, `IsPublic`, `DisplayOrder`, + `IsInside`, `TenantAllowed`, `Url`, `Icon`, `ParentId`) +SELECT + UUID(), 'AGV日志详情', 'AGV日志详情', `ModuleName`, 0, 0, + `ClassName`, 'Details', `Domain`, 0, 0, + (SELECT COALESCE(MAX(child.`DisplayOrder`), 0) + 1 FROM `frameworkmenus` child + WHERE child.`ParentId` = @agv_tasklog_page_id), + 1, `TenantAllowed`, '/agv/AgvTaskLog/Details', NULL, `ID` +FROM `frameworkmenus` WHERE `ID` = @agv_tasklog_page_id + AND NOT EXISTS (SELECT 1 FROM `frameworkmenus` + WHERE `ClassName` = 'HHWMS.Web.Controllers,AgvTaskLogController' + AND `MethodName` = 'Details'); + +-- 给已有日志页权限的角色授予详情权限 +INSERT INTO `functionprivileges` + (`ID`, `RoleCode`, `MenuItemId`, `Allowed`, `TenantCode`, + `CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`) +SELECT + UUID(), page_privilege.`RoleCode`, action_menu.`ID`, 1, page_privilege.`TenantCode`, + NOW(), 'system', NULL, NULL +FROM `frameworkmenus` action_menu +JOIN `functionprivileges` page_privilege + ON page_privilege.`MenuItemId` = @agv_tasklog_page_id AND page_privilege.`Allowed` = 1 +WHERE action_menu.`ClassName` = 'HHWMS.Web.Controllers,AgvTaskLogController' + AND action_menu.`MethodName` = 'Details' + AND @agv_tasklog_page_id IS NOT NULL + AND NOT EXISTS ( + SELECT 1 FROM `functionprivileges` existing_privilege + WHERE existing_privilege.`RoleCode` = page_privilege.`RoleCode` + AND existing_privilege.`MenuItemId` = action_menu.`ID` + AND (existing_privilege.`TenantCode` <=> page_privilege.`TenantCode`) + ); + +SELECT + menu.`PageName`, menu.`MethodName`, menu.`Url`, + privilege.`RoleCode`, privilege.`Allowed` +FROM `frameworkmenus` menu +LEFT JOIN `functionprivileges` privilege ON privilege.`MenuItemId` = menu.`ID` +WHERE menu.`ClassName` = 'HHWMS.Web.Controllers,AgvTaskLogController' +ORDER BY menu.`PageName`, menu.`MethodName`, privilege.`RoleCode`; diff --git a/sql/07_agv_dispatch_retryjob.sql b/sql/07_agv_dispatch_retryjob.sql new file mode 100644 index 0000000..f59fd37 --- /dev/null +++ b/sql/07_agv_dispatch_retryjob.sql @@ -0,0 +1,62 @@ +-- ============================================================= +-- AGV 平库对接 · 07 定时下发/自动重试 Job 注册 + 库位状态兜底修复 +-- 依据:本次新增/调整功能 +-- 说明: +-- 1) 补充 AgvTaskDispatchJob / AgvTaskRetryFinishJob 的 SysJob 注册; +-- 2) 修复历史库位 ContainerStatus 为 NULL 的数据(首页统计空键异常); +-- 3) 脚本可重复执行。 +-- ============================================================= + +-- ------------------------------------------------------------- +-- 1) SysJob:AGV 定时下发(扫描新建/异常任务自动下发) +-- 建议 Cron:*/5 * * * * ?(每 5 秒);已存在则跳过 +-- ------------------------------------------------------------- +INSERT INTO `SysJob` + (`JobName`, `JobGroup`, `MethodName`, `MethodParams`, `CronExpression`, + `LastFireTime`, `NextFireTime`, `MisfirePolicy`, `Status`, `Remark`, + `CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`) +SELECT + 'AgvTaskDispatchJob', 'AgvTaskDispatchJob', NULL, NULL, '*/5 * * * * ?', + NULL, NULL, NULL, 1, 'AGV定时下发(扫描新建/异常任务自动下发)', + NOW(), 'system', NULL, NULL +WHERE NOT EXISTS ( + SELECT 1 FROM `SysJob` WHERE `JobName` = 'AgvTaskDispatchJob' +); + +-- ------------------------------------------------------------- +-- 2) SysJob:AGV 完成联动自动重试(扫描 99 状态自动重试联动) +-- 建议 Cron:0 */5 * * * ?(每 5 分钟);已存在则跳过 +-- ------------------------------------------------------------- +INSERT INTO `SysJob` + (`JobName`, `JobGroup`, `MethodName`, `MethodParams`, `CronExpression`, + `LastFireTime`, `NextFireTime`, `MisfirePolicy`, `Status`, `Remark`, + `CreateTime`, `CreateBy`, `UpdateTime`, `UpdateBy`) +SELECT + 'AgvTaskRetryFinishJob', 'AgvTaskRetryFinishJob', NULL, NULL, '0 */5 * * * ?', + NULL, NULL, NULL, 1, 'AGV完成联动自动重试(扫描99状态自动重试ERP报工/库存)', + NOW(), 'system', NULL, NULL +WHERE NOT EXISTS ( + SELECT 1 FROM `SysJob` WHERE `JobName` = 'AgvTaskRetryFinishJob' +); + +-- ------------------------------------------------------------- +-- 3) 修复历史库位 ContainerStatus 为 NULL 的数据 +-- 新库位实体默认赋值为 空仓位(empty),但历史数据可能为 NULL +-- NULL 会导致首页库位统计接口抛空键异常 +-- ------------------------------------------------------------- +UPDATE `Location` +SET `ContainerStatus` = 'empty' +WHERE `ContainerStatus` IS NULL + OR `ContainerStatus` = ''; + +-- ------------------------------------------------------------- +-- 4) 只读核查:确认 Job 注册情况与库位状态分布 +-- ------------------------------------------------------------- +SELECT `JobName`, `CronExpression`, `Status`, `Remark` +FROM `SysJob` +WHERE `JobName` IN ('AgvTaskDispatchJob', 'AgvTaskRetryFinishJob', 'AgvTaskArchiveJob') +ORDER BY `JobName`; + +SELECT `ContainerStatus`, COUNT(1) AS `数量` +FROM `Location` +GROUP BY `ContainerStatus`; diff --git a/sql/99_agv_verify.sql b/sql/99_agv_verify.sql new file mode 100644 index 0000000..4ecba1a --- /dev/null +++ b/sql/99_agv_verify.sql @@ -0,0 +1,57 @@ +-- ============================================================= +-- AGV 平库对接 · 99 只读核查脚本 +-- 依据:《平库AGV方案流程(AGV自调度版).md》10.2 / 6.2 / 9.6 +-- 说明:只读查询,上线前后核对任务状态、锁、流水一致性。 +-- ============================================================= + +-- 1) AGV 任务按状态分布(0新建/5已下发/10执行中/90异常/95取消/99联动失败/100完成) +SELECT `AgvStatus`, COUNT(1) AS `任务数` +FROM `AgvTask` +GROUP BY `AgvStatus` +ORDER BY `AgvStatus`; + +-- 2) 超期未归档的终态任务(主表保留1个月,应被 AgvTaskArchiveJob 清走) +SELECT `TaskNo`, `AgvStatus`, `CreateTime` +FROM `AgvTask` +WHERE `AgvStatus` IN (99, 95, 100) + AND `CreateTime` < DATE_SUB(NOW(), INTERVAL 1 MONTH) +ORDER BY `CreateTime`; + +-- 3) 下发后长时间未到终态的任务(疑似卡死,供超时监控核对) +SELECT `TaskNo`, `AgvStatus`, `FromLocation`, `ToLocation`, `CreateTime` +FROM `AgvTask` +WHERE `AgvStatus` NOT IN (99, 95, 100) + AND `CreateTime` < DATE_SUB(NOW(), INTERVAL 1 DAY) +ORDER BY `CreateTime`; + +-- 4) 归档镜像表与主表是否重复(归档后主表应无同 TaskNo 记录) +SELECT h.`TaskNo` +FROM `AgvTaskHistory` h +JOIN `AgvTask` t ON t.`TaskNo` = h.`TaskNo` +LIMIT 10; + +-- 5) 容器锁与库位锁残留(任务完成/取消后应全部释放) +SELECT c.`Code` AS `容器`, c.`LocationCode`, c.`IsLock` +FROM `Container` c +WHERE c.`IsLock` <> 0; + +SELECT l.`Code` AS `库位`, l.`Status`, l.`ContainerCode` +FROM `Location` l +WHERE l.`Status` <> 0; + +-- 6) 场景配置未覆盖的上游类型(应无,若有说明接单会被拒绝) +SELECT `SourceTaskType`, `AgvTaskType`, `SceneId`, `SceneName` +FROM `AgvTaskSceneConfig` +ORDER BY `AgvTaskType`; + +-- 7) 完成联动失败任务积压(应被 AgvTaskRetryFinishJob 逐步处理到完成100) +SELECT `TaskNo`, `AgvStatus`, `ErrorMsg`, `CreateTime` +FROM `AgvTask` +WHERE `AgvStatus` = 99 +ORDER BY `CreateTime`; + +-- 8) SysJob 注册情况 +SELECT `JobName`, `Status`, `CronExpression`, `Remark` +FROM `SysJob` +WHERE `JobName` LIKE 'Agv%' +ORDER BY `JobName`; diff --git a/sql/README.sql b/sql/README.sql new file mode 100644 index 0000000..388d660 --- /dev/null +++ b/sql/README.sql @@ -0,0 +1,24 @@ +-- ============================================================= +-- AGV 平库对接 · SQL 执行顺序说明 +-- 说明:按编号顺序执行,每个脚本均可重复执行(幂等) +-- 执行范围:AGV 平库所在数据库(默认连接 wms_yongfeng_cp) +-- ============================================================= + +-- 【执行顺序】 +-- +-- 01_agv_task_table.sql —— AgvTask 主表 + AgvTaskHistory 归档镜像表 +-- 02_agv_locationzone_floor.sql —— LocationZone 新增 Floor 楼层字段 +-- 03_agv_tasklog.sql —— AgvTaskLog 日志表 + AgvTaskLogHistory 归档镜像表 +-- 04_agv_scene_config.sql —— AgvTaskSceneConfig 场景配置表 + 初始数据 +-- 05_agv_dml_menu.sql —— SysJob(归档/超时监控)+ AGV任务页/场景配置页菜单权限 +-- 06_agv_tasklog_menu.sql —— AGV 任务日志页菜单权限 +-- 07_agv_dispatch_retryjob.sql —— SysJob(定时下发/完成联动自动重试)+ 库位 ContainerStatus 兜底修复 +-- 99_agv_verify.sql —— 只读核查(上线前后核对) +-- +-- 【注意事项】 +-- +-- 1. 全部脚本可重复执行,现场误重复执行无影响 +-- 2. 02 执行后需人工更新库区楼层:UPDATE LocationZone SET Floor = ? WHERE ZoneCode = ? +-- 3. 04 中的 SceneId/SceneName 为占位值,需按仙工实际场景配置更新 +-- 4. 07 执行后需在【系统管理→定时任务】页面确认 Job 状态为启用 +-- 5. 99 为只读核查,不修改数据