一、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 构建指纹更新
72 lines
3.1 KiB
Go
72 lines
3.1 KiB
Go
// 一次性运维工具:直接加载项目配置执行 EnsureDB + EnsureSchema(建新表 + 幂等补列),
|
|
// 绕过交互式管理员密码门禁(密码留在配置文件内,不落日志、不打印)。
|
|
// 用法:go run ./tools/migrateonce
|
|
package main
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os"
|
|
|
|
"bj_power_mes/internal/config"
|
|
"bj_power_mes/internal/db"
|
|
|
|
"github.com/zeromicro/go-zero/core/conf"
|
|
)
|
|
|
|
func main() {
|
|
var c config.Config
|
|
conf.MustLoad("etc/bj_power_mes-api.yaml", &c)
|
|
|
|
if err := db.EnsureDB(c.Database); err != nil {
|
|
fmt.Println("ENSURE_DB_FAIL:", err)
|
|
os.Exit(1)
|
|
}
|
|
client, sqlDB := db.MustNewDB(c.Database)
|
|
defer client.Close()
|
|
defer sqlDB.Close()
|
|
|
|
// 迁移前现状:库名 + 现有表清单
|
|
rows, err := sqlDB.QueryContext(context.Background(),
|
|
`SELECT current_database(), COALESCE(string_agg(tablename, ','), '(empty)') FROM pg_tables WHERE schemaname='public'`)
|
|
if err == nil && rows.Next() {
|
|
var dbname, tables string
|
|
_ = rows.Scan(&dbname, &tables)
|
|
rows.Close()
|
|
fmt.Printf("DB=%s TABLES_BEFORE=%s\n", dbname, tables)
|
|
}
|
|
|
|
if err := db.EnsureSchema(client, sqlDB); err != nil {
|
|
fmt.Println("MIGRATE_FAIL:", err)
|
|
os.Exit(1)
|
|
}
|
|
|
|
// 迁移结果自检:新表存在 + 旧表/旧列已清理
|
|
// 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='station_state'),
|
|
EXISTS(SELECT 1 FROM information_schema.tables WHERE table_schema='public' AND table_name='workpiece_bind')`,
|
|
).Scan(&stationStateExists, &workpieceBindExists); err != nil {
|
|
fmt.Println("VERIFY_FAIL:", err)
|
|
os.Exit(1)
|
|
}
|
|
var combinationCol, stationNoCol bool
|
|
var stationProcessLeft, processCodeLeft bool
|
|
if err := sqlDB.QueryRowContext(context.Background(),
|
|
`SELECT EXISTS(SELECT 1 FROM information_schema.columns WHERE table_schema='public' AND table_name='work_order' AND column_name='flow_combination'),
|
|
EXISTS(SELECT 1 FROM information_schema.columns WHERE table_schema='public' AND table_name='workpiece' AND column_name='current_station_no'),
|
|
EXISTS(SELECT 1 FROM information_schema.tables WHERE table_schema='public' AND table_name='station_process'),
|
|
EXISTS(SELECT 1 FROM information_schema.columns WHERE table_schema='public' AND table_name='work_order_bom' AND column_name='process_code')`,
|
|
).Scan(&combinationCol, &stationNoCol, &stationProcessLeft, &processCodeLeft); err != nil {
|
|
fmt.Println("VERIFY_FAIL:", err)
|
|
os.Exit(1)
|
|
}
|
|
|
|
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)
|
|
}
|
|
}
|