fix:永丰售后修复BUG,
1,物料库存获取不到ERP:重新调整触发查询逻辑 2,工序变更导致物料无法出库:配置旧工序 3,测试出库订单ERP推送,任务下发
This commit is contained in:
1 parent
b2a9a38f38
commit
c76e7bb681
69 files changed
+5510
-157
No files matched your search
@@ -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
|
||||
{
|
||||
/// <summary>
|
||||
/// AGV 平库任务手动下发页(方案 9.1 页面路径)
|
||||
/// 页面参数与 Receive 接单接口保持一致,共用 AgvTaskService.CreateTaskAsync 同一套创建逻辑
|
||||
/// </summary>
|
||||
[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;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 任务号请求参数(下发/取消/重试完成共用)
|
||||
/// 普通 Controller 的简单类型参数不会从 JSON body 绑定,必须用 [FromBody] 对象接收
|
||||
/// </summary>
|
||||
public class TaskNoRequest
|
||||
{
|
||||
public string TaskNo { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 任务列表 + 手动下发页(WTM 标准 searchpanel + grid,风格与场景配置页统一)
|
||||
/// </summary>
|
||||
[ActionDescription("Sys.Search")]
|
||||
public ActionResult Index()
|
||||
{
|
||||
var vm = Wtm.CreateVM<AgvTaskListVM>();
|
||||
return PartialView(vm);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// WTM grid 数据源(多条件查询,由 AgvTaskListVM 统一处理)
|
||||
/// </summary>
|
||||
[ActionDescription("Sys.Search")]
|
||||
[HttpPost]
|
||||
public string Search(AgvTaskSearcher searcher)
|
||||
{
|
||||
var vm = Wtm.CreateVM<AgvTaskListVM>(passInit: true);
|
||||
if (ModelState.IsValid)
|
||||
{
|
||||
vm.Searcher = searcher;
|
||||
return vm.GetJson(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
return vm.GetError();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 手动下发表单页(Dialog 内 Vue 渲染,提交走下方 POST Create)
|
||||
/// 必须传入 AgvTaskListVM 类型 model,与 Create.cshtml 的 @model 保持一致,
|
||||
/// 否则 WTM 无参 PartialView() 会注入 BaseVM 导致视图类型不匹配异常
|
||||
/// 场景选项由服务端直接查库(AgvTaskSceneConfig)注入页面,前端不再依赖异步接口加载
|
||||
/// </summary>
|
||||
[ActionDescription("Sys.Create")]
|
||||
public ActionResult Create()
|
||||
{
|
||||
var vm = Wtm.CreateVM<AgvTaskListVM>();
|
||||
// 与 GetScenes 同一套查库逻辑:直接读取场景配置表全量数据
|
||||
var scenes = DC.Set<AgvTaskSceneConfig>()
|
||||
.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);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 场景配置下拉(公开访问,绕过模块权限校验)
|
||||
/// 展示 AgvTaskSceneConfig.SceneName,内部传 SourceTaskType
|
||||
/// </summary>
|
||||
[HttpPost]
|
||||
[Public]
|
||||
public IActionResult GetScenes()
|
||||
{
|
||||
// 走原生 SQL 直捞,绕过 UnitWork 可能的数据权限过滤
|
||||
var sql = @"SELECT * FROM AgvTaskSceneConfig ORDER BY AgvTaskType";
|
||||
var scenes = DC.Set<AgvTaskSceneConfig>()
|
||||
.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 });
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// AGV 点位下拉(起点/终点强制校验,Type=P 且未停用)
|
||||
/// </summary>
|
||||
[HttpPost]
|
||||
public IActionResult GetPoints()
|
||||
{
|
||||
var points = _unitWork.Find<Location>(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<LocationZone>(z => zoneIds.Contains(z.ID))
|
||||
.ToDictionary(z => z.ID, z => z.Floor)
|
||||
: new Dictionary<int, int?>();
|
||||
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 });
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 物料搜索(SKU 非强制,带明细则需本地存在/ERP补建)
|
||||
/// </summary>
|
||||
[HttpPost]
|
||||
public IActionResult GetMaterials(string keyword)
|
||||
{
|
||||
var query = _unitWork.Find<Material>(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 });
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 手动下发创建:参数与 Receive 接单接口一致(起点/终点/任务场景必填,容器/明细可选)
|
||||
/// </summary>
|
||||
[HttpPost]
|
||||
public async Task<IActionResult> 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}" });
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 任务列表查询参数(多条件:任务号/起终点/容器/来源模糊,状态精确)
|
||||
/// </summary>
|
||||
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; }
|
||||
/// <summary>页码(从 1 开始,默认 1)</summary>
|
||||
public int Page { get; set; }
|
||||
/// <summary>每页条数(默认 10)</summary>
|
||||
public int Size { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 任务列表(多条件模糊查询 + 分页,供原生表格页面直调)
|
||||
/// </summary>
|
||||
[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<AgvTask>(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<AgvTaskSceneConfig>()
|
||||
.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 } });
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 来源系统下拉(已有任务的 SourceSystem 去重列表)
|
||||
/// </summary>
|
||||
[HttpPost]
|
||||
public IActionResult GetSourceSystems()
|
||||
{
|
||||
var list = _unitWork.Find<AgvTask>(x => x.SourceSystem != null && x.SourceSystem != "")
|
||||
.Select(x => x.SourceSystem)
|
||||
.Distinct()
|
||||
.ToList();
|
||||
return Json(new { Code = 200, Data = list });
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 下发任务(仅新建/异常可下发)
|
||||
/// </summary>
|
||||
[HttpPost]
|
||||
public async Task<IActionResult> 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}" });
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 取消任务(仅新建/已下发/执行中可取消)
|
||||
/// </summary>
|
||||
[HttpPost]
|
||||
public async Task<IActionResult> 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}" });
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 重试完成联动(仅完成联动失败(99)可重试)
|
||||
/// </summary>
|
||||
[HttpPost]
|
||||
public async Task<IActionResult> 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}" });
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user