【MES】 - AGV点位/线路点位/AGV任务/工单 ent schema 重构(全量重生成 ent 代码) - 新增派车锁 agv_point_lock.go:目标点位占用即拒车,JBT21 库房接驳台卸货后保持锁定待库管手动解锁 - 新增进程内 TTL 缓存 cache.go,由 Redis 看板缓存迁移至内存(singleflight 防击穿,去除外部依赖) - AGV 三段链安全机制、车辆状态/接驳台左右互换、补料损耗闭环完善 - 来料检/工序卡/工单/质检/日排产/AGV 前端与帮助文档更新 - 新增 migrations/、sql/ 目录 【WMS】 - 出库、Excel 导出、物料、路由处理增强 - 配置与 DB 初始化调整;基础数据/成品入库/入库前端调整 【工位终端】 - 移除离线同步队列(syncer 包、sync.go、SyncQueueDialog.vue),改为实时直连上报 MES(断网即失败报错),以本人身份操作 - 本地 SQLite 仅保留操作日志 + 内置账号 + 登录态;保留空闲自动登出 【文档】 - 删除 AGV海康litev1.5.md;案例.md 更新
141 lines
5.2 KiB
Go
141 lines
5.2 KiB
Go
package handler
|
||
|
||
import (
|
||
"encoding/json"
|
||
"errors"
|
||
"fmt"
|
||
"io"
|
||
"net/http"
|
||
"strconv"
|
||
"strings"
|
||
|
||
"bj_power_workstation/internal/mes"
|
||
"bj_power_workstation/internal/svc"
|
||
|
||
"github.com/zeromicro/go-zero/core/logx"
|
||
)
|
||
|
||
// tighteningRecordHandler POST /api/tightening/record —— 录入一条拧紧数据。
|
||
// 真实场景:工件走到「需要拧紧枪」的工艺步骤时界面聚焦拧紧输入框,人工操作拧紧枪把采集到的
|
||
// 扭矩值打入输入框回车 → 本接口实时直连 MES /api/internal/torque/report 上报。
|
||
// 2026-11-05 拍板:断网即失败(无本地缓存/离线队列/自动重试),操作失败工人重做即可;
|
||
// 本地仅记操作日志(审计),不再落 torque_results 表。
|
||
// 入参 {sn, workOrderNo, stepId, stepName, screwNo, torque, angle, result, operator};
|
||
// result 由前端按该步骤考核标准(扭矩 RANGE)判定后传入,非 NG 一律记 OK。
|
||
func tighteningRecordHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
payload, err := io.ReadAll(r.Body)
|
||
if err != nil {
|
||
fail(w, http.StatusBadRequest, "请求体读取失败")
|
||
return
|
||
}
|
||
var req struct {
|
||
Sn string `json:"sn"`
|
||
WorkOrderNo string `json:"workOrderNo"`
|
||
StepId string `json:"stepId"`
|
||
StepName string `json:"stepName"`
|
||
ScrewNo string `json:"screwNo"`
|
||
Torque float64 `json:"torque"`
|
||
Angle float64 `json:"angle"`
|
||
Result string `json:"result"`
|
||
Operator string `json:"operator"`
|
||
}
|
||
if err := json.Unmarshal(payload, &req); err != nil {
|
||
fail(w, http.StatusBadRequest, "请求体解析失败")
|
||
return
|
||
}
|
||
if strings.TrimSpace(req.Sn) == "" {
|
||
fail(w, http.StatusBadRequest, "缺少工件 SN,请先上料")
|
||
return
|
||
}
|
||
if strings.TrimSpace(req.StepId) == "" {
|
||
fail(w, http.StatusBadRequest, "缺少拧紧工艺步骤")
|
||
return
|
||
}
|
||
if req.Result != "NG" {
|
||
req.Result = "OK"
|
||
}
|
||
// 方案 B:操作人取自工位登录态可信身份,忽略浏览器请求体里的 operator(防冒名)
|
||
ss, _ := ctx.Store.GetStationSession()
|
||
op := req.Operator
|
||
if ss != nil && ss.Name != "" {
|
||
op = ss.Name
|
||
}
|
||
// 拧紧域工位标签载体:DOCK%02d 由本机固定工位号生成(与接驳台 dock 表编码无关),
|
||
// MES 侧按 stationNo(数字工位号)落库并做应拧/实拧分组统计。
|
||
dockCode := fmt.Sprintf("DOCK%02d", ctx.Config.Station.StationNo)
|
||
body := map[string]any{
|
||
"workOrderNo": req.WorkOrderNo,
|
||
"sn": req.Sn,
|
||
"dockCode": dockCode,
|
||
"stationNo": strconv.Itoa(ctx.Config.Station.StationNo),
|
||
"screwNo": req.ScrewNo,
|
||
"stepId": req.StepId,
|
||
"stepName": req.StepName,
|
||
"torque": req.Torque,
|
||
"angle": req.Angle,
|
||
"result": req.Result,
|
||
"operator": op,
|
||
}
|
||
if _, _, err := ctx.Mes.Post("/api/internal/torque/report", body); err != nil {
|
||
var bizErr *mes.BizError
|
||
if errors.As(err, &bizErr) {
|
||
msg := mesRespCode(bizErr.Body)
|
||
if msg == "" {
|
||
msg = bizErr.Error()
|
||
}
|
||
ctx.Store.AddEventLog(req.WorkOrderNo, op, "torque_record_rejected",
|
||
fmt.Sprintf("拧紧录入被MES拒绝 sn=%s 步骤=%s:%s", req.Sn, req.StepName, msg))
|
||
fail(w, http.StatusConflict, msg)
|
||
return
|
||
}
|
||
// 网络失败:直接报错(2026-11-05 拍板:断网即失败,无本地缓存/自动重试,工人重做即可)
|
||
ctx.Store.AddEventLog(req.WorkOrderNo, op, "torque_record_failed",
|
||
fmt.Sprintf("拧紧录入失败(MES不可达) sn=%s 步骤=%s 扭矩=%.1f", req.Sn, req.StepName, req.Torque))
|
||
logx.Errorf("拧紧录入上报失败(MES不可达): %v", err)
|
||
fail(w, http.StatusBadGateway, "MES 服务不可达,拧紧数据未保存,请检查网络后重新录入")
|
||
return
|
||
}
|
||
ctx.Store.AddEventLog(req.WorkOrderNo, op, "torque_record",
|
||
fmt.Sprintf("拧紧录入 sn=%s 步骤=%s 扭矩=%.1f 结果=%s", req.Sn, req.StepName, req.Torque, req.Result))
|
||
ok(w, map[string]any{"result": req.Result})
|
||
}
|
||
}
|
||
|
||
// tighteningLiveHandler GET /api/tightening/live —— 返回 OP 控制器最近推送、尚未确认上报的拧紧结果(前端轮询预填)。
|
||
func tighteningLiveHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
if ctx.Tightening == nil || !ctx.Tightening.Enabled() {
|
||
ok(w, map[string]any{"enabled": false, "list": []any{}})
|
||
return
|
||
}
|
||
ok(w, map[string]any{"enabled": true, "list": ctx.Tightening.Latest()})
|
||
}
|
||
}
|
||
|
||
// tighteningConsumeHandler POST /api/tightening/consume —— 操作工点「完成」后标记某条 OP 缓冲结果为已确认(防重复上报)。
|
||
// 入参 {id}。
|
||
func tighteningConsumeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
payload, err := io.ReadAll(r.Body)
|
||
if err != nil {
|
||
fail(w, http.StatusBadRequest, "请求体读取失败")
|
||
return
|
||
}
|
||
var req struct {
|
||
ID int64 `json:"id"`
|
||
}
|
||
if err := json.Unmarshal(payload, &req); err != nil {
|
||
fail(w, http.StatusBadRequest, "请求体解析失败")
|
||
return
|
||
}
|
||
if req.ID <= 0 {
|
||
fail(w, http.StatusBadRequest, "缺少缓冲结果 ID")
|
||
return
|
||
}
|
||
if ctx.Tightening != nil {
|
||
ctx.Tightening.Consume(req.ID)
|
||
}
|
||
ok(w, map[string]any{"ok": true})
|
||
}
|
||
} |