From 9aaa768e6c8eaaa5741dd156e1e75dd74bc07a5b Mon Sep 17 00:00:00 2001 From: SunYF <123@hard_man.com> Date: Thu, 19 Nov 2026 23:08:46 +0800 Subject: [PATCH] =?UTF-8?q?feat(mes):=20AGV=E6=8C=82=E8=B5=B7=E5=8A=A8?= =?UTF-8?q?=E4=BD=9C=E5=BC=95=E6=93=8E=20+=20=E6=99=BA=E8=83=BD=E8=B7=9F?= =?UTF-8?q?=E8=BD=A6=E6=B5=81=E8=BD=AC=20+=20PLC=E5=BF=AB=E7=85=A7?= =?UTF-8?q?=E7=BC=93=E5=AD=98=EF=BC=882026-11-19=20=E4=B8=BB=E6=8E=A7?= =?UTF-8?q?=E6=8B=8D=E6=9D=BF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 一、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 构建指纹更新 --- bj_power_mes/ent/agvtask.go | 26 +- bj_power_mes/ent/agvtask/agvtask.go | 22 + bj_power_mes/ent/agvtask/where.go | 115 ++++ bj_power_mes/ent/agvtask_create.go | 55 ++ bj_power_mes/ent/agvtask_update.go | 98 ++++ bj_power_mes/ent/migrate/schema.go | 5 + bj_power_mes/ent/mutation.go | 359 +++++++++++- bj_power_mes/ent/runtime.go | 24 +- bj_power_mes/ent/workpiece.go | 46 +- bj_power_mes/ent/workpiece/where.go | 170 ++++++ bj_power_mes/ent/workpiece/workpiece.go | 30 + bj_power_mes/ent/workpiece_create.go | 73 +++ bj_power_mes/ent/workpiece_update.go | 150 +++++ bj_power_mes/frontend/src/help.js | 12 +- bj_power_mes/frontend/src/pages/Agv.vue | 37 +- bj_power_mes/frontend/src/pages/AgvManual.vue | 150 ++++- bj_power_mes/frontend/src/pages/DailyPlan.vue | 53 +- .../frontend/src/pages/PlcMonitor.vue | 57 +- bj_power_mes/internal/agv/client.go | 49 ++ bj_power_mes/internal/db/db.go | 7 + .../internal/handler/production/agv.go | 56 +- .../internal/handler/routes_production.go | 3 + bj_power_mes/internal/logic/agv.go | 528 ++++++++++++++---- bj_power_mes/internal/logic/agv_pending.go | 211 +++++++ bj_power_mes/internal/logic/call.go | 2 +- bj_power_mes/internal/logic/dashboard.go | 3 +- bj_power_mes/internal/logic/flow_chain.go | 135 +++-- bj_power_mes/internal/logic/flow_engine.go | 270 +++++++++ bj_power_mes/internal/logic/plc_monitor.go | 42 +- bj_power_mes/internal/netutil/localip.go | 26 + bj_power_mes/internal/plc/logging.go | 58 +- bj_power_mes/internal/plc/plc.go | 32 +- bj_power_mes/internal/plc/snapshot_cache.go | 89 +++ bj_power_mes/internal/plc/tcp.go | 132 ++--- bj_power_mes/public/index.html | 2 +- bj_power_mes/schema/agv_task.go | 2 + bj_power_mes/schema/workpiece.go | 6 + bj_power_mes/tools/migrateonce/main.go | 14 +- bj_power_mes/tools/plcdiag/main.go | 233 ++++++++ 问题临时.md | 19 +- 40 files changed, 3037 insertions(+), 364 deletions(-) create mode 100644 bj_power_mes/internal/logic/agv_pending.go create mode 100644 bj_power_mes/internal/logic/flow_engine.go create mode 100644 bj_power_mes/internal/plc/snapshot_cache.go create mode 100644 bj_power_mes/tools/plcdiag/main.go diff --git a/bj_power_mes/ent/agvtask.go b/bj_power_mes/ent/agvtask.go index 29d60be..f908289 100644 --- a/bj_power_mes/ent/agvtask.go +++ b/bj_power_mes/ent/agvtask.go @@ -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(", ") diff --git a/bj_power_mes/ent/agvtask/agvtask.go b/bj_power_mes/ent/agvtask/agvtask.go index ab51106..ab1ba5a 100644 --- a/bj_power_mes/ent/agvtask/agvtask.go +++ b/bj_power_mes/ent/agvtask/agvtask.go @@ -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() diff --git a/bj_power_mes/ent/agvtask/where.go b/bj_power_mes/ent/agvtask/where.go index 34ee4bb..1868a9e 100644 --- a/bj_power_mes/ent/agvtask/where.go +++ b/bj_power_mes/ent/agvtask/where.go @@ -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)) diff --git a/bj_power_mes/ent/agvtask_create.go b/bj_power_mes/ent/agvtask_create.go index c8faf0a..8097406 100644 --- a/bj_power_mes/ent/agvtask_create.go +++ b/bj_power_mes/ent/agvtask_create.go @@ -249,6 +249,34 @@ func (_c *AgvTaskCreate) SetNillableArrivedAt(v *int64) *AgvTaskCreate { return _c } +// SetPendingAction sets the "pending_action" field. +func (_c *AgvTaskCreate) SetPendingAction(v string) *AgvTaskCreate { + _c.mutation.SetPendingAction(v) + return _c +} + +// SetNillablePendingAction sets the "pending_action" field if the given value is not nil. +func (_c *AgvTaskCreate) SetNillablePendingAction(v *string) *AgvTaskCreate { + if v != nil { + _c.SetPendingAction(*v) + } + return _c +} + +// SetPendingSince sets the "pending_since" field. +func (_c *AgvTaskCreate) SetPendingSince(v int64) *AgvTaskCreate { + _c.mutation.SetPendingSince(v) + return _c +} + +// SetNillablePendingSince sets the "pending_since" field if the given value is not nil. +func (_c *AgvTaskCreate) SetNillablePendingSince(v *int64) *AgvTaskCreate { + if v != nil { + _c.SetPendingSince(*v) + } + return _c +} + // SetRemark sets the "remark" field. func (_c *AgvTaskCreate) SetRemark(v string) *AgvTaskCreate { _c.mutation.SetRemark(v) @@ -376,6 +404,14 @@ func (_c *AgvTaskCreate) defaults() { v := agvtask.DefaultArrivedAt _c.mutation.SetArrivedAt(v) } + if _, ok := _c.mutation.PendingAction(); !ok { + v := agvtask.DefaultPendingAction + _c.mutation.SetPendingAction(v) + } + if _, ok := _c.mutation.PendingSince(); !ok { + v := agvtask.DefaultPendingSince + _c.mutation.SetPendingSince(v) + } if _, ok := _c.mutation.Remark(); !ok { v := agvtask.DefaultRemark _c.mutation.SetRemark(v) @@ -503,6 +539,17 @@ func (_c *AgvTaskCreate) check() error { if _, ok := _c.mutation.ArrivedAt(); !ok { return &ValidationError{Name: "arrived_at", err: errors.New(`ent: missing required field "AgvTask.arrived_at"`)} } + if _, ok := _c.mutation.PendingAction(); !ok { + return &ValidationError{Name: "pending_action", err: errors.New(`ent: missing required field "AgvTask.pending_action"`)} + } + if v, ok := _c.mutation.PendingAction(); ok { + if err := agvtask.PendingActionValidator(v); err != nil { + return &ValidationError{Name: "pending_action", err: fmt.Errorf(`ent: validator failed for field "AgvTask.pending_action": %w`, err)} + } + } + if _, ok := _c.mutation.PendingSince(); !ok { + return &ValidationError{Name: "pending_since", err: errors.New(`ent: missing required field "AgvTask.pending_since"`)} + } if v, ok := _c.mutation.Remark(); ok { if err := agvtask.RemarkValidator(v); err != nil { return &ValidationError{Name: "remark", err: fmt.Errorf(`ent: validator failed for field "AgvTask.remark": %w`, err)} @@ -605,6 +652,14 @@ func (_c *AgvTaskCreate) createSpec() (*AgvTask, *sqlgraph.CreateSpec) { _spec.SetField(agvtask.FieldArrivedAt, field.TypeInt64, value) _node.ArrivedAt = value } + if value, ok := _c.mutation.PendingAction(); ok { + _spec.SetField(agvtask.FieldPendingAction, field.TypeString, value) + _node.PendingAction = value + } + if value, ok := _c.mutation.PendingSince(); ok { + _spec.SetField(agvtask.FieldPendingSince, field.TypeInt64, value) + _node.PendingSince = value + } if value, ok := _c.mutation.Remark(); ok { _spec.SetField(agvtask.FieldRemark, field.TypeString, value) _node.Remark = value diff --git a/bj_power_mes/ent/agvtask_update.go b/bj_power_mes/ent/agvtask_update.go index 981197b..fda8998 100644 --- a/bj_power_mes/ent/agvtask_update.go +++ b/bj_power_mes/ent/agvtask_update.go @@ -292,6 +292,41 @@ func (_u *AgvTaskUpdate) AddArrivedAt(v int64) *AgvTaskUpdate { return _u } +// SetPendingAction sets the "pending_action" field. +func (_u *AgvTaskUpdate) SetPendingAction(v string) *AgvTaskUpdate { + _u.mutation.SetPendingAction(v) + return _u +} + +// SetNillablePendingAction sets the "pending_action" field if the given value is not nil. +func (_u *AgvTaskUpdate) SetNillablePendingAction(v *string) *AgvTaskUpdate { + if v != nil { + _u.SetPendingAction(*v) + } + return _u +} + +// SetPendingSince sets the "pending_since" field. +func (_u *AgvTaskUpdate) SetPendingSince(v int64) *AgvTaskUpdate { + _u.mutation.ResetPendingSince() + _u.mutation.SetPendingSince(v) + return _u +} + +// SetNillablePendingSince sets the "pending_since" field if the given value is not nil. +func (_u *AgvTaskUpdate) SetNillablePendingSince(v *int64) *AgvTaskUpdate { + if v != nil { + _u.SetPendingSince(*v) + } + return _u +} + +// AddPendingSince adds value to the "pending_since" field. +func (_u *AgvTaskUpdate) AddPendingSince(v int64) *AgvTaskUpdate { + _u.mutation.AddPendingSince(v) + return _u +} + // SetRemark sets the "remark" field. func (_u *AgvTaskUpdate) SetRemark(v string) *AgvTaskUpdate { _u.mutation.SetRemark(v) @@ -437,6 +472,11 @@ func (_u *AgvTaskUpdate) check() error { return &ValidationError{Name: "operator", err: fmt.Errorf(`ent: validator failed for field "AgvTask.operator": %w`, err)} } } + if v, ok := _u.mutation.PendingAction(); ok { + if err := agvtask.PendingActionValidator(v); err != nil { + return &ValidationError{Name: "pending_action", err: fmt.Errorf(`ent: validator failed for field "AgvTask.pending_action": %w`, err)} + } + } if v, ok := _u.mutation.Remark(); ok { if err := agvtask.RemarkValidator(v); err != nil { return &ValidationError{Name: "remark", err: fmt.Errorf(`ent: validator failed for field "AgvTask.remark": %w`, err)} @@ -526,6 +566,15 @@ func (_u *AgvTaskUpdate) sqlSave(ctx context.Context) (_node int, err error) { if value, ok := _u.mutation.AddedArrivedAt(); ok { _spec.AddField(agvtask.FieldArrivedAt, field.TypeInt64, value) } + if value, ok := _u.mutation.PendingAction(); ok { + _spec.SetField(agvtask.FieldPendingAction, field.TypeString, value) + } + if value, ok := _u.mutation.PendingSince(); ok { + _spec.SetField(agvtask.FieldPendingSince, field.TypeInt64, value) + } + if value, ok := _u.mutation.AddedPendingSince(); ok { + _spec.AddField(agvtask.FieldPendingSince, field.TypeInt64, value) + } if value, ok := _u.mutation.Remark(); ok { _spec.SetField(agvtask.FieldRemark, field.TypeString, value) } @@ -824,6 +873,41 @@ func (_u *AgvTaskUpdateOne) AddArrivedAt(v int64) *AgvTaskUpdateOne { return _u } +// SetPendingAction sets the "pending_action" field. +func (_u *AgvTaskUpdateOne) SetPendingAction(v string) *AgvTaskUpdateOne { + _u.mutation.SetPendingAction(v) + return _u +} + +// SetNillablePendingAction sets the "pending_action" field if the given value is not nil. +func (_u *AgvTaskUpdateOne) SetNillablePendingAction(v *string) *AgvTaskUpdateOne { + if v != nil { + _u.SetPendingAction(*v) + } + return _u +} + +// SetPendingSince sets the "pending_since" field. +func (_u *AgvTaskUpdateOne) SetPendingSince(v int64) *AgvTaskUpdateOne { + _u.mutation.ResetPendingSince() + _u.mutation.SetPendingSince(v) + return _u +} + +// SetNillablePendingSince sets the "pending_since" field if the given value is not nil. +func (_u *AgvTaskUpdateOne) SetNillablePendingSince(v *int64) *AgvTaskUpdateOne { + if v != nil { + _u.SetPendingSince(*v) + } + return _u +} + +// AddPendingSince adds value to the "pending_since" field. +func (_u *AgvTaskUpdateOne) AddPendingSince(v int64) *AgvTaskUpdateOne { + _u.mutation.AddPendingSince(v) + return _u +} + // SetRemark sets the "remark" field. func (_u *AgvTaskUpdateOne) SetRemark(v string) *AgvTaskUpdateOne { _u.mutation.SetRemark(v) @@ -982,6 +1066,11 @@ func (_u *AgvTaskUpdateOne) check() error { return &ValidationError{Name: "operator", err: fmt.Errorf(`ent: validator failed for field "AgvTask.operator": %w`, err)} } } + if v, ok := _u.mutation.PendingAction(); ok { + if err := agvtask.PendingActionValidator(v); err != nil { + return &ValidationError{Name: "pending_action", err: fmt.Errorf(`ent: validator failed for field "AgvTask.pending_action": %w`, err)} + } + } if v, ok := _u.mutation.Remark(); ok { if err := agvtask.RemarkValidator(v); err != nil { return &ValidationError{Name: "remark", err: fmt.Errorf(`ent: validator failed for field "AgvTask.remark": %w`, err)} @@ -1088,6 +1177,15 @@ func (_u *AgvTaskUpdateOne) sqlSave(ctx context.Context) (_node *AgvTask, err er if value, ok := _u.mutation.AddedArrivedAt(); ok { _spec.AddField(agvtask.FieldArrivedAt, field.TypeInt64, value) } + if value, ok := _u.mutation.PendingAction(); ok { + _spec.SetField(agvtask.FieldPendingAction, field.TypeString, value) + } + if value, ok := _u.mutation.PendingSince(); ok { + _spec.SetField(agvtask.FieldPendingSince, field.TypeInt64, value) + } + if value, ok := _u.mutation.AddedPendingSince(); ok { + _spec.AddField(agvtask.FieldPendingSince, field.TypeInt64, value) + } if value, ok := _u.mutation.Remark(); ok { _spec.SetField(agvtask.FieldRemark, field.TypeString, value) } diff --git a/bj_power_mes/ent/migrate/schema.go b/bj_power_mes/ent/migrate/schema.go index 40236a9..b9af304 100644 --- a/bj_power_mes/ent/migrate/schema.go +++ b/bj_power_mes/ent/migrate/schema.go @@ -69,6 +69,8 @@ var ( {Name: "operator", Type: field.TypeString, Size: 64, Comment: "下发人", Default: ""}, {Name: "dispatched_at", Type: field.TypeInt64, Comment: "下发时间 unix秒", Default: 0}, {Name: "arrived_at", Type: field.TypeInt64, Comment: "到位时间 unix秒", Default: 0}, + {Name: "pending_action", Type: field.TypeString, Size: 30, Comment: "挂起待办动作(2026-11-19 主控定稿,弃队列弃硬拒):CONTINUE_LIFT等举升完成→continueTask#1/WAIT_DROP_CONFIRM等人工确认放下→continueTask#2/FREE_ROBOT等末组完成→freeRobot;空=无待办;RCS报错即清+告警,系统动作超60s转预警人工重试", Default: ""}, + {Name: "pending_since", Type: field.TypeInt64, Comment: "挂起动作起始时间 unix秒(60s超时告警判定基准)", Default: 0}, {Name: "remark", Type: field.TypeString, Nullable: true, Size: 500, Comment: "备注/失败原因", Default: ""}, {Name: "created_at", Type: field.TypeInt64, Comment: "创建时间"}, } @@ -1506,6 +1508,9 @@ var ( {Name: "torque_ng_pending", Type: field.TypeBool, Comment: "拧紧扭矩不合格待人工处置标记", Default: false}, {Name: "torque_ng_at", Type: field.TypeTime, Nullable: true, Comment: "拧紧不合格标记时间"}, {Name: "torque_ng_by", Type: field.TypeString, Nullable: true, Size: 64, Comment: "拧紧不合格标记操作人"}, + {Name: "flow_transit_mw", Type: field.TypeInt, Comment: "流转在途MW地址(0=无在途;>0=已下发未确认到位)", Default: 0}, + {Name: "flow_transit_target", Type: field.TypeString, Size: 32, Comment: "流转在途目标点位编号(如 C3 / G9)", Default: ""}, + {Name: "flow_transit_at", Type: field.TypeTime, Nullable: true, Comment: "流转指令下发时刻(到位确认超时判定)"}, } // WorkpieceTable holds the schema information for the "workpiece" table. WorkpieceTable = &schema.Table{ diff --git a/bj_power_mes/ent/mutation.go b/bj_power_mes/ent/mutation.go index 353c69b..e2bfc68 100644 --- a/bj_power_mes/ent/mutation.go +++ b/bj_power_mes/ent/mutation.go @@ -1188,6 +1188,9 @@ type AgvTaskMutation struct { adddispatched_at *int64 arrived_at *int64 addarrived_at *int64 + pending_action *string + pending_since *int64 + addpending_since *int64 remark *string created_at *int64 addcreated_at *int64 @@ -1973,6 +1976,98 @@ func (m *AgvTaskMutation) ResetArrivedAt() { m.addarrived_at = nil } +// SetPendingAction sets the "pending_action" field. +func (m *AgvTaskMutation) SetPendingAction(s string) { + m.pending_action = &s +} + +// PendingAction returns the value of the "pending_action" field in the mutation. +func (m *AgvTaskMutation) PendingAction() (r string, exists bool) { + v := m.pending_action + if v == nil { + return + } + return *v, true +} + +// OldPendingAction returns the old "pending_action" field's value of the AgvTask entity. +// If the AgvTask object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AgvTaskMutation) OldPendingAction(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldPendingAction is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldPendingAction requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldPendingAction: %w", err) + } + return oldValue.PendingAction, nil +} + +// ResetPendingAction resets all changes to the "pending_action" field. +func (m *AgvTaskMutation) ResetPendingAction() { + m.pending_action = nil +} + +// SetPendingSince sets the "pending_since" field. +func (m *AgvTaskMutation) SetPendingSince(i int64) { + m.pending_since = &i + m.addpending_since = nil +} + +// PendingSince returns the value of the "pending_since" field in the mutation. +func (m *AgvTaskMutation) PendingSince() (r int64, exists bool) { + v := m.pending_since + if v == nil { + return + } + return *v, true +} + +// OldPendingSince returns the old "pending_since" field's value of the AgvTask entity. +// If the AgvTask object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AgvTaskMutation) OldPendingSince(ctx context.Context) (v int64, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldPendingSince is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldPendingSince requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldPendingSince: %w", err) + } + return oldValue.PendingSince, nil +} + +// AddPendingSince adds i to the "pending_since" field. +func (m *AgvTaskMutation) AddPendingSince(i int64) { + if m.addpending_since != nil { + *m.addpending_since += i + } else { + m.addpending_since = &i + } +} + +// AddedPendingSince returns the value that was added to the "pending_since" field in this mutation. +func (m *AgvTaskMutation) AddedPendingSince() (r int64, exists bool) { + v := m.addpending_since + if v == nil { + return + } + return *v, true +} + +// ResetPendingSince resets all changes to the "pending_since" field. +func (m *AgvTaskMutation) ResetPendingSince() { + m.pending_since = nil + m.addpending_since = nil +} + // SetRemark sets the "remark" field. func (m *AgvTaskMutation) SetRemark(s string) { m.remark = &s @@ -2112,7 +2207,7 @@ func (m *AgvTaskMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *AgvTaskMutation) Fields() []string { - fields := make([]string, 0, 19) + fields := make([]string, 0, 21) if m.task_no != nil { fields = append(fields, agvtask.FieldTaskNo) } @@ -2164,6 +2259,12 @@ func (m *AgvTaskMutation) Fields() []string { if m.arrived_at != nil { fields = append(fields, agvtask.FieldArrivedAt) } + if m.pending_action != nil { + fields = append(fields, agvtask.FieldPendingAction) + } + if m.pending_since != nil { + fields = append(fields, agvtask.FieldPendingSince) + } if m.remark != nil { fields = append(fields, agvtask.FieldRemark) } @@ -2212,6 +2313,10 @@ func (m *AgvTaskMutation) Field(name string) (ent.Value, bool) { return m.DispatchedAt() case agvtask.FieldArrivedAt: return m.ArrivedAt() + case agvtask.FieldPendingAction: + return m.PendingAction() + case agvtask.FieldPendingSince: + return m.PendingSince() case agvtask.FieldRemark: return m.Remark() case agvtask.FieldCreatedAt: @@ -2259,6 +2364,10 @@ func (m *AgvTaskMutation) OldField(ctx context.Context, name string) (ent.Value, return m.OldDispatchedAt(ctx) case agvtask.FieldArrivedAt: return m.OldArrivedAt(ctx) + case agvtask.FieldPendingAction: + return m.OldPendingAction(ctx) + case agvtask.FieldPendingSince: + return m.OldPendingSince(ctx) case agvtask.FieldRemark: return m.OldRemark(ctx) case agvtask.FieldCreatedAt: @@ -2391,6 +2500,20 @@ func (m *AgvTaskMutation) SetField(name string, value ent.Value) error { } m.SetArrivedAt(v) return nil + case agvtask.FieldPendingAction: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetPendingAction(v) + return nil + case agvtask.FieldPendingSince: + v, ok := value.(int64) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetPendingSince(v) + return nil case agvtask.FieldRemark: v, ok := value.(string) if !ok { @@ -2419,6 +2542,9 @@ func (m *AgvTaskMutation) AddedFields() []string { if m.addarrived_at != nil { fields = append(fields, agvtask.FieldArrivedAt) } + if m.addpending_since != nil { + fields = append(fields, agvtask.FieldPendingSince) + } if m.addcreated_at != nil { fields = append(fields, agvtask.FieldCreatedAt) } @@ -2434,6 +2560,8 @@ func (m *AgvTaskMutation) AddedField(name string) (ent.Value, bool) { return m.AddedDispatchedAt() case agvtask.FieldArrivedAt: return m.AddedArrivedAt() + case agvtask.FieldPendingSince: + return m.AddedPendingSince() case agvtask.FieldCreatedAt: return m.AddedCreatedAt() } @@ -2459,6 +2587,13 @@ func (m *AgvTaskMutation) AddField(name string, value ent.Value) error { } m.AddArrivedAt(v) return nil + case agvtask.FieldPendingSince: + v, ok := value.(int64) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddPendingSince(v) + return nil case agvtask.FieldCreatedAt: v, ok := value.(int64) if !ok { @@ -2565,6 +2700,12 @@ func (m *AgvTaskMutation) ResetField(name string) error { case agvtask.FieldArrivedAt: m.ResetArrivedAt() return nil + case agvtask.FieldPendingAction: + m.ResetPendingAction() + return nil + case agvtask.FieldPendingSince: + m.ResetPendingSince() + return nil case agvtask.FieldRemark: m.ResetRemark() return nil @@ -42083,6 +42224,10 @@ type WorkpieceMutation struct { torque_ng_pending *bool torque_ng_at *time.Time torque_ng_by *string + flowTransitMW *int + addflowTransitMW *int + flowTransitTarget *string + flowTransitAt *time.Time clearedFields map[string]struct{} done bool oldValue func(context.Context) (*Workpiece, error) @@ -42828,6 +42973,147 @@ func (m *WorkpieceMutation) ResetTorqueNgBy() { delete(m.clearedFields, workpiece.FieldTorqueNgBy) } +// SetFlowTransitMW sets the "flowTransitMW" field. +func (m *WorkpieceMutation) SetFlowTransitMW(i int) { + m.flowTransitMW = &i + m.addflowTransitMW = nil +} + +// FlowTransitMW returns the value of the "flowTransitMW" field in the mutation. +func (m *WorkpieceMutation) FlowTransitMW() (r int, exists bool) { + v := m.flowTransitMW + if v == nil { + return + } + return *v, true +} + +// OldFlowTransitMW returns the old "flowTransitMW" field's value of the Workpiece entity. +// If the Workpiece object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *WorkpieceMutation) OldFlowTransitMW(ctx context.Context) (v int, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldFlowTransitMW is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldFlowTransitMW requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldFlowTransitMW: %w", err) + } + return oldValue.FlowTransitMW, nil +} + +// AddFlowTransitMW adds i to the "flowTransitMW" field. +func (m *WorkpieceMutation) AddFlowTransitMW(i int) { + if m.addflowTransitMW != nil { + *m.addflowTransitMW += i + } else { + m.addflowTransitMW = &i + } +} + +// AddedFlowTransitMW returns the value that was added to the "flowTransitMW" field in this mutation. +func (m *WorkpieceMutation) AddedFlowTransitMW() (r int, exists bool) { + v := m.addflowTransitMW + if v == nil { + return + } + return *v, true +} + +// ResetFlowTransitMW resets all changes to the "flowTransitMW" field. +func (m *WorkpieceMutation) ResetFlowTransitMW() { + m.flowTransitMW = nil + m.addflowTransitMW = nil +} + +// SetFlowTransitTarget sets the "flowTransitTarget" field. +func (m *WorkpieceMutation) SetFlowTransitTarget(s string) { + m.flowTransitTarget = &s +} + +// FlowTransitTarget returns the value of the "flowTransitTarget" field in the mutation. +func (m *WorkpieceMutation) FlowTransitTarget() (r string, exists bool) { + v := m.flowTransitTarget + if v == nil { + return + } + return *v, true +} + +// OldFlowTransitTarget returns the old "flowTransitTarget" field's value of the Workpiece entity. +// If the Workpiece object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *WorkpieceMutation) OldFlowTransitTarget(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldFlowTransitTarget is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldFlowTransitTarget requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldFlowTransitTarget: %w", err) + } + return oldValue.FlowTransitTarget, nil +} + +// ResetFlowTransitTarget resets all changes to the "flowTransitTarget" field. +func (m *WorkpieceMutation) ResetFlowTransitTarget() { + m.flowTransitTarget = nil +} + +// SetFlowTransitAt sets the "flowTransitAt" field. +func (m *WorkpieceMutation) SetFlowTransitAt(t time.Time) { + m.flowTransitAt = &t +} + +// FlowTransitAt returns the value of the "flowTransitAt" field in the mutation. +func (m *WorkpieceMutation) FlowTransitAt() (r time.Time, exists bool) { + v := m.flowTransitAt + if v == nil { + return + } + return *v, true +} + +// OldFlowTransitAt returns the old "flowTransitAt" field's value of the Workpiece entity. +// If the Workpiece object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *WorkpieceMutation) OldFlowTransitAt(ctx context.Context) (v *time.Time, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldFlowTransitAt is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldFlowTransitAt requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldFlowTransitAt: %w", err) + } + return oldValue.FlowTransitAt, nil +} + +// ClearFlowTransitAt clears the value of the "flowTransitAt" field. +func (m *WorkpieceMutation) ClearFlowTransitAt() { + m.flowTransitAt = nil + m.clearedFields[workpiece.FieldFlowTransitAt] = struct{}{} +} + +// FlowTransitAtCleared returns if the "flowTransitAt" field was cleared in this mutation. +func (m *WorkpieceMutation) FlowTransitAtCleared() bool { + _, ok := m.clearedFields[workpiece.FieldFlowTransitAt] + return ok +} + +// ResetFlowTransitAt resets all changes to the "flowTransitAt" field. +func (m *WorkpieceMutation) ResetFlowTransitAt() { + m.flowTransitAt = nil + delete(m.clearedFields, workpiece.FieldFlowTransitAt) +} + // Where appends a list predicates to the WorkpieceMutation builder. func (m *WorkpieceMutation) Where(ps ...predicate.Workpiece) { m.predicates = append(m.predicates, ps...) @@ -42862,7 +43148,7 @@ func (m *WorkpieceMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *WorkpieceMutation) Fields() []string { - fields := make([]string, 0, 13) + fields := make([]string, 0, 16) if m.sn != nil { fields = append(fields, workpiece.FieldSn) } @@ -42902,6 +43188,15 @@ func (m *WorkpieceMutation) Fields() []string { if m.torque_ng_by != nil { fields = append(fields, workpiece.FieldTorqueNgBy) } + if m.flowTransitMW != nil { + fields = append(fields, workpiece.FieldFlowTransitMW) + } + if m.flowTransitTarget != nil { + fields = append(fields, workpiece.FieldFlowTransitTarget) + } + if m.flowTransitAt != nil { + fields = append(fields, workpiece.FieldFlowTransitAt) + } return fields } @@ -42936,6 +43231,12 @@ func (m *WorkpieceMutation) Field(name string) (ent.Value, bool) { return m.TorqueNgAt() case workpiece.FieldTorqueNgBy: return m.TorqueNgBy() + case workpiece.FieldFlowTransitMW: + return m.FlowTransitMW() + case workpiece.FieldFlowTransitTarget: + return m.FlowTransitTarget() + case workpiece.FieldFlowTransitAt: + return m.FlowTransitAt() } return nil, false } @@ -42971,6 +43272,12 @@ func (m *WorkpieceMutation) OldField(ctx context.Context, name string) (ent.Valu return m.OldTorqueNgAt(ctx) case workpiece.FieldTorqueNgBy: return m.OldTorqueNgBy(ctx) + case workpiece.FieldFlowTransitMW: + return m.OldFlowTransitMW(ctx) + case workpiece.FieldFlowTransitTarget: + return m.OldFlowTransitTarget(ctx) + case workpiece.FieldFlowTransitAt: + return m.OldFlowTransitAt(ctx) } return nil, fmt.Errorf("unknown Workpiece field %s", name) } @@ -43071,6 +43378,27 @@ func (m *WorkpieceMutation) SetField(name string, value ent.Value) error { } m.SetTorqueNgBy(v) return nil + case workpiece.FieldFlowTransitMW: + v, ok := value.(int) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetFlowTransitMW(v) + return nil + case workpiece.FieldFlowTransitTarget: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetFlowTransitTarget(v) + return nil + case workpiece.FieldFlowTransitAt: + v, ok := value.(time.Time) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetFlowTransitAt(v) + return nil } return fmt.Errorf("unknown Workpiece field %s", name) } @@ -43088,6 +43416,9 @@ func (m *WorkpieceMutation) AddedFields() []string { if m.addatStationNo != nil { fields = append(fields, workpiece.FieldAtStationNo) } + if m.addflowTransitMW != nil { + fields = append(fields, workpiece.FieldFlowTransitMW) + } return fields } @@ -43102,6 +43433,8 @@ func (m *WorkpieceMutation) AddedField(name string) (ent.Value, bool) { return m.AddedCurrentStationNo() case workpiece.FieldAtStationNo: return m.AddedAtStationNo() + case workpiece.FieldFlowTransitMW: + return m.AddedFlowTransitMW() } return nil, false } @@ -43132,6 +43465,13 @@ func (m *WorkpieceMutation) AddField(name string, value ent.Value) error { } m.AddAtStationNo(v) return nil + case workpiece.FieldFlowTransitMW: + v, ok := value.(int) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddFlowTransitMW(v) + return nil } return fmt.Errorf("unknown Workpiece numeric field %s", name) } @@ -43164,6 +43504,9 @@ func (m *WorkpieceMutation) ClearedFields() []string { if m.FieldCleared(workpiece.FieldTorqueNgBy) { fields = append(fields, workpiece.FieldTorqueNgBy) } + if m.FieldCleared(workpiece.FieldFlowTransitAt) { + fields = append(fields, workpiece.FieldFlowTransitAt) + } return fields } @@ -43202,6 +43545,9 @@ func (m *WorkpieceMutation) ClearField(name string) error { case workpiece.FieldTorqueNgBy: m.ClearTorqueNgBy() return nil + case workpiece.FieldFlowTransitAt: + m.ClearFlowTransitAt() + return nil } return fmt.Errorf("unknown Workpiece nullable field %s", name) } @@ -43249,6 +43595,15 @@ func (m *WorkpieceMutation) ResetField(name string) error { case workpiece.FieldTorqueNgBy: m.ResetTorqueNgBy() return nil + case workpiece.FieldFlowTransitMW: + m.ResetFlowTransitMW() + return nil + case workpiece.FieldFlowTransitTarget: + m.ResetFlowTransitTarget() + return nil + case workpiece.FieldFlowTransitAt: + m.ResetFlowTransitAt() + return nil } return fmt.Errorf("unknown Workpiece field %s", name) } diff --git a/bj_power_mes/ent/runtime.go b/bj_power_mes/ent/runtime.go index 417e95f..2c27268 100644 --- a/bj_power_mes/ent/runtime.go +++ b/bj_power_mes/ent/runtime.go @@ -205,14 +205,24 @@ func init() { agvtaskDescArrivedAt := agvtaskFields[16].Descriptor() // agvtask.DefaultArrivedAt holds the default value on creation for the arrived_at field. agvtask.DefaultArrivedAt = agvtaskDescArrivedAt.Default.(int64) + // agvtaskDescPendingAction is the schema descriptor for pending_action field. + agvtaskDescPendingAction := agvtaskFields[17].Descriptor() + // agvtask.DefaultPendingAction holds the default value on creation for the pending_action field. + agvtask.DefaultPendingAction = agvtaskDescPendingAction.Default.(string) + // agvtask.PendingActionValidator is a validator for the "pending_action" field. It is called by the builders before save. + agvtask.PendingActionValidator = agvtaskDescPendingAction.Validators[0].(func(string) error) + // agvtaskDescPendingSince is the schema descriptor for pending_since field. + agvtaskDescPendingSince := agvtaskFields[18].Descriptor() + // agvtask.DefaultPendingSince holds the default value on creation for the pending_since field. + agvtask.DefaultPendingSince = agvtaskDescPendingSince.Default.(int64) // agvtaskDescRemark is the schema descriptor for remark field. - agvtaskDescRemark := agvtaskFields[17].Descriptor() + agvtaskDescRemark := agvtaskFields[19].Descriptor() // agvtask.DefaultRemark holds the default value on creation for the remark field. agvtask.DefaultRemark = agvtaskDescRemark.Default.(string) // agvtask.RemarkValidator is a validator for the "remark" field. It is called by the builders before save. agvtask.RemarkValidator = agvtaskDescRemark.Validators[0].(func(string) error) // agvtaskDescCreatedAt is the schema descriptor for created_at field. - agvtaskDescCreatedAt := agvtaskFields[18].Descriptor() + agvtaskDescCreatedAt := agvtaskFields[20].Descriptor() // agvtask.DefaultCreatedAt holds the default value on creation for the created_at field. agvtask.DefaultCreatedAt = agvtaskDescCreatedAt.Default.(func() int64) agvvehiclestateFields := schema.AgvVehicleState{}.Fields() @@ -2371,6 +2381,16 @@ func init() { workpieceDescTorqueNgBy := workpieceFields[13].Descriptor() // workpiece.TorqueNgByValidator is a validator for the "torque_ng_by" field. It is called by the builders before save. workpiece.TorqueNgByValidator = workpieceDescTorqueNgBy.Validators[0].(func(string) error) + // workpieceDescFlowTransitMW is the schema descriptor for flowTransitMW field. + workpieceDescFlowTransitMW := workpieceFields[14].Descriptor() + // workpiece.DefaultFlowTransitMW holds the default value on creation for the flowTransitMW field. + workpiece.DefaultFlowTransitMW = workpieceDescFlowTransitMW.Default.(int) + // workpieceDescFlowTransitTarget is the schema descriptor for flowTransitTarget field. + workpieceDescFlowTransitTarget := workpieceFields[15].Descriptor() + // workpiece.DefaultFlowTransitTarget holds the default value on creation for the flowTransitTarget field. + workpiece.DefaultFlowTransitTarget = workpieceDescFlowTransitTarget.Default.(string) + // workpiece.FlowTransitTargetValidator is a validator for the "flowTransitTarget" field. It is called by the builders before save. + workpiece.FlowTransitTargetValidator = workpieceDescFlowTransitTarget.Validators[0].(func(string) error) // workpieceDescID is the schema descriptor for id field. workpieceDescID := workpieceFields[0].Descriptor() // workpiece.IDValidator is a validator for the "id" field. It is called by the builders before save. diff --git a/bj_power_mes/ent/workpiece.go b/bj_power_mes/ent/workpiece.go index 4042b1e..659cf8b 100644 --- a/bj_power_mes/ent/workpiece.go +++ b/bj_power_mes/ent/workpiece.go @@ -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() } diff --git a/bj_power_mes/ent/workpiece/where.go b/bj_power_mes/ent/workpiece/where.go index 8273022..f957aeb 100644 --- a/bj_power_mes/ent/workpiece/where.go +++ b/bj_power_mes/ent/workpiece/where.go @@ -119,6 +119,21 @@ func TorqueNgBy(v string) predicate.Workpiece { return predicate.Workpiece(sql.FieldEQ(FieldTorqueNgBy, v)) } +// FlowTransitMW applies equality check predicate on the "flowTransitMW" field. It's identical to FlowTransitMWEQ. +func FlowTransitMW(v int) predicate.Workpiece { + return predicate.Workpiece(sql.FieldEQ(FieldFlowTransitMW, v)) +} + +// FlowTransitTarget applies equality check predicate on the "flowTransitTarget" field. It's identical to FlowTransitTargetEQ. +func FlowTransitTarget(v string) predicate.Workpiece { + return predicate.Workpiece(sql.FieldEQ(FieldFlowTransitTarget, v)) +} + +// FlowTransitAt applies equality check predicate on the "flowTransitAt" field. It's identical to FlowTransitAtEQ. +func FlowTransitAt(v time.Time) predicate.Workpiece { + return predicate.Workpiece(sql.FieldEQ(FieldFlowTransitAt, v)) +} + // SnEQ applies the EQ predicate on the "sn" field. func SnEQ(v string) predicate.Workpiece { return predicate.Workpiece(sql.FieldEQ(FieldSn, v)) @@ -789,6 +804,161 @@ func TorqueNgByContainsFold(v string) predicate.Workpiece { return predicate.Workpiece(sql.FieldContainsFold(FieldTorqueNgBy, v)) } +// FlowTransitMWEQ applies the EQ predicate on the "flowTransitMW" field. +func FlowTransitMWEQ(v int) predicate.Workpiece { + return predicate.Workpiece(sql.FieldEQ(FieldFlowTransitMW, v)) +} + +// FlowTransitMWNEQ applies the NEQ predicate on the "flowTransitMW" field. +func FlowTransitMWNEQ(v int) predicate.Workpiece { + return predicate.Workpiece(sql.FieldNEQ(FieldFlowTransitMW, v)) +} + +// FlowTransitMWIn applies the In predicate on the "flowTransitMW" field. +func FlowTransitMWIn(vs ...int) predicate.Workpiece { + return predicate.Workpiece(sql.FieldIn(FieldFlowTransitMW, vs...)) +} + +// FlowTransitMWNotIn applies the NotIn predicate on the "flowTransitMW" field. +func FlowTransitMWNotIn(vs ...int) predicate.Workpiece { + return predicate.Workpiece(sql.FieldNotIn(FieldFlowTransitMW, vs...)) +} + +// FlowTransitMWGT applies the GT predicate on the "flowTransitMW" field. +func FlowTransitMWGT(v int) predicate.Workpiece { + return predicate.Workpiece(sql.FieldGT(FieldFlowTransitMW, v)) +} + +// FlowTransitMWGTE applies the GTE predicate on the "flowTransitMW" field. +func FlowTransitMWGTE(v int) predicate.Workpiece { + return predicate.Workpiece(sql.FieldGTE(FieldFlowTransitMW, v)) +} + +// FlowTransitMWLT applies the LT predicate on the "flowTransitMW" field. +func FlowTransitMWLT(v int) predicate.Workpiece { + return predicate.Workpiece(sql.FieldLT(FieldFlowTransitMW, v)) +} + +// FlowTransitMWLTE applies the LTE predicate on the "flowTransitMW" field. +func FlowTransitMWLTE(v int) predicate.Workpiece { + return predicate.Workpiece(sql.FieldLTE(FieldFlowTransitMW, v)) +} + +// FlowTransitTargetEQ applies the EQ predicate on the "flowTransitTarget" field. +func FlowTransitTargetEQ(v string) predicate.Workpiece { + return predicate.Workpiece(sql.FieldEQ(FieldFlowTransitTarget, v)) +} + +// FlowTransitTargetNEQ applies the NEQ predicate on the "flowTransitTarget" field. +func FlowTransitTargetNEQ(v string) predicate.Workpiece { + return predicate.Workpiece(sql.FieldNEQ(FieldFlowTransitTarget, v)) +} + +// FlowTransitTargetIn applies the In predicate on the "flowTransitTarget" field. +func FlowTransitTargetIn(vs ...string) predicate.Workpiece { + return predicate.Workpiece(sql.FieldIn(FieldFlowTransitTarget, vs...)) +} + +// FlowTransitTargetNotIn applies the NotIn predicate on the "flowTransitTarget" field. +func FlowTransitTargetNotIn(vs ...string) predicate.Workpiece { + return predicate.Workpiece(sql.FieldNotIn(FieldFlowTransitTarget, vs...)) +} + +// FlowTransitTargetGT applies the GT predicate on the "flowTransitTarget" field. +func FlowTransitTargetGT(v string) predicate.Workpiece { + return predicate.Workpiece(sql.FieldGT(FieldFlowTransitTarget, v)) +} + +// FlowTransitTargetGTE applies the GTE predicate on the "flowTransitTarget" field. +func FlowTransitTargetGTE(v string) predicate.Workpiece { + return predicate.Workpiece(sql.FieldGTE(FieldFlowTransitTarget, v)) +} + +// FlowTransitTargetLT applies the LT predicate on the "flowTransitTarget" field. +func FlowTransitTargetLT(v string) predicate.Workpiece { + return predicate.Workpiece(sql.FieldLT(FieldFlowTransitTarget, v)) +} + +// FlowTransitTargetLTE applies the LTE predicate on the "flowTransitTarget" field. +func FlowTransitTargetLTE(v string) predicate.Workpiece { + return predicate.Workpiece(sql.FieldLTE(FieldFlowTransitTarget, v)) +} + +// FlowTransitTargetContains applies the Contains predicate on the "flowTransitTarget" field. +func FlowTransitTargetContains(v string) predicate.Workpiece { + return predicate.Workpiece(sql.FieldContains(FieldFlowTransitTarget, v)) +} + +// FlowTransitTargetHasPrefix applies the HasPrefix predicate on the "flowTransitTarget" field. +func FlowTransitTargetHasPrefix(v string) predicate.Workpiece { + return predicate.Workpiece(sql.FieldHasPrefix(FieldFlowTransitTarget, v)) +} + +// FlowTransitTargetHasSuffix applies the HasSuffix predicate on the "flowTransitTarget" field. +func FlowTransitTargetHasSuffix(v string) predicate.Workpiece { + return predicate.Workpiece(sql.FieldHasSuffix(FieldFlowTransitTarget, v)) +} + +// FlowTransitTargetEqualFold applies the EqualFold predicate on the "flowTransitTarget" field. +func FlowTransitTargetEqualFold(v string) predicate.Workpiece { + return predicate.Workpiece(sql.FieldEqualFold(FieldFlowTransitTarget, v)) +} + +// FlowTransitTargetContainsFold applies the ContainsFold predicate on the "flowTransitTarget" field. +func FlowTransitTargetContainsFold(v string) predicate.Workpiece { + return predicate.Workpiece(sql.FieldContainsFold(FieldFlowTransitTarget, v)) +} + +// FlowTransitAtEQ applies the EQ predicate on the "flowTransitAt" field. +func FlowTransitAtEQ(v time.Time) predicate.Workpiece { + return predicate.Workpiece(sql.FieldEQ(FieldFlowTransitAt, v)) +} + +// FlowTransitAtNEQ applies the NEQ predicate on the "flowTransitAt" field. +func FlowTransitAtNEQ(v time.Time) predicate.Workpiece { + return predicate.Workpiece(sql.FieldNEQ(FieldFlowTransitAt, v)) +} + +// FlowTransitAtIn applies the In predicate on the "flowTransitAt" field. +func FlowTransitAtIn(vs ...time.Time) predicate.Workpiece { + return predicate.Workpiece(sql.FieldIn(FieldFlowTransitAt, vs...)) +} + +// FlowTransitAtNotIn applies the NotIn predicate on the "flowTransitAt" field. +func FlowTransitAtNotIn(vs ...time.Time) predicate.Workpiece { + return predicate.Workpiece(sql.FieldNotIn(FieldFlowTransitAt, vs...)) +} + +// FlowTransitAtGT applies the GT predicate on the "flowTransitAt" field. +func FlowTransitAtGT(v time.Time) predicate.Workpiece { + return predicate.Workpiece(sql.FieldGT(FieldFlowTransitAt, v)) +} + +// FlowTransitAtGTE applies the GTE predicate on the "flowTransitAt" field. +func FlowTransitAtGTE(v time.Time) predicate.Workpiece { + return predicate.Workpiece(sql.FieldGTE(FieldFlowTransitAt, v)) +} + +// FlowTransitAtLT applies the LT predicate on the "flowTransitAt" field. +func FlowTransitAtLT(v time.Time) predicate.Workpiece { + return predicate.Workpiece(sql.FieldLT(FieldFlowTransitAt, v)) +} + +// FlowTransitAtLTE applies the LTE predicate on the "flowTransitAt" field. +func FlowTransitAtLTE(v time.Time) predicate.Workpiece { + return predicate.Workpiece(sql.FieldLTE(FieldFlowTransitAt, v)) +} + +// FlowTransitAtIsNil applies the IsNil predicate on the "flowTransitAt" field. +func FlowTransitAtIsNil() predicate.Workpiece { + return predicate.Workpiece(sql.FieldIsNull(FieldFlowTransitAt)) +} + +// FlowTransitAtNotNil applies the NotNil predicate on the "flowTransitAt" field. +func FlowTransitAtNotNil() predicate.Workpiece { + return predicate.Workpiece(sql.FieldNotNull(FieldFlowTransitAt)) +} + // And groups predicates with the AND operator between them. func And(predicates ...predicate.Workpiece) predicate.Workpiece { return predicate.Workpiece(sql.AndPredicates(predicates...)) diff --git a/bj_power_mes/ent/workpiece/workpiece.go b/bj_power_mes/ent/workpiece/workpiece.go index a78009f..a85c6af 100644 --- a/bj_power_mes/ent/workpiece/workpiece.go +++ b/bj_power_mes/ent/workpiece/workpiece.go @@ -39,6 +39,12 @@ const ( FieldTorqueNgAt = "torque_ng_at" // FieldTorqueNgBy holds the string denoting the torque_ng_by field in the database. FieldTorqueNgBy = "torque_ng_by" + // FieldFlowTransitMW holds the string denoting the flowtransitmw field in the database. + FieldFlowTransitMW = "flow_transit_mw" + // FieldFlowTransitTarget holds the string denoting the flowtransittarget field in the database. + FieldFlowTransitTarget = "flow_transit_target" + // FieldFlowTransitAt holds the string denoting the flowtransitat field in the database. + FieldFlowTransitAt = "flow_transit_at" // Table holds the table name of the workpiece in the database. Table = "workpiece" ) @@ -59,6 +65,9 @@ var Columns = []string{ FieldTorqueNgPending, FieldTorqueNgAt, FieldTorqueNgBy, + FieldFlowTransitMW, + FieldFlowTransitTarget, + FieldFlowTransitAt, } // ValidColumn reports if the column name is valid (part of the table columns). @@ -92,6 +101,12 @@ var ( DefaultTorqueNgPending bool // TorqueNgByValidator is a validator for the "torque_ng_by" field. It is called by the builders before save. TorqueNgByValidator func(string) error + // DefaultFlowTransitMW holds the default value on creation for the "flowTransitMW" field. + DefaultFlowTransitMW int + // DefaultFlowTransitTarget holds the default value on creation for the "flowTransitTarget" field. + DefaultFlowTransitTarget string + // FlowTransitTargetValidator is a validator for the "flowTransitTarget" field. It is called by the builders before save. + FlowTransitTargetValidator func(string) error // IDValidator is a validator for the "id" field. It is called by the builders before save. IDValidator func(int) error ) @@ -168,3 +183,18 @@ func ByTorqueNgAt(opts ...sql.OrderTermOption) OrderOption { func ByTorqueNgBy(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldTorqueNgBy, opts...).ToFunc() } + +// ByFlowTransitMW orders the results by the flowTransitMW field. +func ByFlowTransitMW(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldFlowTransitMW, opts...).ToFunc() +} + +// ByFlowTransitTarget orders the results by the flowTransitTarget field. +func ByFlowTransitTarget(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldFlowTransitTarget, opts...).ToFunc() +} + +// ByFlowTransitAt orders the results by the flowTransitAt field. +func ByFlowTransitAt(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldFlowTransitAt, opts...).ToFunc() +} diff --git a/bj_power_mes/ent/workpiece_create.go b/bj_power_mes/ent/workpiece_create.go index 9e1d187..35edf17 100644 --- a/bj_power_mes/ent/workpiece_create.go +++ b/bj_power_mes/ent/workpiece_create.go @@ -194,6 +194,48 @@ func (_c *WorkpieceCreate) SetNillableTorqueNgBy(v *string) *WorkpieceCreate { return _c } +// SetFlowTransitMW sets the "flowTransitMW" field. +func (_c *WorkpieceCreate) SetFlowTransitMW(v int) *WorkpieceCreate { + _c.mutation.SetFlowTransitMW(v) + return _c +} + +// SetNillableFlowTransitMW sets the "flowTransitMW" field if the given value is not nil. +func (_c *WorkpieceCreate) SetNillableFlowTransitMW(v *int) *WorkpieceCreate { + if v != nil { + _c.SetFlowTransitMW(*v) + } + return _c +} + +// SetFlowTransitTarget sets the "flowTransitTarget" field. +func (_c *WorkpieceCreate) SetFlowTransitTarget(v string) *WorkpieceCreate { + _c.mutation.SetFlowTransitTarget(v) + return _c +} + +// SetNillableFlowTransitTarget sets the "flowTransitTarget" field if the given value is not nil. +func (_c *WorkpieceCreate) SetNillableFlowTransitTarget(v *string) *WorkpieceCreate { + if v != nil { + _c.SetFlowTransitTarget(*v) + } + return _c +} + +// SetFlowTransitAt sets the "flowTransitAt" field. +func (_c *WorkpieceCreate) SetFlowTransitAt(v time.Time) *WorkpieceCreate { + _c.mutation.SetFlowTransitAt(v) + return _c +} + +// SetNillableFlowTransitAt sets the "flowTransitAt" field if the given value is not nil. +func (_c *WorkpieceCreate) SetNillableFlowTransitAt(v *time.Time) *WorkpieceCreate { + if v != nil { + _c.SetFlowTransitAt(*v) + } + return _c +} + // SetID sets the "id" field. func (_c *WorkpieceCreate) SetID(v int) *WorkpieceCreate { _c.mutation.SetID(v) @@ -255,6 +297,14 @@ func (_c *WorkpieceCreate) defaults() { v := workpiece.DefaultTorqueNgPending _c.mutation.SetTorqueNgPending(v) } + if _, ok := _c.mutation.FlowTransitMW(); !ok { + v := workpiece.DefaultFlowTransitMW + _c.mutation.SetFlowTransitMW(v) + } + if _, ok := _c.mutation.FlowTransitTarget(); !ok { + v := workpiece.DefaultFlowTransitTarget + _c.mutation.SetFlowTransitTarget(v) + } } // check runs all checks and user-defined validators on the builder. @@ -294,6 +344,17 @@ func (_c *WorkpieceCreate) check() error { return &ValidationError{Name: "torque_ng_by", err: fmt.Errorf(`ent: validator failed for field "Workpiece.torque_ng_by": %w`, err)} } } + if _, ok := _c.mutation.FlowTransitMW(); !ok { + return &ValidationError{Name: "flowTransitMW", err: errors.New(`ent: missing required field "Workpiece.flowTransitMW"`)} + } + if _, ok := _c.mutation.FlowTransitTarget(); !ok { + return &ValidationError{Name: "flowTransitTarget", err: errors.New(`ent: missing required field "Workpiece.flowTransitTarget"`)} + } + if v, ok := _c.mutation.FlowTransitTarget(); ok { + if err := workpiece.FlowTransitTargetValidator(v); err != nil { + return &ValidationError{Name: "flowTransitTarget", err: fmt.Errorf(`ent: validator failed for field "Workpiece.flowTransitTarget": %w`, err)} + } + } if v, ok := _c.mutation.ID(); ok { if err := workpiece.IDValidator(v); err != nil { return &ValidationError{Name: "id", err: fmt.Errorf(`ent: validator failed for field "Workpiece.id": %w`, err)} @@ -383,6 +444,18 @@ func (_c *WorkpieceCreate) createSpec() (*Workpiece, *sqlgraph.CreateSpec) { _spec.SetField(workpiece.FieldTorqueNgBy, field.TypeString, value) _node.TorqueNgBy = &value } + if value, ok := _c.mutation.FlowTransitMW(); ok { + _spec.SetField(workpiece.FieldFlowTransitMW, field.TypeInt, value) + _node.FlowTransitMW = value + } + if value, ok := _c.mutation.FlowTransitTarget(); ok { + _spec.SetField(workpiece.FieldFlowTransitTarget, field.TypeString, value) + _node.FlowTransitTarget = value + } + if value, ok := _c.mutation.FlowTransitAt(); ok { + _spec.SetField(workpiece.FieldFlowTransitAt, field.TypeTime, value) + _node.FlowTransitAt = &value + } return _node, _spec } diff --git a/bj_power_mes/ent/workpiece_update.go b/bj_power_mes/ent/workpiece_update.go index 46cd6cc..9fce1d0 100644 --- a/bj_power_mes/ent/workpiece_update.go +++ b/bj_power_mes/ent/workpiece_update.go @@ -258,6 +258,61 @@ func (_u *WorkpieceUpdate) ClearTorqueNgBy() *WorkpieceUpdate { return _u } +// SetFlowTransitMW sets the "flowTransitMW" field. +func (_u *WorkpieceUpdate) SetFlowTransitMW(v int) *WorkpieceUpdate { + _u.mutation.ResetFlowTransitMW() + _u.mutation.SetFlowTransitMW(v) + return _u +} + +// SetNillableFlowTransitMW sets the "flowTransitMW" field if the given value is not nil. +func (_u *WorkpieceUpdate) SetNillableFlowTransitMW(v *int) *WorkpieceUpdate { + if v != nil { + _u.SetFlowTransitMW(*v) + } + return _u +} + +// AddFlowTransitMW adds value to the "flowTransitMW" field. +func (_u *WorkpieceUpdate) AddFlowTransitMW(v int) *WorkpieceUpdate { + _u.mutation.AddFlowTransitMW(v) + return _u +} + +// SetFlowTransitTarget sets the "flowTransitTarget" field. +func (_u *WorkpieceUpdate) SetFlowTransitTarget(v string) *WorkpieceUpdate { + _u.mutation.SetFlowTransitTarget(v) + return _u +} + +// SetNillableFlowTransitTarget sets the "flowTransitTarget" field if the given value is not nil. +func (_u *WorkpieceUpdate) SetNillableFlowTransitTarget(v *string) *WorkpieceUpdate { + if v != nil { + _u.SetFlowTransitTarget(*v) + } + return _u +} + +// SetFlowTransitAt sets the "flowTransitAt" field. +func (_u *WorkpieceUpdate) SetFlowTransitAt(v time.Time) *WorkpieceUpdate { + _u.mutation.SetFlowTransitAt(v) + return _u +} + +// SetNillableFlowTransitAt sets the "flowTransitAt" field if the given value is not nil. +func (_u *WorkpieceUpdate) SetNillableFlowTransitAt(v *time.Time) *WorkpieceUpdate { + if v != nil { + _u.SetFlowTransitAt(*v) + } + return _u +} + +// ClearFlowTransitAt clears the value of the "flowTransitAt" field. +func (_u *WorkpieceUpdate) ClearFlowTransitAt() *WorkpieceUpdate { + _u.mutation.ClearFlowTransitAt() + return _u +} + // Mutation returns the WorkpieceMutation object of the builder. func (_u *WorkpieceUpdate) Mutation() *WorkpieceMutation { return _u.mutation @@ -321,6 +376,11 @@ func (_u *WorkpieceUpdate) check() error { return &ValidationError{Name: "torque_ng_by", err: fmt.Errorf(`ent: validator failed for field "Workpiece.torque_ng_by": %w`, err)} } } + if v, ok := _u.mutation.FlowTransitTarget(); ok { + if err := workpiece.FlowTransitTargetValidator(v); err != nil { + return &ValidationError{Name: "flowTransitTarget", err: fmt.Errorf(`ent: validator failed for field "Workpiece.flowTransitTarget": %w`, err)} + } + } return nil } @@ -411,6 +471,21 @@ func (_u *WorkpieceUpdate) sqlSave(ctx context.Context) (_node int, err error) { if _u.mutation.TorqueNgByCleared() { _spec.ClearField(workpiece.FieldTorqueNgBy, field.TypeString) } + if value, ok := _u.mutation.FlowTransitMW(); ok { + _spec.SetField(workpiece.FieldFlowTransitMW, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedFlowTransitMW(); ok { + _spec.AddField(workpiece.FieldFlowTransitMW, field.TypeInt, value) + } + if value, ok := _u.mutation.FlowTransitTarget(); ok { + _spec.SetField(workpiece.FieldFlowTransitTarget, field.TypeString, value) + } + if value, ok := _u.mutation.FlowTransitAt(); ok { + _spec.SetField(workpiece.FieldFlowTransitAt, field.TypeTime, value) + } + if _u.mutation.FlowTransitAtCleared() { + _spec.ClearField(workpiece.FieldFlowTransitAt, field.TypeTime) + } _spec.AddModifiers(_u.modifiers...) if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { if _, ok := err.(*sqlgraph.NotFoundError); ok { @@ -662,6 +737,61 @@ func (_u *WorkpieceUpdateOne) ClearTorqueNgBy() *WorkpieceUpdateOne { return _u } +// SetFlowTransitMW sets the "flowTransitMW" field. +func (_u *WorkpieceUpdateOne) SetFlowTransitMW(v int) *WorkpieceUpdateOne { + _u.mutation.ResetFlowTransitMW() + _u.mutation.SetFlowTransitMW(v) + return _u +} + +// SetNillableFlowTransitMW sets the "flowTransitMW" field if the given value is not nil. +func (_u *WorkpieceUpdateOne) SetNillableFlowTransitMW(v *int) *WorkpieceUpdateOne { + if v != nil { + _u.SetFlowTransitMW(*v) + } + return _u +} + +// AddFlowTransitMW adds value to the "flowTransitMW" field. +func (_u *WorkpieceUpdateOne) AddFlowTransitMW(v int) *WorkpieceUpdateOne { + _u.mutation.AddFlowTransitMW(v) + return _u +} + +// SetFlowTransitTarget sets the "flowTransitTarget" field. +func (_u *WorkpieceUpdateOne) SetFlowTransitTarget(v string) *WorkpieceUpdateOne { + _u.mutation.SetFlowTransitTarget(v) + return _u +} + +// SetNillableFlowTransitTarget sets the "flowTransitTarget" field if the given value is not nil. +func (_u *WorkpieceUpdateOne) SetNillableFlowTransitTarget(v *string) *WorkpieceUpdateOne { + if v != nil { + _u.SetFlowTransitTarget(*v) + } + return _u +} + +// SetFlowTransitAt sets the "flowTransitAt" field. +func (_u *WorkpieceUpdateOne) SetFlowTransitAt(v time.Time) *WorkpieceUpdateOne { + _u.mutation.SetFlowTransitAt(v) + return _u +} + +// SetNillableFlowTransitAt sets the "flowTransitAt" field if the given value is not nil. +func (_u *WorkpieceUpdateOne) SetNillableFlowTransitAt(v *time.Time) *WorkpieceUpdateOne { + if v != nil { + _u.SetFlowTransitAt(*v) + } + return _u +} + +// ClearFlowTransitAt clears the value of the "flowTransitAt" field. +func (_u *WorkpieceUpdateOne) ClearFlowTransitAt() *WorkpieceUpdateOne { + _u.mutation.ClearFlowTransitAt() + return _u +} + // Mutation returns the WorkpieceMutation object of the builder. func (_u *WorkpieceUpdateOne) Mutation() *WorkpieceMutation { return _u.mutation @@ -738,6 +868,11 @@ func (_u *WorkpieceUpdateOne) check() error { return &ValidationError{Name: "torque_ng_by", err: fmt.Errorf(`ent: validator failed for field "Workpiece.torque_ng_by": %w`, err)} } } + if v, ok := _u.mutation.FlowTransitTarget(); ok { + if err := workpiece.FlowTransitTargetValidator(v); err != nil { + return &ValidationError{Name: "flowTransitTarget", err: fmt.Errorf(`ent: validator failed for field "Workpiece.flowTransitTarget": %w`, err)} + } + } return nil } @@ -845,6 +980,21 @@ func (_u *WorkpieceUpdateOne) sqlSave(ctx context.Context) (_node *Workpiece, er if _u.mutation.TorqueNgByCleared() { _spec.ClearField(workpiece.FieldTorqueNgBy, field.TypeString) } + if value, ok := _u.mutation.FlowTransitMW(); ok { + _spec.SetField(workpiece.FieldFlowTransitMW, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedFlowTransitMW(); ok { + _spec.AddField(workpiece.FieldFlowTransitMW, field.TypeInt, value) + } + if value, ok := _u.mutation.FlowTransitTarget(); ok { + _spec.SetField(workpiece.FieldFlowTransitTarget, field.TypeString, value) + } + if value, ok := _u.mutation.FlowTransitAt(); ok { + _spec.SetField(workpiece.FieldFlowTransitAt, field.TypeTime, value) + } + if _u.mutation.FlowTransitAtCleared() { + _spec.ClearField(workpiece.FieldFlowTransitAt, field.TypeTime) + } _spec.AddModifiers(_u.modifiers...) _node = &Workpiece{config: _u.config} _spec.Assign = _node.assignValues diff --git a/bj_power_mes/frontend/src/help.js b/bj_power_mes/frontend/src/help.js index d1c970d..7b238c5 100644 --- a/bj_power_mes/frontend/src/help.js +++ b/bj_power_mes/frontend/src/help.js @@ -321,19 +321,23 @@ export const helpProducibleSupport = P('齐套测算', '只读测算,库存不 export const helpPlc = P('工位下发', '把某张工单要经过的工位组合写进产线设备;SENT 不是失败,是在等 PLC 回完成信号。', [ { k: 'role', t: '这页解决什么', text: '工单定了路线之后,把这套组合码下发给 PLC,让设备和 MES 对同一条路线达成共识。下发记录留痕,便于对账。' }, + { k: 'why', t: '和日常报工是什么关系、为什么单独有这页', text: '要先分清两种指令:工件在产线上一段段往前走,靠的是工位终端每道报工后,系统自动算出下一站并把托盘流转过去——推动托盘的是报工后的自动流转,上线建档和本页下发都不会自己搬动托盘。本页下发的是另一种东西:把工单的工艺路线(这台件该经过哪几个工位)写成工位码写给设备,让设备和系统对同一条路线达成一致,并留一条记录用于对账。它做的是报工之外的两件事:① 把路线正式告知设备并留痕;② 下错了能撤回、设备完成信号丢了能人工收口。它不是「开线开关」,日常工作不需要每件都来这里点一遍。' }, + { k: 'complex', t: '它对正常业务的影响:只动设备路线和这条记录', text: '本页下发只做两件事——向设备写这套工位码、留一条下发记录。它不改工件状态、不扣库存、不生成报工实绩。让工单完工数加一、扣料、记质量账的,是工位终端的报工,不是这里。所以在本页下发不会让工单算完工,也不会产生库存或质量数据。' }, + { k: 'exception', t: '缺料(比如没胶料)还能下发吗,会怎样', text: '能。本页下发不检查物料齐不齐全——系统只认工单的工艺路线,不查装配物料。所以这台工件就算还缺料也能下发成功、也会走到工位。但到了工位终端报工那一步,齐套校验会拦下来:报工要求这台件在该工艺该装的料都绑齐(电气件按单台用量逐颗扫码,结构件至少一个批次号),缺料直接拒绝报工并列出缺哪些料。结果就是件停在工位上报不了工、下不去,还占着工位挡住后面的件。缺料时正确做法是先把料叫齐、在工位终端绑上,再报工;不要指望先下发「占位」。' }, + { k: 'exception', t: '工位终端没完工,在这里强行下发会怎样', text: '分两种情况。① 从本页正常下发:有握手保护——上一条下发还没收到设备完成信号(记录显示「已下发·等待完成信号」)时,会拒绝下发下一条,防止两件工件在产线上串序;只要前一件没真正走完,本页一般不会让你连发。② 从「PLC管理」页手动下发路径指令或强制清零在途指令:那是在设备层面直接写搬运指令或清标志,绕过了上面的握手保护。后果是设备物理位置和系统台账可能对不上——工件实际还在动、或被人工搬走,系统却以为那趟已完成。报工时会做设备与台账对账,一旦对不上就直接拒绝报工,要求先到「产线管理」处理托盘异常(新件建档或绑定已知件)。所以手动下发和清零只用于设备联调、确认卡死的处置,不是催单手段;真要放行前一件,用本页的「撤回」或「人工完成」,别去清零。' }, { k: 'states', t: '下发状态', items: [ 'SENT 已下发·等待完成信号 / DONE 已完成 / CANCELLED 已撤回 / TIMEOUT 超时 / REPLY_NG 回复异常。' ] }, - { k: 'flow', t: '第一次开线:让滚筒线转起来的顺序', items: [ + { k: 'flow', t: '从建产品到出第一件:各环节先后顺序', items: [ '① 产品与工艺 → 产品档案建档 → 产品工艺把总账物料分到各道工艺。', '② 产品与工艺 → 工位管理 →「快捷绑定工艺」,确认清线五项后应用,工位才知道每道干什么。', '③ 计划与排产 → 工单管理建工单 →「下发并开工」(工单变执行中,排产才能启用)。', '④ 计划与排产 → 日排产排到具体日期并启用,工位终端才看得到这一天的活。', - '⑤ 本页「下发录入」选工单和产品序号(SN) →「下发工位码」,滚筒线据此只停靠对应工位——到这一步线才真正开始动。', - '⑥ 工位终端扫 SN 上线建档、各工位逐道报工,报完最后一道自动完工、工件流向下线位。' + '⑤ (可选)本页「下发录入」选工单和工件序号(SN) →「下发工位码」,把这台件的工位路线告知设备;不要求每件都下发,只有需要设备按指定路线停靠或做对账时才用。', + '⑥ 工位终端扫 SN 上线建档、各工位逐道报工——托盘的正向流转在这里由报工自动驱动,报完最后一道自动完工、流向下线位。' ] }, { k: 'rule', t: '工单号怎么选', text: '工单号(工单号)是下拉选择,输入关键字就实时向后台模糊搜索(工单号 / 产品编码 / 产品名称 / 合同号任一命中),下拉往下滑到底自动加载下一页;不允许凭记忆手敲一个不存在的工单号。下拉不会一次性把全厂工单拉回来。' }, - { k: 'confuse', t: '等太久怎么办', text: '先确认现场实物到底走没走。确实没走就「撤回」,确实走了但信号没回来就「人工完成」收口。两个动作都会留痕,别互相代替。' }, + { k: 'correct', t: '能不能用它纠正正常业务的异常、人工干预让线继续走', text: '能,这是本页的主要用途之一,但要先看清它改的是什么。它纠正的是「下发给设备的路线码」这一层:① 下错了(选错工单/SN/工位)→ 用「撤回」把这条已下发指令作废,握手位释放后可以重新下发正确的;② 工件其实已经到位、但设备的完成信号没回来,卡在「已下发·等待完成信号」挡住下一条 → 现场确认实物确已到位后用「人工完成」收口,放行下一条下发。两个动作都只改本页的下发台账、留痕,不碰工件状态、不扣料、不产生报工实绩——工件该走哪道、走到哪,最终仍以工位终端报工和系统自动流转为准。它纠不了的是工件本身的问题:托盘物理卡住、位置错、缺料、漏报工,这些要到「PLC管理」处置在途指令、到工位终端补报工或「产线管理」纠正位置,反复在这里下发不会让卡住的工件自己走起来。' }, { k: 'irreversible', t: '撤回不回滚报工', text: '撤回只撤这条下发指令,已经报工产生的实绩不会被抹掉。' } ], [ { name: '工单管理', path: '/work-order' }, diff --git a/bj_power_mes/frontend/src/pages/Agv.vue b/bj_power_mes/frontend/src/pages/Agv.vue index 82a547a..0d0e515 100644 --- a/bj_power_mes/frontend/src/pages/Agv.vue +++ b/bj_power_mes/frontend/src/pages/Agv.vue @@ -103,6 +103,12 @@ const statusText = (s) => (statusOptions.find((x) => x.v === s) || {}).l || '— const statusTag = (s) => s === '9' ? 'success' : s === 'ARRIVED' ? 'danger' : s === 'FAILED' || s === '5' ? 'info' : s === '2' ? 'warning' : s === '1' ? 'primary' : '' const kindText = (k) => ({ GO_LOAD: '空车去程', TRANSPORT: '重载运输', EMPTY_RETURN: '空车回充', FREE: '自由调度', MANUAL: '手动节点' }[k] || '—') +// 挂起动作中文(2026-11-19 挂起动作引擎):任务上等待触发的待办动作 +const pendingCn = (a) => ({ + CONTINUE_LIFT: '等待举升完成', + WAIT_DROP_CONFIRM: '待确认放下', + FREE_ROBOT: '等待放车' +}[a] || '') /* ===================== 到位待令确认 ===================== */ // 2026-11-17 用户裁决:车来工位与车离开是两步,工位 GO_LOAD 到位后必须人点「确认装车回库」 @@ -126,10 +132,11 @@ async function confirmLoadGo(row) { async function confirmAgv(row, action, nextDock, confirmForcePick) { if (!canAgv.value) { ElMessage.error('没有 AGV管理的操作权限'); return } const tips = { - load_go: '确认已装车并送货?AGV 将背着托盘前往目标接驳台。', + load_go: '确认已装车并送货?AGV 将举起托盘前往目标接驳台。', line_load_confirm: '确认工位已装车?AGV 将背着托盘离开工位返回库房 JBT21。请确认工件已放稳。', - unload_release: '确认卸货完成并放行?托盘将落位当前接驳台,海康任务结束,车辆由 RCS 自行处置。', - finish_return: '确认结束本任务?海康任务将被取消,车辆由 RCS 自行处置。' + // 2026-11-19 B01 段语义:确认=放行放下动作组(放下完成后车辆自动释放、托盘自动落位台账) + unload_release: '确认放行放下?AGV 将把托盘放下落位当前接驳台,放下完成后车辆自动释放。', + finish_return: '确认结束本任务?任务将完结,车辆释放。' } const isFree = action !== 'load_go' && action !== 'line_load_confirm' && action !== 'unload_release' try { @@ -158,6 +165,18 @@ async function loadTasks() { loadingTasks.value = false } +// 2026-11-19 挂起动作人工重试:/agv/pending/retry(后端按任务当前挂起重放 continueTask/freeRobot 一次) +async function retryPending(row) { + if (!canAgv.value) { ElMessage.error('没有 AGV管理的操作权限'); return } + try { + await request.post('/agv/pending/retry', { taskNo: row.taskNo }) + ElMessage.success('已重试挂起动作,结果见任务状态') + loadTasks() + } catch (e) { + ElMessage.error('重试失败:' + (e?.message || e)) + } +} + // AGV 状态实时推送(2026-11-16 主控包项10):删原「刷新状态」手动按钮,改 WebSocket 自动推送。 // 后端 AgvHub 每 3s 拉 RCS 写回本地库,任务/链快照变化即推整帧;本页消费 tasks 刷新任务列表与接驳台。 // (与人工派车页 AgvManual.vue 共用 /api/v1/agv/ws,token 走 query,后端 tokenx.Parse 自校验。) @@ -539,9 +558,11 @@ function onTabChange(name) { - + @@ -594,6 +615,14 @@ function onTabChange(name) { 取消 + + + + 异常处理 diff --git a/bj_power_mes/frontend/src/pages/AgvManual.vue b/bj_power_mes/frontend/src/pages/AgvManual.vue index 066b5be..1050151 100644 --- a/bj_power_mes/frontend/src/pages/AgvManual.vue +++ b/bj_power_mes/frontend/src/pages/AgvManual.vue @@ -19,7 +19,7 @@ const points = ref([]) const chains = ref([]) const busy = ref(false) const selected = ref('') -const activeChain = reactive({ chainNo: '', agvCode: '', current: '', segments: [], status: '', realtime: null }) +const activeChain = reactive({ chainNo: '', agvCode: '', current: '', segments: [], status: '', pendingAction: '', templateType: '', realtime: null }) // 人工派车白名单(2026-11-14 用户终版):只允许库房接驳台 JBT21 与 7 个虚拟点位。 // 所有 GW* 工位接驳台、DOCK* 历史业务点位、AGV-WAIT*/AGV-CHARGE* 待命充电位一律不显示。 @@ -41,6 +41,10 @@ const carLabel = computed(() => { const statusText = computed(() => { if (!activeChain.chainNo) return '未开始' const s = activeChain.status + // 2026-11-19 挂起动作提示:等待举升/等待放下确认/等待放下完成(主控定稿,页面看得清清楚楚) + if (activeChain.pendingAction === 'CONTINUE_LIFT') return '等待举升完成 · 车辆正在举起货物' + if (activeChain.pendingAction === 'WAIT_DROP_CONFIRM') return '已到位 · 货物待放下(请点「确认放下」)' + if (activeChain.pendingAction === 'FREE_ROBOT') return '放下执行中 · 等待放下完成后自动释放车辆' if (s === 'ARRIVED') return '已到位 · 可前往下一站' // RCS 的 taskStatus=2 只代表「任务已被海康受理/激活」,不代表有车在跑—— // 必须结合 agvCode 判断:车号为空=海康尚未派车,车辆不会移动(2026-11-17 现场实测:C01 长时间 status=2 且 agvCode 全空)。 @@ -162,7 +166,7 @@ function connectAgvWs() { ws.onmessage = (ev) => { try { const msg = JSON.parse(ev.data) - if (msg && Array.isArray(msg.chains)) applyChains(msg.chains) + if (msg && Array.isArray(msg.chains)) { applyChains(msg.chains); loadPalletState() } if (msg && (msg.vehicles || msg.vehicleStatus)) loadVehicles() } catch { /* 忽略单条异常推送 */ } } @@ -199,10 +203,30 @@ function applyChains(list) { current: last?.targetDock || '', segments: c?.segments || [], status: last?.status || '', + pendingAction: last?.pendingAction || '', + templateType: last?.templateType || '', realtime: c?.realtime || null }) } +// ===== 载货台账(2026-11-19 取/送互锁依据):当前车有没有托盘,看得清清楚楚 ===== +const palletState = ref(null) // { agvCode, hasPallet, source, updatedAt } +async function loadPalletState() { + try { + const d = await request.get('/agv/vehicle-states') + const list = d?.list || d || [] + const code = activeChain.agvCode + palletState.value = code ? (list.find((x) => x.agvCode === code) || null) : null + } catch { palletState.value = null } +} +// 车辆载货判定:台账缺失行视为空车(首段未建立台账) +const carLoaded = computed(() => !!(palletState.value && palletState.value.hasPallet)) +const carLoadedText = computed(() => { + if (vehicleUnavailable.value) return '载货状态未知(RCS 不可用)' + if (carLoaded.value) return '有托盘(载货)' + return '无托盘(空车)' +}) + // RCS 实时对比行文案(2026-11-17 用户要求:本地判定必须有 API 事实可对比)。 const realtimeText = computed(() => { const r = activeChain.realtime @@ -240,8 +264,14 @@ function pick(code) { selected.value = code } -/** 开始用车(系统自动分车)/ 前往下一站(固定延续同一辆车) */ -async function dispatch() { +/** + * 三个生命周期动作(2026-11-19 主控定稿,按钮点名道姓突出取/送): + * - 到【A】取货(purpose=pickup,空车可点)→ B02 移动模板 + * - 送货到【A】(purpose=deliver,载货可点)→ B01 举升模板 + * - 开始用车(首段空车 C01,无 purpose) + * 后端 AgvChainNextNode 按台账做同口径硬校验,前端灰化只是第一道提示。 + */ +async function dispatch(purpose) { if (!canManual.value) { ElMessage.error('没有人工派车的操作权限'); return } const target = selected.value if (!target) { ElMessage.warning('请先点选一个目标点位'); return } @@ -252,6 +282,7 @@ async function dispatch() { selected.value = '' return } + const verb = purpose === 'pickup' ? '取货' : purpose === 'deliver' ? '送货' : '前往' if (!(await askPathClear())) return busy.value = true try { @@ -272,9 +303,10 @@ async function dispatch() { chainNo: activeChain.chainNo, source: activeChain.current || '', target, + purpose: purpose || '', confirmForcePick: '' }) - ElMessage.success(`已前往下一站 ${target}(继续用车 ${carLabel.value})`) + ElMessage.success(`已${verb}前往 ${target}(继续用车 ${carLabel.value})`) } else { // 开始用车:不传车号,由海康 RCS 自行分配 try { @@ -293,20 +325,33 @@ async function dispatch() { } } selected.value = '' - await loadChains() + await Promise.all([loadChains(), loadPalletState()]) } finally { busy.value = false } } -/** 结束用车:海康任务取消、车辆释放(RCS 自行处置);本地记录的车号一并清空 */ +/** 确认放下(B01 到位举着货 → 放行组3 放下,放下完成自动释放车辆) */ +async function confirmDrop() { + if (!canManual.value) { ElMessage.error('没有人工派车的操作权限'); return } + const last = activeChain.segments?.length ? activeChain.segments[activeChain.segments.length - 1] : null + if (!last?.taskNo) { ElMessage.warning('未找到当前任务'); return } + busy.value = true + try { + await request.post('/agv/confirm-drop', { taskNo: last.taskNo }) + ElMessage.success('已放行放下动作,放下完成后车辆自动释放') + await loadChains() + } finally { busy.value = false } +} + +/** 结束任务:continueTask 完结海康任务 + freeRobot 释放车辆(2026-11-19 主控定稿);本地记录的车号一并清空 */ async function endUse() { if (!canManual.value) { ElMessage.error('没有人工派车的操作权限'); return } if (!activeChain.chainNo) return try { await ElMessageBox.confirm( - `请确保 ${carLabel.value || '当前车辆'} 上没有托盘。结束后本次用车完成,海康任务取消,车辆由 RCS 自行处置。`, - '结束用车', { confirmButtonText: '确认无托盘,结束用车', cancelButtonText: '取消', type: 'warning' } + `请确保 ${carLabel.value || '当前车辆'} 上没有托盘。结束后本次用车完成,海康任务完结,车辆释放。`, + '结束任务', { confirmButtonText: '确认无托盘,结束任务', cancelButtonText: '取消', type: 'warning' } ) } catch { return } busy.value = true @@ -314,7 +359,7 @@ async function endUse() { await request.post('/agv/chain/end', { chainNo: activeChain.chainNo, force: false }) ElMessage.success('本次用车已结束,车辆已释放') selected.value = '' - Object.assign(activeChain, { chainNo: '', agvCode: '', current: '', segments: [], status: '' }) + Object.assign(activeChain, { chainNo: '', agvCode: '', current: '', segments: [], status: '', pendingAction: '', templateType: '' }) await loadChains() } catch (e) { const msg = e?.message || e?.response?.data?.message || String(e) @@ -367,7 +412,7 @@ async function submitForceEnd() { ElMessage.success('系统任务状态已解除。请继续到现场核实实物状态。') forceDialog.value = false selected.value = '' - Object.assign(activeChain, { chainNo: '', agvCode: '', current: '', segments: [], status: '' }) + Object.assign(activeChain, { chainNo: '', agvCode: '', current: '', segments: [], status: '', pendingAction: '', templateType: '' }) // 2026-11-17 补:强制结束会释放点位锁,必须同步刷新点位卡,否则锁标记残留误导 await Promise.all([loadPoints(), loadChains()]) } catch { /* 请求层已提示 */ } @@ -375,7 +420,7 @@ async function submitForceEnd() { } onMounted(async () => { - await Promise.all([loadPoints(), loadChains(), loadVehicles()]) + await Promise.all([loadPoints(), loadChains(), loadVehicles(), loadPalletState()]) connectAgvWs() }) @@ -404,12 +449,17 @@ onBeforeUnmount(() => { 车辆卡死?异常处理 - - 车辆 + - + + 暂无车辆 + + 状态自动更新 @@ -436,17 +486,43 @@ onBeforeUnmount(() => { - +
目的地
{{ selected ? selected : '请点选上方点位' }}
{{ selectedPoint.name || '' }} · {{ selectedTemplate }} · {{ activeChain.chainNo ? `继续用车 ${carLabel || '待识别'}` : '由系统自动分配车辆' }}
- - + +
+ {{ carLabel || '当前车' }}:{{ carLoadedText }} +
+ + + + +
@@ -461,7 +537,7 @@ onBeforeUnmount(() => { + description="开始用车:选一个点位点「开始用车」,系统自动分配一辆空车前往。之后按车载货状态点按钮:空车时点「到【目标】取货」,载货时点「送货到【目标】」,按钮会根据当前车有没有托盘自动灰化并提示原因。B01 举升送货到位后车举着货停稳,需点「确认放下」,放下完成后车辆自动释放。结束任务前请确认车上无托盘。全程不需要你选车号,工位接驳台不可选。状态(到位/等待举升/等待放下)自动更新,无需手动刷新。右侧每台车上下显示车号与颜色条:灰=不在线/不可用,绿=空闲可用,红=执行占用。" /> @@ -506,13 +582,16 @@ onBeforeUnmount(() => { .status-value.unknown { color: #e6a23c; } .status-value.running { color: #67c23a; } .live-tag { margin-left: auto; font-size: 14px; color: #67c23a; } -/* 车辆状态小圆点:极小、低调,只标识闲忙,不抢视觉 */ -.veh-dots { display: inline-flex; align-items: center; gap: 5px; align-self: center; } -.veh-dots-label { font-size: 12px; color: #909399; margin-right: 2px; } -.veh-dot { display: inline-block; width: 8px; height: 8px; border-radius: 50%; } -.veh-dot.green { background: #67c23a; } -.veh-dot.red { background: #f56c6c; } -.veh-dot.gray { background: #c0c4cc; } +/* 车辆状态:上下结构,车号小字 + 颜色条区分闲忙(不显示"车辆"二字) */ +.veh-list { display: inline-flex; align-items: center; flex-wrap: wrap; gap: 8px; align-self: center; } +.veh-cell { display: inline-flex; flex-direction: column; align-items: center; gap: 3px; } +.veh-code { font-size: 11px; line-height: 1; white-space: nowrap; color: #909399; } +.veh-bar { display: inline-block; width: 30px; height: 4px; border-radius: 2px; background: #c0c4cc; } +.veh-cell.green .veh-bar { background: #67c23a; } +.veh-cell.green .veh-code { color: #67c23a; } +.veh-cell.red .veh-bar { background: #f56c6c; } +.veh-cell.red .veh-code { color: #f56c6c; } +.veh-cell.gray .veh-bar { background: #c0c4cc; } /* RCS 实时对比条:正常=灰字事实陈述;取不到 RCS=橙色警示(本地状态未经证实) */ .realtime-bar { padding: 6px 14px; font-size: 13px; color: #909399; @@ -563,6 +642,19 @@ onBeforeUnmount(() => { font-size: 27px; font-weight: 800; cursor: pointer; font-family: inherit; } .big-action:disabled { background: #c0c4cc; cursor: not-allowed; } +/* 取/送按钮色彩区分(2026-11-19):取货=绿(去装货)、送货=橙(载货运输)、确认放下=绿深 */ +.big-action.pickup { background: #67c23a; } +.big-action.deliver { background: #e6a23c; } +.big-action.drop { background: #529b2e; } +/* 当前车载货徽标:绿=空车可取货 / 橙=载货待送货,互锁判定一目了然 */ +.pallet-badge { + display: inline-block; margin: 4px auto 12px; padding: 6px 22px; border-radius: 20px; + font-size: 18px; font-weight: 700; +} +.pallet-badge.empty { color: #529b2e; background: #f0f9eb; border: 2px solid #67c23a; } +.pallet-badge.loaded { color: #b88230; background: #fdf6ec; border: 2px solid #e6a23c; } +/* 互锁原因提示:置灰按钮下方一句话说清为什么不能点 */ +.lock-tip { font-size: 15px; color: #b8860b; margin: 8px 0 4px; } .big-end { display: block; width: 100%; max-width: 520px; margin: 12px auto 0; min-height: 60px; border: 2px solid #f56c6c; border-radius: 14px; background: #fff; color: #f56c6c; diff --git a/bj_power_mes/frontend/src/pages/DailyPlan.vue b/bj_power_mes/frontend/src/pages/DailyPlan.vue index 59a92e1..6c5889a 100644 --- a/bj_power_mes/frontend/src/pages/DailyPlan.vue +++ b/bj_power_mes/frontend/src/pages/DailyPlan.vue @@ -195,20 +195,21 @@
- 工单数量 {{ dialog.woQty }},剩余可排 {{ dialog.woRemain }} 台;总数量不能超过剩余可排。 + 工单数量 {{ dialog.woQty }},剩余可排 {{ dialog.woRemain }} 台;{{ dialog.mode === 'FIXED' ? `本次共 ${planTotalQty} 台(每日 ${dialog.planQty} × ${previewDates.length} 天),不能超过剩余可排` : '总数量不能超过剩余可排' }}。
- +
{{ d.date }} - +
- 各日合计 {{ dailyItems.reduce((s, d) => s + (Number(d.qty) || 0), 0) }} / 总数量 {{ dialog.planQty }}(要相等才能保存;可把前面排少、中后期排多) + :style="{ color: dailyItems.reduce((s, d) => s + (Number(d.qty) || 0), 0) === planTotalQty ? '#67c23a' : '#f56c6c' }"> + 各日合计 {{ dailyItems.reduce((s, d) => s + (Number(d.qty) || 0), 0) }} / 总数量 {{ planTotalQty }} + ({{ dialog.mode === 'FIXED' ? `固定日产,每天 ${dialog.planQty} 台,共 ${planTotalQty} 台` : '要相等才能保存;可把前面排少、中后期排多' }})
{ return out }) +// 本次排产「应排总件数」:固定日产 = 每日产量 × 天数,平均分摊 = 填写的总数量。 +// 逐日合计要跟它对齐,不能跟「每日产量」比——否则固定日产下越点越对不上(bug 根因)。 +const planTotalQty = computed(() => { + const q = Number(dialog.planQty) || 0 + return dialog.mode === 'FIXED' ? q * previewDates.value.length : q +}) + // 逐日数量预览:与后端 distributeQty 同算法(AVG 余数排前 / FIXED 按每日产量末日取余) const dailyPreview = computed(() => { const dates = previewDates.value @@ -428,7 +436,9 @@ const dailyPreview = computed(() => { const days = dates.length const out = [] if (dialog.mode === 'FIXED') { - let left = total + // 固定日产:总件数 = 每日产量 × 天数(与后端 distributeQty(PlanQty*days,...) 同口径), + // 逐日每天先铺「每日产量」,末日不足取余;Σ = 每日产量 × 天数。 + let left = total * days const daily = Math.max(1, Number(dialog.planQty) || 1) dates.forEach((date) => { const q = Math.min(daily, left); out.push({ date, qty: q }); left -= q }) } else { @@ -717,24 +727,33 @@ async function save() { if (!dialog.planRange || dialog.planRange.length !== 2 || !dialog.planRange[0] || !dialog.planRange[1]) return ElMessage.warning('请选择排产日期范围') if (!dialog.planQty || dialog.planQty < 1) return ElMessage.warning('请填写数量') - // 总量不得超过工单剩余可排(实际以服务端为准,这里提前提示避免让用户白填一遍) - if (dialog.woRemain != null && dialog.planQty > dialog.woRemain) - return ElMessage.warning(`总数量 ${dialog.planQty} 超过工单剩余可排 ${dialog.woRemain} 台,请调小或到工单管理追加数量`) + // 总量不得超过工单剩余可排(固定日产=每日产量×天数,与后端 quota 校验同口径) + if (dialog.woRemain != null && planTotalQty.value > dialog.woRemain) { + const hint = dialog.mode === 'FIXED' + ? `每日 ${dialog.planQty} × ${previewDates.value.length} 天 = ${planTotalQty.value} 台` + : `总数量 ${planTotalQty.value}` + return ElMessage.warning(`${hint} 超过工单剩余可排 ${dialog.woRemain} 台,请调小或到工单管理追加数量`) + } if (dialog.woStatus && ['DONE', 'CANCELLED'].includes(dialog.woStatus)) return ElMessage.warning(`工单 ${dialog.orderNo} 已完成或已取消,不能排产`) - // 逐日可手改:各日合计必须等于总数量(与工单自动排产同一口径),带 items 交后端按指定量落库。 - if (dailyItems.value.length) { + // 平均分摊:逐日可手改,各日合计必须等于总数量,带 items 交后端按指定量落库。 + // 固定日产:每天恒定,逐日只读,不传 items——让后端按 mode 自己分摊(planQty 传每日产量, + // 与后端 distributeQty(PlanQty*days) 及 quota 校验同口径),彻底避开逐日合计对不上的问题。 + const payload = { + orderNo: dialog.orderNo, planRange: dialog.planRange, mode: dialog.mode, planQty: dialog.planQty + } + if (dialog.mode === 'FIXED') { + payload.items = [] + } else if (dailyItems.value.length) { if (dailyItems.value.some((d) => !(Number(d.qty) >= 0))) return ElMessage.warning('逐日数量不能为负') const daySum = dailyItems.value.reduce((s, d) => s + (Number(d.qty) || 0), 0) - if (daySum !== Number(dialog.planQty)) - return ElMessage.warning(`各日合计 ${daySum} 与总数量 ${dialog.planQty} 不一致,请把逐日数量调到相等`) + if (daySum !== planTotalQty.value) + return ElMessage.warning(`各日合计 ${daySum} 与总数量 ${planTotalQty.value} 不一致,请把逐日数量调到相等`) + payload.items = dailyItems.value.map((d) => ({ date: d.date, qty: Number(d.qty) || 0 })) } warnOutOfWindow([dialog.planRange[0], dialog.planRange[1]]) - await request.post('/daily-plans', { - orderNo: dialog.orderNo, planRange: dialog.planRange, mode: dialog.mode, planQty: dialog.planQty, - items: dailyItems.value.map((d) => ({ date: d.date, qty: Number(d.qty) || 0 })) - }) + await request.post('/daily-plans', payload) } ElMessage.success('保存成功') dialog.show = false diff --git a/bj_power_mes/frontend/src/pages/PlcMonitor.vue b/bj_power_mes/frontend/src/pages/PlcMonitor.vue index 8d3139c..b56a23b 100644 --- a/bj_power_mes/frontend/src/pages/PlcMonitor.vue +++ b/bj_power_mes/frontend/src/pages/PlcMonitor.vue @@ -74,7 +74,49 @@ - + 手动下发会向产线设备写入路径指令。下发前系统自动检查是否存在在途指令(尚未收到完成信号)——若有则拒绝并提示,以免打断自动线。 @@ -129,6 +171,7 @@ import request from '../utils/request' import PageHelp from '../components/PageHelp.vue' import { helpPlcMonitor } from '../help' import { dockCn } from '../utils/dockLabel' +import { WarningFilled } from '@element-plus/icons-vue' const bits = reactive({ station: [], main: [], dock: [], jbt: null, mock: false }) const mws = ref([]) @@ -371,4 +414,16 @@ onUnmounted(closePlcWs) .preview { margin: 10px 0; font-size: 14px; } .muted { color: #909399; } .clear-body { margin: 10px 0; font-size: 14px; } +.help-dot { margin-left: 6px; cursor: help; color: #5b8ff9; font-size: 15px; vertical-align: middle; } + + + + diff --git a/bj_power_mes/internal/agv/client.go b/bj_power_mes/internal/agv/client.go index f326f26..68e50f2 100644 --- a/bj_power_mes/internal/agv/client.go +++ b/bj_power_mes/internal/agv/client.go @@ -42,6 +42,14 @@ type Client interface { QueryTask(ctx context.Context, taskCode string) (status string, agvCode string, err error) // CancelTask 取消任务(按 taskCode)。 CancelTask(ctx context.Context, taskCode, reason string) error + // ContinueTask 继续执行任务(接口文档 2.1.2):模板触发方式=任务编号的动作组停在等待点, + // 上层按业务时机发本接口(传 taskCode,与 RCS 模板配置「触发方式=任务编号」一致,文档推荐), + // RCS 取下一个动作继续执行。B01 举升模板:举升完成(b01endJuSheng)→第 1 次;到位确认(b01endZhuanYi) + // 后人工放行→第 2 次(触发组3 放下)。 + ContinueTask(ctx context.Context, taskCode string) error + // FreeRobot 释放 AGV(接口文档 3.1.2):把指定车辆置空闲,RCS 可重新调度。 + // 放下完成(b01endFangXia/b02end3/c01end2)或人工点「下一站/结束」时调用,robots 为车号列表。 + FreeRobot(ctx context.Context, robots []string) error // QueryAgvStatus 获取车辆状态(3.1.7 queryAgvStatus):车辆闲忙/充电/电量/位置。 // 用于并发闸门取 AGV 总数 + 人工派车状态点展示。 // 纯只读展示,不参与调度(调度完全交给 RCS 自身)。 @@ -341,6 +349,35 @@ func (c *realClient) CancelTask(ctx context.Context, taskCode, reason string) er return c.call(ctx, "/cancelTask", payload, nil) } +// ContinueTask 实现 Client:继续执行任务(2.1.2)。触发方式=任务编号 → 只传 taskCode(文档推荐), +// wbCode/podCode/agvCode 三种触发方式均不传——模板配置以任务编号为准,传了反而不匹配。 +func (c *realClient) ContinueTask(ctx context.Context, taskCode string) error { + if taskCode == "" { + return fmt.Errorf("缺少任务单号") + } + payload := map[string]any{"taskCode": taskCode} + return c.call(ctx, "/continueTask", payload, nil) +} + +// FreeRobot 实现 Client:释放 AGV(3.1.2)。指定车号列表时 robotCount 传列表长度(-1=全部,需 mapShortName, +// MES 永不释放全部车辆——释放哪些车必须显式点名,防止误放正在作业的车)。 +func (c *realClient) FreeRobot(ctx context.Context, robots []string) error { + clean := make([]string, 0, len(robots)) + for _, r := range robots { + if r = strings.TrimSpace(r); r != "" { + clean = append(clean, r) + } + } + if len(clean) == 0 { + return fmt.Errorf("缺少要释放的车辆编号") + } + payload := map[string]any{ + "robotCount": fmt.Sprintf("%d", len(clean)), + "robots": clean, + } + return c.call(ctx, "/freeRobot", payload, nil) +} + // queryAgvStatusData 3.1.7 单条车辆状态 data 项(字段兼容字符串/数字) type queryAgvStatusData struct { RobotCode flexString `json:"robotCode"` @@ -418,6 +455,18 @@ func (m *mockClient) CancelTask(ctx context.Context, taskCode, reason string) er return nil } +// ContinueTask Mock:模拟任务继续成功。 +func (m *mockClient) ContinueTask(ctx context.Context, taskCode string) error { + logx.WithContext(ctx).Infof("[AGV]"+commTag+"[MOCK] ContinueTask taskCode=%s(模拟继续任务成功)", taskCode) + return nil +} + +// FreeRobot Mock:模拟释放车辆成功。 +func (m *mockClient) FreeRobot(ctx context.Context, robots []string) error { + logx.WithContext(ctx).Infof("[AGV]"+commTag+"[MOCK] FreeRobot robots=%v(模拟释放车辆成功)", robots) + return nil +} + // QueryAgvStatus Mock:返回两台示例车(一台空闲、一台执行中),便于联调展示。 func (m *mockClient) QueryAgvStatus(ctx context.Context, mapShortName string) ([]AgvVehicle, error) { logx.WithContext(ctx).Infof("[AGV]" + commTag + "[MOCK] QueryAgvStatus(模拟返回样例车 9001/9002)") diff --git a/bj_power_mes/internal/db/db.go b/bj_power_mes/internal/db/db.go index 744e000..074ca63 100644 --- a/bj_power_mes/internal/db/db.go +++ b/bj_power_mes/internal/db/db.go @@ -457,6 +457,13 @@ var schemaPatchSQL = []string{ // ---- 2026-11-10 物料档案新增「物料编码」展示字段(普通字段,不参与业务/校验)---- // 与 schema/material.go 的 material_code 字段同名;ent Schema.Create 不给既有表加列,故显式 ALTER。 `ALTER TABLE materials ADD COLUMN IF NOT EXISTS material_code varchar(128) NOT NULL DEFAULT ''`, + + // ---- 2026-11-19 智能跟车 IN_TRANSIT:工件级在途标记(下发 MW 后到确认到位前)---- + // 与 schema/workpiece.go 的 flow_transit_mw/flow_transit_target/flow_transit_at 同名。 + // int→integer,varchar(32) 有 MaxLen,Time Optional/Nillable→可空 timestamp。 + `ALTER TABLE workpiece ADD COLUMN IF NOT EXISTS flow_transit_mw integer NOT NULL DEFAULT 0`, + `ALTER TABLE workpiece ADD COLUMN IF NOT EXISTS flow_transit_target varchar(32) NOT NULL DEFAULT ''`, + `ALTER TABLE workpiece ADD COLUMN IF NOT EXISTS flow_transit_at timestamptz NULL`, } // EnsureSchema ent 建表 + 幂等列补丁(只增,不删数据) diff --git a/bj_power_mes/internal/handler/production/agv.go b/bj_power_mes/internal/handler/production/agv.go index 52778b7..8932763 100644 --- a/bj_power_mes/internal/handler/production/agv.go +++ b/bj_power_mes/internal/handler/production/agv.go @@ -311,6 +311,7 @@ func AgvChainNextHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { ChainNo string `json:"chainNo"` Source string `json:"source"` Target string `json:"target"` + Purpose string `json:"purpose"` // 2026-11-19 取/送互锁:"pickup"=到目标取货 / "deliver"=送货到目标 / 空=按点位属性 ConfirmForcePick string `json:"confirmForcePick"` // "1"=人工已确认强提风险点位 } if err := httpx.ParseJSON(r, &req); err != nil || req.ChainNo == "" { @@ -326,7 +327,7 @@ func AgvChainNextHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { if operator == "" { operator = "dispatcher" } - taskNo, err := logic.New(svcCtx).AgvChainNextNode(r.Context(), req.ChainNo, req.Source, req.Target, operator, req.ConfirmForcePick) + taskNo, err := logic.New(svcCtx).AgvChainNextNode(r.Context(), req.ChainNo, req.Source, req.Target, req.Purpose, operator, req.ConfirmForcePick) if err != nil { httpx.Fail(w, 3313, err.Error()) return @@ -336,7 +337,7 @@ func AgvChainNextHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { } // AgvChainEndHandler POST /agv/chain/end 手动链「结束任务」:body {chainNo} -// 校验 AGV 上无托盘(载货台账+RCS 车载货架双校验),通过后本段结束并空车自动回充。 +// 校验 AGV 上无托盘(载货台账+RCS 车载货架双校验),通过后本段结束、车辆释放(freeRobot)。 func AgvChainEndHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var req struct { @@ -355,7 +356,7 @@ func AgvChainEndHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { httpx.Fail(w, 3314, err.Error()) return } - httpx.OkMessage(w, "任务已结束,AGV 空车自动回充", nil) + httpx.OkMessage(w, "任务已结束,车辆已释放", nil) } } @@ -384,6 +385,55 @@ func AgvChainForceEndHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { } } +// AgvConfirmDropHandler POST /agv/confirm-drop 人工「确认放下」(2026-11-19 主控定稿): +// B01 举升段到位停稳(b01endZhuanYi)后车举着货等放下确认;本入口发第 2 次 continueTask +// 放行组3 放下,放下完成回调自动 freeRobot 释放车辆。body {taskNo} +func AgvConfirmDropHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req struct { + TaskNo string `json:"taskNo"` + } + if err := httpx.ParseJSON(r, &req); err != nil || req.TaskNo == "" { + httpx.BadRequest(w, "缺少任务号(taskNo)") + return + } + operator := r.Header.Get("X-Username") + if operator == "" { + operator = "dispatcher" + } + if err := logic.New(svcCtx).ConfirmAgvDrop(r.Context(), req.TaskNo, operator); err != nil { + httpx.Fail(w, 3316, err.Error()) + return + } + httpx.OkMessage(w, "已放行放下动作,放下完成后车辆自动释放", nil) + } +} + +// AgvPendingRetryHandler POST /agv/pending/retry 挂起动作人工重试(2026-11-19 主控定稿): +// 挂起动作(放行转移/释放车辆)超 60s 未触发或 RCS 报错清除后,人工核实现场后重放一次。 +// 绝不自动重发——重发 continueTask 会重复触发动作组、重发 freeRobot 可能误放作业中的车。 +// body {taskNo} +func AgvPendingRetryHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req struct { + TaskNo string `json:"taskNo"` + } + if err := httpx.ParseJSON(r, &req); err != nil || req.TaskNo == "" { + httpx.BadRequest(w, "缺少任务号(taskNo)") + return + } + operator := r.Header.Get("X-Username") + if operator == "" { + operator = "dispatcher" + } + if err := logic.New(svcCtx).RetryAgvPending(r.Context(), req.TaskNo, operator); err != nil { + httpx.Fail(w, 3317, err.Error()) + return + } + httpx.OkMessage(w, "已重试挂起动作,结果见任务状态", nil) + } +} + // AgvChainListHandler GET /agv/chain/list 手动链列表(任务进行中面板:链号/锁定车/节点/进行中)。 func AgvChainListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { diff --git a/bj_power_mes/internal/handler/routes_production.go b/bj_power_mes/internal/handler/routes_production.go index 58125f2..b185fc4 100644 --- a/bj_power_mes/internal/handler/routes_production.go +++ b/bj_power_mes/internal/handler/routes_production.go @@ -458,6 +458,9 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext // 手动多段链(2026-11-06 拍板):逐节点人工推进,全程锁同一台车 {Method: http.MethodPost, Path: "/agv/chain/next", Handler: production.AgvChainNextHandler(serverCtx)}, {Method: http.MethodPost, Path: "/agv/chain/end", Handler: production.AgvChainEndHandler(serverCtx)}, + // 2026-11-19 挂起动作引擎配套入口:人工「确认放下」(B01 到位放行组3)/ 挂起动作人工重试 + {Method: http.MethodPost, Path: "/agv/confirm-drop", Handler: production.AgvConfirmDropHandler(serverCtx)}, + {Method: http.MethodPost, Path: "/agv/pending/retry", Handler: production.AgvPendingRetryHandler(serverCtx)}, {Method: http.MethodPost, Path: "/agv/chain/force-end", Handler: production.AgvChainForceEndHandler(serverCtx)}, {Method: http.MethodGet, Path: "/agv/chain/list", Handler: production.AgvChainListHandler(serverCtx)}, {Method: http.MethodGet, Path: "/agv/mode", Handler: production.AgvModeHandler(serverCtx)}, diff --git a/bj_power_mes/internal/logic/agv.go b/bj_power_mes/internal/logic/agv.go index b92ba01..3889997 100644 --- a/bj_power_mes/internal/logic/agv.go +++ b/bj_power_mes/internal/logic/agv.go @@ -388,6 +388,9 @@ type AgvTaskView struct { ArrivedAt int64 `json:"arrivedAt"` Remark string `json:"remark"` CreatedAt int64 `json:"createdAt"` + // 挂起动作(2026-11-19 主控定稿):前端按此渲染「等待举升/等待放下确认/等待放车」提示 + PendingAction string `json:"pendingAction"` + PendingSince int64 `json:"pendingSince"` } // toAgvTaskView 将 ent.AgvTask 映射为 camelCase 视图(供前端;materialsJson 保持原串由前端 JSON.parse)。 @@ -413,6 +416,8 @@ func toAgvTaskView(t *ent.AgvTask) AgvTaskView { ArrivedAt: t.ArrivedAt, Remark: t.Remark, CreatedAt: t.CreatedAt, + PendingAction: t.PendingAction, + PendingSince: t.PendingSince, } } @@ -507,29 +512,43 @@ func (s *Service) RefreshAgvTasks(ctx context.Context) (int, error) { upd.SetAgvCode(agvCode) } switch st { - case "9": // 已结束(到位) + case "9": // RCS 已结束(到位) + // 2026-11-19 挂起动作引擎:FREE_ROBOT 挂起中 RCS 报 9=放下/末组已完成(回调丢失场景) + // → 补 freeRobot + 完整收尾;否则按到位统一路径(auto_end→9 / B01→ARRIVED+等放下确认)。 + if t.PendingAction == agvPendingFreeRobot { + s.clearAgvPending(ctx, t.ID) + nt, gerr := s.ctx.EntClient.AgvTask.Get(ctx, t.ID) + if gerr == nil { + s.finishAgvSegmentAfterFreeRobot(ctx, nt, "轮询发现 RCS 已结束(回调丢失兜底)") + if nt.AgvCode != "" { + if ferr := s.ctx.Agv.FreeRobot(ctx, []string{nt.AgvCode}); ferr != nil { + s.ctx.EventLog.Write(ctx, "agv.pending_fail", "system", "", "agv_task", nt.TaskNo, + "兜底收尾释放车辆失败:"+ferr.Error()+",请人工核实", nil) + } + } + changed++ + } + continue + } // auto_end 段直接结束;其余段进 ARRIVED「到位待令」。 // 托盘回收(remark 带 AUTO_LOAD)到位自动装车免确认;退料/叫料仍由人工确认。 - if t.AutoEnd { - upd.SetStatus("9").SetArrivedAt(time.Now().Unix()) - } else { - upd.SetStatus("ARRIVED").SetArrivedAt(time.Now().Unix()) - s.ctx.EventLog.Write(ctx, "agv.arrive", "", "", "agv_task", t.TaskNo, - "AGV已到位,等待确认 "+t.TargetDock, nil) - } - if err := upd.Exec(ctx); err == nil { - s.maybeAutoLineDockLoad(ctx, t) + nt, gerr := s.ctx.EntClient.AgvTask.Get(ctx, t.ID) + if gerr == nil { + s.markAgvArrived(ctx, nt, agvCode, "轮询RCS状态9") changed++ } continue case "5": // 取消完成 upd.SetStatus("5") + s.clearAgvPending(ctx, t.ID) default: // 1 已创建 / 2 执行中 upd.SetStatus(st) // 2026-11-17 到位探测候选:RCS 对「空车接货到位等待」类任务(C01)永远保持 2、不发 end 回调, // 也不置 9——车停下等装货在 RCS 语义里仍属「执行中」(16:44 实测:车 33517 到点后 // queryTaskStatus 恒 2、queryAgvStatus 里该车 status=4 任务空闲)。已分车的记录下来探测。 - if st == "2" && agvCode != "" { + // 2026-11-19 排除 CONTINUE_LIFT 挂起任务:B01 等举升期间车举着货停稳 status=4 会误判 + // 到位(车还在起点,货刚举起来)——等举升完成只能靠回调或超时告警,绝不靠空闲探测。 + if st == "2" && agvCode != "" && t.PendingAction != agvPendingContinueLift { pendingExec = append(pendingExec, execTask{id: t.ID, taskNo: t.TaskNo, agvCode: agvCode, target: t.TargetDock, autoEnd: t.AutoEnd}) } } @@ -552,24 +571,18 @@ func (s *Service) RefreshAgvTasks(ctx context.Context) (int, error) { if !free[e.agvCode] { continue } - upd := s.ctx.EntClient.AgvTask.UpdateOneID(e.id) - if e.autoEnd { - upd.SetStatus("9").SetArrivedAt(time.Now().Unix()) - } else { - upd.SetStatus("ARRIVED").SetArrivedAt(time.Now().Unix()) - s.ctx.EventLog.Write(ctx, "agv.arrive", "", "", "agv_task", e.taskNo, - "AGV已到位(车 "+e.agvCode+" 空闲于 "+e.target+",车辆状态探测判定),等待确认", nil) - } - if err := upd.Exec(ctx); err == nil { - // 托盘回收(remark 带 AUTO_LOAD)到位自动装车免确认 - if t, gerr := s.ctx.EntClient.AgvTask.Get(ctx, e.id); gerr == nil { - s.maybeAutoLineDockLoad(ctx, t) - } - changed++ + // 2026-11-19 统一到 markAgvArrived:auto_end→9 / B01→ARRIVED+等放下确认 / 其余→ARRIVED + nt, gerr := s.ctx.EntClient.AgvTask.Get(ctx, e.id) + if gerr != nil { + continue } + s.markAgvArrived(ctx, nt, e.agvCode, "车 "+e.agvCode+" 空闲于 "+e.target+",车辆状态探测判定") + changed++ } } } + // 2026-11-19 挂起动作超时巡检:CONTINUE_LIFT/FREE_ROBOT 超 60s 未触发 → 转预警人工重试 + s.checkAgvPendingTimeouts(ctx) // 2026-11-17 死锁兜底:清掉「任务已终态但 system 锁残留」的点位(历史回调 cancel/force-end // 漏解锁会留下僵尸锁,把点位永久占死,后续派车全被 preDispatchPointCheck 拒绝)。幂等, // 每轮刷新执行一次;JBT21 例外不动(库房接驳台由库管手动解锁,见 agv_point_lock.go 注释)。 @@ -655,7 +668,8 @@ func (s *Service) ConfirmLineDockLoad(ctx context.Context, taskNo, operator stri // 装货点托盘被背走 → 台面清空;该车置「有托盘」 s.setDockPalletByCode(ctx, t.TargetDock, false, "", chainRefOf(t)) s.setAgvLoadedState(ctx, t.AgvCode, true, "AUTO_LOAD", operator) - // 2026-11-18 定稿:先发回库运输段(锁同一台车),成功后本段置9 + cancel 旧任务 + // 2026-11-19 主控定稿:先收尾旧 RCS 任务(continueTask 放行末组完结)再 gen 回库段,不再 cancelTask + _ = s.ctx.Agv.ContinueTask(ctx, t.TaskNo) if _, derr := s.dispatchAgvSegment(ctx, agvSegInput{ Kind: "TRANSPORT", BizType: t.BizType, BizNo: t.BizNo, ChainNo: t.ChainNo, Source: t.TargetDock, Target: dockStoreCode, @@ -664,12 +678,13 @@ func (s *Service) ConfirmLineDockLoad(ctx context.Context, taskNo, operator stri }); derr != nil { return fmt.Errorf("回库运输段下发失败: %w", derr) } - s.ctx.EntClient.AgvTask.UpdateOneID(t.ID).SetStatus("9").SetArrivedAt(time.Now().Unix()) - s.cancelOldRcsTask(ctx, t.TaskNo, operator, "工位装车回库衔接") + s.clearAgvPending(ctx, t.ID) + // 2026-11-19 顺手修既有 bug:原语句缺 .Exec(ctx),置 9 从未落库 + s.ctx.EntClient.AgvTask.UpdateOneID(t.ID).SetStatus("9").SetArrivedAt(time.Now().Unix()).Exec(ctx) // 车驶离工位 → 释放该点系统锁 s.unlockAgvPointByTask(ctx, t.TargetDock, t.TaskNo) s.ctx.EventLog.Write(ctx, "agv.line_dock_load_confirm", operator, "", "agv_task", t.TaskNo, - "工位接驳台 "+t.TargetDock+" 装车,送回 "+dockStoreCode+"(锁车 "+t.AgvCode+"),旧任务已通知取消", nil) + "工位接驳台 "+t.TargetDock+" 装车,送回 "+dockStoreCode+"(锁车 "+t.AgvCode+"),旧任务已放行完结", nil) return nil } @@ -793,13 +808,27 @@ func (s *Service) ApplyAgvWarnCallback(ctx context.Context, agvCode, mainCode, m } // ApplyAgvCallback RCS-Lite SPI 回调(文档 2.2.1 任务执行通知):按 taskCode 匹配任务,按 method 更新状态。 -// method: start 任务开始 / outbin 走出储位 / end 任务结束 / cancel 任务单取消。 -// RCS 数字状态:1 已创建 / 2 执行中 / 5 取消完成 / 9 已结束。 -// robotCode(文档 2.2.1 必填 AGV 编号)用于绑定任务与载货台账(2026-11-04 载货状态补做)。 +// 2026-11-19 重构(主控定稿,依据甲方 RCS 后台模板配置截图):method 在 body 不在 URL,最大 16 字符。 +// 自定义回调矩阵(运行时 switch 精确匹配,禁正则——用户 2026-10-28 铁律;12 个 method 全部已知固定): +// B01 举升模板:b01endJuSheng=举升完成→台账置有货+立刻发第1次 continueTask(放行组2 转移)/ +// b01endZhuanYi=到位停稳(举着货)→markAgvArrived 分流:业务段(Kind≠MANUAL)自动放行放下 +// (continueTask 第2次→b01endFangXia→freeRobot,不等人工),人工段(Kind=MANUAL)挂 +// WAIT_DROP_CONFIRM 等用户「确认放下/下一站」/ b01endFangXia=放下完成→台账置空+目标台有托盘+ +// 段收尾;业务段 freeRobot 放下即发不等签收,人工段**不自动 freeRobot**(车原地待命等用户); +// b01startJuSheng/b01startZhuanYi/b01startFangXia=动作组开始,留痕。 +// B02 移动模板:b02end2=停稳→ARRIVED 等人 / b02end3=末组完成→段收尾(freeRobot 由人工动作链路负责); +// b02endOne=中间组完成,留痕。 +// C01 空车模板:c01endOne=到位停稳→ARRIVED 等人(装货/取货期间车必须原地被占,不自动 continueTask/ +// 不 freeRobot——freeRobot 会把车释放给 RCS 派走);c01end2=末组完成→段收尾。 +// 通用兜底(模板回调未配置时):end=到位(同 markAgvArrived 分流:业务 LIFT 自动放下/人工等操作)/ +// cancel=取消 / start/outbin/空=执行中;未知自定义 method 落 event_log 留痕(验收取证用)。 func (s *Service) ApplyAgvCallback(ctx context.Context, taskCode, method, robotCode string) error { if taskCode == "" { return errors.New("缺少 taskCode") } + // 2026-11-19 验证日志:打印海康回调原始 method,确认新模板自定义回调真的送达 MES。 + // 验证期保留(主控验收1要求取证),确认后删除本行。 + logx.WithContext(ctx).Infof("[AGV][callback][原始报文] taskCode=%s method=%s robotCode=%s", taskCode, method, robotCode) t, err := s.ctx.EntClient.AgvTask.Query(). Where(agvtask.TaskNo(taskCode)).Only(ctx) if err != nil || t == nil { @@ -814,50 +843,187 @@ func (s *Service) ApplyAgvCallback(ctx context.Context, taskCode, method, robotC } return nil } - var status string - arrived := false + robot := robotCode + if robot == "" { + robot = t.AgvCode + } switch method { - case "end": - // 2026-11-03 三层机制:到位分流——空车回充段(auto_end)直接结束;其余进 ARRIVED 待人工确认 - if t.AutoEnd { - status = "9" - } else { - status = "ARRIVED" + // ---------- B01 举升模板(3 组:举升自动 / 转移任务编号触发 / 放下自动) ---------- + case "b01endJuSheng": // 举升完成:货已上车 → 台账置有货 + 立刻发第 1 次 continueTask 放行组2(转移货架) + if robot != "" { + s.setAgvLoadedState(ctx, robot, true, "AUTO_LIFT", "system") } - arrived = true + if t.PendingAction == agvPendingContinueLift { + s.runPendingContinueLift(ctx, t) + } else { + // 无挂起(旧任务/人工已重试过):仍按矩阵放行一次(RCS 幂等,重复放行无新动作组可触发) + if cerr := s.ctx.Agv.ContinueTask(ctx, t.TaskNo); cerr != nil { + s.ctx.EventLog.Write(ctx, "agv.pending_fail", "system", "", "agv_task", t.TaskNo, + "举升完成放行转移失败:"+cerr.Error()+",请人工核实后到「AGV任务」重试", nil) + } else { + s.ctx.EventLog.Write(ctx, "agv.pending_continue_lift", "system", "", "agv_task", t.TaskNo, + "举升完成(无挂起记录),已放行货架转移(continueTask 第1次)", nil) + } + } + return nil + case "b01endZhuanYi": // 到位停稳(举着货停在目标):业务段自动放行放下;人工派车段等用户操作 + s.markAgvArrived(ctx, t, robot, "回调b01endZhuanYi(到位停稳)") + return nil + case "b01endFangXia": // 放下完成:台账置空 + 目标台有托盘 + 段收尾 + if robot != "" { + s.setAgvLoadedState(ctx, robot, false, "AUTO_DROP", "system") + } + s.setDockPalletByCode(ctx, t.TargetDock, true, chainRefOf(t), chainRefOf(t)) + if t.Kind == "MANUAL" { + // 人工派车放下完成(主控 2026-11-19 整改):只写台账,**绝不自动 freeRobot**—— + // 车辆原地待命,等用户「下一站」(freeRobot+gen)或「结束用车」触发放车, + // 防止车在用户还没操作下一站时被 RCS 派走。段保持 ARRIVED 可继续加节点。 + s.clearAgvPending(ctx, t.ID) + if t.Status != "9" && t.Status != "5" { + s.ctx.EventLog.Write(ctx, "agv.pending_free_robot", "system", "", "agv_task", t.TaskNo, + "人工派车放下完成,托盘落位 "+t.TargetDock+",车辆原地待命(freeRobot 由用户「下一站/结束用车」触发)", nil) + } else { + s.ctx.EventLog.Write(ctx, "agv.pending_free_robot", "system", "", "agv_task", t.TaskNo, + "放下完成回调(段已终态,仅留痕)", nil) + } + return nil + } + // 业务段:放下即发不等签收(freeRobot+收尾+送达回写) + if t.PendingAction == agvPendingFreeRobot { + s.runPendingFreeRobot(ctx, t, "放下完成回调") + } else if t.Status != "9" && t.Status != "5" { + // 无挂起但段活动(自动放行后回调迟到/竞态):兜底放车+收尾 + s.finishAgvSegmentAfterFreeRobot(ctx, t, "放下完成回调(无挂起记录,兜底收尾)") + if robot != "" { + if ferr := s.ctx.Agv.FreeRobot(ctx, []string{robot}); ferr != nil { + s.ctx.EventLog.Write(ctx, "agv.pending_fail", "system", "", "agv_task", t.TaskNo, + "放下完成释放车辆失败:"+ferr.Error()+",请人工到海康后台或「AGV任务」处置", nil) + } + } + } else { + s.ctx.EventLog.Write(ctx, "agv.pending_free_robot", "system", "", "agv_task", t.TaskNo, + "放下完成回调(段已终态,仅留痕)", nil) + } + return nil + case "b01startJuSheng", "b01startZhuanYi", "b01startFangXia", "b02endOne": + // 过程事件(动作组开始/中间组完成):任务仍执行中,留痕即可 + s.ctx.EventLog.Write(ctx, "agv.callback_step", "system", "", "agv_task", t.TaskNo, + "模板动作组事件 "+method+"(车 "+robot+")", nil) + s.touchTaskExecuting(ctx, t, robot) + return nil + // ---------- B02 移动模板(3 组:组1/组2 自动,组3 任务编号触发) ---------- + case "b02end2": // 停稳等待(组2 完成):ARRIVED 等人;freeRobot 等人工动作(点下一站/结束)才发 + s.markAgvArrived(ctx, t, robot, "回调b02end2(停稳等待)") + return nil + case "b02end3", "c01end2": // 末组完成(人工 continueTask 触发后的完结事件):段置 9;freeRobot 已由人工链路发过 + if t.PendingAction == agvPendingFreeRobot { + // 段若已终态(衔接竞态)只清挂起留痕;活动则按 freeRobot 收尾口径闭环 + s.clearAgvPending(ctx, t.ID) + } + if t.Status != "9" && t.Status != "5" { + _ = s.ctx.EntClient.AgvTask.UpdateOneID(t.ID).SetStatus("9").Exec(ctx) + s.unlockAgvPointByTask(ctx, t.TargetDock, t.TaskNo) + s.ctx.EventLog.Write(ctx, "agv.callback_finish", "system", "", "agv_task", t.TaskNo, + "末组完成回调 "+method+",任务自然完结置 9(车辆释放由人工动作链路负责)", nil) + } else { + s.ctx.EventLog.Write(ctx, "agv.callback_finish", "system", "", "agv_task", t.TaskNo, + "末组完成回调 "+method+"(段已终态,仅留痕)", nil) + } + return nil + // ---------- C01 空车模板(2 组:组1 自动,组2 任务编号触发) ---------- + case "c01endOne": // 到位停稳:ARRIVED 等人(装货/人工操作期间车原地被占) + s.markAgvArrived(ctx, t, robot, "回调c01endOne(到位停稳)") + return nil + // ---------- 通用兜底(模板自定义回调未送达时的原有语义) ---------- + case "end": + // 2026-11-03 三层机制:到位分流——空车回充段(auto_end)直接结束;其余进 ARRIVED。 + // LIFT 段由 markAgvArrived 二次分流:业务自动放行放下 / 人工等用户操作。 + s.markAgvArrived(ctx, t, robot, "回调end(通用到位)") + return nil case "cancel": - status = "5" - case "start", "outbin", "": - status = "2" - default: - status = "2" - } - upd := s.ctx.EntClient.AgvTask.UpdateOneID(t.ID).SetStatus(status) - // 2026-11-04 载货台账绑定:回调携带 robotCode 时回写任务 agv_code - if robotCode != "" && robotCode != t.AgvCode { - upd.SetAgvCode(robotCode) - } - if arrived { - upd.SetArrivedAt(time.Now().Unix()) - } - if err := upd.Exec(ctx); err != nil { - return err - } - // 2026-11-17 现场事故修复:海康后台取消任务 → method=cancel 回调把本地置 5,但没释放 - // 目标点位的系统锁——点位被已取消任务永久占用,后续派车全被防撞守卫拒绝(死胡同根源)。 - // 取消=任务终止,与 CancelAgvTask 同口径必须解锁。 - if status == "5" { + if uerr := s.ctx.EntClient.AgvTask.UpdateOneID(t.ID).SetStatus("5").Exec(ctx); uerr != nil { + return uerr + } + s.clearAgvPending(ctx, t.ID) + // 2026-11-17 现场事故修复:取消=任务终止,与 CancelAgvTask 同口径必须解锁。 s.unlockAgvPointByTask(ctx, t.TargetDock, t.TaskNo) s.ctx.EventLog.Write(ctx, "agv.point_unlock", "", "", "agv_task", t.TaskNo, "海康回调取消(method=cancel),任务终态自动解锁点位 "+t.TargetDock, nil) + return nil + default: + // start / outbin / 空串 / 未知自定义 method:任务执行中;未知 method 落痕(取证+接入依据) + if method != "" && method != "start" && method != "outbin" { + s.ctx.EventLog.Write(ctx, "agv.callback_unknown", "system", "", "agv_task", t.TaskNo, + "未接入的自定义回调 method="+method+"(车 "+robot+"),已按执行中处理;请将原文回传主控评估接入", nil) + } + s.touchTaskExecuting(ctx, t, robot) + return nil } - if arrived && status == "ARRIVED" { +} + +// touchTaskExecuting 回调=执行中:回写状态 2 与车号(保持任务活性,不改挂起动作)。 +func (s *Service) touchTaskExecuting(ctx context.Context, t *ent.AgvTask, robot string) { + upd := s.ctx.EntClient.AgvTask.UpdateOneID(t.ID).SetStatus("2") + if robot != "" && robot != t.AgvCode { + upd.SetAgvCode(robot) + } + _ = upd.Exec(ctx) +} + +// markAgvArrived 到位统一处理(回调/轮询探测共用): +// - auto_end 段(回充类):直接置 9; +// - B01 举升段(template_type=LIFT)**业务流转(Kind≠MANUAL)**:ARRIVED 即自动放行放下 +// (continueTask 第2次)→ 放下完成回调自动 freeRobot——物理搬运与业务台账解耦, +// 严禁挂 WAIT_DROP_CONFIRM 等人工(主控 2026-11-19 整改定稿); +// - B01 举升段**人工派车(Kind=MANUAL)**:ARRIVED + WAIT_DROP_CONFIRM,等用户 +// 「确认放下」或「下一站」(freeRobot 由用户动作触发); +// - 其余(B02/C01/NONE):ARRIVED 等人——装货/取货/人工操作期间车必须原地被占, +// 不自动 continueTask、不 freeRobot(freeRobot 会把车释放给 RCS 派走)。 +func (s *Service) markAgvArrived(ctx context.Context, t *ent.AgvTask, robot, source string) { + if t.Status == "ARRIVED" || t.Status == "9" || t.Status == "5" { + return // 幂等保护:已到位/已终态,重复事件(探测与回调竞态)不再重复写 + } + now := time.Now().Unix() + upd := s.ctx.EntClient.AgvTask.UpdateOneID(t.ID) + if robot != "" && robot != t.AgvCode { + upd.SetAgvCode(robot) + } + if t.AutoEnd { + upd.SetStatus("9").SetArrivedAt(now) + if err := upd.Exec(ctx); err == nil { + s.ctx.EventLog.Write(ctx, "agv.arrive", "", "", "agv_task", t.TaskNo, + "AGV已到位("+source+"),自动结束段直接完结", nil) + } + return + } + if t.TemplateType == "LIFT" { + if t.Kind == "MANUAL" { + // 人工派车到位:唯一允许等人工的路径——车原地被占,等用户操作 + upd.SetStatus("ARRIVED").SetArrivedAt(now).SetPendingAction(agvPendingDropConfirm).SetPendingSince(now) + if err := upd.Exec(ctx); err == nil { + s.ctx.EventLog.Write(ctx, "agv.arrive", "", "", "agv_task", t.TaskNo, + "AGV已到位("+source+"),等待人工操作:「确认放下」或「下一站」", nil) + } + return + } + // 业务流转到位(叫料/退料/托盘回收):自动放行放下+放车,单据等工人签收 + upd.SetStatus("ARRIVED").SetArrivedAt(now) + if err := upd.Exec(ctx); err == nil { + s.ctx.EventLog.Write(ctx, "agv.arrive", "", "", "agv_task", t.TaskNo, + "AGV已到位("+source+"),业务流转自动放行放下(不等人工确认)", nil) + s.autoDropBusinessB01(ctx, t, source) + } + return + } + upd.SetStatus("ARRIVED").SetArrivedAt(now) + if err := upd.Exec(ctx); err == nil { s.ctx.EventLog.Write(ctx, "agv.arrive", "", "", "agv_task", t.TaskNo, - "AGV已到位(回调),等待人工确认 "+t.TargetDock, map[string]any{"method": method}) - // 托盘回收(remark 带 AUTO_LOAD)到位自动装车免确认;退料/叫料仍等人点 - s.maybeAutoLineDockLoad(ctx, t) + "AGV已到位("+source+"),等待人工确认", nil) + // 托盘回收(remark 带 AUTO_LOAD)到位自动装车免确认;退料/叫料仍由人工确认 + if nt, gerr := s.ctx.EntClient.AgvTask.Get(ctx, t.ID); gerr == nil { + s.maybeAutoLineDockLoad(ctx, nt) + } } - return nil } // notifyDeliveredOnArrival AGV 到位 → 关联出库单回写「已送达」(2026-11-03 断头路补全: @@ -927,6 +1093,9 @@ type agvSegInput struct { // AutoLoad 到位即装车免人工确认(2026-11-18 定稿):托盘回收(空托盘)置 true; // 退料(盘上有料)必须 false→保留 line_load_confirm 人工确认。落库为 remark 标记供到位钩子识别。 AutoLoad bool + // Purpose 段目的(2026-11-19 主控定稿,人工派车取/送互锁):pickup=取货(空车去取, B02 移动模板)/ + // deliver=送货(载货去放, B01 举升模板)/空=沿用目标点位硬件属性推导(业务链不受影响)。 + Purpose string } // agvAutoLoadMark GO_LOAD 段 remark 标记:到位后自动装车放行(托盘回收),无需人工点确认。 @@ -1017,13 +1186,28 @@ func (s *Service) dispatchAgvSegment(ctx context.Context, in agvSegInput) (strin if err := s.preDispatchPointCheck(ctx, in.Target, in.ConfirmForcePick); err != nil { return "", err } + // 2026-11-19 取货正向校验(purpose=pickup):目标为接驳台时台账/传感器必须有托盘(有货可取), + // 否则拒派——空车白跑到取货点无货可装。虚拟点位(无 dock 记录)无传感器可查,放行。 + if in.Purpose == "pickup" { + if err := s.guardPickupTarget(ctx, in.Target); err != nil { + return "", err + } + } // 模板推导(集中唯一入口):段涉及接驳台 → 举升模板;随任务落库并映射 RCS taskTyp。 // 2026-11-17 用户拍板:人工派车首段(空车去接货点)用 C01 空车模板——不举升、不指定 agv; // 下一站仍按目标点硬件属性走 B01(接驳台)/B02(无接驳台),业务逻辑不变,仅首段模板不同。 + // 2026-11-19 主控定稿:人工取/送互锁——purpose=deliver 强制 B01 举升(载货放下交接)、 + // purpose=pickup 强制 B02 移动(空车去取),优先级高于点位硬件属性(仅人工链传 purpose)。 tmpl, terr := s.agvTemplateType(ctx, in.Source, in.Target) if terr != nil { return "", terr } + switch in.Purpose { + case "deliver": + tmpl = "LIFT" + case "pickup": + tmpl = "NONE" + } if in.EmptyRun || in.Source == "" { // 2026-11-18 定稿:所有空车去程首段(Source 空=单点 path)统一 C01——只到达点、不举升、不指定车。 // 载货衔接段 Source 非空,仍按目标点走 B01(接驳台)/B02(虚拟点)。 @@ -1081,6 +1265,11 @@ func (s *Service) dispatchAgvSegment(ctx context.Context, in agvSegInput) (strin s.ctx.EntClient.AgvTask.UpdateOneID(t.ID). SetStatus("1"). SetDispatchedAt(time.Now().Unix()).Exec(ctx) + // 2026-11-19 挂起动作引擎(主控定稿):B01 举升模板下发成功即挂 CONTINUE_LIFT—— + // 等举升完成回调(b01endJuSheng)自动发第 1 次 continueTask;回调丢失 60s 转预警人工重试。 + if tmpl == "LIFT" { + s.setAgvPending(ctx, t.ID, agvPendingContinueLift) + } // 派车成功:目标点位置系统锁(充电位免锁);强提点位人工确认派车成功后自动清标 s.lockAgvPointForTask(ctx, in.Target, taskNo) s.clearForcePickOnDispatch(ctx, in.Target) @@ -1127,7 +1316,10 @@ func (s *Service) ConfirmLoadAndGo(ctx context.Context, taskNo, nextDock, operat if t.TargetDock != dockStoreCode { s.unlockAgvPointByTask(ctx, t.TargetDock, t.TaskNo) } - // 2026-11-18 定稿:先发新段(锁同一台车),成功后再 cancel 旧任务(清 RCS 僵尸任务) + // 2026-11-19 主控定稿:衔接=先收尾旧 RCS 任务(continueTask 放行末组→任务自然完结,C01 组2 无物理 + // 动作零风险),再 gen 新段锁车;不再 cancelTask(新模型下旧任务靠 continueTask 完结,cancel 反而 + // 需 forceCancel=0 扔货风险)。旧任务末组完成回调到达时段已终态,回调侧自动只留痕。 + _ = s.ctx.Agv.ContinueTask(ctx, t.TaskNo) _, derr := s.dispatchAgvSegment(ctx, agvSegInput{ Kind: "TRANSPORT", BizType: t.BizType, BizNo: t.BizNo, ChainNo: t.ChainNo, Source: t.TargetDock, Target: nextDock, @@ -1137,44 +1329,53 @@ func (s *Service) ConfirmLoadAndGo(ctx context.Context, taskNo, nextDock, operat if derr != nil { return fmt.Errorf("运输段下发失败: %w", derr) } + s.clearAgvPending(ctx, t.ID) s.ctx.EntClient.AgvTask.UpdateOneID(t.ID).SetStatus("9").Exec(ctx) - s.cancelOldRcsTask(ctx, t.TaskNo, operator, "叫料装车衔接") s.ctx.EventLog.Write(ctx, "agv.load_confirm", operator, "", "agv_task", taskNo, - "确认装车并送货,运输段 "+t.TargetDock+"→"+nextDock+"(锁车 "+t.AgvCode+"),旧任务已通知取消", nil) + "确认装车并送货,运输段 "+t.TargetDock+"→"+nextDock+"(锁车 "+t.AgvCode+"),旧任务已放行完结", nil) return nil } -// cancelOldRcsTask 衔接/收尾后清理海康侧旧任务(best-effort,失败只留痕不阻断主流程)。 -func (s *Service) cancelOldRcsTask(ctx context.Context, taskNo, operator, scene string) { - if taskNo == "" { - return - } - if err := s.ctx.Agv.CancelTask(ctx, taskNo, scene); err != nil { - s.ctx.EventLog.Write(ctx, "agv.rcs_cancel", "system", "", "agv_task", taskNo, - scene+":通知海康取消旧任务 "+taskNo+" 未成功(RCS 可能已自行结束):"+err.Error(), nil) - return - } - s.ctx.EventLog.Write(ctx, "agv.rcs_cancel", "system", "", "agv_task", taskNo, - scene+":已通知海康取消旧任务 "+taskNo, nil) -} - -// ConfirmUnloadRelease 卸货完成并放行(ARRIVED + TRANSPORT/FREE): -// 卸货动作写库(卸货点 hasPallet=true);本段结束;自动生成空车回充段(免确认,到位自动结束)。 -// 出库单「已送达」回写也移至此处(货真正卸下才算送达)。 +// ConfirmUnloadRelease 卸货确认(ARRIVED + TRANSPORT/FREE)2026-11-19 重构: +// - B01 举升段:=「确认放下」——发第 2 次 continueTask 放行组3(放下),放下完成回调(b01endFangXia) +// 自动写台账(卸货点有托盘/车空车)+ freeRobot(放下即发不等签收)+ 送达回写 + 置 9。 +// 确认动作本身不写台账:货还没放下,台账必须等放下完成的事实回调。 +// - B02/C01/NONE 段(模板回调未配走通用 end 到位的兜底路径):直接收尾——continueTask 完结任务 + +// freeRobot 放车 + 台账写库 + 送达回写 + 置 9(与旧口径一致)。 func (s *Service) ConfirmUnloadRelease(ctx context.Context, taskNo, operator string) error { t, err := s.loadArrivedTask(ctx, taskNo, "TRANSPORT", "FREE") if err != nil { return err } - // 卸货动作写库:托盘上台 + if t.TemplateType == "LIFT" { + if t.PendingAction != agvPendingDropConfirm { + // 旧数据/异常路径兜底:到位但未挂放下确认(如轮询路径漏挂)——补挂后走同一确认闸门 + s.setAgvPending(ctx, t.ID, agvPendingDropConfirm) + } + if derr := s.confirmDropAndPendingFreeRobot(ctx, t, operator); derr != nil { + return derr + } + s.ctx.EventLog.Write(ctx, "agv.unload_confirm", operator, "", "agv_task", taskNo, + "确认卸货放行放下动作组,等待放下完成后自动释放车辆并回写送达", nil) + return nil + } + // 非 B01 段:直接收尾 s.setDockPalletByCode(ctx, t.TargetDock, true, chainRefOf(t), chainRefOf(t)) - // 2026-11-04 载货台账(B1):卸货确认 → 该车置「空车」 s.setAgvLoadedState(ctx, t.AgvCode, false, "AUTO_UNLOAD", operator) - // 2026-11-06 派车锁:卸货完成自动释放目标点位(JBT21 例外:不自动释放,库管手动解锁) + // 派车锁:卸货完成自动释放目标点位(JBT21 例外:不自动释放,库管手动解锁) if t.TargetDock != dockStoreCode { s.unlockAgvPointByTask(ctx, t.TargetDock, t.TaskNo) } + s.clearAgvPending(ctx, t.ID) s.ctx.EntClient.AgvTask.UpdateOneID(t.ID).SetStatus("9").Exec(ctx) + // 2026-11-19 主控定稿:continueTask 完结任务 + freeRobot 放车(原 cancelTask 收尾废止) + _ = s.ctx.Agv.ContinueTask(ctx, t.TaskNo) + if t.AgvCode != "" { + if ferr := s.ctx.Agv.FreeRobot(ctx, []string{t.AgvCode}); ferr != nil { + s.ctx.EventLog.Write(ctx, "agv.pending_fail", "system", "", "agv_task", t.TaskNo, + "收尾释放车辆失败:"+ferr.Error()+",请人工核实后在「AGV任务」重试", nil) + } + } // 出库单回写已送达(CALL 链) if t.BizType == "CALL" { s.notifyDeliveredOnArrival(ctx, t) @@ -1188,32 +1389,55 @@ func (s *Service) ConfirmUnloadRelease(ctx context.Context, taskNo, operator str } } } - // 2026-11-18 定稿:业务终点直接 cancelTask 结束海康任务,不再下发 EMPTY_RETURN 指挥回充; - // 车辆卸货后由 RCS 自行处置(回充/待命),MES 不再遥控。 - s.cancelOldRcsTask(ctx, t.TaskNo, operator, "卸货完成收尾") s.ctx.EventLog.Write(ctx, "agv.unload_confirm", operator, "", "agv_task", taskNo, - "卸货完成并放行,托盘落位 "+t.TargetDock+",海康任务已通知取消(车辆由 RCS 自行处置)", nil) + "卸货完成并放行,托盘落位 "+t.TargetDock+",车辆已释放(freeRobot)", nil) // 事件驱动收口:检查有无 CLOSING 班次可置 CLOSED s.maybeCloseShifts(ctx) return nil } +// confirmDropAndPendingFreeRobot B01 段「确认放下」共用闸门:continueTask 第 2 次放行组3 放下, +// 成功后挂 FREE_ROBOT 等放下完成回调自动放车(ConfirmAgvDrop / ConfirmUnloadRelease 共用)。 +func (s *Service) confirmDropAndPendingFreeRobot(ctx context.Context, t *ent.AgvTask, operator string) error { + if t.PendingAction != agvPendingDropConfirm { + return fmt.Errorf("该任务无需确认放下(挂起动作=%s)", agvPendingFailText(t.PendingAction)) + } + if err := s.ctx.Agv.ContinueTask(ctx, t.TaskNo); err != nil { + // 放行失败:清挂起 + 预警(人可重试),保持 ARRIVED + s.failAgvPending(ctx, t, agvPendingDropConfirm, "确认放下 continueTask 失败:"+err.Error()) + return fmt.Errorf("放行放下失败:%w", err) + } + s.clearAgvPending(ctx, t.ID) + s.setAgvPending(ctx, t.ID, agvPendingFreeRobot) + s.ctx.EventLog.Write(ctx, "agv.drop_confirm", operator, "", "agv_task", t.TaskNo, + "人工确认放下,已放行放下动作组(continueTask 第2次),等待放下完成后自动释放车辆", nil) + return nil +} + // FinishFreeReturn 单点「结束回充电位」(ARRIVED + FREE / 人工派车起始 MANUAL 段): -// 本段结束,空车回充自动下发。人工派车完整生命周期走 AgvChainEndTask,这里兜底旧自由调度单段。 +// 本段结束;continueTask 完结任务 + freeRobot 放车(2026-11-19 主控定稿,原 cancelTask 收尾废止)。 +// 人工派车完整生命周期走 AgvChainEndTask,这里兜底旧自由调度单段。 func (s *Service) FinishFreeReturn(ctx context.Context, taskNo, operator string) error { t, err := s.loadArrivedTask(ctx, taskNo, "FREE", "MANUAL") if err != nil { return err } + s.clearAgvPending(ctx, t.ID) s.ctx.EntClient.AgvTask.UpdateOneID(t.ID).SetStatus("9").Exec(ctx) // 派车锁:FREE 段收尾 → 目标点位释放(JBT21 例外不自动释放) if t.TargetDock != dockStoreCode { s.unlockAgvPointByTask(ctx, t.TargetDock, t.TaskNo) } - // 2026-11-18 定稿:终点 cancelTask,不再下发 EMPTY_RETURN - s.cancelOldRcsTask(ctx, t.TaskNo, operator, "自由调度结束收尾") + // continueTask 完结任务(放行末组)+ freeRobot 放车;均 best-effort(失败留痕,现场人工核实) + _ = s.ctx.Agv.ContinueTask(ctx, t.TaskNo) + if t.AgvCode != "" { + if ferr := s.ctx.Agv.FreeRobot(ctx, []string{t.AgvCode}); ferr != nil { + s.ctx.EventLog.Write(ctx, "agv.pending_fail", "system", "", "agv_task", t.TaskNo, + "结束收尾释放车辆失败:"+ferr.Error()+",请人工核实后在「AGV任务」重试", nil) + } + } s.ctx.EventLog.Write(ctx, "agv.free_finish", operator, "", "agv_task", taskNo, - "自由调度结束,海康任务已通知取消(车辆由 RCS 自行处置)", nil) + "自由调度结束,任务完结、车辆已释放", nil) return nil } @@ -1289,9 +1513,11 @@ func agvChainGuardManual(segs []*ent.AgvTask) error { // AgvChainNextNode 手动链「下一个节点」:当前段必须已到位(ARRIVED);取链锁定车 // (最新段 agv_code,未回写则拒绝)注入下发;当前段置 9,新段挂同一链号。 // source 空=沿用上一节点落点;target 必填(用户自选下一段去哪)。 +// purpose(2026-11-19 主控定稿):"pickup"=到目标取货(B02 移动模板,要求当前空车)/ +// "deliver"=送货到目标(B01 举升模板,要求当前载货)/空=按目标点位硬件属性。 // confirmForcePick="1" 表示用户已对强提风险目标点位完成人工二次确认。 -func (s *Service) AgvChainNextNode(ctx context.Context, chainNo, source, target, operator, confirmForcePick string) (string, error) { - logx.WithContext(ctx).Infof("[AGV][chain-next] 开始 chain=%s source=%s target=%s operator=%s forcePick=%s", chainNo, source, target, operator, confirmForcePick) +func (s *Service) AgvChainNextNode(ctx context.Context, chainNo, source, target, purpose, operator, confirmForcePick string) (string, error) { + logx.WithContext(ctx).Infof("[AGV][chain-next] 开始 chain=%s source=%s target=%s purpose=%s operator=%s forcePick=%s", chainNo, source, target, purpose, operator, confirmForcePick) if chainNo == "" { return "", errors.New("缺少任务链号") } @@ -1319,35 +1545,62 @@ func (s *Service) AgvChainNextNode(ctx context.Context, chainNo, source, target, if agvCode == "" { return "", errors.New("AGV 车辆信息尚未回写,请点「刷新状态」获取当前车辆后再下发下一节点") } - // 2026-11-18 定稿:不再调 continueTask;新段锁车下发成功后 cancel 旧任务(清 RCS 僵尸任务) - // 目标防撞强校验(与手动派车同口径:接驳台有托盘/停用拒派) + // 2026-11-19 取/送互锁(后端硬闸,与前端按钮灰化同口径):载货台账判定—— + // 取货必须空车、送货必须载货;台账缺失行视为空车(首段未建立台账)。 + st, serr := s.ctx.EntClient.AgvVehicleState.Query(). + Where(agvvehiclestate.AgvCode(agvCode)).First(ctx) + loaded := serr == nil && st != nil && st.HasPallet + if purpose == "pickup" && loaded { + return "", errors.New("当前车辆已有托盘,不能取货:请先「送货到」目标点位卸货,或到「车辆状态」人工核实台账") + } + if purpose == "deliver" && !loaded { + return "", errors.New("当前车辆没有托盘,无货可送:请先「到目标取货」,或到「车辆状态」人工核实台账") + } + // 目标防撞强校验:送货目标必须无托盘(有托盘放下会撞);取货目标必须有货可取(guardPickupTarget) if err := s.guardTransportTarget(ctx, target); err != nil { logx.WithContext(ctx).Errorf("[AGV][chain-next] chain=%s 目标=%s 防撞校验拒绝: %v", chainNo, target, err) return "", err } + if purpose == "pickup" { + if err := s.guardPickupTarget(ctx, target); err != nil { + return "", err + } + } src := strings.TrimSpace(source) if src == "" { src = cur.TargetDock // 默认从上一节点落点出发 } - // 先发下一段(锁同一台车),成功后本段置 9 + cancel 旧任务;失败回滚本段状态 + // 2026-11-19 主控整改定稿(freeRobot 触发点固化):用户点「下一站」→ **先 freeRobot + // 释放当前车** → 紧接着 gen 新段锁车。不下发 continueTask:人工段举着货停稳时 + // continueTask 会触发组3 在本站误放下。freeRobot 失败留痕继续(gen 锁车会排队等车)。 + if ferr := s.ctx.Agv.FreeRobot(ctx, []string{agvCode}); ferr != nil { + s.ctx.EventLog.Write(ctx, "agv.pending_fail", "system", "", "agv_task", cur.TaskNo, + "下一站衔接释放车辆失败:"+ferr.Error()+"(新任务已排队锁车,不影响下发)", nil) + } taskNo, derr := s.dispatchAgvSegment(ctx, agvSegInput{ - Kind: "MANUAL", BizType: "CALL", ChainNo: chainNo, - Source: src, Target: target, AgvCode: agvCode, Operator: operator, + Kind: "MANUAL", BizType: "MANUAL", ChainNo: chainNo, + Source: src, Target: target, Purpose: purpose, AgvCode: agvCode, Operator: operator, ConfirmForcePick: confirmForcePick, }) if derr != nil { logx.WithContext(ctx).Errorf("[AGV][chain-next] chain=%s 下一节点下发失败 src=%s target=%s: %v", chainNo, src, target, derr) return "", fmt.Errorf("下一节点下发失败: %w", derr) } + s.clearAgvPending(ctx, cur.ID) s.ctx.EntClient.AgvTask.UpdateOneID(cur.ID).SetStatus("9").Exec(ctx) - s.cancelOldRcsTask(ctx, cur.TaskNo, operator, "人工派车下一站衔接") - logx.WithContext(ctx).Infof("[AGV][chain-next] chain=%s 下一节点下发成功 taskNo=%s %s->%s(锁车 %s),旧任务已通知取消", chainNo, taskNo, src, target, agvCode) + logx.WithContext(ctx).Infof("[AGV][chain-next] chain=%s 下一节点下发成功 taskNo=%s %s->%s(锁车 %s purpose=%s)", chainNo, taskNo, src, target, agvCode, purpose) // AGV 驶向下一节点 → 上一节点落点释放系统锁(JBT21 例外不自动释放) if cur.TargetDock != dockStoreCode { s.unlockAgvPointByTask(ctx, cur.TargetDock, cur.TaskNo) } + action := "下一节点" + if purpose == "pickup" { + action = "取货节点" + } else if purpose == "deliver" { + action = "送货节点" + } s.ctx.EventLog.Write(ctx, "agv.chain_next", operator, "", "agv_task", taskNo, - "手动链下一节点 "+src+"→"+target+"(锁车 "+agvCode+",链="+chainNo+")", nil) + "手动链"+action+" "+src+"→"+target+"(锁车 "+agvCode+",链="+chainNo+"),旧任务已放行完结、车辆已释放", nil) return taskNo, nil } @@ -1370,7 +1623,7 @@ func (s *Service) AgvChainEndTask(ctx context.Context, chainNo, operator string, if cur.Status != "ARRIVED" { return errors.New("AGV 尚未到位,到位后才能结束任务") } - // 2026-11-18 定稿:不再调 continueTask + // 2026-11-18 定稿:不再下发空车回充段(车辆由 RCS 自行处置) agvCode := cur.AgvCode if agvCode == "" { return errors.New("车辆编号尚未回写(RCS 未分车),请先点「刷新状态」后再结束任务") @@ -1393,19 +1646,25 @@ func (s *Service) AgvChainEndTask(ctx context.Context, chainNo, operator string, } } } + s.clearAgvPending(ctx, cur.ID) s.ctx.EntClient.AgvTask.UpdateOneID(cur.ID).SetStatus("9").Exec(ctx) // 结束任务:AGV 驶离当前落点回充 → 释放该点系统锁(JBT21 例外:保持锁定,库管手动解锁) if cur.TargetDock != dockStoreCode { s.unlockAgvPointByTask(ctx, cur.TargetDock, cur.TaskNo) } - // 2026-11-18 定稿:业务终点直接 cancelTask,不再下发 EMPTY_RETURN 指挥回充 - s.cancelOldRcsTask(ctx, cur.TaskNo, operator, "人工派车结束用车收尾") + // 2026-11-19 主控定稿(freeRobot 触发点固化):结束用车=人工动作 → continueTask 完结任务 + + // freeRobot 放车(原 cancelTask 收尾废止——forceCancel=0 有扔货风险且新模型下任务靠 continueTask 完结) + _ = s.ctx.Agv.ContinueTask(ctx, cur.TaskNo) + if ferr := s.ctx.Agv.FreeRobot(ctx, []string{agvCode}); ferr != nil { + s.ctx.EventLog.Write(ctx, "agv.pending_fail", "system", "", "agv_task", cur.TaskNo, + "结束用车释放车辆失败:"+ferr.Error()+",请人工核实后在「AGV任务」重试", nil) + } endNote := "" if force { endNote = ",人工确认无托盘强制结束(RCS 查询失败)" } s.ctx.EventLog.Write(ctx, "agv.chain_end", operator, "", "agv_task", chainNo, - "手动链任务结束(锁车 "+agvCode+")"+endNote+",海康任务已通知取消(车辆由 RCS 自行处置)", nil) + "手动链任务结束(锁车 "+agvCode+")"+endNote+",任务已完结、车辆已释放(freeRobot)", nil) return nil } @@ -1594,7 +1853,7 @@ func (s *Service) FreeDispatch(ctx context.Context, source, target, operator, co // DispatchPalletRecovery 托盘回收(WMS 托盘工作台触发,业务自动触发免弹窗): // 空车前往指定工位接驳台(GO_LOAD,装货点=有托盘的接驳台)→ 到位待令 → 人点「确认装车回库」→ -// 运输段送回库房 JBT21 → 到位待令 → 确认卸货(空托盘上台)→ 空车自动回充。 +// 运输段送回库房 JBT21 → 到位待令 → 确认放下(空托盘上台,放下完成自动释放车辆)。 // 2026-11-17 用户裁决:车到工位后须人同意才离开,见 ConfirmLineDockLoad。 // 2026-11-04 定稿(Q5):JBT21 无空位(有托盘/在途任务占用)不派车——拉回来的托盘没地方放, // 前端按钮已禁用,此处后端兜底拒绝。 @@ -1711,6 +1970,49 @@ func (s *Service) guardTransportTarget(ctx context.Context, target string) error return nil } +// guardPickupTarget 取货正向校验(2026-11-19 主控定稿,purpose=pickup): +// 目标为接驳台时台账/传感器必须有托盘(有货可取),否则拒派——空车白跑到取货点无货可装。 +// 虚拟点位(无 dock 记录)无台账/传感器可查,直接放行(车到点后由人工装货)。 +func (s *Service) guardPickupTarget(ctx context.Context, target string) error { + pt, err := s.ctx.EntClient.AgvPoint.Query().Where(agvpoint.PositionCode(target)).Only(ctx) + if err != nil || pt == nil { + return fmt.Errorf("目标点位不存在:%s", target) + } + if !pt.Enabled { + return fmt.Errorf("目标点位 %s 已停用,禁止派车", target) + } + if !pt.IsDock || pt.DockID == nil { + return nil // 虚拟点位/普通点位:无托盘台账可查,放行 + } + d, derr := s.ctx.EntClient.Dock.Get(ctx, *pt.DockID) + if derr != nil || d == nil { + return fmt.Errorf("目标接驳台不存在:%s", target) + } + if d.Status == "DISABLED" { + return fmt.Errorf("目标接驳台 %s 已停用,禁止派车", target) + } + if d.HasPallet { + return nil // 台账有托盘:有货可取,放行 + } + // 台账无托盘 → 传感器兜底确认(PLC 不可达不阻断,放行并留痕——空跑由现场目视拦截) + if s.ctx.PLC != nil && !s.ctx.PLC.IsMock() { + has, perr := s.plcQueryDockPalletHardCut(ctx, target, 2500*time.Millisecond) + if perr == nil && has { + return nil // 传感器确认有托盘,放行 + } + if perr != nil { + s.ctx.EventLog.Write(ctx, "agv.plc_sensor_skip", "system", "", "agv_point", target, + "取货校验未能读取 PLC 传感器(不可达或超时,已放行派车),现场请目视确认接驳台确有托盘:"+perr.Error(), nil) + return nil + } + return fmt.Errorf("取货点 %s 台账与传感器均无托盘,无货可取,禁止派车(请确认货物已上台后再取货)", target) + } + // PLC 不可用(mock/未接)且台账无托盘:放行并留痕(人工派车场景由前端互锁提示兜底) + s.ctx.EventLog.Write(ctx, "agv.plc_sensor_skip", "system", "", "agv_point", target, + "取货校验:接驳台台账无托盘且 PLC 不可用,已放行派车;现场请目视确认有货可取", nil) + return nil +} + // setDockPalletByCode 动作写库:接驳台托盘台账增减(事件驱动,无轮询)。 // 同时做传感器↔台账相互认证(软校验):不一致落预警,供现场核实。 func (s *Service) setDockPalletByCode(ctx context.Context, dockCode string, hasPallet bool, palletRef, chainRef string) { diff --git a/bj_power_mes/internal/logic/agv_pending.go b/bj_power_mes/internal/logic/agv_pending.go new file mode 100644 index 0000000..a8673f1 --- /dev/null +++ b/bj_power_mes/internal/logic/agv_pending.go @@ -0,0 +1,211 @@ +package logic + +import ( + "context" + "fmt" + "time" + + "bj_power_mes/ent" + "bj_power_mes/ent/agvtask" + + "github.com/zeromicro/go-zero/core/logx" +) + +// ============ AGV 挂起动作引擎(2026-11-19 主控定稿) ============ +// 弃「显式任务队列」、弃「并发硬拒扩展」——待发动作直接挂在任务上(pending_action + pending_since): +// - 每个任务最多一个待办动作;触发源(自定义回调 / 轮询到位探测 / 人工操作)命中即发,条件未满足就等着; +// - RCS 报错 → 清挂起 + event_log + 预警(WS 由 agv_hub 轮询变化检测 ≤3s 自动跟推,无需 logic 层直推); +// - 系统待发动作(CONTINUE_LIFT / FREE_ROBOT)超 60s 未触发 → 转预警人工重试,绝不自动重发 +// (重发 continueTask 可能重复触发动作组;重发 freeRobot 可能误放正在作业的车); +// - WAIT_DROP_CONFIRM 是等人工的挂起,**仅人工派车(Kind=MANUAL)**使用(B01 到位举着货 +// 等「确认放下」或「下一站」),无超时——人可以等很久; +// - 业务流转(叫料/退料/托盘回收,Kind≠MANUAL)B01 到位**严禁**挂 WAIT_DROP_CONFIRM: +// 到位即自动放行放下(continueTask 第2次)→ 放下完成回调自动 freeRobot 放车—— +// 物理搬运与业务台账彻底解耦(主控 2026-11-19 整改定稿,用户原话「人工再确认不确认, +// 其实已经没有什么意义了,就直接放AGV离开吧」),单据留在 PENDING 等工人签收; +// - AGV 并发闸门 guardAgvConcurrency 保持不变(在途链数 ≤ 车数)。 +// +// 海康 RCS-Lite 模板回调配置(2026-11-19 甲方 RCS 后台截图,主控提取,唯一权威): +// B01 举升模板 3 组:组1 移动→举升→移动(自动, b01endJuSheng=举升完成) / 组2 转移货架(任务编号触发, +// b01endZhuanYi=到位停稳) / 组3 移动→放下(自动, b01endFangXia=放下完成) +// B02 移动模板 3 组:组1(b02endOne)/组2(b02end2=停稳) 自动,组3(任务编号触发, b02end3=末组完成) +// C01 空车模板 2 组:组1(c01endOne=到位停稳) 自动,组2(任务编号触发, c01end2=末组完成) +// method 在 body 不在 URL,最大 16 字符(文档 §2.2.1)。 + +// 挂起动作取值(落 agv_tasks.pending_action,前端按此渲染等待提示与按钮互锁) +const ( + // agvPendingContinueLift B01 下发成功即挂:等举升完成回调(b01endJuSheng) → 发第 1 次 continueTask(放行组2 转移)。 + agvPendingContinueLift = "CONTINUE_LIFT" + // agvPendingDropConfirm B01 到位停稳(b01endZhuanYi)挂:等人工「确认放下」→ 发第 2 次 continueTask(放行组3 放下)。 + // 放下必须人工确认(装卸强制确认铁律),本挂起不设超时。 + agvPendingDropConfirm = "WAIT_DROP_CONFIRM" + // agvPendingFreeRobot continueTask 放行末组后挂:等末组完成回调(b01endFangXia/b02end3/c01end2) → 发 freeRobot 放车。 + agvPendingFreeRobot = "FREE_ROBOT" +) + +// agvPendingTimeout 系统待发动作超时(秒)。超时转预警人工重试(人工可点「AGV任务」列表重试按钮)。 +const agvPendingTimeout = 60 + +// agvPendingTimeoutKey 预警去重键前缀(同任务 30 分钟去重,防轮询刷屏)。 +const agvPendingTimeoutKey = "agv_pending_timeout" + +// setAgvPending 挂起待办动作(覆盖写;一个任务同时只有一个待办)。 +func (s *Service) setAgvPending(ctx context.Context, taskID int, action string) { + now := time.Now().Unix() + if err := s.ctx.EntClient.AgvTask.UpdateOneID(taskID). + SetPendingAction(action).SetPendingSince(now).Exec(ctx); err != nil { + logx.WithContext(ctx).Errorf("[AGV][pending] 挂起动作写入失败 taskID=%d action=%s: %v", taskID, action, err) + } +} + +// clearAgvPending 清除挂起动作(触发完成 / RCS 报错)。 +func (s *Service) clearAgvPending(ctx context.Context, taskID int) { + _ = s.ctx.EntClient.AgvTask.UpdateOneID(taskID). + SetPendingAction("").SetPendingSince(0).Exec(ctx) +} + +// agvPendingFailText 挂起动作中文名(告警/日志用)。 +func agvPendingFailText(action string) string { + switch action { + case agvPendingContinueLift: + return "等待举升完成以放行转移(continueTask)" + case agvPendingDropConfirm: + return "等待人工确认放下" + case agvPendingFreeRobot: + return "等待放下/末段完成以释放车辆(freeRobot)" + } + return action +} + +// failAgvPending RCS 报错/异常 → 清挂起 + 留痕 + 预警(主控定稿:立即清,绝不带病挂着)。 +func (s *Service) failAgvPending(ctx context.Context, t *ent.AgvTask, action, scene string) { + s.clearAgvPending(ctx, t.ID) + s.ctx.EventLog.Write(ctx, "agv.pending_fail", "system", "", "agv_task", t.TaskNo, + "挂起动作["+agvPendingFailText(action)+"]触发失败("+scene+"),已清除挂起,等待人工处置", nil) + s.CreateAlertDedup(ctx, "agv_pending_fail", "警告", t.TaskNo, + "AGV 任务 "+t.TaskNo+" 的动作["+agvPendingFailText(action)+"]触发失败("+scene+"),请到「AGV管理→AGV任务」重试或人工处置", 30) +} + +// runPendingContinueLift 举升完成回调(b01endJuSheng)命中 → 发第 1 次 continueTask 放行组2(转移货架)。 +// 成功清挂起;失败清挂起+预警(绝不留挂起重试——重发会重复触发动作组)。 +func (s *Service) runPendingContinueLift(ctx context.Context, t *ent.AgvTask) { + if err := s.ctx.Agv.ContinueTask(ctx, t.TaskNo); err != nil { + s.failAgvPending(ctx, t, agvPendingContinueLift, err.Error()) + return + } + s.clearAgvPending(ctx, t.ID) + s.ctx.EventLog.Write(ctx, "agv.pending_continue_lift", "system", "", "agv_task", t.TaskNo, + "举升完成,已放行货架转移(continueTask 第1次)", nil) +} + +// runPendingFreeRobot 末组完成回调命中 → 发 freeRobot 放车 + 段收尾。 +// 放下即发不等签收(2026-11-19 用户裁决:freeRobot=放下即发,签收只闭环单据)。 +func (s *Service) runPendingFreeRobot(ctx context.Context, t *ent.AgvTask, scene string) { + if err := s.ctx.Agv.FreeRobot(ctx, []string{t.AgvCode}); err != nil { + s.failAgvPending(ctx, t, agvPendingFreeRobot, err.Error()) + return + } + s.clearAgvPending(ctx, t.ID) + s.finishAgvSegmentAfterFreeRobot(ctx, t, scene) +} + +// finishAgvSegmentAfterFreeRobot freeRobot 成功后的段收尾:置终态 + 点位解锁 + 业务回写(送达)。 +func (s *Service) finishAgvSegmentAfterFreeRobot(ctx context.Context, t *ent.AgvTask, scene string) { + if t.Status != "9" && t.Status != "5" { + _ = s.ctx.EntClient.AgvTask.UpdateOneID(t.ID).SetStatus("9").Exec(ctx) + s.unlockAgvPointByTask(ctx, t.TargetDock, t.TaskNo) + } + s.ctx.EventLog.Write(ctx, "agv.pending_free_robot", "system", "", "agv_task", t.TaskNo, + scene+",车辆 "+t.AgvCode+" 已释放(freeRobot,放下即发不等签收)", nil) + // CALL 链送达回写:货放下+车释放才真正送达(原 ConfirmUnloadRelease 逻辑移到回调侧) + if t.BizType == "CALL" { + s.notifyDeliveredOnArrival(ctx, t) + if s.ctx.Wms != nil && t.BizNo != "" { + if derr := s.ctx.Wms.DeliveryDelivered(ctx, t.BizNo); derr != nil { + s.recordSyncFailure("delivery.delivered", t.BizNo, "/api/internal/delivery/delivered", + map[string]any{"deliveryNo": t.BizNo}, derr) + } + } + } + s.maybeCloseShifts(ctx) +} + +// checkAgvPendingTimeouts 每轮刷新调用:系统待发动作超时转预警(人工重试,绝不自动重发)。 +func (s *Service) checkAgvPendingTimeouts(ctx context.Context) { + rows, err := s.ctx.EntClient.AgvTask.Query(). + Where(agvtask.PendingActionIn(agvPendingContinueLift, agvPendingFreeRobot)).All(ctx) + if err != nil || len(rows) == 0 { + return + } + now := time.Now().Unix() + for _, t := range rows { + if t.PendingSince <= 0 || now-t.PendingSince < agvPendingTimeout { + continue + } + _, _ = s.CreateAlertDedup(ctx, agvPendingTimeoutKey, "警告", t.TaskNo, + "AGV 任务 "+t.TaskNo+" 挂起动作["+agvPendingFailText(t.PendingAction)+"]已超过 60 秒未触发(海康回调可能丢失),"+ + "请现场核实后到「AGV管理→AGV任务」点「重试挂起动作」,系统不会自动重发", 30) + s.ctx.EventLog.Write(ctx, "agv.pending_timeout", "system", "", "agv_task", t.TaskNo, + "挂起动作["+agvPendingFailText(t.PendingAction)+"]超时 60 秒,已转预警等待人工重试", nil) + } +} + +// RetryAgvPending 人工重试挂起动作(预警/任务列表入口):按任务当前挂起重放对应动作。 +// 重试也只重放一次,失败照常清挂起+预警——是否再试由人决定。 +func (s *Service) RetryAgvPending(ctx context.Context, taskNo, operator string) error { + t, err := s.ctx.EntClient.AgvTask.Query().Where(agvtask.TaskNo(taskNo)).First(ctx) + if err != nil || t == nil { + return fmt.Errorf("AGV 任务不存在:%s", taskNo) + } + switch t.PendingAction { + case agvPendingContinueLift: + s.ctx.EventLog.Write(ctx, "agv.pending_retry", operator, "", "agv_task", t.TaskNo, "人工重试:放行货架转移", nil) + s.runPendingContinueLift(ctx, t) + return nil + case agvPendingFreeRobot: + s.ctx.EventLog.Write(ctx, "agv.pending_retry", operator, "", "agv_task", t.TaskNo, "人工重试:释放车辆", nil) + s.runPendingFreeRobot(ctx, t, "人工重试触发") + return nil + case "": + return fmt.Errorf("任务 %s 当前没有挂起动作,无需重试", taskNo) + default: + return fmt.Errorf("任务 %s 挂起动作 %s 不支持重试", taskNo, t.PendingAction) + } +} + +// ConfirmAgvDrop 人工「确认放下」(**仅人工派车** B01 到位举着货 → 放行组3 放下): +// 第 2 次 continueTask,成功后段保持 ARRIVED 等用户「下一站/结束用车」触发 freeRobot +// (人工派车放下完成后车辆原地待命,绝不自动放车——主控 2026-11-19 整改)。 +// 业务流转段(Kind≠MANUAL)不走这里:到位自动放行放下,见 autoDropBusinessB01。 +func (s *Service) ConfirmAgvDrop(ctx context.Context, taskNo, operator string) error { + t, err := s.ctx.EntClient.AgvTask.Query().Where(agvtask.TaskNo(taskNo)).First(ctx) + if err != nil || t == nil { + return fmt.Errorf("AGV 任务不存在:%s", taskNo) + } + if t.Kind == "MANUAL" { + if t.Status != "ARRIVED" { + return fmt.Errorf("任务不在「到位待令」状态,无法确认放下(当前 %s)", agvTaskStatusText(t.Status)) + } + } else { + // 业务段兜底入口(自动放行失败后的补救路径):不卡状态细节,直接补发放行 + if t.Status == "9" || t.Status == "5" { + return fmt.Errorf("任务已结束,无需确认放下") + } + } + return s.confirmDropAndPendingFreeRobot(ctx, t, operator) +} + +// autoDropBusinessB01 业务流转段(叫料/退料/托盘回收,Kind≠MANUAL)B01 到位自动放行放下: +// 第 2 次 continueTask 放行组3(放下),成功挂 FREE_ROBOT 等放下完成回调自动 freeRobot 放车。 +// 主控 2026-11-19 整改定稿:业务流转「物理放下与业务台账解耦」——车到目标接驳台就自动放下、 +// 自动离开,绝不挂 WAIT_DROP_CONFIRM 等人工点按钮;单据留在 PENDING 等工人签收。 +func (s *Service) autoDropBusinessB01(ctx context.Context, t *ent.AgvTask, source string) { + if err := s.ctx.Agv.ContinueTask(ctx, t.TaskNo); err != nil { + // 放行失败:清挂起 + 预警(人可经「AGV任务→确认卸货放行」补救),保持 ARRIVED + s.failAgvPending(ctx, t, agvPendingDropConfirm, "业务到位自动放行放下失败:"+err.Error()) + return + } + s.setAgvPending(ctx, t.ID, agvPendingFreeRobot) + s.ctx.EventLog.Write(ctx, "agv.auto_drop", "system", "", "agv_task", t.TaskNo, + "业务流转到位("+source+"),已自动放行放下(continueTask 第2次);放下完成后自动释放车辆,单据待工人签收", nil) +} diff --git a/bj_power_mes/internal/logic/call.go b/bj_power_mes/internal/logic/call.go index bcb6bfa..2304d14 100644 --- a/bj_power_mes/internal/logic/call.go +++ b/bj_power_mes/internal/logic/call.go @@ -821,7 +821,7 @@ func (s *Service) releaseArrivedTransportOnSign(ctx context.Context, stationNo i continue } s.ctx.EventLog.Write(ctx, "call.sign_agv_release", operator, "", "agv_task", t.TaskNo, - "工位签收联动卸货放行(叫料单 "+requestNo+"),AGV 自动回充", nil) + "工位签收联动卸货放行(叫料单 "+requestNo+"),已放行放下动作组,放下完成后车辆自动释放", nil) } } diff --git a/bj_power_mes/internal/logic/dashboard.go b/bj_power_mes/internal/logic/dashboard.go index 0e322e9..3731df2 100644 --- a/bj_power_mes/internal/logic/dashboard.go +++ b/bj_power_mes/internal/logic/dashboard.go @@ -676,8 +676,9 @@ func dockCnLabel(code string) string { func (s *Service) buildPoints(ctx context.Context) FrontPoints { out := FrontPoints{Mock: s.ctx.PLC.IsMock(), Main: []FrontPoint{}, Dock: []FrontPoint{}, Transit: []InTransit{}} // 2026-11-17:PLC 断电时裸读挂满 10s 会拖住整屏 SSE 快照,改走 plcHardCut 硬切降级。 + // 2026-11-19:看板全量点位走 2s TTL + singleflight 缓存,多路 SSE 合并为一次真读(写 MW 后自动失效)。 bits, err := plcHardCut(ctx, 2500*time.Millisecond, func(c context.Context) ([]bool, error) { - return s.ctx.PLC.ReadBits(c) + return s.ctx.PLC.ReadBitsCached(c) }) if err != nil { return out diff --git a/bj_power_mes/internal/logic/flow_chain.go b/bj_power_mes/internal/logic/flow_chain.go index 09dd96a..c86533a 100644 --- a/bj_power_mes/internal/logic/flow_chain.go +++ b/bj_power_mes/internal/logic/flow_chain.go @@ -146,6 +146,7 @@ func (s *Service) flowLifecycle(ctx context.Context, wp *ent.Workpiece, sn, oper } // flowMoveOnce 对单个工件尝试推进一次。返回 (结果, 是否发生流转)。 +// 2026-11-19:接入智能跟车引擎——在途件跳过、目标动态截断、下发标记在途。 func (s *Service) flowMoveOnce(ctx context.Context, sn, operator string) (*FlowMoveResult, bool) { stay := func(msg string) (*FlowMoveResult, bool) { return &FlowMoveResult{Sn: sn, Mode: flowModeStay, Msg: msg}, false @@ -154,6 +155,10 @@ func (s *Service) flowMoveOnce(ctx context.Context, sn, operator string) (*FlowM if err != nil { return stay("工件不存在或已删除") } + // IN_TRANSIT:已下发未到位,期间绝不重复下发(防撞核心),等 confirmInTransit 确认。 + if wp.FlowTransitMW > 0 { + return stay("工件在途(MW" + strconv.Itoa(wp.FlowTransitMW) + "),等待到位确认,不重复下发") + } // 只有在产线上的工件参与自动流转(NEW 未上线、SEMI_STORED 暂存在库、DONE/SCRAPPED 终态均不动) if wp.Status != "ONLINE" && wp.Status != "PROCESSING" { return stay("状态 " + wp.Status + " 不参与自动流转") @@ -196,12 +201,18 @@ func (s *Service) flowMoveOnce(ctx context.Context, sn, operator string) (*FlowM return stay("点位 " + src.PointNo + " 无法确定流转源类型") } if src.PointType == "END" { + // 工位11/12(末端下料检测位)兼容逻辑原样保留:等待人工取件,不参与滚筒线截断。 return stay("工件已在末端下料检测位 " + src.PointNo + ",等待人工取件") } // 工件正停在下一道工艺的候选工位上 → 等待加工,不推进 if !doneAll && src.PointType == "STATION" && intsContains(cands, src.StationNo) { return stay("工件在工艺候选工位" + strconv.Itoa(src.StationNo) + "等待加工") } + // 智能跟车占用图(台账 + 48 位快照)。虚拟工位无物理点位,不走截断。 + o, oerr := s.engineSnapshot(ctx) + if oerr != nil { + return stay("加载产线占用图失败:" + oerr.Error()) + } // 目标选择:真实候选工位优先(升序,首个「台账空闲 + 无其他在制工件」者); // 无台账行=虚拟工位(负数前段工位)仅作兜底。 // 2026-11-16 工位物理互斥:滚筒线单件流,工位台面被其他工单在制件占用 → 不准流入, @@ -231,6 +242,16 @@ func (s *Service) flowMoveOnce(ctx context.Context, sn, operator string) (*FlowM continue } } + // 智能跟车:先算路径截断。全清→直达目标工位;前方被占→截断到最近空闲缓存位;无位→滞留。 + tgtType, tgtNo, reach, why := s.truncateTarget(ctx, o, srcType, srcNo, cand) + if !reach { + return stay(why) + } + if tgtType == plc.SrcMain { + // 截断进缓存位:走缓存下发(标记在途)。 + pointNo := "C" + strconv.Itoa(tgtNo) + return s.flowDispatchToCache(ctx, src, wp, sn, operator, srcType, srcNo, tgtNo, pointNo, why) + } return s.flowExecMove(ctx, src, wp, sn, srcType, srcNo, pt, operator, doneAll) } if virtualCand != nil { @@ -246,38 +267,44 @@ func (s *Service) flowMoveOnce(ctx context.Context, sn, operator string) (*FlowM return stay("下一道工艺候选工位均不可达/不可用,滞留原地") } -// flowExecMove 流转到真实工位/末端:下发路由 + 台账 OUT/IN + 工件台账 + 流水。 +// flowExecMove 流转到真实工位/末端:下发路由 + 标记 IN_TRANSIT(台账在到位确认后才落实)。 +// 2026-11-19:不再"下发即改台账",避免件还在途中台账就显示已到、造成跟车误判。 func (s *Service) flowExecMove(ctx context.Context, src *ent.LinePoint, wp *ent.Workpiece, sn string, srcType plc.SrcType, srcNo int, tgtPt *ent.LinePoint, operator string, doneAll bool) (*FlowMoveResult, bool) { tgtNo := tgtPt.StationNo - mode, mw, value, ok := s.flowSend(ctx, srcType, srcNo, tgtNo, plc.SrcStation) + mode, mw, value, ok := s.flowDispatch(ctx, wp, sn, operator, srcType, srcNo, plc.SrcStation, tgtNo) if !ok { return &FlowMoveResult{Sn: sn, From: src.PointNo, To: tgtPt.PointNo, Mode: flowModeStay, Msg: src.PointNo + "→" + tgtPt.PointNo + " 不在 §4.4 路由表内,滞留原地"}, false } - if err := s.OccupyPoint(ctx, src.PointNo, sn, wp.OrderNo, operator, "OUT"); err != nil { - return &FlowMoveResult{Sn: sn, From: src.PointNo, To: tgtPt.PointNo, Mode: mode, - Msg: "已下发但原点位释放失败,请人工核对:" + err.Error()}, false - } - if err := s.OccupyPoint(ctx, tgtPt.PointNo, sn, wp.OrderNo, operator, "IN"); err != nil { - return &FlowMoveResult{Sn: sn, From: src.PointNo, To: tgtPt.PointNo, Mode: mode, - Msg: "原点位已释放但目标点位占用失败,请人工核对:" + err.Error()}, false - } - if _, err := s.ctx.EntClient.Workpiece.UpdateOneID(wp.ID).SetAtStationNo(tgtNo).Save(ctx); err != nil { - return &FlowMoveResult{Sn: sn, From: src.PointNo, To: tgtPt.PointNo, Mode: mode, - Msg: "点位已流转但工件台账更新失败,请人工核对:" + err.Error()}, false - } - remark := "报工后自动流转 " + src.PointNo + " → " + tgtPt.PointNo + remark := "报工后自动流转(在途) " + src.PointNo + " → " + tgtPt.PointNo if doneAll { - remark = "全部工艺完成,自动流转至末端下料位" + remark = "全部工艺完成,自动流转至末端下料位(在途)" } s.flowLifecycle(ctx, wp, sn, operator, tgtNo, remark) s.ctx.EventLog.Write(ctx, "workpiece.flow.move", wp.OrderNo, operator, "workpiece", sn, - "报工后自动流转 "+src.PointNo+" → "+tgtPt.PointNo+"("+flowModeMsg(mode, mw, value, src.PointNo, tgtPt.PointNo)+")", + "报工后自动下发 "+src.PointNo+" → "+tgtPt.PointNo+"("+flowModeMsg(mode, mw, value, src.PointNo, tgtPt.PointNo)+",等待 MW 到位确认)", map[string]any{"sn": sn, "orderNo": wp.OrderNo, "from": src.PointNo, "to": tgtPt.PointNo, - "mode": mode, "mw": mw, "value": value}) + "mode": mode, "mw": mw, "value": value, "transit": true}) return &FlowMoveResult{Sn: sn, From: src.PointNo, To: tgtPt.PointNo, Mode: mode, - Msg: flowModeMsg(mode, mw, value, src.PointNo, tgtPt.PointNo)}, true + Msg: flowModeMsg(mode, mw, value, src.PointNo, tgtPt.PointNo) + ",等待到位确认"}, true +} + +// flowDispatchToCache 截断到缓存位:下发 G/C→C 路由 + 标记 IN_TRANSIT。 +func (s *Service) flowDispatchToCache(ctx context.Context, src *ent.LinePoint, wp *ent.Workpiece, sn, operator string, + srcType plc.SrcType, srcNo, tgtC int, pointNo, why string) (*FlowMoveResult, bool) { + mode, mw, value, ok := s.flowDispatch(ctx, wp, sn, operator, srcType, srcNo, plc.SrcMain, tgtC) + if !ok { + return &FlowMoveResult{Sn: sn, From: src.PointNo, Mode: flowModeStay, + Msg: why + ",但该缓存位 §4.4 路由不可达,滞留原地"}, false + } + s.flowLifecycle(ctx, wp, sn, operator, 0, why+",下发进缓存位 "+pointNo+"(在途)") + s.ctx.EventLog.Write(ctx, "workpiece.flow.cache", wp.OrderNo, operator, "workpiece", sn, + why+" → "+pointNo+"("+flowModeMsg(mode, mw, value, src.PointNo, pointNo)+",等待 MW 到位确认)", + map[string]any{"sn": sn, "orderNo": wp.OrderNo, "from": src.PointNo, "to": pointNo, + "mode": mode, "mw": mw, "value": value, "transit": true, "truncate": true}) + return &FlowMoveResult{Sn: sn, From: src.PointNo, To: pointNo, Cached: true, Mode: mode, + Msg: why + ",已下发进缓存位 " + pointNo + ",等待到位确认"}, true } // flowLedgerVirtualMove 虚拟工位(负数前段工位,无台账行/无物理点位):纯台账流转。 @@ -315,46 +342,24 @@ func (s *Service) flowLedgerVirtualMove(ctx context.Context, src *ent.LinePoint, Msg: "虚拟工位(无物理点位),台账流转" + physMsg}, true } -// flowToCacheOrStay 下游候选工位全部被占时的缓存策略分流(仅 strict 且源为工位时进缓存): -// 把工件送进源工位 CatA(G→C)可达的第一个空闲缓存位(CACHE)排队;无可达空位 → 落「缓存满载」 -// 报警并滞留原地。physical 策略一律滞留原地(堵在原地)。 +// flowToCacheOrStay 下游候选工位被占时的进缓存兜底(2026-11-19 智能跟车): +// 无条件把工件送进源工位可达的第一个空闲缓存位(台账空闲 + 传感器=0)排队,标记在途; +// 无可达空位 → 落「缓存满载」报警并滞留原地。 +// 不再区分 physical/strict——动态截断已是常态机制,缓存位是唯一的"可停留"节点。 func (s *Service) flowToCacheOrStay(ctx context.Context, src *ent.LinePoint, wp *ent.Workpiece, sn, operator string, srcNo int) (*FlowMoveResult, bool) { - policy := s.CfgStr(ctx, CfgMultiOrderCachePolicy, "physical") - if policy != "strict" { + o, oerr := s.engineSnapshot(ctx) + if oerr != nil { return &FlowMoveResult{Sn: sn, From: src.PointNo, Mode: flowModeStay, - Msg: "下游候选工位被占,多工单缓存策略=physical,工件滞留原地"}, false + Msg: "加载产线占用图失败:" + oerr.Error()}, false } - // CatA 可达目标(已按编号升序)∩ 缓存位(CACHE 类型)∩ 台账空闲,按主线 seq 升序取第一个 + // CatA 可达目标(已按编号升序)∩ 缓存位(CACHE)∩ 空闲(台账+传感器),按主线编号升序取第一个。 for _, n := range plc.AllTargets(plc.SrcStation, srcNo, plc.SrcMain) { pointNo := "C" + strconv.Itoa(n) - pt, err := s.ctx.EntClient.LinePoint.Query().Where(linepoint.PointNoEQ(pointNo)).First(ctx) - if err != nil || pt == nil || pt.PointType != "CACHE" || pt.Occupied { + if !cacheMainC[n] || !o.cFree(n) { continue } - mode, mw, value, ok := s.flowSend(ctx, plc.SrcStation, srcNo, n, plc.SrcMain) - if !ok { - continue - } - if err := s.OccupyPoint(ctx, src.PointNo, sn, wp.OrderNo, operator, "OUT"); err != nil { - return &FlowMoveResult{Sn: sn, From: src.PointNo, Mode: mode, - Msg: "进缓存失败(原点位释放出错):" + err.Error()}, false - } - if err := s.OccupyPoint(ctx, pointNo, sn, wp.OrderNo, operator, "IN"); err != nil { - return &FlowMoveResult{Sn: sn, From: src.PointNo, Mode: mode, - Msg: "进缓存失败(占用缓存位出错):" + err.Error()}, false - } - if _, err := s.ctx.EntClient.Workpiece.UpdateOneID(wp.ID).SetAtStationNo(0).Save(ctx); err != nil { - return &FlowMoveResult{Sn: sn, From: src.PointNo, To: pointNo, Mode: mode, - Msg: "已进缓存但工件台账更新失败,请人工核对:" + err.Error()}, false - } - s.flowLifecycle(ctx, wp, sn, operator, srcNo, - "下游候选工位被占,按缓存策略=strict 进入缓存位排队(物理位置以点位台账为准)") - s.ctx.EventLog.Write(ctx, "workpiece.flow.cache", wp.OrderNo, operator, "workpiece", sn, - "下游被占,工件进入缓存位排队 "+src.PointNo+" → "+pointNo+"("+flowModeMsg(mode, mw, value, src.PointNo, pointNo)+")", - map[string]any{"sn": sn, "orderNo": wp.OrderNo, "from": src.PointNo, "to": pointNo, - "mode": mode, "mw": mw, "value": value, "policy": policy}) - return &FlowMoveResult{Sn: sn, From: src.PointNo, To: pointNo, Cached: true, Mode: mode, - Msg: "下游候选工位被占,已进入缓存位 " + pointNo + " 排队;" + flowModeMsg(mode, mw, value, src.PointNo, pointNo)}, true + return s.flowDispatchToCache(ctx, src, wp, sn, operator, plc.SrcStation, srcNo, n, pointNo, + "下游候选工位被占,进入缓存位排队") } s.alertLineCacheFull(ctx, sn, src, srcNo) return &FlowMoveResult{Sn: sn, From: src.PointNo, Mode: flowModeStay, @@ -378,14 +383,14 @@ func (s *Service) alertLineCacheFull(ctx context.Context, sn string, src *ent.Li SetRefType("flow_cache_full").SetRefId(sn).SetStatus("UNREAD").Save(ctx) } -// runChainLoop 全线连锁扫描:对台账中全部占用点位上的工件各尝试推进一次; -// 一轮内无任何进展即停(上游腾位 → 缓存/滞留工件被层层拉入靠轮次推进)。 -// 仅记录发生了流转的结果。 -func (s *Service) runChainLoop(ctx context.Context, operator string) []FlowMoveResult { +// runChainLoopLocked 全线连锁扫描(调用方已持 flowEngineMu): +// 每轮先做到位确认,再从下游往上游(seq 降序)逐个推进;无进展即停。 +func (s *Service) runChainLoopLocked(ctx context.Context, operator string) []FlowMoveResult { out := make([]FlowMoveResult, 0, 8) for round := 0; round < flowChainMaxRounds; round++ { + s.confirmInTransit(ctx, operator) pts, err := s.ctx.EntClient.LinePoint.Query(). - Where(linepoint.Occupied(true)).Order(ent.Asc(linepoint.FieldSeq)).All(ctx) + Where(linepoint.Occupied(true)).Order(ent.Desc(linepoint.FieldSeq)).All(ctx) if err != nil { out = append(out, FlowMoveResult{Mode: flowModeStay, Msg: "扫描点位台账失败:" + err.Error()}) break @@ -409,10 +414,19 @@ func (s *Service) runChainLoop(ctx context.Context, operator string) []FlowMoveR return out } -// TriggerFlowChainForSn 单件触发(报工后自动调用):先把该工件连续推进到不能推为止, -// 再全线连锁扫描(本件移出腾出的位置供上游滞留/缓存工件层层拉入)。 +// runChainLoop 全线扫描入口(持全局锁)。 +func (s *Service) runChainLoop(ctx context.Context, operator string) []FlowMoveResult { + flowEngineMu.Lock() + defer flowEngineMu.Unlock() + return s.runChainLoopLocked(ctx, operator) +} + +// TriggerFlowChainForSn 报工后单件触发(持全局锁):先确认在途 → 本件推进 → 全线从下游往上游连锁。 func (s *Service) TriggerFlowChainForSn(ctx context.Context, sn, operator string) []FlowMoveResult { + flowEngineMu.Lock() + defer flowEngineMu.Unlock() out := make([]FlowMoveResult, 0, 4) + s.confirmInTransit(ctx, operator) for i := 0; i < flowChainMaxRounds; i++ { res, moved := s.flowMoveOnce(ctx, sn, operator) if res != nil { @@ -421,8 +435,9 @@ func (s *Service) TriggerFlowChainForSn(ctx context.Context, sn, operator string if !moved { break } + s.confirmInTransit(ctx, operator) // 本件已下发→模拟到位(真实由下轮/下次触发确认) } - out = append(out, s.runChainLoop(ctx, operator)...) + out = append(out, s.runChainLoopLocked(ctx, operator)...) return out } diff --git a/bj_power_mes/internal/logic/flow_engine.go b/bj_power_mes/internal/logic/flow_engine.go new file mode 100644 index 0000000..2ad237b --- /dev/null +++ b/bj_power_mes/internal/logic/flow_engine.go @@ -0,0 +1,270 @@ +package logic + +import ( + "context" + "fmt" + "strconv" + "strings" + "sync" + "time" + + "bj_power_mes/ent" + "bj_power_mes/ent/alert" + "bj_power_mes/ent/linepoint" + "bj_power_mes/ent/workpiece" + "bj_power_mes/internal/plc" +) + +// ============ 智能跟车 + 动态目标截断流转引擎(2026-11-19 主控拍板) ============ +// +// 与旧 runChainLoop(无条件直发最终目标、不读传感器、无在途闭锁)的本质区别: +// 1. 事件驱动:只在报工 / 人工扫描时触发,无后台定时器; +// 2. 一次性读 48 位(ReadBitsCached,2s TTL + singleflight + 写失效)生成物理快照; +// 3. 从下游往上游逐个算,前方路径被占 → 把下发目标动态截断到"占用点之前的最后一个空闲缓存位"; +// 4. IN_TRANSIT 状态机:下发后工件标记在途,期间绝不重复下发;读到 MW=0 才确认到位、落实台账; +// 5. 主线 C 位占用 = 台账 occupied OR 传感器=1(任一被占即视为占,保守防追尾); +// 工位 G 位占用只认台账(工位传感器转圈闪烁不可信,不采信)。 +// +// 全局锁 flowEngineMu 包住「读快照 → 算截断 → 写 MW → 写台账」全过程, +// 并发报工串行化,杜绝两条路径交叉/重复下发。 + +// flowEngineMu 流转引擎全局互斥锁(进程级单例;Service 每请求新建,锁必须包级)。 +var flowEngineMu sync.Mutex + +// flowTransitTimeoutMs 在途到位确认超时(毫秒):下发 MW 后超过此时长仍未读到 MW=0 → 落预警转人工。 +const flowTransitTimeoutMs = 5000 + +// stationOutMainC 工位 Gk 出料停靠位 C 编号(lineCDefs 权威): +// G1/G2→C1, G3/G4→C4, G5/G6→C7, G7/G8→C10, G9/G10→C13, G11/G12→C15。 +var stationOutMainC = map[int]int{1: 1, 2: 1, 3: 4, 4: 4, 5: 7, 6: 7, 7: 10, 8: 10, 9: 13, 10: 13, 11: 15, 12: 15} + +// cacheMainC 可缓存主线位(CACHE=true,lineCDefs 权威):C2/C3/C5/C6/C8/C9/C11/C12/C14。 +var cacheMainC = map[int]bool{2: true, 3: true, 5: true, 6: true, 8: true, 9: true, 11: true, 12: true, 14: true} + +// lineOccupancy 主线占用图: +// - 台账 occupied 为事实源; +// - 48 位快照 sensors 为主线的实时物理信号(工位 G 位传感器不采信)。 +// cFree 采用保守口径:台账空闲 **且** 传感器=0 才算空闲。 +type lineOccupancy struct { + byPointNo map[string]*ent.LinePoint + sensors []bool // 48 位:[12..26]=C1..C15 +} + +func (o *lineOccupancy) sensorMain(c int) bool { + if c < 1 || c > 15 { + return false + } + i := 12 + (c - 1) + return i >= 0 && i < len(o.sensors) && o.sensors[i] +} + +// cFree 主线 C 位是否空闲(台账 + 传感器双确认,任一被占即视为占)。 +func (o *lineOccupancy) cFree(c int) bool { + pt := o.byPointNo["C"+strconv.Itoa(c)] + ledgerBusy := pt != nil && pt.Occupied + return !ledgerBusy && !o.sensorMain(c) +} + +// engineSnapshot 一次触发的公共输入:台账 + 48 位物理快照。 +func (s *Service) engineSnapshot(ctx context.Context) (*lineOccupancy, error) { + pts, err := s.ctx.EntClient.LinePoint.Query().All(ctx) + if err != nil { + return nil, err + } + m := make(map[string]*ent.LinePoint, len(pts)) + for i := range pts { + m[pts[i].PointNo] = pts[i] + } + var sensors []bool + if !s.ctx.PLC.IsMock() { + sensors, _ = s.ctx.PLC.ReadBitsCached(ctx) // 读失败不阻断:退化为仅台账口径 + } + return &lineOccupancy{byPointNo: m, sensors: sensors}, nil +} + +// truncateTarget 动态目标截断核心: +// 给定工件源(srcPt)、最终目标工位(finalStation)与主线占用图,返回本次应下发的目标。 +// +// 返回 (tgtType, tgtNo, reach, why): +// - tgtType=SrcStation 且 tgtNo=finalStation:路径全清,直达最终工位; +// - tgtType=SrcMain 且 tgtNo=缓存位编号:前方被占,截断到占用点之前最近的空闲 CACHE 位; +// - reach=false:无可达路径 / 前方被占且之前无空闲缓存位 → 滞留原地。 +// +// 路径定义:沿主线从源出料停靠位(含)到目标工位停靠位(含)之间的 C 位区间,单向从小到大。 +// 目标工位停靠位是"到达即顶升进工位",本身不缓存 → 它只作为终点判定,不作为截断落点。 +func (s *Service) truncateTarget(ctx context.Context, o *lineOccupancy, srcType plc.SrcType, srcNo, finalStation int) (plc.SrcType, int, bool, string) { + startC := 0 + if srcType == plc.SrcMain { + startC = srcNo + } else { + startC = stationOutMainC[srcNo] + } + endC := stationOutMainC[finalStation] + if startC <= 0 || endC <= 0 { + return "", 0, false, "源或目标工位无主线出料停靠位映射" + } + if endC <= startC { + return "", 0, false, "目标停靠位不在此工位下游(同工位/虚拟工位),不走滚筒线截断" + } + + // 路径上第一个被占主线位(起点自身排除;终点停靠位单独判)。 + firstBlocked := 0 + for c := startC + 1; c < endC; c++ { + if !o.cFree(c) { + firstBlocked = c + break + } + } + if !o.cFree(endC) { + firstBlocked = endC + } + if firstBlocked == 0 { + return plc.SrcStation, finalStation, true, "路径全清,直达最终工位" + } + + // 前方被占 → 截断到 firstBlocked 之前最近的空闲 CACHE 位(> startC,且 §4.4 可达)。 + for c := firstBlocked - 1; c > startC; c-- { + if !cacheMainC[c] || !o.cFree(c) { + continue + } + if _, _, ok := plc.LookupRoute(srcType, srcNo, c, plc.SrcMain); ok { + return plc.SrcMain, c, true, "前方 C" + strconv.Itoa(firstBlocked) + " 被占,截断到缓存位 C" + strconv.Itoa(c) + } + } + return "", 0, false, "前方 C" + strconv.Itoa(firstBlocked) + " 被占,且之前无可达空闲缓存位,滞留原地" +} + +// flowDispatch 统一"下发路由 + 标记在途"入口(替代旧的"下发即落实台账")。 +// +// 写 MW 成功后不立即改台账、不更新 atStationNo——工件进入 IN_TRANSIT, +// 等 confirmInTransit 读到 MW=0 才落实(台账始终反映物理真实)。 +// 返回 (mode, mw, value, ok)。 +func (s *Service) flowDispatch(ctx context.Context, wp *ent.Workpiece, sn, operator string, + srcType plc.SrcType, srcNo int, tgtType plc.SrcType, tgtNo int) (string, int, int, bool) { + mw, value, ok := plc.LookupRoute(srcType, srcNo, tgtNo, tgtType) + if !ok { + return "", 0, 0, false + } + mode := flowModePLC + writeOK := true + if s.ctx.PLC.IsMock() { + mode = flowModeMock + } else if err := s.ctx.PLC.Get().WriteMW(ctx, mw, value); err != nil { + // PLC 不可达:写失败 → 不标记在途,降级为纯台账闭环(沿用旧口径),避免件永久卡在途。 + mode = flowModeLedger + writeOK = false + } + // mock 模式:写 MW 不会自动清零,直接"下发即到位"落实台账,不进 IN_TRANSIT。 + if s.ctx.PLC.IsMock() { + s.settleDirect(ctx, wp, sn, operator, string(tgtType)+strconv.Itoa(tgtNo)) + return mode, mw, value, true + } + if !writeOK { + // 真实 PLC 写失败:纯台账闭环,直接落实(不留在途)。 + s.settleDirect(ctx, wp, sn, operator, string(tgtType)+strconv.Itoa(tgtNo)) + return mode, mw, value, true + } + now := time.Now() + target := string(tgtType) + strconv.Itoa(tgtNo) + _, err := s.ctx.EntClient.Workpiece.UpdateOneID(wp.ID). + SetFlowTransitMW(mw).SetFlowTransitTarget(target).SetFlowTransitAt(now).Save(ctx) + if err != nil { + // 标记失败:PLC 已下发但台账未记在途——落预警提示人工核对(不自动重发)。 + s.ctx.EventLog.Write(ctx, "workpiece.flow.transit_mark_fail", wp.OrderNo, operator, "workpiece", sn, + fmt.Sprintf("MW%d=%d 已下发但在途标记失败,请人工核对:%v", mw, value, err), + map[string]any{"sn": sn, "mw": mw, "value": value}) + } + return mode, mw, value, true +} + +// settleDirect 模拟闭环下"下发即到位":源 OUT / 目标 IN / 更新 atStationNo,清任何在途标记。 +func (s *Service) settleDirect(ctx context.Context, wp *ent.Workpiece, sn, operator, target string) { + if srcPt, err := s.ctx.EntClient.LinePoint.Query(). + Where(linepoint.Occupied(true), linepoint.CurrentSnEQ(sn)).First(ctx); err == nil && srcPt != nil { + _ = s.OccupyPoint(ctx, srcPt.PointNo, sn, wp.OrderNo, operator, "OUT") + } + if tgtPt, err := s.ctx.EntClient.LinePoint.Query().Where(linepoint.PointNoEQ(target)).First(ctx); err == nil && tgtPt != nil { + _ = s.OccupyPoint(ctx, target, sn, wp.OrderNo, operator, "IN") + } + atStation := 0 + if strings.HasPrefix(target, "G") { + atStation, _ = strconv.Atoi(strings.TrimPrefix(target, "G")) + } + _, _ = s.ctx.EntClient.Workpiece.UpdateOneID(wp.ID).SetAtStationNo(atStation). + SetFlowTransitMW(0).SetFlowTransitTarget("").ClearFlowTransitAt().Save(ctx) +} + +// confirmInTransit 到位确认:对全部 IN_TRANSIT 工件读对应 MW(穿透缓存), +// 读到 0(PLC 已把托盘送达并清零)→ 清在途标记 + 落实台账(源 OUT/目标 IN/atStationNo); +// 超时未到位 → 落预警,保持 IN_TRANSIT 转人工。工位传感器不参与。 +func (s *Service) confirmInTransit(ctx context.Context, operator string) []string { + wps, err := s.ctx.EntClient.Workpiece.Query().Where(workpiece.FlowTransitMWGT(0)).All(ctx) + if err != nil || len(wps) == 0 { + return nil + } + confirmed := make([]string, 0, len(wps)) + now := time.Now() + for _, wp := range wps { + val, rerr := s.ctx.PLC.Get().ReadMW(ctx, wp.FlowTransitMW) + if rerr != nil { + continue + } + if val != 0 { + if wp.FlowTransitAt != nil && now.Sub(*wp.FlowTransitAt) > time.Duration(flowTransitTimeoutMs)*time.Millisecond { + s.alertFlowTransitTimeout(ctx, wp) + } + continue + } + if err := s.settleInTransit(ctx, wp, operator); err == nil { + confirmed = append(confirmed, wp.Sn) + } + } + return confirmed +} + +// settleInTransit 到位后台账落定:清在途标记,源 OUT、目标 IN、更新 atStationNo。 +func (s *Service) settleInTransit(ctx context.Context, wp *ent.Workpiece, operator string) error { + target := strings.TrimSpace(wp.FlowTransitTarget) + mw := wp.FlowTransitMW + if target == "" { + _, err := s.ctx.EntClient.Workpiece.UpdateOneID(wp.ID). + SetFlowTransitMW(0).SetFlowTransitTarget("").ClearFlowTransitAt().Save(ctx) + return err + } + if srcPt, err := s.ctx.EntClient.LinePoint.Query(). + Where(linepoint.Occupied(true), linepoint.CurrentSnEQ(wp.Sn)).First(ctx); err == nil && srcPt != nil { + _ = s.OccupyPoint(ctx, srcPt.PointNo, wp.Sn, wp.OrderNo, operator, "OUT") + } + if tgtPt, err := s.ctx.EntClient.LinePoint.Query().Where(linepoint.PointNoEQ(target)).First(ctx); err == nil && tgtPt != nil { + _ = s.OccupyPoint(ctx, target, wp.Sn, wp.OrderNo, operator, "IN") + } + atStation := 0 + if strings.HasPrefix(target, "G") { + atStation, _ = strconv.Atoi(strings.TrimPrefix(target, "G")) + } + _, err := s.ctx.EntClient.Workpiece.UpdateOneID(wp.ID). + SetAtStationNo(atStation). + SetFlowTransitMW(0).SetFlowTransitTarget("").ClearFlowTransitAt().Save(ctx) + if err == nil { + s.ctx.EventLog.Write(ctx, "workpiece.flow.arrive", wp.OrderNo, operator, "workpiece", wp.Sn, + fmt.Sprintf("在途到位确认:MW%d 读到 0,托盘已到 %s,台账落定", mw, target), + map[string]any{"sn": wp.Sn, "mw": mw, "target": target}) + s.notifyDashboard() + } + return err +} + +// alertFlowTransitTimeout 在途超时预警(同 SN 未读去重)。 +func (s *Service) alertFlowTransitTimeout(ctx context.Context, wp *ent.Workpiece) { + has, err := s.ctx.EntClient.Alert.Query(). + Where(alert.RefTypeEQ("flow_transit_timeout"), alert.RefIdEQ(wp.Sn), alert.StatusEQ("UNREAD")).Exist(ctx) + if err != nil || has { + return + } + msg := fmt.Sprintf("工件 %s 的在途指令 MW%d 超过 %d 秒仍未读到 0(目标 %s),请检查 PLC 物理动作或到 PLC 管理页强制清零。", + wp.Sn, wp.FlowTransitMW, flowTransitTimeoutMs/1000, wp.FlowTransitTarget) + _, _ = s.ctx.EntClient.Alert.Create(). + SetRuleId(0).SetType("line_cache_full").SetLevel("warning"). + SetTarget(wp.FlowTransitTarget).SetTitle(truncateUTF8(msg, 255)).SetContent(truncateUTF8(msg, 500)). + SetRefType("flow_transit_timeout").SetRefId(wp.Sn).SetStatus("UNREAD").Save(ctx) +} diff --git a/bj_power_mes/internal/logic/plc_monitor.go b/bj_power_mes/internal/logic/plc_monitor.go index a391dfb..f5151b3 100644 --- a/bj_power_mes/internal/logic/plc_monitor.go +++ b/bj_power_mes/internal/logic/plc_monitor.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "strconv" + "strings" "time" "bj_power_mes/ent" @@ -61,8 +62,9 @@ type ManualWriteReq struct { // 2026-11-17:PLC 断电时 tcp.go 持锁拨号 ctx 打断不了,裸读会挂满 10s 被 go-zero slowcall // 掐成 503。改走 plcHardCut(2.5s fail-open),超时返回明确错误而非拖垮页面。 func (s *Service) PlcMonitorBits(ctx context.Context) (*BitsGroup, error) { + // 2026-11-19:走 2s TTL + singleflight 缓存,多路监控/看板读取合并为一次真读(写 MW 后自动失效)。 bits, err := plcHardCut(ctx, 2500*time.Millisecond, func(c context.Context) ([]bool, error) { - return s.ctx.PLC.Get().ReadBits(c) + return s.ctx.PLC.ReadBitsCached(c) }) if err != nil { return nil, fmt.Errorf("读取 PLC 点位失败:2.5 秒内未读到数据,PLC 可能断电或网络不通。请确认 PLC 已上电、网线连接正常后再刷新(%v)", err) @@ -89,14 +91,31 @@ func bitAt(bits []bool, i int) bool { } // PlcMonitorMW 读取 §4.4 路由表全部 MW 地址当前值并解析(非0 即在途指令)。 +// 2026-11-19 修正:原逐地址 ReadMW 会产生 2×45 次 S7 事务,在 2.5s 快照预算内 +// 读不完(日志实证 MW822 起成片 deadline exceeded),且高频事务是 PLC 主动断链的 +// 诱因之一。改为一次 ReadMWBlock 批量读 MW800..MW887(覆盖全部路由地址), +// 与看板 buildPoints 同口径,单事务完成,耗时从 >2.5s 降到 <50ms。 func (s *Service) PlcMonitorMW(ctx context.Context) ([]MWState, error) { + const ( + mwStart = 800 + mwCount = 88 // MW800..MW887,覆盖 mwRoutes 最大地址 886 + ) + vals, err := plcHardCut(ctx, 2500*time.Millisecond, func(c context.Context) ([]int, error) { + return s.ctx.PLC.ReadMWBlock(c, mwStart, mwCount) + }) + if err != nil { + return nil, err + } + valAt := func(addr int) int { + if i := addr - mwStart; i >= 0 && i < len(vals) { + return vals[i] + } + return 0 + } addrs := plc.AllRouteAddrs() out := make([]MWState, 0, len(addrs)) for _, addr := range addrs { - val, err := s.ctx.PLC.Get().ReadMW(ctx, addr) - if err != nil { - return nil, err - } + val := valAt(addr) st := MWState{Addr: addr, Value: val, InTransit: val != 0} if cat, ok := plc.MWCategory(addr); ok { st.Category = string(cat) @@ -197,11 +216,24 @@ func (s *Service) PlcMonitorClearInTransit(ctx context.Context, req ClearInTrans if err := s.ctx.PLC.Get().WriteMW(ctx, req.Addr, 0); err != nil { return nil, err } + // 2026-11-19 智能跟车联动:强制清零 = 该在途指令作废。清掉对应工件的 IN_TRANSIT 标记, + // 使其不再被"在途闭锁"卡死;台账位置不自动改(指令作废后工件实际位置未知,交由人工纠正)。 + clearedSNs := make([]string, 0, 2) + if wps, werr := s.ctx.EntClient.Workpiece.Query().Where(workpiece.FlowTransitMWEQ(req.Addr)).All(ctx); werr == nil { + for _, wp := range wps { + _, _ = s.ctx.EntClient.Workpiece.UpdateOneID(wp.ID). + SetFlowTransitMW(0).SetFlowTransitTarget("").ClearFlowTransitAt().Save(ctx) + clearedSNs = append(clearedSNs, wp.Sn) + } + } obj := "MW" + strconv.Itoa(req.Addr) desc := "强制清零在途指令:" + obj + " " + strconv.Itoa(before) + " → 0" if srcType, tgtType, src, tgt, ok := plc.ParseMW(req.Addr, before); ok { desc += "(" + string(srcType) + strconv.Itoa(src) + " → " + string(tgtType) + strconv.Itoa(tgt) + ")" } + if len(clearedSNs) > 0 { + desc += ";已解除在途闭锁的工件:" + strings.Join(clearedSNs, ",") + "(台账位置请人工核对)" + } s.ctx.EventLog.Write(ctx, "plc_in_transit_clear", "", operator, "plc", obj, desc, map[string]any{ diff --git a/bj_power_mes/internal/netutil/localip.go b/bj_power_mes/internal/netutil/localip.go index 2d9f562..424528e 100644 --- a/bj_power_mes/internal/netutil/localip.go +++ b/bj_power_mes/internal/netutil/localip.go @@ -35,6 +35,32 @@ func LocalIP() string { return "" } +// LocalIPFor 返回"若要连接 target,本机出口会用的源 IP"——确切反映实际走哪块网卡。 +// +// 原理:net.Dial("udp", target) 不发包(UDP 无连接),但内核会按路由表选出到该目标的 +// 出接口与源地址,conn.LocalAddr() 即结果。它与真实 TCP 连接共用同一张路由表,因此比 +// "枚举网卡取第一个非环回地址"更确切——多网卡(含 169.254 APIPA、虚拟网卡)机器上, +// 前者会选错,后者给出的就是真正用来连目标的 IP。 +// +// target 形如 "192.168.22.20:102";取不到(参数非法/无路由)时返回空串,调用方自行回退。 +func LocalIPFor(target string) string { + if target == "" { + return "" + } + conn, err := net.Dial("udp", target) + if err != nil { + return "" + } + defer conn.Close() + if udpAddr, ok := conn.LocalAddr().(*net.UDPAddr); ok { + if v4 := udpAddr.IP.To4(); v4 != nil { + return v4.String() + } + return udpAddr.IP.String() + } + return "" +} + func firstNonLoopbackIPv4() string { addrs, err := net.InterfaceAddrs() if err != nil { diff --git a/bj_power_mes/internal/plc/logging.go b/bj_power_mes/internal/plc/logging.go index f96a54b..cd61160 100644 --- a/bj_power_mes/internal/plc/logging.go +++ b/bj_power_mes/internal/plc/logging.go @@ -12,21 +12,33 @@ import ( "github.com/zeromicro/go-zero/core/logx" ) -// commTag 本机 IP 前缀(进程启动解析一次),断网排查时可一眼看出日志来自哪台机器。 -var commTag = netutil.Tag() - // logClient 日志装饰器:inner 为真实实现(s7Real / tcpClient / mock)。 -type logClient struct{ inner Client } +// tag 为"[host=本机出口IP]",按实际连接 PLC 的目标地址做路由探测得出——多网卡机器上 +// 它精确指出"连 PLC 走的是哪块网卡的 IP",断网排查时不再被 APIPA 虚拟地址误导。 +type logClient struct { + inner Client + tag string +} -func newLogClient(inner Client) *logClient { return &logClient{inner: inner} } +// newLogClient 按 PLC 目标地址解析本机出口 IP。target 形如 "192.168.22.20:102"; +// 探测不到(如纯 mock 无目标)时回退到通用 netutil.Tag()。进程构造期算一次,不逐请求枚举。 +func newLogClient(inner Client, target string) *logClient { + tag := netutil.Tag() + if target != "" { + if ip := netutil.LocalIPFor(target); ip != "" { + tag = "[host=" + ip + "]" + } + } + return &logClient{inner: inner, tag: tag} +} func (l *logClient) SendProcessCode(ctx context.Context, combination string) ([]int, error) { - logx.WithContext(ctx).Infof("[PLC]"+commTag+" --> SendProcessCode combination=%s", combination) + logx.WithContext(ctx).Infof("[PLC]"+l.tag+" --> SendProcessCode combination=%s", combination) codes, err := l.inner.SendProcessCode(ctx, combination) if err != nil { - logx.WithContext(ctx).Errorf("[PLC]"+commTag+" <-- SendProcessCode err=%v", err) + logx.WithContext(ctx).Errorf("[PLC]"+l.tag+" <-- SendProcessCode err=%v", err) } else { - logx.WithContext(ctx).Infof("[PLC]"+commTag+" <-- SendProcessCode codes=%v", codes) + logx.WithContext(ctx).Infof("[PLC]"+l.tag+" <-- SendProcessCode codes=%v", codes) } return codes, err } @@ -34,24 +46,24 @@ func (l *logClient) SendProcessCode(ctx context.Context, combination string) ([] func (l *logClient) QueryDone(ctx context.Context) (bool, error) { done, err := l.inner.QueryDone(ctx) if err != nil { - logx.WithContext(ctx).Errorf("[PLC]"+commTag+" <-- QueryDone err=%v", err) + logx.WithContext(ctx).Errorf("[PLC]"+l.tag+" <-- QueryDone err=%v", err) } else { - logx.WithContext(ctx).Infof("[PLC]"+commTag+" <-- QueryDone done=%v", done) + logx.WithContext(ctx).Infof("[PLC]"+l.tag+" <-- QueryDone done=%v", done) } return done, err } func (l *logClient) AckDone(ctx context.Context, ok bool) { - logx.WithContext(ctx).Infof("[PLC]"+commTag+" AckDone ok=%v", ok) + logx.WithContext(ctx).Infof("[PLC]"+l.tag+" AckDone ok=%v", ok) l.inner.AckDone(ctx, ok) } func (l *logClient) QueryDockPallet(ctx context.Context, dockCode string) (bool, error) { has, err := l.inner.QueryDockPallet(ctx, dockCode) if err != nil { - logx.WithContext(ctx).Errorf("[PLC]"+commTag+" <-- QueryDockPallet dock=%s err=%v", dockCode, err) + logx.WithContext(ctx).Errorf("[PLC]"+l.tag+" <-- QueryDockPallet dock=%s err=%v", dockCode, err) } else { - logx.WithContext(ctx).Infof("[PLC]"+commTag+" <-- QueryDockPallet dock=%s hasPallet=%v", dockCode, has) + logx.WithContext(ctx).Infof("[PLC]"+l.tag+" <-- QueryDockPallet dock=%s hasPallet=%v", dockCode, has) } return has, err } @@ -59,9 +71,9 @@ func (l *logClient) QueryDockPallet(ctx context.Context, dockCode string) (bool, func (l *logClient) QueryStationPallet(ctx context.Context, stationNo int) (bool, error) { has, err := l.inner.QueryStationPallet(ctx, stationNo) if err != nil { - logx.WithContext(ctx).Errorf("[PLC]"+commTag+" <-- QueryStationPallet station=%d err=%v", stationNo, err) + logx.WithContext(ctx).Errorf("[PLC]"+l.tag+" <-- QueryStationPallet station=%d err=%v", stationNo, err) } else { - logx.WithContext(ctx).Infof("[PLC]"+commTag+" <-- QueryStationPallet station=%d hasPallet=%v", stationNo, has) + logx.WithContext(ctx).Infof("[PLC]"+l.tag+" <-- QueryStationPallet station=%d hasPallet=%v", stationNo, has) } return has, err } @@ -69,7 +81,7 @@ func (l *logClient) QueryStationPallet(ctx context.Context, stationNo int) (bool func (l *logClient) ReadBits(ctx context.Context) ([]bool, error) { bits, err := l.inner.ReadBits(ctx) if err != nil { - logx.WithContext(ctx).Errorf("[PLC]"+commTag+" <-- ReadBits err=%v", err) + logx.WithContext(ctx).Errorf("[PLC]"+l.tag+" <-- ReadBits err=%v", err) } else { // 48 位压成 0/1 字符串,一行可读 s := make([]byte, len(bits)) @@ -80,7 +92,7 @@ func (l *logClient) ReadBits(ctx context.Context) ([]bool, error) { s[i] = '0' } } - logx.WithContext(ctx).Infof("[PLC]"+commTag+" <-- ReadBits bits=%s", string(s)) + logx.WithContext(ctx).Infof("[PLC]"+l.tag+" <-- ReadBits bits=%s", string(s)) } return bits, err } @@ -88,9 +100,9 @@ func (l *logClient) ReadBits(ctx context.Context) ([]bool, error) { func (l *logClient) ReadMW(ctx context.Context, addr int) (int, error) { v, err := l.inner.ReadMW(ctx, addr) if err != nil { - logx.WithContext(ctx).Errorf("[PLC]"+commTag+" <-- ReadMW MW%d err=%v", addr, err) + logx.WithContext(ctx).Errorf("[PLC]"+l.tag+" <-- ReadMW MW%d err=%v", addr, err) } else { - logx.WithContext(ctx).Infof("[PLC]"+commTag+" <-- ReadMW MW%d=%d", addr, v) + logx.WithContext(ctx).Infof("[PLC]"+l.tag+" <-- ReadMW MW%d=%d", addr, v) } return v, err } @@ -98,18 +110,18 @@ func (l *logClient) ReadMW(ctx context.Context, addr int) (int, error) { func (l *logClient) ReadMWBlock(ctx context.Context, start, count int) ([]int, error) { vals, err := l.inner.ReadMWBlock(ctx, start, count) if err != nil { - logx.WithContext(ctx).Errorf("[PLC]"+commTag+" <-- ReadMWBlock MW%d..MW%d err=%v", start, start+count-1, err) + logx.WithContext(ctx).Errorf("[PLC]"+l.tag+" <-- ReadMWBlock MW%d..MW%d err=%v", start, start+count-1, err) } else { - logx.WithContext(ctx).Infof("[PLC]"+commTag+" <-- ReadMWBlock MW%d..MW%d vals=%v", start, start+count-1, vals) + logx.WithContext(ctx).Infof("[PLC]"+l.tag+" <-- ReadMWBlock MW%d..MW%d vals=%v", start, start+count-1, vals) } return vals, err } func (l *logClient) WriteMW(ctx context.Context, addr, value int) error { - logx.WithContext(ctx).Infof("[PLC]"+commTag+" --> WriteMW MW%d=%d", addr, value) + logx.WithContext(ctx).Infof("[PLC]"+l.tag+" --> WriteMW MW%d=%d", addr, value) err := l.inner.WriteMW(ctx, addr, value) if err != nil { - logx.WithContext(ctx).Errorf("[PLC]"+commTag+" <-- WriteMW MW%d=%d err=%v", addr, value, err) + logx.WithContext(ctx).Errorf("[PLC]"+l.tag+" <-- WriteMW MW%d=%d err=%v", addr, value, err) } return err } diff --git a/bj_power_mes/internal/plc/plc.go b/bj_power_mes/internal/plc/plc.go index cf0e831..8e86ffc 100644 --- a/bj_power_mes/internal/plc/plc.go +++ b/bj_power_mes/internal/plc/plc.go @@ -3,6 +3,7 @@ package plc import ( "context" "errors" + "net" "strconv" "strings" "sync" @@ -46,6 +47,10 @@ type Client interface { WriteMW(ctx context.Context, addr, value int) error } +// plcSnapshotTTL 48 位快照缓存有效期(2026-11-19 智能跟车): +// 2 秒内对 PLC 的多次全量读合并为一次;写 MW 后立即失效重建,兼顾负载与实时性。 +const plcSnapshotTTL = 2 * time.Second + // Manager 管理 PLC 客户端实例 type Manager struct { client Client @@ -54,15 +59,18 @@ type Manager struct { onFail func(ctx context.Context, err error) // 2026-11-16:连续失败首次沿触发(通信异常预警),恢复后重置 mu sync.Mutex consecFails int - mockOffline bool // mock 模式:模拟 PLC 离线(拍板2 联调/自测用,真实 PLC 忽略) + mockOffline bool // mock 模式:模拟 PLC 离线(拍板2 联调/自测用,真实 PLC 忽略) + snap *snapshotCache // 48 位快照缓存(读合并 + 写失效) } func NewManager(c config.PlcConf, mock bool) (*Manager, error) { - m := &Manager{mock: mock} + m := &Manager{mock: mock, snap: newSnapshotCache(plcSnapshotTTL)} + // 日志前缀按实际连接目标做路由探测,精确显示连 PLC 走的是哪块网卡的 IP。 + target := net.JoinHostPort(c.Host, strconv.Itoa(c.Port)) if mock { - m.client = newLogClient(newMockClient()) + m.client = newLogClient(newMockClient(), target) } else { - m.client = newLogClient(newTcpClient(c)) + m.client = newLogClient(newTcpClient(c), target) } return m, nil } @@ -103,13 +111,20 @@ func (m *Manager) QueryStationPallet(ctx context.Context, stationNo int) (bool, return v, err } -// ReadBits 读 48 位点位信号(带恢复检测)。 +// ReadBits 读 48 位点位信号(带恢复检测,穿透缓存,实时)。 func (m *Manager) ReadBits(ctx context.Context) ([]bool, error) { v, err := m.client.ReadBits(ctx) m.track(err) return v, err } +// ReadBitsCached 读 48 位快照(2 秒 TTL + singleflight 合并 + 写失效)。 +// 看板/监控/流转引擎的"看一眼全量点位"走这里,避免高频轮询打死 PLC; +// 进站、到位等精细业务确认必须走 ReadBits/ReadMW 穿透,拿实时值。 +func (m *Manager) ReadBitsCached(ctx context.Context) ([]bool, error) { + return m.snap.get(ctx, m.ReadBits) +} + // ReadMW 读 16 位寄存器(带恢复检测)。 func (m *Manager) ReadMW(ctx context.Context, addr int) (int, error) { v, err := m.client.ReadMW(ctx, addr) @@ -125,8 +140,13 @@ func (m *Manager) ReadMWBlock(ctx context.Context, start, count int) ([]int, err } // WriteMW 写 16 位寄存器(带恢复检测)。 +// 2026-11-19:写入成功后立即失效 48 位快照——下一条指令/判定读到的是下发后的真实物理状态, +// 杜绝"下发了却仍吃 2 秒前旧缓存"造成误判(用户拍板的写即失效兜底)。写失败不失效(状态未变)。 func (m *Manager) WriteMW(ctx context.Context, addr, value int) error { err := m.client.WriteMW(ctx, addr, value) + if err == nil { + m.snap.invalidate() + } m.track(err) return err } @@ -203,4 +223,4 @@ func parseCombination(s string) []int { // Sleep 简化轮询间隔(供 logic 使用) func Sleep(d time.Duration) { time.Sleep(d) -} \ No newline at end of file +} diff --git a/bj_power_mes/internal/plc/snapshot_cache.go b/bj_power_mes/internal/plc/snapshot_cache.go new file mode 100644 index 0000000..0c35a74 --- /dev/null +++ b/bj_power_mes/internal/plc/snapshot_cache.go @@ -0,0 +1,89 @@ +package plc + +import ( + "context" + "sync" + "time" +) + +// bitsSnapshot 一次 48 位点位快照(MB895~MB902)。 +// 全程只存副本,调用方改动不影响缓存。 +type bitsSnapshot struct { + bits []bool + at time.Time +} + +// snapshotCache 全局单例的 PLC 48 位快照缓存(2026-11-19 智能跟车)。 +// +// 目的:看板 SSE / PLC 监控 WS / 流转引擎 每轮都要读一次全量点位。多网卡、高频轮询 +// 叠加时若不合并,会在 2 秒内对同一条 S7 连接打多次读事务。这里做两件事: +// 1. TTL:snapshotTTL 内的重复读直接返回同一份快照,不碰 PLC; +// 2. singleflight:TTL 过期瞬间并发的 N 个读,只放 1 个真读打 PLC,其余等结果; +// 3. 写失效:任何 WriteMW 后调用 Invalidate(),立即丢弃旧快照,下次读强制重建—— +// 保证"下发指令 → 再读点位"不会因为吃了 2 秒旧缓存而误判(用户拍板的兜底)。 +// +// 业务精细确认(进站判定读单个 MW / 到位确认)不走本缓存,直接穿透PLC,实时取值。 +type snapshotCache struct { + mu sync.Mutex + ttl time.Duration + snap *bitsSnapshot + loading bool + waiters []chan struct{} +} + +func newSnapshotCache(ttl time.Duration) *snapshotCache { + return &snapshotCache{ttl: ttl} +} + +// get 取快照:命中 TTL 直接返回;并发只放一个真读(load),其余等待共享结果。 +func (c *snapshotCache) get(ctx context.Context, load func(context.Context) ([]bool, error)) ([]bool, error) { + c.mu.Lock() + if c.snap != nil && time.Since(c.snap.at) < c.ttl { + bits := append([]bool(nil), c.snap.bits...) + c.mu.Unlock() + return bits, nil + } + if c.loading { + ch := make(chan struct{}) + c.waiters = append(c.waiters, ch) + c.mu.Unlock() + select { + case <-ch: + case <-ctx.Done(): + return nil, ctx.Err() + } + c.mu.Lock() + if c.snap != nil { + bits := append([]bool(nil), c.snap.bits...) + c.mu.Unlock() + return bits, nil + } + c.mu.Unlock() + // 真读失败导致无快照,等待者各自穿透重试(不把错误缓存)。 + return load(ctx) + } + c.loading = true + c.mu.Unlock() + + bits, err := load(ctx) + + c.mu.Lock() + if err == nil { + c.snap = &bitsSnapshot{bits: append([]bool(nil), bits...), at: time.Now()} + } + c.loading = false + waiters := c.waiters + c.waiters = nil + c.mu.Unlock() + for _, ch := range waiters { + close(ch) + } + return bits, err +} + +// invalidate 让缓存立即过期(写 MW 后调用):丢弃快照,下次 get 强制真读重建。 +func (c *snapshotCache) invalidate() { + c.mu.Lock() + c.snap = nil + c.mu.Unlock() +} diff --git a/bj_power_mes/internal/plc/tcp.go b/bj_power_mes/internal/plc/tcp.go index e20c153..075aae5 100644 --- a/bj_power_mes/internal/plc/tcp.go +++ b/bj_power_mes/internal/plc/tcp.go @@ -27,64 +27,76 @@ import ( const ( plcBlockStartByte = 895 plcBlockBytes = 8 - plcReadTimeout = 30 * time.Second + // plcOpTimeout 单次 S7 网络操作的硬上限(拨号 + 一次读/写事务的收尾)。 + // 2026-11-19 修正:原值 30s 与上层 plcHardCut 2.5s 严重错配——gos7 的 Send 用 + // conn.SetDeadline(lastActivity+Timeout) 做读超时,30s 内不返回的读会把事务层 + // 的串行闸一直占住;上层虽已 2.5s 硬切返回,底层 goroutine 仍在拨号/读,后续 + // 每轮轮询全部堵在闸上 → 日志里成片 context deadline exceeded。现场实测正常 + // 单次读 <50ms(诊断工具 17ms 建连),1.5s 已是极宽裕的容错,断电时也能Quick fail。 + plcOpTimeout = 1500 * time.Millisecond ) // s7Real 真实西门子 S7 客户端(gos7),持有一条长连接,断线惰性重连。 +// +// 并发模型(2026-11-19 重构,修复 PLC 强制断链 / 重连风暴): +// - gos7 的 Client 用同一个 TCPClientHandler/conn + 自增事务号收发,并非并发安全: +// 两个 goroutine 同时在一条连接上做 AGReadMB,会出现请求-响应错配、读到半包、 +// PLC 协议栈拒绝报文并主动 RST(日志里 "forcibly closed by the remote host")。 +// - 因此连接建立 + 每一次读/写事务全程在 opMu 内串行执行,任何时刻只有一条 S7 事务在途。 +// - 串行化后单事务耗时可控(<50ms),不会拖垮 3s 一轮的监控页快照 / 看板 SSE。 type s7Real struct { c config.PlcConf handler *gos7.TCPClientHandler client gos7.Client - mu sync.Mutex + opMu sync.Mutex // 串行闸:连接 + 单次事务全程持有,保证 gos7 单连接不被并发访问 } func newS7Real(c config.PlcConf) *s7Real { h := gos7.NewTCPClientHandler(c.Host, c.Rack, c.Slot) - h.Timeout = plcReadTimeout + h.Timeout = plcOpTimeout return &s7Real{c: c, handler: h} } -// ensure 惰性连接 + 断线重连。 -func (s *s7Real) ensure() error { +// ensure 惰性连接 + 断线重连。调用方必须已持有 s.opMu。 +// 用 ConnectContext 而非 Connect:gos7 的 Connect() 内部走 context.Background(), +// 拨号不可打断;带 ctx 后上层 plcHardCut 硬切能真正取消拨号,不留后台 goroutine。 +func (s *s7Real) ensure(ctx context.Context) error { if s.client != nil { return nil } - if err := s.handler.Connect(); err != nil { + if err := s.handler.ConnectContext(ctx); err != nil { return err } s.client = gos7.NewClient(s.handler) return nil } -// readBlock 读取 48 位块(MB895..MB900)原始 6 字节。 +// run 在串行闸内执行一条 S7 事务:确保连接 → 执行 fn → 出错即断链(下轮惰性重连)。 +// 拨号阶段认 ctx(可被上层硬切取消);读/写事务阶段由 gos7 的 plcOpTimeout 兜底。 +func (s *s7Real) run(ctx context.Context, fn func(gos7.Client) error) error { + s.opMu.Lock() + defer s.opMu.Unlock() + if err := s.ensure(ctx); err != nil { + return err + } + if err := fn(s.client); err != nil { + _ = s.handler.Close() + s.client = nil + return err + } + return nil +} + +// readBlock 读取 48 位块(MB895..MB902)原始 8 字节。 func (s *s7Real) readBlock(ctx context.Context) ([]byte, error) { - s.mu.Lock() - cl := s.client - need := cl == nil - if need { - if err := s.ensure(); err != nil { - s.mu.Unlock() - return nil, err - } - cl = s.client - } - s.mu.Unlock() buf := make([]byte, plcBlockBytes) - done := make(chan error, 1) - go func() { done <- cl.AGReadMB(plcBlockStartByte, plcBlockBytes, buf) }() - select { - case <-ctx.Done(): - return nil, ctx.Err() - case err := <-done: - if err != nil { - s.mu.Lock() - _ = s.handler.Close() - s.client = nil - s.mu.Unlock() - return nil, err - } - return buf, nil + err := s.run(ctx, func(cl gos7.Client) error { + return cl.AGReadMB(plcBlockStartByte, plcBlockBytes, buf) + }) + if err != nil { + return nil, err } + return buf, nil } // readByte 读取单个 Merker 字节(用于 48 位块之外的完成信号位等)。 @@ -96,34 +108,19 @@ func (s *s7Real) readByte(ctx context.Context, byteOffset int) (byte, error) { return buf[0], nil } -// readBytes 读任意 Merker 字节区间(带惰性连接与断线重连),供 ReadMWBlock 等批量读使用。 +// readBytes 读任意 Merker 字节区间(串行闸内一次事务),供 ReadMWBlock 等批量读使用。 func (s *s7Real) readBytes(ctx context.Context, byteOffset, length int) ([]byte, error) { if byteOffset < 0 || length <= 0 { return nil, fmt.Errorf("非法读区间: offset=%d len=%d", byteOffset, length) } - s.mu.Lock() - if err := s.ensure(); err != nil { - s.mu.Unlock() + buf := make([]byte, length) + err := s.run(ctx, func(cl gos7.Client) error { + return cl.AGReadMB(byteOffset, length, buf) + }) + if err != nil { return nil, err } - cl := s.client - s.mu.Unlock() - buf := make([]byte, length) - done := make(chan error, 1) - go func() { done <- cl.AGReadMB(byteOffset, length, buf) }() - select { - case <-ctx.Done(): - return nil, ctx.Err() - case err := <-done: - if err != nil { - s.mu.Lock() - _ = s.handler.Close() - s.client = nil - s.mu.Unlock() - return nil, err - } - return buf, nil - } + return buf, nil } // bit 取块内某位(bitOffset 0..47)。 @@ -275,28 +272,9 @@ func (t *tcpClient) WriteMW(ctx context.Context, addr, value int) error { return t.real.writeBuffer(ctx, addr, buf) } -// writeBuffer 写任意 Merker 字节区间(供 WriteMW 调用),带惰性连接与断线重连。 +// writeBuffer 写任意 Merker 字节区间(供 WriteMW 调用),与读共用同一串行闸。 func (s *s7Real) writeBuffer(ctx context.Context, byteOffset int, data []byte) error { - s.mu.Lock() - if err := s.ensure(); err != nil { - s.mu.Unlock() - return err - } - cl := s.client - s.mu.Unlock() - done := make(chan error, 1) - go func() { done <- cl.AGWriteMB(byteOffset, len(data), data) }() - select { - case <-ctx.Done(): - return ctx.Err() - case err := <-done: - if err != nil { - s.mu.Lock() - _ = s.handler.Close() - s.client = nil - s.mu.Unlock() - return err - } - return nil - } + return s.run(ctx, func(cl gos7.Client) error { + return cl.AGWriteMB(byteOffset, len(data), data) + }) } diff --git a/bj_power_mes/public/index.html b/bj_power_mes/public/index.html index ab9d866..e6861ca 100644 --- a/bj_power_mes/public/index.html +++ b/bj_power_mes/public/index.html @@ -6,7 +6,7 @@ MES 产线控制 - + diff --git a/bj_power_mes/schema/agv_task.go b/bj_power_mes/schema/agv_task.go index 8062b5f..3be7fdd 100644 --- a/bj_power_mes/schema/agv_task.go +++ b/bj_power_mes/schema/agv_task.go @@ -44,6 +44,8 @@ func (AgvTask) Fields() []ent.Field { field.String("operator").Default("").MaxLen(64).Comment("下发人"), field.Int64("dispatched_at").Default(0).Comment("下发时间 unix秒"), field.Int64("arrived_at").Default(0).Comment("到位时间 unix秒"), + field.String("pending_action").Default("").MaxLen(30).Comment("挂起待办动作(2026-11-19 主控定稿,弃队列弃硬拒):CONTINUE_LIFT等举升完成→continueTask#1/WAIT_DROP_CONFIRM等人工确认放下→continueTask#2/FREE_ROBOT等末组完成→freeRobot;空=无待办;RCS报错即清+告警,系统动作超60s转预警人工重试"), + field.Int64("pending_since").Default(0).Comment("挂起动作起始时间 unix秒(60s超时告警判定基准)"), field.String("remark").Default("").MaxLen(500).Optional().Comment("备注/失败原因"), field.Int64("created_at").DefaultFunc(nowUnix).Comment("创建时间"), } diff --git a/bj_power_mes/schema/workpiece.go b/bj_power_mes/schema/workpiece.go index c816c2e..bc034aa 100644 --- a/bj_power_mes/schema/workpiece.go +++ b/bj_power_mes/schema/workpiece.go @@ -45,6 +45,12 @@ func (Workpiece) Fields() []ent.Field { field.Bool("torque_ng_pending").Default(false).Comment("拧紧扭矩不合格待人工处置标记"), field.Time("torque_ng_at").Optional().Nillable().Comment("拧紧不合格标记时间"), field.String("torque_ng_by").Optional().Nillable().MaxLen(64).Comment("拧紧不合格标记操作人"), + // 智能跟车 IN_TRANSIT(2026-11-19):下发 MW 后、读到 MW=0 确认到位前,工件处于"物理在途"。 + // 在途期间流转引擎跳过该件(绝不重复下发);确认到位后才落实 line_point 的 OUT/IN 与 atStationNo。 + // flowTransitMW=0 表示无在途;>0 为下发的目标 MW 地址。台账始终反映物理真实,不提前乐观置位。 + field.Int("flowTransitMW").Default(0).Comment("流转在途MW地址(0=无在途;>0=已下发未确认到位)"), + field.String("flowTransitTarget").Default("").MaxLen(32).Comment("流转在途目标点位编号(如 C3 / G9)"), + field.Time("flowTransitAt").Optional().Nillable().Comment("流转指令下发时刻(到位确认超时判定)"), } } diff --git a/bj_power_mes/tools/migrateonce/main.go b/bj_power_mes/tools/migrateonce/main.go index c06d8c9..64ed50b 100644 --- a/bj_power_mes/tools/migrateonce/main.go +++ b/bj_power_mes/tools/migrateonce/main.go @@ -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) } } diff --git a/bj_power_mes/tools/plcdiag/main.go b/bj_power_mes/tools/plcdiag/main.go new file mode 100644 index 0000000..ebe3da1 --- /dev/null +++ b/bj_power_mes/tools/plcdiag/main.go @@ -0,0 +1,233 @@ +// Command plcdiag 分层诊断 PLC 通讯故障,定位「ping 通但读点位失败」的真实原因。 +// +// 用法(在 bj_power_mes 根目录执行): +// +// go run ./tools/plcdiag +// go run ./tools/plcdiag -host 192.168.22.20 -port 102 -rack 0 -slot 1 -timeout 5 +// +// 诊断分四层,任一层失败即定位问题所在: +// +// [1] 本机网卡 IP —— 确认已切到与 PLC 同段(192.168.22.x) +// [2] ICMP ping —— 网络层是否可达(ping 通只证明这一层) +// [3] TCP 102 端口 —— S7 服务端口是否可达(ping 通 ≠ 端口通,最常见故障点) +// [4] S7 握手 + 读 MB895 —— 协议 / 机架槽号 / 点位映射是否正确 +package main + +import ( + "errors" + "flag" + "fmt" + "net" + "os/exec" + "runtime" + "strings" + "time" + + "bj_power_mes/internal/netutil" + "github.com/robinson/gos7" +) + +func main() { + host := flag.String("host", "192.168.22.20", "PLC IP 地址") + port := flag.Int("port", 102, "S7 TCP 端口(默认 102)") + rack := flag.Int("rack", 0, "S7 机架号(1200/300=0)") + slot := flag.Int("slot", 1, "S7 槽号(1200=1,300=2)") + sec := flag.Int("timeout", 5, "每层超时秒数(默认 5)") + flag.Parse() + + timeout := time.Duration(*sec) * time.Second + addr := net.JoinHostPort(*host, fmt.Sprintf("%d", *port)) + + fmt.Println("========================================") + fmt.Println(" PLC 通讯分层诊断工具") + fmt.Printf(" 目标 PLC: %s rack=%d slot=%d 每层超时=%ds\n", addr, *rack, *slot, *sec) + fmt.Println("========================================") + + stepLocalIP(addr) + ok2 := stepPing(*host, timeout) + ok3 := stepTCP(addr, timeout) + ok4 := stepS7(*host, *rack, *slot, timeout) + + fmt.Println() + fmt.Println("========================================") + fmt.Println(" 诊断结论") + fmt.Println("========================================") + conclusion(ok2, ok3, ok4, *host) + + fmt.Println() + fmt.Println("---------- 附:工位号越界(15)本地校验 ----------") + fmt.Println(" QueryStationPallet 合法工位号 = 1..12(G1..G12)。") + fmt.Println(" 15 越界;15 实际是主线缓存位 C15(MB898.2,逻辑位 26),不是工位。") + fmt.Println(" 该错误与网络无关,是本地参数校验:若切网后仍出现,请查是哪个页面把 15 当工位号传入。") +} + +// [1] 列出本机所有非回环 IPv4,并用内核路由探测"连 PLC 实际走的出口 IP"。 +func stepLocalIP(target string) bool { + fmt.Println("\n[1/4] 本机网卡 IPv4 + 连 PLC 实际出口 IP(内核路由探测)") + addrs, err := net.InterfaceAddrs() + if err != nil { + fmt.Println(" [FAIL] 读取本机网卡失败:", err) + return false + } + found := false + for _, a := range addrs { + ipnet, ok := a.(*net.IPNet) + if !ok || ipnet.IP.IsLoopback() { + continue + } + v4 := ipnet.IP.To4() + if v4 == nil { + continue + } + fmt.Printf(" - %s\n", v4.String()) + found = true + } + if !found { + fmt.Println(" [FAIL] 未找到任何非回环 IPv4 地址,检查网卡是否启用") + return false + } + // 让内核按路由表选出"连目标 PLC 会用的源 IP"——与真实 TCP 连接同一张路由表。 + outIP := netutil.LocalIPFor(target) + if outIP == "" { + fmt.Printf(" [WARN] 无法确定连 %s 的出口 IP(目标不可达或无路由)\n", target) + return false + } + fmt.Printf(" [出口] 连 %s 实际使用本机 IP: %s\n", target, outIP) + return true +} + +// [2] 调系统 ping 命令测 ICMP(不引入额外依赖,Windows/Linux 均可用)。 +func stepPing(host string, timeout time.Duration) bool { + fmt.Printf("\n[2/4] ICMP ping %s(网络层可达性)\n", host) + var cmd *exec.Cmd + if runtime.GOOS == "windows" { + cmd = exec.Command("ping", "-n", "2", "-w", fmt.Sprintf("%d", timeout.Milliseconds()), host) + } else { + cmd = exec.Command("ping", "-c", "2", "-W", fmt.Sprintf("%d", int(timeout.Seconds())), host) + } + out, err := cmd.CombinedOutput() + for _, line := range strings.Split(string(out), "\n") { + l := strings.TrimRight(line, "\r") + if l != "" { + fmt.Println(" |", l) + } + } + if err != nil { + fmt.Println(" [FAIL] ping 命令执行失败:", err) + return false + } + s := string(out) + if strings.Contains(s, "TTL=") || strings.Contains(s, "ttl=") || + strings.Contains(s, "0% packet loss") || strings.Contains(s, "0 packets transmitted") { + fmt.Println(" [PASS] 网络层可达(ICMP 通)") + return true + } + fmt.Println(" [WARN] 未识别到明确成功标志,请人工核对上面输出") + return false +} + +// [3] TCP 连接 S7 端口。ping 通 ≠ 102 端口通,这是最常见的故障分层。 +func stepTCP(addr string, timeout time.Duration) bool { + fmt.Printf("\n[3/4] TCP 连接 %s(S7 服务端口,关键分层)\n", addr) + start := time.Now() + conn, err := net.DialTimeout("tcp", addr, timeout) + if err != nil { + fmt.Printf(" [FAIL] %s(耗时 %s)\n", classifyNetErr(err), time.Since(start).Round(time.Millisecond)) + return false + } + defer conn.Close() + fmt.Printf(" [PASS] TCP 握手成功(耗时 %s)—— 端口可达\n", time.Since(start).Round(time.Millisecond)) + return true +} + +func classifyNetErr(err error) string { + var ne net.Error + if errors.As(err, &ne) && ne.Timeout() { + return "连接超时(timeout):多为网段不通/防火墙静默丢包 —— 重点确认本机 IP 与 PLC 是否同段" + } + low := strings.ToLower(err.Error()) + switch { + case strings.Contains(low, "connection refused"), strings.Contains(low, "connectex"), strings.Contains(low, "econnrefused"): + return "连接被拒绝(refused):主机可达但 102 端口未监听或被防火墙拒绝" + case strings.Contains(low, "no route to host"), strings.Contains(low, "network is unreachable"), + strings.Contains(low, "enetiunreach"), strings.Contains(low, "unreachable"): + return "网络不可达:路由/网段/掩码错误 —— 检查本机 IP 与子网掩码" + default: + return err.Error() + } +} + +// [4] 真正的 S7 握手 + 读 MB895..MB902 共 8 字节点位块,与生产 tcp.go 同参数同库。 +func stepS7(host string, rack, slot int, timeout time.Duration) bool { + fmt.Printf("\n[4/4] S7 协议握手 + 读 MB895..MB902(8 字节点位块)\n") + handler := gos7.NewTCPClientHandler(host, rack, slot) + handler.Timeout = timeout + if err := handler.Connect(); err != nil { + fmt.Printf(" [FAIL] S7 握手失败: %v\n", err) + fmt.Println(" → TCP 通但握手失败:核对 rack/slot(1200=0/1,300=0/2)、PLC 是否允许 PG/PC 访问") + return false + } + defer func() { _ = handler.Close() }() + client := gos7.NewClient(handler) + + buf := make([]byte, 8) + if err := client.AGReadMB(895, 8, buf); err != nil { + fmt.Printf(" [FAIL] 读 MB895 失败: %v\n", err) + fmt.Println(" → 检查 PLC 程序是否映射 MB895..MB902、以及读权限") + return false + } + fmt.Printf(" [PASS] 读块成功,原始字节(MB895..MB902): % X\n", buf) + printBits(buf) + return true +} + +func printBits(buf []byte) { + fmt.Println(" ---- 解码后的点位([1]=有件/占用,[0]=空) ----") + fmt.Println(" 工位托盘位 G1..G12:") + for i := 1; i <= 12; i++ { + fmt.Printf(" G%-2d %s\n", i, mark(rawBit(buf, i-1))) + } + fmt.Println(" 主线缓存位 C1..C15:") + for i := 1; i <= 15; i++ { + fmt.Printf(" C%-2d %s\n", i, mark(rawBit(buf, 11+i))) + } + fmt.Println(" 工位接驳台 DOCK01..DOCK20 / 库房接驳台 JBT21:") + for i := 1; i <= 20; i++ { + fmt.Printf(" DOCK%02d %s\n", i, mark(rawBit(buf, 39+i))) + } + fmt.Printf(" JBT21 %s\n", mark(rawBit(buf, 60))) +} + +func mark(on bool) string { + if on { + return "[1]" + } + return "[0]" +} + +func rawBit(buf []byte, phys int) bool { + if phys < 0 || phys >= len(buf)*8 { + return false + } + return buf[phys/8]&(1<<(phys%8)) != 0 +} + +func conclusion(ok2, ok3, ok4 bool, host string) { + switch { + case ok4: + fmt.Println(" [结论] 全链路正常:网络 / 端口 / S7 协议 / 点位读取 全部 OK。") + fmt.Println(" 之前的报错就是当时未切到 192.168.22.x 段导致,切网后已恢复。") + case ok3 && !ok4: + fmt.Println(" [结论] TCP 102 通但 S7 读失败 → 协议层问题:") + fmt.Println(" 核对 rack/slot、PLC 的 PG/PC 通信权限、MB895 点位映射。") + case ok2 && !ok3: + fmt.Printf(" [结论] ping 通但 TCP 102 不通 → 这是最常见的情况!\n") + fmt.Println(" ping 只证明 ICMP 可达,S7 走的是 TCP 102。") + fmt.Println(" 多为:未切网/不同段、防火墙拦截 102 端口、PLC 102 服务未开。") + fmt.Println(" 切到 192.168.22.108 后重跑;若仍 FAIL 请查防火墙与 PLC 端口。") + case !ok2 && ok3: + fmt.Println(" [结论] ping 不通但 TCP 通(少见):ICMP 被禁但 S7 正常,可忽略 ping。") + default: + fmt.Printf(" [结论] 网络层就不通:确认本机 IP 已切到与 %s 同段(192.168.22.x)、网线/交换机是否正常。\n", host) + } +} diff --git a/问题临时.md b/问题临时.md index cfe8ac2..704b5ef 100644 --- a/问题临时.md +++ b/问题临时.md @@ -382,6 +382,23 @@ api/v1/stations/appl…template/precheck:1 -1、 +1、“加小叹号弹说明” 怎么没有 “看图:”这个流程说明,你瞎改,描述可以有,这个图也很直观 +2、“没有这一步,工单建得再全、排产排得再好,产线也不会动” 你自己瞎编的,工位终端的上线建档 没办法 让产线动起来吗? 你自己好好捋捋,不要瞎编 +3、工位下发,能用于纠正,正常业务中的异常,人工干预让它正常流转吗? 你没详细说清楚 +4、人工派车 车辆 显示的太小了 。并且 单台车时 只显示了一个小灰点。 建议,不用显示 “车辆”两个字, 上下结构显示 AGV 33516 AGV 33517 ,还是小字显示,颜色区分。 +5、 bug,见图片。Clipboard_Screenshot.png 。“各日合计2/总数量1(要相等才能保存:可把前面排少、中后期排多” 多点几次就出现这个错误,很不合理。 + + + + +agv有流程bug,需要改东西: +当前bug现象:C01到xw --> B02 开始任务 到A4 --> C01结束任务 --> 小车去A4到位了 --> B01 去接驳他。 bug问题小车没有动 +问题分析: 去接驳台是举升模板,需要多一次 continueTask 。原因是:去A4时 小车不是举升状态。它这个B01有个举升动作,做完就又停下等命令。 如果小车本来就是举升状态 这一步就不需要 continueTask。并且需要continueTask时 还需要等他举升完成才可以(也就是等通知回调) +第二个bug:C01到jbt21 --> B02 到 xw 。 错误原因,应该是调 B01 。请看日志 +其它问题:当前代码 都是 先 enAgvSchedulingTask 再 cancelTask ,c01 b01 b02模板(见图) 都是结束以后就回去充电了,导致小车 会先跑到路上,又回去 A4 再从A4到下一个点。 现在,改模板为:cancelTask 以后,原地不动,也就是需要 上位机业务真正结束时再调用一次 (释放 AGV freeRobot) + + + +2、wms_unreachable 这个报错,太多