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,8 +42,14 @@ type Workpiece struct {
|
||||
// 拧紧不合格标记时间
|
||||
TorqueNgAt *time.Time `json:"torque_ng_at,omitempty"`
|
||||
// 拧紧不合格标记操作人
|
||||
TorqueNgBy *string `json:"torque_ng_by,omitempty"`
|
||||
selectValues sql.SelectValues
|
||||
TorqueNgBy *string `json:"torque_ng_by,omitempty"`
|
||||
// 流转在途MW地址(0=无在途;>0=已下发未确认到位)
|
||||
FlowTransitMW int `json:"flowTransitMW,omitempty"`
|
||||
// 流转在途目标点位编号(如 C3 / G9)
|
||||
FlowTransitTarget string `json:"flowTransitTarget,omitempty"`
|
||||
// 流转指令下发时刻(到位确认超时判定)
|
||||
FlowTransitAt *time.Time `json:"flowTransitAt,omitempty"`
|
||||
selectValues sql.SelectValues
|
||||
}
|
||||
|
||||
// scanValues returns the types for scanning values from sql.Rows.
|
||||
@@ -53,11 +59,11 @@ func (*Workpiece) scanValues(columns []string) ([]any, error) {
|
||||
switch columns[i] {
|
||||
case workpiece.FieldTorqueNgPending:
|
||||
values[i] = new(sql.NullBool)
|
||||
case workpiece.FieldID, workpiece.FieldWorkOrderId, workpiece.FieldCurrentStationNo, workpiece.FieldAtStationNo:
|
||||
case workpiece.FieldID, workpiece.FieldWorkOrderId, workpiece.FieldCurrentStationNo, workpiece.FieldAtStationNo, workpiece.FieldFlowTransitMW:
|
||||
values[i] = new(sql.NullInt64)
|
||||
case workpiece.FieldSn, workpiece.FieldOrderNo, workpiece.FieldStatus, workpiece.FieldTorqueNgBy:
|
||||
case workpiece.FieldSn, workpiece.FieldOrderNo, workpiece.FieldStatus, workpiece.FieldTorqueNgBy, workpiece.FieldFlowTransitTarget:
|
||||
values[i] = new(sql.NullString)
|
||||
case workpiece.FieldOnlineAt, workpiece.FieldDoneAt, workpiece.FieldCreatedAt, workpiece.FieldUpdatedAt, workpiece.FieldTorqueNgAt:
|
||||
case workpiece.FieldOnlineAt, workpiece.FieldDoneAt, workpiece.FieldCreatedAt, workpiece.FieldUpdatedAt, workpiece.FieldTorqueNgAt, workpiece.FieldFlowTransitAt:
|
||||
values[i] = new(sql.NullTime)
|
||||
default:
|
||||
values[i] = new(sql.UnknownType)
|
||||
@@ -163,6 +169,25 @@ func (_m *Workpiece) assignValues(columns []string, values []any) error {
|
||||
_m.TorqueNgBy = new(string)
|
||||
*_m.TorqueNgBy = value.String
|
||||
}
|
||||
case workpiece.FieldFlowTransitMW:
|
||||
if value, ok := values[i].(*sql.NullInt64); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field flowTransitMW", values[i])
|
||||
} else if value.Valid {
|
||||
_m.FlowTransitMW = int(value.Int64)
|
||||
}
|
||||
case workpiece.FieldFlowTransitTarget:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field flowTransitTarget", values[i])
|
||||
} else if value.Valid {
|
||||
_m.FlowTransitTarget = value.String
|
||||
}
|
||||
case workpiece.FieldFlowTransitAt:
|
||||
if value, ok := values[i].(*sql.NullTime); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field flowTransitAt", values[i])
|
||||
} else if value.Valid {
|
||||
_m.FlowTransitAt = new(time.Time)
|
||||
*_m.FlowTransitAt = value.Time
|
||||
}
|
||||
default:
|
||||
_m.selectValues.Set(columns[i], values[i])
|
||||
}
|
||||
@@ -247,6 +272,17 @@ func (_m *Workpiece) String() string {
|
||||
builder.WriteString("torque_ng_by=")
|
||||
builder.WriteString(*v)
|
||||
}
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("flowTransitMW=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.FlowTransitMW))
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("flowTransitTarget=")
|
||||
builder.WriteString(_m.FlowTransitTarget)
|
||||
builder.WriteString(", ")
|
||||
if v := _m.FlowTransitAt; v != nil {
|
||||
builder.WriteString("flowTransitAt=")
|
||||
builder.WriteString(v.Format(time.ANSIC))
|
||||
}
|
||||
builder.WriteByte(')')
|
||||
return builder.String()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user