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:
@@ -50,6 +50,10 @@ type AgvTask struct {
|
||||
DispatchedAt int64 `json:"dispatched_at,omitempty"`
|
||||
// 到位时间 unix秒
|
||||
ArrivedAt int64 `json:"arrived_at,omitempty"`
|
||||
// 挂起待办动作(2026-11-19 主控定稿,弃队列弃硬拒):CONTINUE_LIFT等举升完成→continueTask#1/WAIT_DROP_CONFIRM等人工确认放下→continueTask#2/FREE_ROBOT等末组完成→freeRobot;空=无待办;RCS报错即清+告警,系统动作超60s转预警人工重试
|
||||
PendingAction string `json:"pending_action,omitempty"`
|
||||
// 挂起动作起始时间 unix秒(60s超时告警判定基准)
|
||||
PendingSince int64 `json:"pending_since,omitempty"`
|
||||
// 备注/失败原因
|
||||
Remark string `json:"remark,omitempty"`
|
||||
// 创建时间
|
||||
@@ -64,9 +68,9 @@ func (*AgvTask) scanValues(columns []string) ([]any, error) {
|
||||
switch columns[i] {
|
||||
case agvtask.FieldAutoEnd:
|
||||
values[i] = new(sql.NullBool)
|
||||
case agvtask.FieldID, agvtask.FieldDispatchedAt, agvtask.FieldArrivedAt, agvtask.FieldCreatedAt:
|
||||
case agvtask.FieldID, agvtask.FieldDispatchedAt, agvtask.FieldArrivedAt, agvtask.FieldPendingSince, agvtask.FieldCreatedAt:
|
||||
values[i] = new(sql.NullInt64)
|
||||
case agvtask.FieldTaskNo, agvtask.FieldSourceDock, agvtask.FieldTargetDock, agvtask.FieldMaterialsJSON, agvtask.FieldRelatedRequestNo, agvtask.FieldRelatedOutboundNo, agvtask.FieldStatus, agvtask.FieldKind, agvtask.FieldBizType, agvtask.FieldBizNo, agvtask.FieldTemplateType, agvtask.FieldChainNo, agvtask.FieldAgvCode, agvtask.FieldOperator, agvtask.FieldRemark:
|
||||
case agvtask.FieldTaskNo, agvtask.FieldSourceDock, agvtask.FieldTargetDock, agvtask.FieldMaterialsJSON, agvtask.FieldRelatedRequestNo, agvtask.FieldRelatedOutboundNo, agvtask.FieldStatus, agvtask.FieldKind, agvtask.FieldBizType, agvtask.FieldBizNo, agvtask.FieldTemplateType, agvtask.FieldChainNo, agvtask.FieldAgvCode, agvtask.FieldOperator, agvtask.FieldPendingAction, agvtask.FieldRemark:
|
||||
values[i] = new(sql.NullString)
|
||||
default:
|
||||
values[i] = new(sql.UnknownType)
|
||||
@@ -191,6 +195,18 @@ func (_m *AgvTask) assignValues(columns []string, values []any) error {
|
||||
} else if value.Valid {
|
||||
_m.ArrivedAt = value.Int64
|
||||
}
|
||||
case agvtask.FieldPendingAction:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field pending_action", values[i])
|
||||
} else if value.Valid {
|
||||
_m.PendingAction = value.String
|
||||
}
|
||||
case agvtask.FieldPendingSince:
|
||||
if value, ok := values[i].(*sql.NullInt64); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field pending_since", values[i])
|
||||
} else if value.Valid {
|
||||
_m.PendingSince = value.Int64
|
||||
}
|
||||
case agvtask.FieldRemark:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field remark", values[i])
|
||||
@@ -290,6 +306,12 @@ func (_m *AgvTask) String() string {
|
||||
builder.WriteString("arrived_at=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.ArrivedAt))
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("pending_action=")
|
||||
builder.WriteString(_m.PendingAction)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("pending_since=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.PendingSince))
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("remark=")
|
||||
builder.WriteString(_m.Remark)
|
||||
builder.WriteString(", ")
|
||||
|
||||
Reference in New Issue
Block a user