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:
@@ -42,12 +42,12 @@ func main() {
|
||||
}
|
||||
|
||||
// 迁移结果自检:新表存在 + 旧表/旧列已清理
|
||||
var flowMatExists, stationStateExists, workpieceBindExists bool
|
||||
// 2026-11-19 修正:flow_material 实体已随 4c4cda1 删除,过时断言导致迁移成功也退出码 1(假报警)
|
||||
var stationStateExists, workpieceBindExists bool
|
||||
if err := sqlDB.QueryRowContext(context.Background(),
|
||||
`SELECT EXISTS(SELECT 1 FROM information_schema.tables WHERE table_schema='public' AND table_name='flow_material'),
|
||||
EXISTS(SELECT 1 FROM information_schema.tables WHERE table_schema='public' AND table_name='station_state'),
|
||||
`SELECT EXISTS(SELECT 1 FROM information_schema.tables WHERE table_schema='public' AND table_name='station_state'),
|
||||
EXISTS(SELECT 1 FROM information_schema.tables WHERE table_schema='public' AND table_name='workpiece_bind')`,
|
||||
).Scan(&flowMatExists, &stationStateExists, &workpieceBindExists); err != nil {
|
||||
).Scan(&stationStateExists, &workpieceBindExists); err != nil {
|
||||
fmt.Println("VERIFY_FAIL:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
@@ -63,9 +63,9 @@ func main() {
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
fmt.Printf("MIGRATE_OK flow_material=%v station_state=%v workpiece_bind=%v work_order.flow_combination=%v workpiece.current_station_no=%v station_process_dropped=%v bom.process_code_dropped=%v\n",
|
||||
flowMatExists, stationStateExists, workpieceBindExists, combinationCol, stationNoCol, !stationProcessLeft, !processCodeLeft)
|
||||
if !flowMatExists || !stationStateExists || !workpieceBindExists || !combinationCol || !stationNoCol || stationProcessLeft || processCodeLeft {
|
||||
fmt.Printf("MIGRATE_OK station_state=%v workpiece_bind=%v work_order.flow_combination=%v workpiece.current_station_no=%v station_process_dropped=%v bom.process_code_dropped=%v\n",
|
||||
stationStateExists, workpieceBindExists, combinationCol, stationNoCol, !stationProcessLeft, !processCodeLeft)
|
||||
if !stationStateExists || !workpieceBindExists || !combinationCol || !stationNoCol || stationProcessLeft || processCodeLeft {
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user