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:
@@ -45,6 +45,10 @@ const (
|
||||
FieldDispatchedAt = "dispatched_at"
|
||||
// FieldArrivedAt holds the string denoting the arrived_at field in the database.
|
||||
FieldArrivedAt = "arrived_at"
|
||||
// FieldPendingAction holds the string denoting the pending_action field in the database.
|
||||
FieldPendingAction = "pending_action"
|
||||
// FieldPendingSince holds the string denoting the pending_since field in the database.
|
||||
FieldPendingSince = "pending_since"
|
||||
// FieldRemark holds the string denoting the remark field in the database.
|
||||
FieldRemark = "remark"
|
||||
// FieldCreatedAt holds the string denoting the created_at field in the database.
|
||||
@@ -73,6 +77,8 @@ var Columns = []string{
|
||||
FieldOperator,
|
||||
FieldDispatchedAt,
|
||||
FieldArrivedAt,
|
||||
FieldPendingAction,
|
||||
FieldPendingSince,
|
||||
FieldRemark,
|
||||
FieldCreatedAt,
|
||||
}
|
||||
@@ -148,6 +154,12 @@ var (
|
||||
DefaultDispatchedAt int64
|
||||
// DefaultArrivedAt holds the default value on creation for the "arrived_at" field.
|
||||
DefaultArrivedAt int64
|
||||
// DefaultPendingAction holds the default value on creation for the "pending_action" field.
|
||||
DefaultPendingAction string
|
||||
// PendingActionValidator is a validator for the "pending_action" field. It is called by the builders before save.
|
||||
PendingActionValidator func(string) error
|
||||
// DefaultPendingSince holds the default value on creation for the "pending_since" field.
|
||||
DefaultPendingSince int64
|
||||
// DefaultRemark holds the default value on creation for the "remark" field.
|
||||
DefaultRemark string
|
||||
// RemarkValidator is a validator for the "remark" field. It is called by the builders before save.
|
||||
@@ -249,6 +261,16 @@ func ByArrivedAt(opts ...sql.OrderTermOption) OrderOption {
|
||||
return sql.OrderByField(FieldArrivedAt, opts...).ToFunc()
|
||||
}
|
||||
|
||||
// ByPendingAction orders the results by the pending_action field.
|
||||
func ByPendingAction(opts ...sql.OrderTermOption) OrderOption {
|
||||
return sql.OrderByField(FieldPendingAction, opts...).ToFunc()
|
||||
}
|
||||
|
||||
// ByPendingSince orders the results by the pending_since field.
|
||||
func ByPendingSince(opts ...sql.OrderTermOption) OrderOption {
|
||||
return sql.OrderByField(FieldPendingSince, opts...).ToFunc()
|
||||
}
|
||||
|
||||
// ByRemark orders the results by the remark field.
|
||||
func ByRemark(opts ...sql.OrderTermOption) OrderOption {
|
||||
return sql.OrderByField(FieldRemark, opts...).ToFunc()
|
||||
|
||||
@@ -138,6 +138,16 @@ func ArrivedAt(v int64) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldEQ(FieldArrivedAt, v))
|
||||
}
|
||||
|
||||
// PendingAction applies equality check predicate on the "pending_action" field. It's identical to PendingActionEQ.
|
||||
func PendingAction(v string) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldEQ(FieldPendingAction, v))
|
||||
}
|
||||
|
||||
// PendingSince applies equality check predicate on the "pending_since" field. It's identical to PendingSinceEQ.
|
||||
func PendingSince(v int64) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldEQ(FieldPendingSince, v))
|
||||
}
|
||||
|
||||
// Remark applies equality check predicate on the "remark" field. It's identical to RemarkEQ.
|
||||
func Remark(v string) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldEQ(FieldRemark, v))
|
||||
@@ -1168,6 +1178,111 @@ func ArrivedAtLTE(v int64) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldLTE(FieldArrivedAt, v))
|
||||
}
|
||||
|
||||
// PendingActionEQ applies the EQ predicate on the "pending_action" field.
|
||||
func PendingActionEQ(v string) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldEQ(FieldPendingAction, v))
|
||||
}
|
||||
|
||||
// PendingActionNEQ applies the NEQ predicate on the "pending_action" field.
|
||||
func PendingActionNEQ(v string) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldNEQ(FieldPendingAction, v))
|
||||
}
|
||||
|
||||
// PendingActionIn applies the In predicate on the "pending_action" field.
|
||||
func PendingActionIn(vs ...string) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldIn(FieldPendingAction, vs...))
|
||||
}
|
||||
|
||||
// PendingActionNotIn applies the NotIn predicate on the "pending_action" field.
|
||||
func PendingActionNotIn(vs ...string) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldNotIn(FieldPendingAction, vs...))
|
||||
}
|
||||
|
||||
// PendingActionGT applies the GT predicate on the "pending_action" field.
|
||||
func PendingActionGT(v string) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldGT(FieldPendingAction, v))
|
||||
}
|
||||
|
||||
// PendingActionGTE applies the GTE predicate on the "pending_action" field.
|
||||
func PendingActionGTE(v string) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldGTE(FieldPendingAction, v))
|
||||
}
|
||||
|
||||
// PendingActionLT applies the LT predicate on the "pending_action" field.
|
||||
func PendingActionLT(v string) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldLT(FieldPendingAction, v))
|
||||
}
|
||||
|
||||
// PendingActionLTE applies the LTE predicate on the "pending_action" field.
|
||||
func PendingActionLTE(v string) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldLTE(FieldPendingAction, v))
|
||||
}
|
||||
|
||||
// PendingActionContains applies the Contains predicate on the "pending_action" field.
|
||||
func PendingActionContains(v string) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldContains(FieldPendingAction, v))
|
||||
}
|
||||
|
||||
// PendingActionHasPrefix applies the HasPrefix predicate on the "pending_action" field.
|
||||
func PendingActionHasPrefix(v string) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldHasPrefix(FieldPendingAction, v))
|
||||
}
|
||||
|
||||
// PendingActionHasSuffix applies the HasSuffix predicate on the "pending_action" field.
|
||||
func PendingActionHasSuffix(v string) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldHasSuffix(FieldPendingAction, v))
|
||||
}
|
||||
|
||||
// PendingActionEqualFold applies the EqualFold predicate on the "pending_action" field.
|
||||
func PendingActionEqualFold(v string) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldEqualFold(FieldPendingAction, v))
|
||||
}
|
||||
|
||||
// PendingActionContainsFold applies the ContainsFold predicate on the "pending_action" field.
|
||||
func PendingActionContainsFold(v string) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldContainsFold(FieldPendingAction, v))
|
||||
}
|
||||
|
||||
// PendingSinceEQ applies the EQ predicate on the "pending_since" field.
|
||||
func PendingSinceEQ(v int64) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldEQ(FieldPendingSince, v))
|
||||
}
|
||||
|
||||
// PendingSinceNEQ applies the NEQ predicate on the "pending_since" field.
|
||||
func PendingSinceNEQ(v int64) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldNEQ(FieldPendingSince, v))
|
||||
}
|
||||
|
||||
// PendingSinceIn applies the In predicate on the "pending_since" field.
|
||||
func PendingSinceIn(vs ...int64) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldIn(FieldPendingSince, vs...))
|
||||
}
|
||||
|
||||
// PendingSinceNotIn applies the NotIn predicate on the "pending_since" field.
|
||||
func PendingSinceNotIn(vs ...int64) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldNotIn(FieldPendingSince, vs...))
|
||||
}
|
||||
|
||||
// PendingSinceGT applies the GT predicate on the "pending_since" field.
|
||||
func PendingSinceGT(v int64) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldGT(FieldPendingSince, v))
|
||||
}
|
||||
|
||||
// PendingSinceGTE applies the GTE predicate on the "pending_since" field.
|
||||
func PendingSinceGTE(v int64) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldGTE(FieldPendingSince, v))
|
||||
}
|
||||
|
||||
// PendingSinceLT applies the LT predicate on the "pending_since" field.
|
||||
func PendingSinceLT(v int64) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldLT(FieldPendingSince, v))
|
||||
}
|
||||
|
||||
// PendingSinceLTE applies the LTE predicate on the "pending_since" field.
|
||||
func PendingSinceLTE(v int64) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldLTE(FieldPendingSince, v))
|
||||
}
|
||||
|
||||
// RemarkEQ applies the EQ predicate on the "remark" field.
|
||||
func RemarkEQ(v string) predicate.AgvTask {
|
||||
return predicate.AgvTask(sql.FieldEQ(FieldRemark, v))
|
||||
|
||||
Reference in New Issue
Block a user