feat(mes): AGV挂起动作引擎 + 智能跟车流转 + PLC快照缓存(2026-11-19 主控拍板)
一、AGV 挂起动作引擎(弃显式任务队列、弃并发硬拒) - 新增 internal/logic/agv_pending.go:待发动作直接挂任务(pending_action + pending_since), CONTINUE_LIFT(举升完成→continueTask#1)/ WAIT_DROP_CONFIRM(人工确认放下→continueTask#2) / FREE_ROBOT(末组完成→freeRobot);系统动作超 60s 未触发转预警人工重试,绝不自动重发 - Client 新增 ContinueTask(RCS 2.1.2) / FreeRobot(3.1.2),仅点名释放指定车,禁止释放全部 - agv_task 增 pending_action/pending_since 字段,ent 重生成 + db.go 幂等迁移补丁 + migrateonce - 回调按 B01/B02/C01 模板编排:业务流转到位即自动放行放下、回调自动放车; 仅人工派车(MANUAL)挂 WAIT_DROP_CONFIRM;新增 /agv/confirm-drop、/agv/pending/retry - 前端 AgvManual/Agv 确认放下、挂起重试按钮与等待提示联动 二、智能跟车 + 动态目标截断流转引擎 - 新增 internal/logic/flow_engine.go:事件驱动(报工/扫码),读 48 位物理快照,从下游往上游算, 前方占用则动态截断到最近空闲缓存位;IN_TRANSIT 在途闭锁防重复下发,MW=0 才确认到位落台账; 主线占用=台账 OR 传感器,工位 G 位只认台账;在途超 5s 落预警 - workpiece 增 flow_transit_mw/target/at 字段,ent 重生成 + 迁移补丁 三、PLC 读取优化与诊断 - 新增 internal/plc/snapshot_cache.go:2s TTL + singleflight + 写失效,合并 SSE/PLC监控/流转引擎 的重复点位读取;tcp.go 读块重构、localip.go 多网卡、plcdiag 诊断工具、plc_monitor/logging 配套 四、文档与前端 - help.js 重写「工位下发」帮助:明确报工自动驱动流转 vs 下发路线码的定位、缺料/握手/撤回边界 - 案例.md 补充定稿说明;public/index.html 构建指纹更新
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user