feat(mes): AGV挂起动作引擎 + 智能跟车流转 + PLC快照缓存(2026-11-19 主控拍板)
一、AGV 挂起动作引擎(弃显式任务队列、弃并发硬拒) - 新增 internal/logic/agv_pending.go:待发动作直接挂任务(pending_action + pending_since), CONTINUE_LIFT(举升完成→continueTask#1)/ WAIT_DROP_CONFIRM(人工确认放下→continueTask#2) / FREE_ROBOT(末组完成→freeRobot);系统动作超 60s 未触发转预警人工重试,绝不自动重发 - Client 新增 ContinueTask(RCS 2.1.2) / FreeRobot(3.1.2),仅点名释放指定车,禁止释放全部 - agv_task 增 pending_action/pending_since 字段,ent 重生成 + db.go 幂等迁移补丁 + migrateonce - 回调按 B01/B02/C01 模板编排:业务流转到位即自动放行放下、回调自动放车; 仅人工派车(MANUAL)挂 WAIT_DROP_CONFIRM;新增 /agv/confirm-drop、/agv/pending/retry - 前端 AgvManual/Agv 确认放下、挂起重试按钮与等待提示联动 二、智能跟车 + 动态目标截断流转引擎 - 新增 internal/logic/flow_engine.go:事件驱动(报工/扫码),读 48 位物理快照,从下游往上游算, 前方占用则动态截断到最近空闲缓存位;IN_TRANSIT 在途闭锁防重复下发,MW=0 才确认到位落台账; 主线占用=台账 OR 传感器,工位 G 位只认台账;在途超 5s 落预警 - workpiece 增 flow_transit_mw/target/at 字段,ent 重生成 + 迁移补丁 三、PLC 读取优化与诊断 - 新增 internal/plc/snapshot_cache.go:2s TTL + singleflight + 写失效,合并 SSE/PLC监控/流转引擎 的重复点位读取;tcp.go 读块重构、localip.go 多网卡、plcdiag 诊断工具、plc_monitor/logging 配套 四、文档与前端 - help.js 重写「工位下发」帮助:明确报工自动驱动流转 vs 下发路线码的定位、缺料/握手/撤回边界 - 案例.md 补充定稿说明;public/index.html 构建指纹更新
This commit is contained in:
@@ -311,6 +311,7 @@ func AgvChainNextHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
ChainNo string `json:"chainNo"`
|
||||
Source string `json:"source"`
|
||||
Target string `json:"target"`
|
||||
Purpose string `json:"purpose"` // 2026-11-19 取/送互锁:"pickup"=到目标取货 / "deliver"=送货到目标 / 空=按点位属性
|
||||
ConfirmForcePick string `json:"confirmForcePick"` // "1"=人工已确认强提风险点位
|
||||
}
|
||||
if err := httpx.ParseJSON(r, &req); err != nil || req.ChainNo == "" {
|
||||
@@ -326,7 +327,7 @@ func AgvChainNextHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
if operator == "" {
|
||||
operator = "dispatcher"
|
||||
}
|
||||
taskNo, err := logic.New(svcCtx).AgvChainNextNode(r.Context(), req.ChainNo, req.Source, req.Target, operator, req.ConfirmForcePick)
|
||||
taskNo, err := logic.New(svcCtx).AgvChainNextNode(r.Context(), req.ChainNo, req.Source, req.Target, req.Purpose, operator, req.ConfirmForcePick)
|
||||
if err != nil {
|
||||
httpx.Fail(w, 3313, err.Error())
|
||||
return
|
||||
@@ -336,7 +337,7 @@ func AgvChainNextHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
|
||||
// AgvChainEndHandler POST /agv/chain/end 手动链「结束任务」:body {chainNo}
|
||||
// 校验 AGV 上无托盘(载货台账+RCS 车载货架双校验),通过后本段结束并空车自动回充。
|
||||
// 校验 AGV 上无托盘(载货台账+RCS 车载货架双校验),通过后本段结束、车辆释放(freeRobot)。
|
||||
func AgvChainEndHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req struct {
|
||||
@@ -355,7 +356,7 @@ func AgvChainEndHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
httpx.Fail(w, 3314, err.Error())
|
||||
return
|
||||
}
|
||||
httpx.OkMessage(w, "任务已结束,AGV 空车自动回充", nil)
|
||||
httpx.OkMessage(w, "任务已结束,车辆已释放", nil)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -384,6 +385,55 @@ func AgvChainForceEndHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
// AgvConfirmDropHandler POST /agv/confirm-drop 人工「确认放下」(2026-11-19 主控定稿):
|
||||
// B01 举升段到位停稳(b01endZhuanYi)后车举着货等放下确认;本入口发第 2 次 continueTask
|
||||
// 放行组3 放下,放下完成回调自动 freeRobot 释放车辆。body {taskNo}
|
||||
func AgvConfirmDropHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req struct {
|
||||
TaskNo string `json:"taskNo"`
|
||||
}
|
||||
if err := httpx.ParseJSON(r, &req); err != nil || req.TaskNo == "" {
|
||||
httpx.BadRequest(w, "缺少任务号(taskNo)")
|
||||
return
|
||||
}
|
||||
operator := r.Header.Get("X-Username")
|
||||
if operator == "" {
|
||||
operator = "dispatcher"
|
||||
}
|
||||
if err := logic.New(svcCtx).ConfirmAgvDrop(r.Context(), req.TaskNo, operator); err != nil {
|
||||
httpx.Fail(w, 3316, err.Error())
|
||||
return
|
||||
}
|
||||
httpx.OkMessage(w, "已放行放下动作,放下完成后车辆自动释放", nil)
|
||||
}
|
||||
}
|
||||
|
||||
// AgvPendingRetryHandler POST /agv/pending/retry 挂起动作人工重试(2026-11-19 主控定稿):
|
||||
// 挂起动作(放行转移/释放车辆)超 60s 未触发或 RCS 报错清除后,人工核实现场后重放一次。
|
||||
// 绝不自动重发——重发 continueTask 会重复触发动作组、重发 freeRobot 可能误放作业中的车。
|
||||
// body {taskNo}
|
||||
func AgvPendingRetryHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req struct {
|
||||
TaskNo string `json:"taskNo"`
|
||||
}
|
||||
if err := httpx.ParseJSON(r, &req); err != nil || req.TaskNo == "" {
|
||||
httpx.BadRequest(w, "缺少任务号(taskNo)")
|
||||
return
|
||||
}
|
||||
operator := r.Header.Get("X-Username")
|
||||
if operator == "" {
|
||||
operator = "dispatcher"
|
||||
}
|
||||
if err := logic.New(svcCtx).RetryAgvPending(r.Context(), req.TaskNo, operator); err != nil {
|
||||
httpx.Fail(w, 3317, err.Error())
|
||||
return
|
||||
}
|
||||
httpx.OkMessage(w, "已重试挂起动作,结果见任务状态", nil)
|
||||
}
|
||||
}
|
||||
|
||||
// AgvChainListHandler GET /agv/chain/list 手动链列表(任务进行中面板:链号/锁定车/节点/进行中)。
|
||||
func AgvChainListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
@@ -458,6 +458,9 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext
|
||||
// 手动多段链(2026-11-06 拍板):逐节点人工推进,全程锁同一台车
|
||||
{Method: http.MethodPost, Path: "/agv/chain/next", Handler: production.AgvChainNextHandler(serverCtx)},
|
||||
{Method: http.MethodPost, Path: "/agv/chain/end", Handler: production.AgvChainEndHandler(serverCtx)},
|
||||
// 2026-11-19 挂起动作引擎配套入口:人工「确认放下」(B01 到位放行组3)/ 挂起动作人工重试
|
||||
{Method: http.MethodPost, Path: "/agv/confirm-drop", Handler: production.AgvConfirmDropHandler(serverCtx)},
|
||||
{Method: http.MethodPost, Path: "/agv/pending/retry", Handler: production.AgvPendingRetryHandler(serverCtx)},
|
||||
{Method: http.MethodPost, Path: "/agv/chain/force-end", Handler: production.AgvChainForceEndHandler(serverCtx)},
|
||||
{Method: http.MethodGet, Path: "/agv/chain/list", Handler: production.AgvChainListHandler(serverCtx)},
|
||||
{Method: http.MethodGet, Path: "/agv/mode", Handler: production.AgvModeHandler(serverCtx)},
|
||||
|
||||
Reference in New Issue
Block a user