feat: 新增 AgvPoint 点位表及客户端,支持点位编码与接驳台绑定
This commit is contained in:
@@ -9,7 +9,9 @@ import (
|
||||
"time"
|
||||
|
||||
"bj_power_mes/ent"
|
||||
"bj_power_mes/ent/agvpoint"
|
||||
"bj_power_mes/ent/agvtask"
|
||||
"bj_power_mes/ent/dock"
|
||||
"bj_power_mes/ent/materialrequest"
|
||||
|
||||
"github.com/google/uuid"
|
||||
@@ -36,6 +38,21 @@ type AgvSubmitRequest struct {
|
||||
}
|
||||
|
||||
// SubmitAgv 手动下发 AGV:按 target_dock 聚合生成任务并调 RCS。
|
||||
// AgvPointView AGV 点位视图(camelCase,与前端契约一致)。
|
||||
type AgvPointView struct {
|
||||
ID int `json:"id"`
|
||||
PositionCode string `json:"positionCode"`
|
||||
Name string `json:"name"`
|
||||
IsDock bool `json:"isDock"`
|
||||
DockID *int `json:"dockId"`
|
||||
DockCode string `json:"dockCode"`
|
||||
HasPallet bool `json:"hasPallet"`
|
||||
Enabled bool `json:"enabled"`
|
||||
CreatedAt int64 `json:"createdAt"`
|
||||
}
|
||||
|
||||
// SubmitAgv 手动下发 AGV:目标=AGV 点位编码(position_code),按点位聚合生成任务并调 RCS。
|
||||
// 防撞强校验:接驳台点位有托盘 → 拒派;纯点位(无传感器)由前端二次确认后放行。
|
||||
func (s *Service) SubmitAgv(ctx context.Context, req AgvSubmitRequest, operator string) (int, []string, error) {
|
||||
if len(req.Rows) == 0 {
|
||||
return 0, nil, errors.New("请至少选择一批待发料")
|
||||
@@ -44,6 +61,7 @@ func (s *Service) SubmitAgv(ctx context.Context, req AgvSubmitRequest, operator
|
||||
if source == "" {
|
||||
source = "DOCK21"
|
||||
}
|
||||
// 目标字段复用语义为 AGV 点位编码(position_code)
|
||||
groups := map[string][]AgvSubmitRow{}
|
||||
for _, row := range req.Rows {
|
||||
if row.TargetDock == "" {
|
||||
@@ -52,17 +70,64 @@ func (s *Service) SubmitAgv(ctx context.Context, req AgvSubmitRequest, operator
|
||||
groups[row.TargetDock] = append(groups[row.TargetDock], row)
|
||||
}
|
||||
if len(groups) == 0 {
|
||||
return 0, nil, errors.New("所选料行缺少目标接驳台(targetDock)")
|
||||
return 0, nil, errors.New("所选料行缺少目标点位(targetDock)")
|
||||
}
|
||||
// 解析点位:硬件映射 + 防撞强校验(接驳台点位有托盘拒派)
|
||||
type resolved struct {
|
||||
phys string // 送往 RCS 的物理目标(接驳台点位=dockCode;纯点位=position_code)
|
||||
}
|
||||
resolvedMap := map[string]resolved{}
|
||||
var collide, unknown []string
|
||||
for target := range groups {
|
||||
pt, err := s.ctx.EntClient.AgvPoint.Query().Where(agvpoint.PositionCode(target)).Only(ctx)
|
||||
if err != nil || pt == nil {
|
||||
unknown = append(unknown, target)
|
||||
continue
|
||||
}
|
||||
if !pt.Enabled {
|
||||
// 点位已停用(管理员在「产线管理」禁用)→ 硬拒:停用即「AGV 不去这个点」,不提供二次确认放行
|
||||
collide = append(collide, target)
|
||||
continue
|
||||
}
|
||||
if pt.IsDock && pt.DockID != nil {
|
||||
d, derr := s.ctx.EntClient.Dock.Get(ctx, *pt.DockID)
|
||||
if derr != nil || d == nil {
|
||||
unknown = append(unknown, target)
|
||||
continue
|
||||
}
|
||||
if d.Status == "DISABLED" {
|
||||
collide = append(collide, target) // 停用接驳台禁派(2026-11-03 断头路补全):同防撞口径拒派
|
||||
continue
|
||||
}
|
||||
if d.HasPallet {
|
||||
collide = append(collide, target) // 防撞拒派:接驳台有托盘
|
||||
continue
|
||||
}
|
||||
resolvedMap[target] = resolved{phys: d.DockCode}
|
||||
} else {
|
||||
resolvedMap[target] = resolved{phys: pt.PositionCode} // 纯点位
|
||||
}
|
||||
}
|
||||
if len(unknown) > 0 {
|
||||
return 0, unknown, fmt.Errorf("目标点位不存在:%s", strings.Join(unknown, "、"))
|
||||
}
|
||||
if len(collide) > 0 {
|
||||
return 0, collide, fmt.Errorf("目标接驳台有托盘或已停用,存在碰撞/失效风险,禁止派车:%s(请在「产线管理」清空托盘或恢复启用后重试)", strings.Join(collide, "、"))
|
||||
}
|
||||
created := 0
|
||||
failed := []string{}
|
||||
for target, rows := range groups {
|
||||
r, ok := resolvedMap[target]
|
||||
if !ok {
|
||||
failed = append(failed, target)
|
||||
continue
|
||||
}
|
||||
taskNo := "AGV" + strings.ToUpper(uuid.NewString()[:10])
|
||||
mats, _ := json.Marshal(rows)
|
||||
t, err := s.ctx.EntClient.AgvTask.Create().
|
||||
SetTaskNo(taskNo).
|
||||
SetSourceDock(source).
|
||||
SetTargetDock(target).
|
||||
SetTargetDock(r.phys).
|
||||
SetMaterialsJSON(string(mats)).
|
||||
SetStatus("PENDING").
|
||||
SetOperator(operator).
|
||||
@@ -72,7 +137,7 @@ func (s *Service) SubmitAgv(ctx context.Context, req AgvSubmitRequest, operator
|
||||
failed = append(failed, target)
|
||||
continue
|
||||
}
|
||||
if robCode, aerr := s.ctx.Agv.SubmitTask(ctx, taskNo, source, target, ""); aerr != nil {
|
||||
if robCode, aerr := s.ctx.Agv.SubmitTask(ctx, taskNo, source, r.phys, ""); aerr != nil {
|
||||
s.ctx.EntClient.AgvTask.UpdateOneID(t.ID).
|
||||
SetStatus("FAILED").SetRemark("RCS下发失败: " + aerr.Error()).Exec(ctx)
|
||||
failed = append(failed, target)
|
||||
@@ -83,12 +148,51 @@ func (s *Service) SubmitAgv(ctx context.Context, req AgvSubmitRequest, operator
|
||||
SetDispatchedAt(time.Now().Unix()).Exec(ctx)
|
||||
}
|
||||
s.ctx.EventLog.Write(ctx, "agv.dispatch", "", operator, "agv_task", taskNo,
|
||||
"下发AGV搬运 "+source+"→"+target, map[string]any{"rows": len(rows)})
|
||||
"下发AGV搬运 "+source+"→"+r.phys, map[string]any{"rows": len(rows)})
|
||||
created++
|
||||
}
|
||||
return created, failed, nil
|
||||
}
|
||||
|
||||
// ListAgvPoints 列出 AGV 点位(enabledOnly=true 仅返回启用项,供派车下拉)。
|
||||
func (s *Service) ListAgvPoints(ctx context.Context, enabledOnly bool) ([]AgvPointView, error) {
|
||||
q := s.ctx.EntClient.AgvPoint.Query()
|
||||
if enabledOnly {
|
||||
q = q.Where(agvpoint.Enabled(true))
|
||||
}
|
||||
pts, err := q.Order(agvpoint.ByPositionCode()).All(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
docks, _ := s.ctx.EntClient.Dock.Query().All(ctx)
|
||||
dockCodeByID := map[int]string{}
|
||||
dockHasPallet := map[int]bool{}
|
||||
for _, d := range docks {
|
||||
dockCodeByID[d.ID] = d.DockCode
|
||||
dockHasPallet[d.ID] = d.HasPallet
|
||||
}
|
||||
out := make([]AgvPointView, 0, len(pts))
|
||||
for _, p := range pts {
|
||||
v := AgvPointView{
|
||||
ID: p.ID, PositionCode: p.PositionCode, Name: p.Name, IsDock: p.IsDock,
|
||||
DockID: p.DockID, Enabled: p.Enabled, CreatedAt: p.CreatedAt.Unix(),
|
||||
}
|
||||
if p.DockID != nil {
|
||||
v.DockCode = dockCodeByID[*p.DockID]
|
||||
v.HasPallet = dockHasPallet[*p.DockID]
|
||||
}
|
||||
out = append(out, v)
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// UpdateAgvPoint 仅允许改 name 与 enabled(硬件映射 position_code/dock_id 不可改)。
|
||||
func (s *Service) UpdateAgvPoint(ctx context.Context, id int, name string, enabled bool) error {
|
||||
_, err := s.ctx.EntClient.AgvPoint.UpdateOneID(id).
|
||||
SetName(name).SetEnabled(enabled).Save(ctx)
|
||||
return err
|
||||
}
|
||||
|
||||
// LoadCallForDispatch 取叫料单用于派车(与 CompleteCall 同口径:仅 SHIPPED 状态可派车)。
|
||||
func (s *Service) LoadCallForDispatch(ctx context.Context, requestNo string) (*ent.MaterialRequest, error) {
|
||||
mr, err := s.ctx.EntClient.MaterialRequest.Query().
|
||||
@@ -109,6 +213,15 @@ func (s *Service) DispatchAgvForCall(ctx context.Context, mr *ent.MaterialReques
|
||||
if mr == nil || !mr.NeedAgv || mr.TargetDock == "" {
|
||||
return nil
|
||||
}
|
||||
// 目标接驳台停用禁派(2026-11-03 断头路补全):按派车失败口径落预警,由人工改派或恢复接驳台。
|
||||
if d, derr := s.ctx.EntClient.Dock.Query().Where(dock.DockCodeEQ(mr.TargetDock)).First(ctx); derr == nil && d != nil && d.Status == "DISABLED" {
|
||||
err := fmt.Errorf("目标接驳台 %s 已停用,自动派车拒绝(请恢复接驳台或人工配送)", mr.TargetDock)
|
||||
if alertErr := s.CreateAlert(ctx, "agv_dispatch_fail", "警告", mr.RequestNo,
|
||||
"叫料单 "+mr.RequestNo+" AGV 派车失败:"+err.Error()); alertErr != nil {
|
||||
fmt.Println("AGV 派车失败落预警异常:", alertErr)
|
||||
}
|
||||
return err
|
||||
}
|
||||
source := "DOCK21"
|
||||
taskNo := "AGV" + strings.ToUpper(uuid.NewString()[:10])
|
||||
row := AgvSubmitRow{
|
||||
@@ -248,6 +361,7 @@ func (s *Service) RefreshAgvTasks(ctx context.Context) (int, error) {
|
||||
upd.SetStatus("9").SetArrivedAt(time.Now().Unix())
|
||||
s.ctx.EventLog.Write(ctx, "agv.arrive", "", "", "agv_task", t.TaskNo,
|
||||
"AGV已到位 "+t.TargetDock, nil)
|
||||
s.notifyDeliveredOnArrival(ctx, t)
|
||||
case "5": // 取消完成
|
||||
upd.SetStatus("5")
|
||||
default: // 1 已创建 / 2 执行中
|
||||
@@ -283,6 +397,43 @@ func (s *Service) CancelAgvTask(ctx context.Context, taskNo, reason, operator st
|
||||
return nil
|
||||
}
|
||||
|
||||
// RetryAgvTask 重试失败/卡住的 AGV 任务:沿用原 taskNo/source/target 重新向 RCS 下发。
|
||||
// 仅允许对 FAILED 与未成功下发的 PENDING 任务重试;已结束(9/5)不可重试;目标接驳台有托盘拒派。
|
||||
func (s *Service) RetryAgvTask(ctx context.Context, taskNo, operator string) error {
|
||||
t, err := s.ctx.EntClient.AgvTask.Query().Where(agvtask.TaskNo(taskNo)).First(ctx)
|
||||
if err != nil {
|
||||
return errors.New("AGV 任务不存在")
|
||||
}
|
||||
if t.Status == "9" || t.Status == "5" {
|
||||
return errors.New("任务已结束,无法重试")
|
||||
}
|
||||
// 防撞强校验:目标接驳台点位有托盘/已停用 → 拒派(与手动派车一致)
|
||||
if t.TargetDock != "" {
|
||||
if pt, perr := s.ctx.EntClient.AgvPoint.Query().Where(agvpoint.PositionCode(t.TargetDock)).Only(ctx); perr == nil && pt != nil && pt.IsDock && pt.DockID != nil {
|
||||
if d, derr := s.ctx.EntClient.Dock.Get(ctx, *pt.DockID); derr == nil && d != nil {
|
||||
if d.HasPallet {
|
||||
return errors.New("目标接驳台有托盘,禁止重试派车")
|
||||
}
|
||||
if d.Status == "DISABLED" {
|
||||
return errors.New("目标接驳台已停用,禁止重试派车(请先在「产线管理」恢复启用)")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
robCode, aerr := s.ctx.Agv.SubmitTask(ctx, taskNo, t.SourceDock, t.TargetDock, "")
|
||||
if aerr != nil {
|
||||
s.ctx.EntClient.AgvTask.UpdateOneID(t.ID).
|
||||
SetStatus("FAILED").SetRemark("RCS重试下发失败: " + aerr.Error()).Exec(ctx)
|
||||
return fmt.Errorf("RCS 重试下发失败: %w", aerr)
|
||||
}
|
||||
s.ctx.EntClient.AgvTask.UpdateOneID(t.ID).
|
||||
SetHikTaskCode(robCode).SetStatus("1").
|
||||
SetDispatchedAt(time.Now().Unix()).SetRemark("").Exec(ctx)
|
||||
s.ctx.EventLog.Write(ctx, "agv.retry", "", operator, "agv_task", taskNo,
|
||||
"重试AGV搬运 "+t.SourceDock+"→"+t.TargetDock, nil)
|
||||
return nil
|
||||
}
|
||||
|
||||
// AgvMode 返回 AGV 对接模式(mock / 真实 RCS),供前端提示当前是否在模拟。
|
||||
func (s *Service) AgvMode() map[string]any {
|
||||
mock := s.ctx.Agv.Disable()
|
||||
@@ -330,6 +481,36 @@ func (s *Service) ApplyAgvCallback(ctx context.Context, taskCode, method string)
|
||||
if arrived {
|
||||
s.ctx.EventLog.Write(ctx, "agv.arrive", "", "", "agv_task", t.TaskNo,
|
||||
"AGV已到位(回调) "+t.TargetDock, map[string]any{"method": method})
|
||||
s.notifyDeliveredOnArrival(ctx, t)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// notifyDeliveredOnArrival AGV 到位 → 关联出库单回写「已送达」(2026-11-03 断头路补全:
|
||||
// 出库单状态机「已出库/已送达」此前无写者)。任务关联叫料单 → 叫料单上回写的 WMS 出库单号
|
||||
//(可多个逗号分隔)→ 通知 WMS 置已送达。best-effort:WMS 不可达只记日志,不阻断到位链路。
|
||||
func (s *Service) notifyDeliveredOnArrival(ctx context.Context, t *ent.AgvTask) {
|
||||
if t == nil || t.RelatedRequestNo == "" || s.ctx.Wms == nil {
|
||||
return
|
||||
}
|
||||
mr, mErr := s.ctx.EntClient.MaterialRequest.Query().
|
||||
Where(materialrequest.RequestNo(t.RelatedRequestNo)).First(ctx)
|
||||
if mErr != nil || mr == nil || mr.OutboundNo == "" {
|
||||
return
|
||||
}
|
||||
nos := []string{}
|
||||
for _, p := range strings.Split(mr.OutboundNo, ",") {
|
||||
if p = strings.TrimSpace(p); p != "" {
|
||||
nos = append(nos, p)
|
||||
}
|
||||
}
|
||||
if len(nos) == 0 {
|
||||
return
|
||||
}
|
||||
if dErr := s.ctx.Wms.DeliveredOutbound(ctx, nos); dErr != nil {
|
||||
fmt.Println("出库单回写已送达失败(可忽略):", dErr)
|
||||
return
|
||||
}
|
||||
s.ctx.EventLog.Write(ctx, "outbound.delivered", "", "AGV", "agv_task", t.TaskNo,
|
||||
"AGV到位,出库单已回写「已送达」:"+mr.OutboundNo, nil)
|
||||
}
|
||||
|
||||
@@ -477,11 +477,12 @@ func (s *Service) CreateCallOrders(ctx context.Context, stationNo int, items []C
|
||||
}
|
||||
allowCross := s.CfgInt(ctx, CfgAllowCrossDay, 1) == 1
|
||||
allowBorrow := s.CfgInt(ctx, CfgAllowBorrow, 1) == 1
|
||||
// 接驳台校验:目标接驳台必须属于该工位(一工位左L/右R 两个,真源=dock 表)
|
||||
// 接驳台校验:目标接驳台必须属于该工位(一工位左L/右R 两个,真源=dock 表);
|
||||
// 停用(DISABLED)接驳台不进候选(2026-11-03 断头路补全:此前只校验归属不校验启停,停用台仍可被叫料指向)
|
||||
dockSet := map[string]bool{}
|
||||
if dks, e := s.ctx.EntClient.Dock.Query().Where(dock.StationNo(stationNo)).All(ctx); e == nil {
|
||||
for _, d := range dks {
|
||||
if d.DockCode != "" {
|
||||
if d.DockCode != "" && d.Status != "DISABLED" {
|
||||
dockSet[d.DockCode] = true
|
||||
}
|
||||
}
|
||||
@@ -495,7 +496,7 @@ func (s *Service) CreateCallOrders(ctx context.Context, stationNo int, items []C
|
||||
return 0, errors.New("请选择目标接驳台")
|
||||
}
|
||||
if !dockSet[it.Dock] {
|
||||
return 0, errors.New("该工位无此接驳台:" + it.Dock)
|
||||
return 0, fmt.Errorf("接驳台 %s 不属于本工位或已停用,请在「产线管理」确认后重选", it.Dock)
|
||||
}
|
||||
}
|
||||
tx, terr := s.ctx.EntClient.Tx(ctx)
|
||||
|
||||
@@ -755,11 +755,13 @@ func (s *Service) buildAlarms(ctx context.Context, today time.Time) []AlarmItem
|
||||
Status: "active",
|
||||
})
|
||||
}
|
||||
// 在途未完成下发(2026-11-03 断头路收口):原统计 status=TIMEOUT 但全项目无人写入 TIMEOUT,恒为 0。
|
||||
// 改统计 SENT(已下发未收到完成信号)——超 1 条即说明产线有指令挂起,需在「工位下发」页撤回或人工完成。
|
||||
if n, err := s.ctx.EntClient.PlcSendLog.Query().
|
||||
Where(plcsendlog.Status("TIMEOUT")).Count(ctx); err == nil && n > 0 {
|
||||
Where(plcsendlog.Status("SENT")).Count(ctx); err == nil && n > 0 {
|
||||
items = append(items, AlarmItem{
|
||||
ID: "plc-timeout", Level: "critical", Type: "equipment",
|
||||
Target: "PLC", Message: "存在 PLC 下发超时 " + itoa(n) + " 条", Time: fmtDashboardTime(time.Now()),
|
||||
ID: "plc-intransit", Level: "critical", Type: "equipment",
|
||||
Target: "PLC", Message: "存在在途未完成的工位下发 " + itoa(n) + " 条,请在「工位下发」页收口", Time: fmtDashboardTime(time.Now()),
|
||||
Status: "active",
|
||||
})
|
||||
}
|
||||
|
||||
@@ -3,6 +3,8 @@ package logic
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"bj_power_mes/ent"
|
||||
@@ -97,19 +99,98 @@ func (s *Service) SendProcess(ctx context.Context, req PlcSendReq, operator stri
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
s.ctx.EventLog.Write(ctx, "plc.send", req.OrderNo, operator, "plc_send_log", req.Sn, "工位组合下发", map[string]any{"combination": combination})
|
||||
s.ctx.EventLog.Write(ctx, "plc.send", req.OrderNo, operator, "plc_send_log", req.Sn, "工位下发", map[string]any{"combination": combination})
|
||||
|
||||
// mock 完成信号:延时后置为完成(演示"未完成不下发下一条"握手)
|
||||
// mock 完成信号:延时后置为完成(演示"未完成不下发下一条"握手)。
|
||||
// 条件更新(仅 SENT 才置 DONE):若记录已被人工撤回/收口,不得被模拟信号覆盖。
|
||||
go func(id int) {
|
||||
time.Sleep(5 * time.Second)
|
||||
s.ctx.PLC.Get().AckDone(context.Background(), true)
|
||||
_, _ = s.ctx.EntClient.PlcSendLog.UpdateOneID(id).
|
||||
_, _ = s.ctx.EntClient.PlcSendLog.Update().
|
||||
Where(plcsendlog.ID(id), plcsendlog.StatusEQ("SENT")).
|
||||
SetStatus("DONE").SetDoneTime(time.Now()).SetAck(true).Save(context.Background())
|
||||
}(rec.ID)
|
||||
|
||||
return rec, nil
|
||||
}
|
||||
|
||||
// WithdrawSend 撤回下发(2026-11-03 断头路补全):把误下发的指令收回来。
|
||||
// 仅「已下发(SENT)」可撤回;已完成(DONE)/已撤回(CANCELLED) 不可撤。
|
||||
// 撤回后该条不再占用"上一条未完成不能下发下一条"的握手位,可立即重新下发正确工位码。
|
||||
func (s *Service) WithdrawSend(ctx context.Context, id int, reason, operator string) (*ent.PlcSendLog, error) {
|
||||
if id <= 0 {
|
||||
return nil, errors.New("下发记录 ID 无效")
|
||||
}
|
||||
if reason == "" {
|
||||
return nil, errors.New("撤回原因必填(写清楚为什么撤,如:选错工件/工位)")
|
||||
}
|
||||
rec, err := s.ctx.EntClient.PlcSendLog.Query().Where(plcsendlog.ID(id)).First(ctx)
|
||||
if err != nil {
|
||||
return nil, errors.New("下发记录不存在")
|
||||
}
|
||||
if rec.Status != "SENT" {
|
||||
return nil, fmt.Errorf("仅「已下发」状态可撤回(当前状态:%s)", plcSendStatusText(rec.Status))
|
||||
}
|
||||
updated, err := s.ctx.EntClient.PlcSendLog.Update().
|
||||
Where(plcsendlog.ID(id), plcsendlog.StatusEQ("SENT")).
|
||||
SetStatus("CANCELLED").SetRemark("撤回:" + reason).
|
||||
SetDoneTime(time.Now()).Save(ctx)
|
||||
if err != nil || updated == 0 {
|
||||
return nil, errors.New("撤回失败:记录状态已变化,请刷新后重试")
|
||||
}
|
||||
s.ctx.EventLog.Write(ctx, "plc.send.withdraw", rec.OrderNo, operator, "plc_send_log", rec.Sn,
|
||||
"撤回工位下发(工位"+strconv.Itoa(rec.StationNo)+"):"+reason, nil)
|
||||
return s.ctx.EntClient.PlcSendLog.Get(ctx, id)
|
||||
}
|
||||
|
||||
// ManualComplete 人工完成收口(2026-11-03 断头路补全):PLC 完成信号丢失/产线未接入时,
|
||||
// 现场确认工件实际已到位,由人工把「已下发」置为「已完成」,解除握手、放行下一条下发。
|
||||
func (s *Service) ManualComplete(ctx context.Context, id int, operator string) (*ent.PlcSendLog, error) {
|
||||
if id <= 0 {
|
||||
return nil, errors.New("下发记录 ID 无效")
|
||||
}
|
||||
rec, err := s.ctx.EntClient.PlcSendLog.Query().Where(plcsendlog.ID(id)).First(ctx)
|
||||
if err != nil {
|
||||
return nil, errors.New("下发记录不存在")
|
||||
}
|
||||
if rec.Status != "SENT" {
|
||||
return nil, fmt.Errorf("仅「已下发」状态可人工完成(当前状态:%s)", plcSendStatusText(rec.Status))
|
||||
}
|
||||
remark := "人工确认完成"
|
||||
if rec.Remark == "" {
|
||||
remark = "人工确认完成(PLC 完成信号丢失,现场确认到位)"
|
||||
}
|
||||
updated, err := s.ctx.EntClient.PlcSendLog.Update().
|
||||
Where(plcsendlog.ID(id), plcsendlog.StatusEQ("SENT")).
|
||||
SetStatus("DONE").SetAck(true).SetDoneTime(time.Now()).
|
||||
SetRemark(remark).
|
||||
Save(ctx)
|
||||
if err != nil || updated == 0 {
|
||||
return nil, errors.New("收口失败:记录状态已变化,请刷新后重试")
|
||||
}
|
||||
s.ctx.EventLog.Write(ctx, "plc.send.manual_done", rec.OrderNo, operator, "plc_send_log", rec.Sn,
|
||||
"人工确认工位"+strconv.Itoa(rec.StationNo)+"流转完成(PLC 信号未回,现场收口)", nil)
|
||||
return s.ctx.EntClient.PlcSendLog.Get(ctx, id)
|
||||
}
|
||||
|
||||
// plcSendStatusText 下发状态中文(前端展示同口径)
|
||||
func plcSendStatusText(s string) string {
|
||||
switch s {
|
||||
case "SENT":
|
||||
return "已下发"
|
||||
case "DONE":
|
||||
return "已完成"
|
||||
case "CANCELLED":
|
||||
return "已撤回"
|
||||
case "TIMEOUT":
|
||||
return "已超时"
|
||||
case "REPLY_NG":
|
||||
return "回复异常"
|
||||
default:
|
||||
return s
|
||||
}
|
||||
}
|
||||
|
||||
// ListPlcSendLogs 查询 PLC 下发日志
|
||||
func (s *Service) ListPlcSendLogs(ctx context.Context, orderNo, status string) ([]*ent.PlcSendLog, error) {
|
||||
q := s.ctx.EntClient.PlcSendLog.Query()
|
||||
|
||||
@@ -114,13 +114,13 @@ func (s *Service) PlcMonitorMW(ctx context.Context) ([]MWState, error) {
|
||||
// 3) 写 MW 寄存器;
|
||||
// 4) 记操作日志(event_log,type=plc_manual_write)。
|
||||
func (s *Service) PlcMonitorManualWrite(ctx context.Context, req ManualWriteReq, operator string) (*MonitorPreview, error) {
|
||||
// 1. 互斥:在途指令(工位组合下发尚未收到完成信号)
|
||||
// 1. 互斥:在途指令(工位下发尚未收到完成信号)
|
||||
inTransit, err := s.ctx.EntClient.PlcSendLog.Query().Where(plcsendlog.Status("SENT")).Exist(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if inTransit {
|
||||
return nil, errors.New("存在在途指令(工位组合下发尚未收到完成信号),手动下发被拒绝,以免打断自动线")
|
||||
return nil, errors.New("存在在途指令(工位下发尚未收到完成信号),手动下发被拒绝,以免打断自动线;可在「工位下发」页撤回或人工完成后重试")
|
||||
}
|
||||
// 2. 校验组合
|
||||
st, stok := plc.ParseSrcType(req.SrcType)
|
||||
|
||||
@@ -93,8 +93,8 @@ func (s *Service) Seed(ctx context.Context) error {
|
||||
{"produce.producible", "排产支撑", "MENU", "/producible-support"},
|
||||
{"produce.material", "叫料单", "MENU", "/material-request"},
|
||||
{"produce.qty", "数量不符处理", "MENU", "/qty-report"},
|
||||
{"produce.plc", "工位组合下发", "MENU", "/plc-send"},
|
||||
{"produce.plc.monitor", "PLC 手动监控", "MENU", "/plc-monitor"},
|
||||
{"produce.plc", "工位下发", "MENU", "/plc-send"},
|
||||
{"produce.plc.monitor", "PLC管理", "MENU", "/plc-monitor"},
|
||||
{"produce.processflow", "工艺", "MENU", "/process-flow"},
|
||||
{"produce.station", "工位管理", "MENU", "/station"}, {"produce.performance", "绩效报表", "MENU", "/performance"},
|
||||
// 产线管理(块 E):顶部 4 tab = 工位状态 / 缓存状态 / 接驳台维护 / 工件位置纠正。
|
||||
@@ -262,6 +262,8 @@ func (s *Service) Seed(ctx context.Context) error {
|
||||
seedStations(ctx, s)
|
||||
// 5. 接驳台主数据(真源在 MES,2026-09-21 自 WMS 迁入;2026-10-17 块 E.2 起可在「产线管理」页维护)
|
||||
seedDocks(ctx, s)
|
||||
// 5.1 AGV 点位真源(硬件内置):接驳台点位与 dock 一一对应 + 少量纯待命/充电点位
|
||||
seedAgvPoints(ctx, s)
|
||||
// 6. 预警规则常用占位(遗留5 告警框架第一阶段):只插缺失行,enabled=false / threshold=0,
|
||||
// 即"占位不启用"——由实施在预警中心按需改阈值/启用,绝不默认触发
|
||||
seedAlertRules(ctx, s)
|
||||
@@ -362,6 +364,45 @@ func seedDocks(ctx context.Context, s *Service) {
|
||||
Save(ctx)
|
||||
}
|
||||
|
||||
// seedAgvPoints AGV 点位真源(硬件内置):接驳台点位 position_code= dockCode、dock_id 强绑定;
|
||||
// 另补纯待命/充电点位(is_dock=false)。仅当表为空时写入,人工改动不被覆盖。
|
||||
func seedAgvPoints(ctx context.Context, s *Service) {
|
||||
if n, _ := s.ctx.EntClient.AgvPoint.Query().Count(ctx); n > 0 {
|
||||
return
|
||||
}
|
||||
// 1) 接驳台点位:与 dock 一一对应(position_code= dockCode,dock_id 硬件内置强绑定,软件不可改)
|
||||
docks, err := s.ctx.EntClient.Dock.Query().All(ctx)
|
||||
if err == nil {
|
||||
for _, d := range docks {
|
||||
name := d.Name
|
||||
if name == "" {
|
||||
name = "接驳台 " + d.DockCode
|
||||
}
|
||||
_, _ = s.ctx.EntClient.AgvPoint.Create().
|
||||
SetPositionCode(d.DockCode).
|
||||
SetName(name).
|
||||
SetIsDock(true).
|
||||
SetDockID(d.ID).
|
||||
SetEnabled(true).
|
||||
Save(ctx)
|
||||
}
|
||||
}
|
||||
// 2) 纯 AGV 点位(无接驳台):待命 / 充电,派车时仅做二次确认(无传感器)
|
||||
pure := []struct{ code, name string }{
|
||||
{"AGV-WAIT01", "AGV 待命位 1"},
|
||||
{"AGV-WAIT02", "AGV 待命位 2"},
|
||||
{"AGV-CHARGE01", "AGV 充电位 1"},
|
||||
}
|
||||
for _, p := range pure {
|
||||
_, _ = s.ctx.EntClient.AgvPoint.Create().
|
||||
SetPositionCode(p.code).
|
||||
SetName(p.name).
|
||||
SetIsDock(false).
|
||||
SetEnabled(true).
|
||||
Save(ctx)
|
||||
}
|
||||
}
|
||||
|
||||
func seedStations(ctx context.Context, s *Service) {
|
||||
// 工位是产线固定物理工位,一律「内置工位」:需连 PLC、按工位号顺序流转、不可改类型、不可删除、仅可改名,
|
||||
// 属系统内置只读主数据(同 WMS 接驳台),故由种子初始化。12 个装配工位(1~10 带接驳台,11/12 产线末端无接驳台);
|
||||
|
||||
Reference in New Issue
Block a user